Refector oldestdeps a lot

AlistairSymonds · May 17, 2022 · 28e5e5a · 28e5e5a
1 parent 1e7b1dc
commit 28e5e5a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 25 deletions.
diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml
@@ -15,15 +15,16 @@ jobs:
     with:
       envs: |
         - linux: codestyle
-        - macos: py38-test-oldestdeps-cov
-        - macos: py39-test-cov
-        - macos: py310-test-cov
-        - linux: py38-test-oldestdeps-cov
-        - linux: py39-test-cov
-        - linux: py310-test-cov
-        - windows: py38-test-oldestdeps-cov
-        - windows: py39-test-cov
-        - windows: py310-test-cov
+        - macos: py38-test-oldestdeps
+        - macos: py39-test
+        - macos: py310-test
+        - linux: py38-test-oldestdeps
+        - linux: py38-test
+        - linux: py39-test
+        - linux: py310-test
+        - windows: py38-test-oldestdeps
+        - windows: py39-test
+        - windows: py310-test
       coverage: 'codecov'
 
   publish:

diff --git a/setup.cfg b/setup.cfg
@@ -17,10 +17,10 @@ packages = find:
 python_requires = >=3.8
 setup_requires = setuptools_scm
 install_requires =
-  numpy>=1.14
-  astropy>=3.2
+  numpy>=1.17
+  astropy>=4.0
   astropy-healpix>=0.6
-  scipy>=1.1
+  scipy>=1.3
 
 [options.extras_require]
 test =

diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,12 @@
 [tox]
 envlist =
-    py{37,38,39,310}-{test}{-oldestdeps,-numpy121}{-cov}
+    py{37,38,39,310}-{test}{-oldestdeps,-numpy121}
     build_docs
     codestyle
 isolated_build = True
 indexserver =
     NIGHTLY = https://pypi.anaconda.org/scipy-wheels-nightly/simple
+    ASTROPY = https://pkgs.dev.azure.com/astropy-project/astropy/_packaging/nightly/pypi/simple/
 
 [testenv]
 whitelist_externals =
@@ -15,6 +16,7 @@ passenv =
 setenv =
     HOME = {envtmpdir}
     MPLBACKEND = Agg
+    PYTEST_COMMAND = pytest --arraydiff --arraydiff-default-format=fits --pyargs reproject --cov reproject --cov-config={toxinidir}/setup.cfg {toxinidir}/docs 
 changedir =
     .tmp/{envname}
 deps =
@@ -23,29 +25,27 @@ deps =
 
     numpy121: numpy==1.21.*
 
-    # FIXME: https://github.com/astropy/reproject/issues/269
-    oldestdeps: numpy==1.14.5
-    oldestdeps: astropy==3.2.*
+    oldestdeps: numpy==1.17.3
+    oldestdeps: astropy==4.0.*
     oldestdeps: astropy-healpix==0.6
-    oldestdeps: scipy==1.1.*
-    # Not strictly a reproject test dependency but gets included
-    # as a dependency of other dependencies and we have to limit
-    # the version for compatibility with Numpy.
-    oldestdeps: matplotlib==3.0.*
+    oldestdeps: scipy==1.3.2
 
     devdeps: :NIGHTLY:numpy
-    devdeps: git+https://github.com/astropy/astropy.git#egg=astropy
+    devdeps: :NIGHTLY:scipy
+    devdeps: :ASTROPY:astropy
     devdeps: git+https://github.com/asdf-format/asdf.git#egg=asdf
     devdeps: git+https://github.com/astropy/asdf-astropy.git
     devdeps: git+https://github.com/spacetelescope/gwcs.git#egg=gwcs
     devdeps: git+https://github.com/sunpy/sunpy.git#egg=sunpy
 extras =
     test
-    testall
+    # Don't run the more complex tests on oldestdeps because it pulls in a nest
+    # web of dependencies much newer than our mins
+    !oldestdeps: testall
 commands =
     pip freeze
-    !cov: pytest --arraydiff --arraydiff-default-format=fits --pyargs reproject  {toxinidir}/docs {posargs}
-    cov: pytest --arraydiff --arraydiff-default-format=fits --pyargs reproject {toxinidir}/docs --cov reproject --cov-config={toxinidir}/setup.cfg {posargs}
+    !oldestdeps: {env:PYTEST_COMMAND} {posargs}
+    oldestdeps: {env:PYTEST_COMMAND} -W ignore::RuntimeWarning {posargs}
     # Clear the download cache from the .tox directory - this is done to
     # avoid issues in the continuous integration when uploading results
     python -c 'from astropy.utils.data import clear_download_cache; clear_download_cache()'