From 1d2e11cfaf9d6fd1f278421f01f7419d6b7fe58c Mon Sep 17 00:00:00 2001
From: Brett <brettgraham@gmail.com>
Date: Sat, 9 Mar 2024 11:27:21 -0500
Subject: [PATCH] attempt to re-add numpy 2.0 testing

---
 .github/workflows/ci.yml | 19 +------------------
 tox.ini                  | 17 +++--------------
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dad8aa27..eed2ebd0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -88,6 +88,7 @@ jobs:
       envs: |
         - linux: py310-test-devdeps-parallel
         - linux: py311-test-devdeps-parallel
+        - linux: py311-test-devdeps-numpydev-parallel
 
   oldest:
     needs: [core, asdf-schemas]
@@ -103,24 +104,6 @@ jobs:
         - linux: py39-test-oldestdep-parallels-cov
       coverage: codecov
 
-  numpy:
-    needs: [core, asdf-schemas]
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
-    with:
-      cache-path: ~/.cache/pip
-      cache-key: pip-${{ needs.setup.outputs.requirements-hash }}
-      cache-restore-keys: |
-        pip-
-      # Any env name which does not start with `pyXY` will use this Python version.
-      default_python: '3.9'
-      envs: |
-        - linux: py39-test-numpy119-parallel
-        - linux: py39-test-numpy120-parallel
-        - linux: py310-test-numpy121-parallel
-        - linux: py310-test-numpy122-parallel
-        - linux: py311-test-numpy123-parallel
-        - linux: py311-test-numpy124-parallel
-
   wheel_building:
     permissions:
       contents: none
diff --git a/tox.ini b/tox.ini
index f351dd0d..212451bc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,8 @@
 [tox]
 envlist =
     py{39,310}-test{,-alldeps}
-    py38-test-devdeps
+    py38-test-devdeps{,-numpydev}
     py38-cov
-    py{39,}-test-numpy{119,120,121,122}
     py38-astropylts
     py39-test-oldestdep-parallels-cov
 requires =
@@ -17,12 +16,6 @@ description =
     alldeps: with all optional dependencies
     devdeps: with the latest developer version of key dependencies
     cov: and test coverage
-    numpy119: with numpy 1.19.*
-    numpy120: with numpy 1.20.*
-    numpy121: with numpy 1.21.*
-    numpy122: with numpy 1.22.*
-    numpy123: with numpy 1.23.*
-    numpy124: with numpy 1.24.*
     astropylts: with astropy LTS
 
 setenv =
@@ -31,12 +24,6 @@ setenv =
 # The following provides some specific pinnings for key packages
 deps =
     cov: coverage
-    numpy119: numpy==1.19.*
-    numpy120: numpy==1.20.*
-    numpy121: numpy==1.21.*
-    numpy122: numpy==1.22.*
-    numpy123: numpy==1.23.*
-    numpy124: numpy==1.24.*
     astropylts: astropy==5.0.*
     transformlts: asdf-transform-schemas==0.2.*
 
@@ -48,6 +35,8 @@ extras =
     test
     alldeps: all
 commands_pre=
+    numpydev: pip install -U --pre -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
+    numpydev: pip install -U --pre -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy
     devdeps: pip install -U --pre -i https://pypi.anaconda.org/liberfa/simple pyerfa
     devdeps: pip install -U --pre -i https://pypi.anaconda.org/astropy/simple astropy