From ec1701d2a00def79efae9f6bb7c4364cc8e4a98a Mon Sep 17 00:00:00 2001 From: Marten van Kerkwijk Date: Wed, 22 Mar 2023 17:45:54 -0400 Subject: [PATCH 1/4] Revert "Update min numpy version in setup.cfg" This reverts commit 61a845be46c8cc2f2885b84f4cc18ed469f86c3d. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 77c9c2a..4c1cb04 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,7 +24,7 @@ requires = numpy zip_safe = False tests_require = pytest-doctestplus setup_requires = setuptools_scm -install_requires = numpy>=1.21 +install_requires = numpy>=1.17 python_requires = >=3.7 [options.packages.find] From 525ba956413c109b9eb5f35147824efad42df5c4 Mon Sep 17 00:00:00 2001 From: Marten van Kerkwijk Date: Wed, 22 Mar 2023 18:26:49 -0400 Subject: [PATCH 2/4] Move back oldestdeps so that we actually test oldest supported numpy --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 86bd86e..37f9e21 100644 --- a/tox.ini +++ b/tox.ini @@ -36,7 +36,7 @@ description = # The following provides some specific pinnings for key packages deps = - oldestdeps: numpy==1.21.* + oldestdeps: numpy==1.17.* devdeps: numpy>=0.0.dev0 # The following indicates which extras_require from setup.cfg will be installed From cd5f321537902700f9298fb301a6f3fd525b35c5 Mon Sep 17 00:00:00 2001 From: Marten van Kerkwijk Date: Wed, 22 Mar 2023 18:27:18 -0400 Subject: [PATCH 3/4] Also test numpy 1.20, which was problematic in gh-101 --- .github/workflows/ci_workflows.yml | 8 ++++++++ tox.ini | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index d399856..35d65c9 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -24,6 +24,14 @@ jobs: toxenv: test-oldestdeps toxargs: -v + - name: Test with medium old supported versions of our dependencies + # Test that we do not have a problem with some specific version (gh-101). + # Comment out if not needed. + os: ubuntu-20.04 + python: 3.9 + toxenv: test-olddeps + toxargs: -v + - name: Test with development versions of our dependencies os: ubuntu-latest python: 3.11 diff --git a/tox.ini b/tox.ini index 37f9e21..86fe79f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - test{,-oldestdeps,-devdeps} + test{,-oldestdeps,-olddeps,-devdeps} build_docs linkcheck codestyle @@ -32,11 +32,13 @@ changedir = .tmp/{envname} description = run tests devdeps: with the latest developer version of key dependencies + olddeps: with medium old versions of key dependencies oldestdeps: with the oldest supported version of key dependencies # The following provides some specific pinnings for key packages deps = - oldestdeps: numpy==1.17.* + oldestdeps: numpy==1.17.* # astropy LTS + olddeps: numpy==1.20.* # something potentially problematic (see gh-101) devdeps: numpy>=0.0.dev0 # The following indicates which extras_require from setup.cfg will be installed From a29d68bef6b3aafeb720ff2e8b11554e81314df3 Mon Sep 17 00:00:00 2001 From: Marten van Kerkwijk Date: Wed, 22 Mar 2023 18:27:33 -0400 Subject: [PATCH 4/4] Changelog entry for 2.0.0.3 --- CHANGES.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 23fa8a4..25561cd 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,8 @@ +2.0.0.3 (2023-03-22) +==================== + +- Ensure minimum numpy version of 1.17 continues to work (for astropy LTS). + 2.0.0.2 (2023-03-19) ====================