From fd06a74d64cf5d957f041f9d4bcc6c71dc0dd8bf Mon Sep 17 00:00:00 2001 From: Nadia Dencheva Date: Wed, 2 Aug 2023 10:50:09 -0400 Subject: [PATCH] Remove numpy 1.21 and 1.20 from testing. Add scipy-dev to requirement-dev. add scipy dev remove branch testing --- .github/workflows/ci.yml | 8 +++----- requirements-dev.txt | 1 + tox.ini | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 736d18b3..8a325cd6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ concurrency: jobs: check: - name: + name: uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1 with: envs: | @@ -31,15 +31,13 @@ jobs: envs: | - linux: test python-version: 3.9 - - linux: test-numpy120 - python-version: 3.9 - - linux: test-numpy121 + - linux: test-numpy125 python-version: 3.9 - linux: test-numpy122 python-version: 3.9 - linux: test python-version: 3.10 - - linux: test-numpy121 + - linux: test-numpy125 python-version: 3.10 - linux: test-numpy122 python-version: 3.10 diff --git a/requirements-dev.txt b/requirements-dev.txt index ec699788..a73bb54b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,3 +6,4 @@ git+https://github.com/asdf-format/asdf-wcs-schemas git+https://github.com/astropy/astropy git+https://github.com/astropy/asdf-astropy numpy>=0.0.dev0 +scipy>=0.0.dev0 diff --git a/tox.ini b/tox.ini index fd1784e3..93ac88e5 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = check-{style,security,build} test{,-dev}{,-pyargs,-cov} - test-numpy{120,121,122} + test-numpy{125,122} build-{docs,dist} # tox environments are constructed with so-called 'factors' (or terms) @@ -69,9 +69,8 @@ deps = cov: pytest-cov jwst: jwst[test] @ git+https://github.com/spacetelescope/jwst.git romancal: romancal[test] @ git+https://github.com/spacetelescope/romancal.git - numpy120: numpy==1.20.* - numpy121: numpy==1.21.* numpy122: numpy==1.22.* + numpy125: numpy==1.25.* pass_env = jwst,romancal: CRDS_* commands_pre =