From 5d7939eef55c628c80e1f1f0ea4545bb47ed2963 Mon Sep 17 00:00:00 2001 From: Benjamin Rodenberg Date: Wed, 4 Sep 2024 12:06:47 +0200 Subject: [PATCH 1/8] Allow numpy 2 for pyprecice>=3.1.1 --- spack/repo/packages/py-pyprecice/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spack/repo/packages/py-pyprecice/package.py b/spack/repo/packages/py-pyprecice/package.py index 7ee79d6e..437dbc20 100644 --- a/spack/repo/packages/py-pyprecice/package.py +++ b/spack/repo/packages/py-pyprecice/package.py @@ -59,7 +59,8 @@ class PyPyprecice(PythonPackage): depends_on("python@3:", type=("build", "link", "run")) depends_on("py-setuptools@61:71", type="build") - depends_on("py-numpy@:1", type=("build", "link", "run")) + depends_on("py-numpy@:1", type=("build", "link", "run"), when="@:3.1.1") + depends_on("py-numpy", type=("build", "link", "run"), when="@3.1.1:") depends_on("py-mpi4py", type=("build", "run")) depends_on("py-cython@0.29:", type="build") depends_on("py-packaging", type="build") From 487fb9f5220a42973b06077e1447657ceadd43fb Mon Sep 17 00:00:00 2001 From: Benjamin Rodenberg Date: Wed, 4 Sep 2024 12:07:56 +0200 Subject: [PATCH 2/8] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6f8c358a..f4efd4da 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [build-system] # PEP 518 - minimum build system requirements -requires = ["setuptools>=61,<72", "wheel", "Cython>=0.29", "packaging", "pip>=19.0.0", "numpy<2", "mpi4py", "pkgconfig"] \ No newline at end of file +requires = ["setuptools>=61,<72", "wheel", "Cython>=0.29", "packaging", "pip>=19.0.0", "numpy", "mpi4py", "pkgconfig"] From c2c156a18b55e7a2fb0263d7b9c7e4b8417fb75a Mon Sep 17 00:00:00 2001 From: Benjamin Rodenberg Date: Wed, 4 Sep 2024 12:08:19 +0200 Subject: [PATCH 3/8] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2adf7a44..c4c50541 100644 --- a/setup.py +++ b/setup.py @@ -137,7 +137,7 @@ def initialize_options(self): author_email='info@precice.org', license='LGPL-3.0', python_requires='>=3', - install_requires=['numpy<2', 'mpi4py', 'Cython'], + install_requires=['numpy', 'mpi4py', 'Cython'], # mpi4py is only needed, if preCICE was compiled with MPI # see https://github.com/precice/python-bindings/issues/8 packages=['precice'], From 25086b2fff5f4f3d9c0316233862927729d639d3 Mon Sep 17 00:00:00 2001 From: Benjamin Rodenberg Date: Wed, 4 Sep 2024 13:45:32 +0200 Subject: [PATCH 4/8] Trigger CI. From de9acc7f5625965e83600edf68516f64cdd07b70 Mon Sep 17 00:00:00 2001 From: Benjamin Rodenberg Date: Wed, 4 Sep 2024 13:51:45 +0200 Subject: [PATCH 5/8] Explicitly specify develop. --- spack/repo/packages/py-pyprecice/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spack/repo/packages/py-pyprecice/package.py b/spack/repo/packages/py-pyprecice/package.py index 437dbc20..54766d2e 100644 --- a/spack/repo/packages/py-pyprecice/package.py +++ b/spack/repo/packages/py-pyprecice/package.py @@ -59,8 +59,9 @@ class PyPyprecice(PythonPackage): depends_on("python@3:", type=("build", "link", "run")) depends_on("py-setuptools@61:71", type="build") - depends_on("py-numpy@:1", type=("build", "link", "run"), when="@:3.1.1") + depends_on("py-numpy:", type=("build", "link", "run"), when="@develop") # explicitly specity develop depends_on("py-numpy", type=("build", "link", "run"), when="@3.1.1:") + depends_on("py-numpy@:1", type=("build", "link", "run"), when="@:3.1.1") depends_on("py-mpi4py", type=("build", "run")) depends_on("py-cython@0.29:", type="build") depends_on("py-packaging", type="build") From 8b6ef650ff7ff8698c8a83c4914731381e6ce68a Mon Sep 17 00:00:00 2001 From: Benjamin Rodenberg Date: Wed, 4 Sep 2024 13:53:25 +0200 Subject: [PATCH 6/8] Fix. --- spack/repo/packages/py-pyprecice/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack/repo/packages/py-pyprecice/package.py b/spack/repo/packages/py-pyprecice/package.py index 54766d2e..1ad1bfcf 100644 --- a/spack/repo/packages/py-pyprecice/package.py +++ b/spack/repo/packages/py-pyprecice/package.py @@ -59,7 +59,7 @@ class PyPyprecice(PythonPackage): depends_on("python@3:", type=("build", "link", "run")) depends_on("py-setuptools@61:71", type="build") - depends_on("py-numpy:", type=("build", "link", "run"), when="@develop") # explicitly specity develop + depends_on("py-numpy", type=("build", "link", "run"), when="@develop") # explicitly specity develop depends_on("py-numpy", type=("build", "link", "run"), when="@3.1.1:") depends_on("py-numpy@:1", type=("build", "link", "run"), when="@:3.1.1") depends_on("py-mpi4py", type=("build", "run")) From 6f53b6df888e64891b8bf3e5c3b1c027ec24f7f9 Mon Sep 17 00:00:00 2001 From: Benjamin Rodenberg Date: Wed, 4 Sep 2024 13:56:42 +0200 Subject: [PATCH 7/8] Explicitly ask for numpy 2. --- spack/repo/packages/py-pyprecice/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack/repo/packages/py-pyprecice/package.py b/spack/repo/packages/py-pyprecice/package.py index 1ad1bfcf..83c622b0 100644 --- a/spack/repo/packages/py-pyprecice/package.py +++ b/spack/repo/packages/py-pyprecice/package.py @@ -59,7 +59,7 @@ class PyPyprecice(PythonPackage): depends_on("python@3:", type=("build", "link", "run")) depends_on("py-setuptools@61:71", type="build") - depends_on("py-numpy", type=("build", "link", "run"), when="@develop") # explicitly specity develop + depends_on("py-numpy@2:", type=("build", "link", "run"), when="@develop") # explicitly specity develop depends_on("py-numpy", type=("build", "link", "run"), when="@3.1.1:") depends_on("py-numpy@:1", type=("build", "link", "run"), when="@:3.1.1") depends_on("py-mpi4py", type=("build", "run")) From f6940a8a8cd2bacabfc1221fdc529182b3bf56ad Mon Sep 17 00:00:00 2001 From: Benjamin Rodenberg Date: Wed, 4 Sep 2024 14:11:23 +0200 Subject: [PATCH 8/8] Remove explicit specification for develop to not over-constrain. --- spack/repo/packages/py-pyprecice/package.py | 1 - 1 file changed, 1 deletion(-) diff --git a/spack/repo/packages/py-pyprecice/package.py b/spack/repo/packages/py-pyprecice/package.py index 83c622b0..f6c31915 100644 --- a/spack/repo/packages/py-pyprecice/package.py +++ b/spack/repo/packages/py-pyprecice/package.py @@ -59,7 +59,6 @@ class PyPyprecice(PythonPackage): depends_on("python@3:", type=("build", "link", "run")) depends_on("py-setuptools@61:71", type="build") - depends_on("py-numpy@2:", type=("build", "link", "run"), when="@develop") # explicitly specity develop depends_on("py-numpy", type=("build", "link", "run"), when="@3.1.1:") depends_on("py-numpy@:1", type=("build", "link", "run"), when="@:3.1.1") depends_on("py-mpi4py", type=("build", "run"))