From c170955545c3a92e8bb391008cdf7936506b3afb Mon Sep 17 00:00:00 2001
From: William Jamieson <wjamieson@stsci.edu>
Date: Tue, 31 Jan 2023 14:39:46 -0500
Subject: [PATCH] Drop support for NumPy 1.20

---
 .github/workflows/ci_workflows.yml | 4 ++--
 setup.cfg                          | 2 +-
 tox.ini                            | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml
index e9ab7a3ed4e..2066ea460e4 100644
--- a/.github/workflows/ci_workflows.yml
+++ b/.github/workflows/ci_workflows.yml
@@ -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
@@ -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
diff --git a/setup.cfg b/setup.cfg
index 3baaf18cbaf..6805543436c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -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
diff --git a/tox.ini b/tox.ini
index 320f85b78a1..fa907e98cbb 100644
--- a/tox.ini
+++ b/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
@@ -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.*
@@ -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.*
@@ -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.*