From 75da6d879e95b9b6f8dd61c36bdd06449b47f8af Mon Sep 17 00:00:00 2001 From: Benjamin Rodenberg Date: Tue, 27 Aug 2024 12:44:14 +0200 Subject: [PATCH] Restrict to numpy < 2 and setuptools < 72 for better compatibiltiy with CI pipeline (#213) * Restrict to numpy<2 since we do not support numpy 2 yet. * Restrict to setuptools < 72 since the "test" command was removed in Setuptools 72. See #214. --- CHANGELOG.md | 2 ++ pyproject.toml | 2 +- setup.py | 2 +- spack/repo/packages/py-pyprecice/package.py | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab2af4e0..2c46a1bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## latest +* Restrict to numpy < 2 for better compatibility with CI pipeline. https://github.com/precice/python-bindings/pull/213 +* Require setuptools < 72 since support for the test command was removed in Setuptools 72. https://github.com/precice/python-bindings/pull/213 * Require setuptools >= 61 to guarantee that pyproject.toml is used https://github.com/precice/python-bindings/pull/207 * Fix CI pipeline for spack https://github.com/precice/python-bindings/pull/206 diff --git a/pyproject.toml b/pyproject.toml index 27c696d5..6f8c358a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [build-system] # PEP 518 - minimum build system requirements -requires = ["setuptools>=61", "wheel", "Cython>=0.29", "packaging", "pip>=19.0.0", "numpy", "mpi4py", "pkgconfig"] +requires = ["setuptools>=61,<72", "wheel", "Cython>=0.29", "packaging", "pip>=19.0.0", "numpy<2", "mpi4py", "pkgconfig"] \ No newline at end of file diff --git a/setup.py b/setup.py index c4c50541..2adf7a44 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', 'mpi4py', 'Cython'], + install_requires=['numpy<2', 'mpi4py', 'Cython'], # mpi4py is only needed, if preCICE was compiled with MPI # see https://github.com/precice/python-bindings/issues/8 packages=['precice'], diff --git a/spack/repo/packages/py-pyprecice/package.py b/spack/repo/packages/py-pyprecice/package.py index 765cd557..7ee79d6e 100644 --- a/spack/repo/packages/py-pyprecice/package.py +++ b/spack/repo/packages/py-pyprecice/package.py @@ -58,8 +58,8 @@ class PyPyprecice(PythonPackage): depends_on("precice@" + ver, when="@" + ver) depends_on("python@3:", type=("build", "link", "run")) - depends_on("py-setuptools@61:", type="build") - depends_on("py-numpy", type=("build", "link", "run")) + depends_on("py-setuptools@61:71", type="build") + depends_on("py-numpy@:1", type=("build", "link", "run")) depends_on("py-mpi4py", type=("build", "run")) depends_on("py-cython@0.29:", type="build") depends_on("py-packaging", type="build")