Skip to content

Commit

Permalink
Merge pull request #14349 from WilliamJamieson/mnt/drop_numpy_1.20
Browse files Browse the repository at this point in the history
Drop support for NumPy 1.20
  • Loading branch information
mhvk committed Feb 5, 2023
2 parents 9155949 + 36ba035 commit 3fc3eaf
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci_workflows.yml
Expand Up @@ -120,7 +120,7 @@ jobs:
- name: Install dependencies for Python 3.8
run: /opt/python/cp38-cp38/bin/pip install --upgrade tox
- name: Run tests for Python 3.8
run: /opt/python/cp38-cp38/bin/python -m tox -e py38-numpy120-test -- -n=4 --durations=50
run: /opt/python/cp38-cp38/bin/python -m tox -e py38-numpy121-test -- -n=4 --durations=50
# We use the 3.8 build to check that running tests twice in a row in the
# same Python session works without issues. This catches cases where
# running the tests changes the module state permanently. Note that we
Expand All @@ -129,4 +129,4 @@ jobs:
# here.
# Numpy is pinned to avoid building it from source for numpy 1.21.5
- name: Run tests for Python 3.8
run: /opt/python/cp38-cp38/bin/python -m tox -e py38-numpy120-test-double
run: /opt/python/cp38-cp38/bin/python -m tox -e py38-numpy121-test-double
1 change: 1 addition & 0 deletions docs/changes/14349.other.rst
@@ -0,0 +1 @@
Drop support for NumPy 1.20 per APE 18.
2 changes: 1 addition & 1 deletion setup.cfg
Expand Up @@ -28,7 +28,7 @@ packages = find:
zip_safe = False
tests_require = pytest-astropy
install_requires =
numpy>=1.20
numpy>=1.21
pyerfa>=2.0
PyYAML>=3.13
packaging>=19.0
Expand Down
6 changes: 2 additions & 4 deletions tox.ini
@@ -1,6 +1,6 @@
[tox]
envlist =
py{38,39,310,311,dev}-test{,-recdeps,-alldeps,-oldestdeps,-devdeps,-devinfra,-predeps,-numpy120,-numpy121,-numpy122,-numpy123,-mpl322}{,-cov}{,-clocale}{,-fitsio}
py{38,39,310,311,dev}-test{,-recdeps,-alldeps,-oldestdeps,-devdeps,-devinfra,-predeps,-numpy121,-numpy122,-numpy123,-mpl322}{,-cov}{,-clocale}{,-fitsio}
# Only these two exact tox environments have corresponding figure hash files.
py39-test-image-mpl322-cov
py39-test-image-mpldev-cov
Expand Down Expand Up @@ -47,7 +47,6 @@ description =
devinfra: like devdeps but also dev version of infrastructure
oldestdeps: with the oldest supported version of key dependencies
cov: and test coverage
numpy120: with numpy 1.20.*
numpy121: with numpy 1.21.*
numpy122: with numpy 1.22.*
numpy123: with numpy 1.23.*
Expand All @@ -57,7 +56,6 @@ description =
double: twice in a row to check for global state changes

deps =
numpy120: numpy==1.20.*
numpy121: numpy==1.21.*
numpy122: numpy==1.22.*
numpy123: numpy==1.23.*
Expand All @@ -73,7 +71,7 @@ deps =

# The oldestdeps factor is intended to be used to install the oldest versions of all
# dependencies that have a minimum version.
oldestdeps: numpy==1.20.*
oldestdeps: numpy==1.21.*
oldestdeps: matplotlib==3.2.*
oldestdeps: asdf==2.10.0
oldestdeps: scipy==1.5.*
Expand Down

0 comments on commit 3fc3eaf

Please sign in to comment.