Merge pull request #45 from carlodri/bump_v304

Bump v304
conda-forge · Oct 28, 2022 · 2310546 · 2310546
2 parents e4e2804 + 5b2a69e
commit 2310546
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 40 deletions.
diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml
@@ -4,6 +4,8 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
+cxx_compiler:
+- vs2019
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml
@@ -4,6 +4,8 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
+cxx_compiler:
+- vs2019
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml
@@ -4,6 +4,8 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
+cxx_compiler:
+- vs2019
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml
@@ -4,6 +4,8 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
+cxx_compiler:
+- vs2019
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/recipe/0003-remove-PATH-pth-hack.patch b/recipe/0003-remove-PATH-pth-hack.patch
@@ -1,14 +1,5 @@
-From 981ac7d03d05da6cbdc354970bb37342f077c9ee Mon Sep 17 00:00:00 2001
-From: Mike Sarahan <[email protected]>
-Date: Wed, 15 Jan 2020 09:11:35 -0600
-Subject: [PATCH 3/4] remove PATH pth hack
-
----
- pywin32.pth | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
 diff --git a/pywin32.pth b/pywin32.pth
-index b57c496..0b75a1e 100644
+index b57c4964..89cb9e0e 100644
 --- a/pywin32.pth
 +++ b/pywin32.pth
 @@ -2,6 +2,7 @@
@@ -18,10 +9,7 @@ index b57c496..0b75a1e 100644
 -# And some hackery to deal with environments where the post_install script
 -# isn't run.
 -import pywin32_bootstrap
-+# This breaks any software involving a feedback loop involving PATH and Python
-+# One example of such software is the Anaconda Distribition's conda package
-+# manager, so we do not do it. We fixed this in a slightly better way anyway.
+++# This breaks any software involving a feedback loop involving PATH and Python
+++# One example of such software is the Anaconda Distribition's conda package
+++# manager, so we do not do it. We fixed this in a slightly better way anyway.
 +# import pywin32_bootstrap
--- 
-2.20.1.windows.1
-
diff --git a/recipe/disable_exchange_modules.patch b/recipe/disable_exchange_modules.patch
diff --git a/recipe/do-not-build-scintilla.patch b/recipe/do-not-build-scintilla.patch
@@ -0,0 +1,22 @@
+diff --git a/setup.py b/setup.py
+index e74e6d97..53b2b56a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -748,7 +748,7 @@ class my_build_ext(build_ext):
+
+         # Not sure how to make this completely generic, and there is no
+         # need at this stage.
+-        self._build_scintilla()
++        # self._build_scintilla()
+         # Copy cpp lib files needed to create Python COM extensions
+         clib_files = (
+             ["win32", "pywintypes%s.lib"],
+@@ -2425,7 +2425,7 @@ packages = [
+     "pythonwin.pywin.framework.editor.color",
+     "pythonwin.pywin.idle",
+     "pythonwin.pywin.mfc",
+-    "pythonwin.pywin.scintilla",
++    # "pythonwin.pywin.scintilla",
+     "pythonwin.pywin.tools",
+     "isapi",
+     "adodbapi",
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,21 +1,22 @@
-{% set version = "303" %}
+{% set version = "304" %}
 
 package:
   name: pywin32
   version: {{ version }}
 
 source:
   url: https://github.com/mhammond/pywin32/archive/b{{ version }}.tar.gz
-  sha256: bc3980d80e351333cc5566c7847d8f179828f2678d8539eed0e52d39ea0c3970
+  sha256: 23e43eaacca3161565b2adc71f75625d9011087379e60fcdfb5238e187169246
   patches:
-    - disable_exchange_modules.patch
     - 0003-remove-PATH-pth-hack.patch
+    - do-not-build-scintilla.patch
 
 build:
   number: 1
   script:
     - |                                                                                           # [win and python_impl != 'pypy']
       @echo on                                                                                    # [win and python_impl != 'pypy']
+      set "STDLIB_DIR=%PREFIX%\Lib;%PREFIX%;%LIBRARY_BIN%"                                        # [win and python_impl != 'pypy']
       {{ PYTHON }} setup.py -q install --record=record.txt --skip-verstamp                        # [win and python_impl != 'pypy']
       echo "sleeping for 15"                                                                      # [win and python_impl != 'pypy']
       {{ PYTHON }} -c "import time; time.sleep(15)"                                               # [win and python_impl != 'pypy']
@@ -36,6 +37,7 @@ build:
 requirements:
   build:                          # [win and python_impl != 'pypy']
     - {{ compiler("c") }}         # [win and python_impl != 'pypy']
+    - {{ compiler("cxx") }}       # [win and python_impl != 'pypy']
   host:
     - python
     - pip                         # [win and python_impl != 'pypy']