Merge pull request #254 from regro-cf-autotick-bot/1.11.3_h904b92

scipy v1.11.3
conda-forge · Sep 28, 2023 · b0e17a5 · b0e17a5
2 parents d5fd7f7 + 2f6e9b7
commit b0e17a5
Show file tree

Hide file tree

Showing 9 changed files with 159 additions and 162 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "1.11.2" %}
+{% set version = "1.11.3" %}
 
 package:
   name: scipy-split
@@ -13,12 +13,11 @@ source:
   # we can compile pythran ourselves (or not), but manually need to include
   # the submodules (not in tarball due to dear-github/dear-github#214)
   - url: https://github.com/scipy/scipy/archive/refs/tags/v{{ version }}.tar.gz
-    sha256: 8bde045d246e5cae53069d73c44b6b673fc03bf2d6aebb830f2ffb0900c84881
+    sha256: 86712f1dff2cf674d823ad5489db54928b44149f76d7ba891ad19a6ae118abcf
     # need separate folder to do full reset on windows, see build-output.bat
     folder: base
     patches:
-      # backport https://github.com/scipy/scipy/pull/19200
-      - patches/0001-TST-fix-TestODR.test_implicit-test-failure-with-tole.patch
+      - patches/0001-remove-comment-that-breaks-parsing.patch
   # https://github.com/scipy/scipy/tree/v{{ version }}/scipy/_lib
   - git_url: https://github.com/boostorg/math.git
     git_rev: 298a243ccd3639b6eaa59bcdab7ab9d5f008fb36
@@ -35,7 +34,7 @@ source:
     folder: base/scipy/sparse/linalg/_propack/PROPACK
 
 build:
-  number: 1
+  number: 0
   skip: true  # [py<39]
 
 requirements:

diff --git a/recipe/patches/0001-TST-fix-TestODR.test_implicit-test-failure-with-tole.patch b/recipe/patches/0001-TST-fix-TestODR.test_implicit-test-failure-with-tole.patch
diff --git a/recipe/patches/0001-remove-comment-that-breaks-parsing.patch b/recipe/patches/0001-remove-comment-that-breaks-parsing.patch
@@ -0,0 +1,22 @@
+From 2a49f74cf35801ca4547da47cdb5c3cc1815e512 Mon Sep 17 00:00:00 2001
+From: "H. Vetinari" <[email protected]>
+Date: Thu, 28 Sep 2023 20:13:37 +1100
+Subject: [PATCH] remove comment that breaks parsing
+
+---
+ pyproject.toml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 95d0ccbe9..851fe8a92 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -12,8 +12,6 @@ build-backend = 'mesonpy'
+ requires = [
+     # Reason for `<`: future-proofing (0.14.0 released and known to work)
+     "meson-python>=0.12.1,<0.15.0",
+-    # Reason for `<`: we want to build the 1.11.x releases with Cython 0.29.x
+-    # (too many changes in 3.0)
+     "Cython>=0.29.35,<3.0",   # when updating version, also update check in meson.build
+     # Reason for `<`: future-proofing (2.11.1 is the most recent version)
+     "pybind11>=2.10.4,<2.11.1",