Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update test matrix for newer versions of numpy #836

Merged
merged 5 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,22 @@ jobs:
- name: 'ubuntu-py39'
os: ubuntu-latest
python: '3.9'
tox_env: 'py39-test-alldeps-numpy119-cov'
tox_env: 'py39-test-alldeps-numpy124-cov'

- name: 'ubuntu-py39-bottleneck'
os: ubuntu-latest
python: '3.9'
tox_env: 'py39-test-alldeps-numpy119-cov-bottleneck'
tox_env: 'py39-test-alldeps-numpy124-cov-bottleneck'

- name: 'ubuntu-py310'
os: ubuntu-latest
python: '3.10'
tox_env: 'py310-test-alldeps-numpy121'
tox_env: 'py310-test-alldeps-numpy124'

- name: 'ubuntu-py311'
os: ubuntu-latest
python: '3.11'
tox_env: 'py311-test-alldeps-numpy123'
tox_env: 'py311-test-alldeps-numpy124'

- name: 'ubuntu-py312'
os: ubuntu-latest
Expand All @@ -77,10 +77,10 @@ jobs:
python: '3.12'
tox_env: 'build_docs'

- name: 'ubuntu-py310-test-alldeps-devdeps'
- name: 'ubuntu-py312-test-alldeps-devdeps'
os: ubuntu-latest
python: '3.10'
tox_env: 'py310-test-alldeps-devdeps'
python: '3.12'
tox_env: 'py312-test-alldeps-devdeps'

steps:
- name: Check out repository
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ authors = [
]
dependencies = [
"astropy>=5.0.1",
"astroscrappy>=1.0.8",
"numpy>=1.21",
"astroscrappy>=1.1.0",
"numpy>=1.24",
"reproject>=0.7",
"scikit-image",
"scipy",
Expand Down
28 changes: 9 additions & 19 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,44 +19,34 @@ description =
devdeps: with the latest developer version of key dependencies
oldestdeps: with the oldest supported version of key dependencies
cov: and test coverage
numpy118: with numpy 1.18.*
numpy119: with numpy 1.19.*
numpy120: with numpy 1.20.*
numpy121: with numpy 1.21.*
astropylts: with the latest astropy LTS
numpy124: with numpy 1.24.*
numpy126: with numpy 1.26.*
numpy200: with numpy 2.0.*
numpy210: with numpy 2.1.*
bottleneck: with bottleneck

# The following provides some specific pinnings for key packages
deps =
cov: coverage

numpy118: numpy==1.18.*
numpy119: numpy==1.19.*
numpy120: numpy==1.20.*
numpy121: numpy==1.21.*
numpy123: numpy==1.23.*
numpy124: numpy==1.24.* # current oldest suppported numpy
numpy126: numpy==1.26.*
numpy200: numpy==2.0.*
numpy210: numpy==2.1.*

astroscrappy11: astroscrappy==1.1.*
astroscrappy11: numpy<2.0

astropylts: astropy==4.0.*

bottleneck: bottleneck>=1.3.2

devdeps: git+https://github.com/astropy/astropy.git#egg=astropy
devdeps: git+https://github.com/astropy/astroscrappy.git#egg=astroscrappy

# Remember to transfer any changes here to setup.cfg also. Only listing
# packages which are constrained in the setup.cfg
# NOTE ABOUT NUMPY VERSION: for astroscrappy 1.0.8 have to use at least 1.20
# for the tests to even get to the point of running.
oldestdeps: numpy==1.21.*
oldestdeps: numpy==1.24.*
oldestdeps: astropy==5.0.*
oldestdeps: reproject==0.7
# astroscrappy needs to install AFTER numpy so its install is done in
# the commands section instead of here.
#oldestdeps: astroscrappy==1.0.8
oldestdeps: cython

commands =
Expand All @@ -65,7 +55,7 @@ commands =
cov: pytest --pyargs ccdproc {toxinidir}/docs --cov ccdproc --cov-config={toxinidir}/pyproject.toml {posargs}
cov: coverage xml -o {toxinidir}/coverage.xml
# install astroscrappy after numpy
oldestdeps: python -m pip install astroscrappy==1.0.8
oldestdeps: python -m pip install astroscrappy==1.1.0
# Do not care about warnings on the oldest builds
oldestdeps: pytest --pyargs ccdproc {toxinidir}/docs -W ignore {posargs}

Expand Down