From b916462b1b9f9ae9b796113429118b6dcb39b0d9 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 17 Aug 2024 09:55:48 +1100 Subject: [PATCH 1/2] add missing numpy lower bounds to scipy --- recipe/patch_yaml/scipy.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/recipe/patch_yaml/scipy.yaml b/recipe/patch_yaml/scipy.yaml index ac4c2ce56..118ec8fa3 100644 --- a/recipe/patch_yaml/scipy.yaml +++ b/recipe/patch_yaml/scipy.yaml @@ -1,3 +1,28 @@ +# missing lower bounds for numpy after 2.0 migration, c.f. +# https://github.com/conda-forge/numpy-feedstock/issues/324 +# the upper bound has been there correctly, c.f. +# https://github.com/conda-forge/scipy-feedstock/commit/0711eb22f502ce2f1ea1bd7a22ffd4b8f73b73a7 +if: + name: scipy + version: 1.14.0 + +then: + # https://github.com/scipy/scipy/blob/v1.14.0/pyproject.toml#L55 + - add_constrains: numpy >=1.23.5 + +--- + +if: + name: scipy + version_lt: 1.14.0 + version_ge: 1.13.0 + +then: + # https://github.com/scipy/scipy/blob/v1.13.1/pyproject.toml#L55 + - add_constrains: numpy >=1.22.4 + +--- + # 2024/01 -- hmaarrfk # scipy version 1.12.0 build 2 was patched # for compatibility with libopenblas 0.3.26 From 40ce064b5b20495b335186976c104e6631702d12 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 17 Aug 2024 11:56:38 +1100 Subject: [PATCH 2/2] use replace_depends instead of add_constrains --- recipe/patch_yaml/scipy.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipe/patch_yaml/scipy.yaml b/recipe/patch_yaml/scipy.yaml index 118ec8fa3..688c970e3 100644 --- a/recipe/patch_yaml/scipy.yaml +++ b/recipe/patch_yaml/scipy.yaml @@ -8,7 +8,9 @@ if: then: # https://github.com/scipy/scipy/blob/v1.14.0/pyproject.toml#L55 - - add_constrains: numpy >=1.23.5 + - replace_depends: + old: numpy <2.3 + new: numpy >=1.23.5,<2.3 --- @@ -19,7 +21,9 @@ if: then: # https://github.com/scipy/scipy/blob/v1.13.1/pyproject.toml#L55 - - add_constrains: numpy >=1.22.4 + - replace_depends: + old: numpy <2.3 + new: numpy >=1.22.4,<2.3 ---