From 616ff6390609d34f24632b346adfb67485a0f719 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Thu, 7 Nov 2024 11:10:22 +0100 Subject: [PATCH 1/7] changed numpy pinning to be more flexible --- recipes/pyopenms/conda_build_config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/pyopenms/conda_build_config.yaml b/recipes/pyopenms/conda_build_config.yaml index dd7f1933d9e4e..004d24421efa1 100644 --- a/recipes/pyopenms/conda_build_config.yaml +++ b/recipes/pyopenms/conda_build_config.yaml @@ -10,9 +10,9 @@ python_impl: - cpython numpy: - 1.23.* - - 1.23.* - - 1.23.* - - 1.26.* + - >=1.23.0 + - >=1.23.0 + - >=1.26.0 zip_keys: - python - python_impl From 1056c838e44137d85f5eb73d941d042280d200d2 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Thu, 7 Nov 2024 11:11:31 +0100 Subject: [PATCH 2/7] updated build number --- recipes/pyopenms/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pyopenms/meta.yaml b/recipes/pyopenms/meta.yaml index f156ccddb0a36..a22081be07893 100644 --- a/recipes/pyopenms/meta.yaml +++ b/recipes/pyopenms/meta.yaml @@ -17,7 +17,7 @@ source: build: skip: True # [py2k or osx] - number: 0 + number: 1 run_exports: - {{ pin_subpackage("pyopenms", max_pin="x.x") }} From 91c770da4b9b366df98291ee5547eb1dcfd52041 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Thu, 7 Nov 2024 11:17:53 +0100 Subject: [PATCH 3/7] trying with generic numpy pin --- recipes/pyopenms/conda_build_config.yaml | 5 ----- recipes/pyopenms/meta.yaml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/recipes/pyopenms/conda_build_config.yaml b/recipes/pyopenms/conda_build_config.yaml index 004d24421efa1..48426702aedcd 100644 --- a/recipes/pyopenms/conda_build_config.yaml +++ b/recipes/pyopenms/conda_build_config.yaml @@ -8,11 +8,6 @@ python_impl: - cpython - cpython - cpython -numpy: - - 1.23.* - - >=1.23.0 - - >=1.23.0 - - >=1.26.0 zip_keys: - python - python_impl diff --git a/recipes/pyopenms/meta.yaml b/recipes/pyopenms/meta.yaml index a22081be07893..29d239e2f8ba4 100644 --- a/recipes/pyopenms/meta.yaml +++ b/recipes/pyopenms/meta.yaml @@ -41,7 +41,7 @@ requirements: - setuptools - wheel - pip - - numpy {{ numpy }} + - numpy >=1.23.* - pandas - matplotlib-base - sysroot_linux-64 =2.17 # [linux] From b122b349f0392636eda43da5fe1867b297c7b324 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Thu, 7 Nov 2024 11:23:17 +0100 Subject: [PATCH 4/7] fix run dep --- recipes/pyopenms/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pyopenms/meta.yaml b/recipes/pyopenms/meta.yaml index 29d239e2f8ba4..30d5422711e45 100644 --- a/recipes/pyopenms/meta.yaml +++ b/recipes/pyopenms/meta.yaml @@ -55,7 +55,7 @@ requirements: - qt-main >=5.15.8 - eigen >=3.3.4 - python {{ python }} - - numpy {{ numpy }} + - numpy >=1.23.* - pandas - matplotlib-base - sysroot_linux-64 =2.17 # [linux] From 987a1c0a78130e93e92c3c29f7c1f86c1a18a0f7 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Thu, 7 Nov 2024 11:31:12 +0100 Subject: [PATCH 5/7] fixed zip keys --- recipes/pyopenms/conda_build_config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/pyopenms/conda_build_config.yaml b/recipes/pyopenms/conda_build_config.yaml index 48426702aedcd..ab9b70739a9ed 100644 --- a/recipes/pyopenms/conda_build_config.yaml +++ b/recipes/pyopenms/conda_build_config.yaml @@ -11,4 +11,3 @@ python_impl: zip_keys: - python - python_impl - - numpy From 9d8a6b070e245d3799b8accaa3bbbf72be8b6e91 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Thu, 7 Nov 2024 11:38:55 +0100 Subject: [PATCH 6/7] removed build config --- recipes/pyopenms/conda_build_config.yaml | 13 ------------- recipes/pyopenms/meta.yaml | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 recipes/pyopenms/conda_build_config.yaml diff --git a/recipes/pyopenms/conda_build_config.yaml b/recipes/pyopenms/conda_build_config.yaml deleted file mode 100644 index ab9b70739a9ed..0000000000000 --- a/recipes/pyopenms/conda_build_config.yaml +++ /dev/null @@ -1,13 +0,0 @@ -python: - - 3.9.* - - 3.10.* - - 3.11.* - - 3.12.* -python_impl: - - cpython - - cpython - - cpython - - cpython -zip_keys: - - python - - python_impl diff --git a/recipes/pyopenms/meta.yaml b/recipes/pyopenms/meta.yaml index 30d5422711e45..94b78a11ad681 100644 --- a/recipes/pyopenms/meta.yaml +++ b/recipes/pyopenms/meta.yaml @@ -35,7 +35,7 @@ requirements: - xerces-c - boost-cpp - qt-main >=5.15.8 - - python {{ python }} + - python >=3.9 - cython >=0.25.2 - autowrap >=0.22.10 - setuptools @@ -54,7 +54,7 @@ requirements: - boost-cpp - qt-main >=5.15.8 - eigen >=3.3.4 - - python {{ python }} + - python >=3.9 - numpy >=1.23.* - pandas - matplotlib-base From f86f615aa9771e889fc905a8c08274dc60d7d4c7 Mon Sep 17 00:00:00 2001 From: Helge Hecht Date: Thu, 7 Nov 2024 11:52:53 +0100 Subject: [PATCH 7/7] set upper python limit to <3.13 --- recipes/pyopenms/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/pyopenms/meta.yaml b/recipes/pyopenms/meta.yaml index 94b78a11ad681..59cf39da0d5d7 100644 --- a/recipes/pyopenms/meta.yaml +++ b/recipes/pyopenms/meta.yaml @@ -35,7 +35,7 @@ requirements: - xerces-c - boost-cpp - qt-main >=5.15.8 - - python >=3.9 + - python >=3.9,<3.13 - cython >=0.25.2 - autowrap >=0.22.10 - setuptools @@ -54,7 +54,7 @@ requirements: - boost-cpp - qt-main >=5.15.8 - eigen >=3.3.4 - - python >=3.9 + - python >=3.9,<3.13 - numpy >=1.23.* - pandas - matplotlib-base