From 6e048f07481c7c536322d69e8172d118daacaf45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Robert?= Date: Fri, 12 Apr 2024 08:53:24 +0200 Subject: [PATCH 1/3] TST: pin runtime requirement to numpy>=2.0.0rc1 to see which of our optional dependencies still lack compat --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6fe32ca438..80db5ad914 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,7 @@ dependencies = [ "ipywidgets>=8.0.0", "matplotlib>=3.5", "more-itertools>=8.4", - "numpy>=1.19.3, <3", # keep minimal requirement in sync with NPY_TARGET_VERSION + "numpy>=2.0.0rc1, <3", # keep minimal requirement in sync with NPY_TARGET_VERSION "packaging>=20.9", "pillow>=8.0.0", "tomli-w>=0.4.0", From 2cb0677cc9b723c19d8520de51757b243dc7cf2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Robert?= Date: Fri, 14 Jun 2024 09:00:17 +0200 Subject: [PATCH 2/3] test with astropy nightlies --- tests/ci_install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/ci_install.sh b/tests/ci_install.sh index b73c90f739..7e67805054 100644 --- a/tests/ci_install.sh +++ b/tests/ci_install.sh @@ -39,6 +39,7 @@ elif [[ ${dependencies} == "cartopy" ]]; then python -m pip install scipy python -m pip install -e ".[test]" elif [[ ${dependencies} == "full" ]]; then + python -m pip install astropy --pre --extra-index-url=https://pypi.anaconda.org/scientific-python-nightly-wheels/simple # test with all optional runtime dependencies python -m pip install -e ".[test,full]" else From 2e3d69c454d777490dcad7c647f149c5e413e709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Robert?= Date: Fri, 14 Jun 2024 09:16:41 +0200 Subject: [PATCH 3/3] do not pin numpy on Python 3.9 --- pyproject.toml | 3 ++- tests/ci_install.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 80db5ad914..658d46cac4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,8 @@ dependencies = [ "ipywidgets>=8.0.0", "matplotlib>=3.5", "more-itertools>=8.4", - "numpy>=2.0.0rc1, <3", # keep minimal requirement in sync with NPY_TARGET_VERSION + "numpy>=2.0.0rc1, <3 ; python_version >= '3.10'", # keep minimal requirement in sync with NPY_TARGET_VERSION + "numpy; python_version == '3.9'", # keep minimal requirement in sync with NPY_TARGET_VERSION "packaging>=20.9", "pillow>=8.0.0", "tomli-w>=0.4.0", diff --git a/tests/ci_install.sh b/tests/ci_install.sh index 7e67805054..4685a75961 100644 --- a/tests/ci_install.sh +++ b/tests/ci_install.sh @@ -39,7 +39,7 @@ elif [[ ${dependencies} == "cartopy" ]]; then python -m pip install scipy python -m pip install -e ".[test]" elif [[ ${dependencies} == "full" ]]; then - python -m pip install astropy --pre --extra-index-url=https://pypi.anaconda.org/scientific-python-nightly-wheels/simple + #python -m pip install astropy --pre --extra-index-url=https://pypi.anaconda.org/scientific-python-nightly-wheels/simple # test with all optional runtime dependencies python -m pip install -e ".[test,full]" else