Skip to content

Commit

Permalink
Merge pull request #169 from WilliamJamieson/feature/parallel_jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
WilliamJamieson committed Feb 24, 2023
2 parents c409b50 + d965807 commit be948ff
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 25 deletions.
41 changes: 21 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ jobs:
# Any env name which does not start with `pyXY` will use this Python version.
default_python: '3.9'
envs: |
- linux: py39-cov
- linux: py39-test-devdeps-cov
- linux: py38-test-cov
- linux: py39-astropylts-cov
- linux: py39-transformlts-cov
- linux: py39-parallel-cov
- linux: py39-test-devdeps-parallel-cov
- linux: py38-test-parallel-cov
- linux: py39-astropylts-parallel-cov
- linux: py39-transformlts-parallel-cov
coverage: codecov

asdf-schemas:
Expand All @@ -68,11 +68,12 @@ jobs:
cache-restore-keys: |
pip-
# Any env name which does not start with `pyXY` will use this Python version.
default_python: '3.9'
default_python: '3.10'
envs: |
- linux: py310-test
- macos: py39-test
- windows: py39-test
- linux: py310-test-parallel
- linux: py311-test-parallel
- macos: py311-test-parallel
- windows: py311-test-parallel
dev:
needs: [core, asdf-schemas]
Expand All @@ -85,10 +86,9 @@ jobs:
# Any env name which does not start with `pyXY` will use this Python version.
default_python: '3.9'
envs: |
- linux: py38-test-devdeps
- linux: py39-test-devdeps
- linux: py310-test-devdeps
- linux: py311-test-devdeps
- linux: py38-test-devdeps-parallel
- linux: py310-test-devdeps-parallel
- linux: py311-test-devdeps-parallel
oldest:
needs: [core, asdf-schemas]
Expand All @@ -101,8 +101,8 @@ jobs:
# Any env name which does not start with `pyXY` will use this Python version.
default_python: '3.9'
envs: |
- linux: py38-test-oldestdeps-cov
- linux: py39-test-oldestdeps-cov
- linux: py38-test-oldestdeps-parallel-cov
- linux: py39-test-oldestdep-parallels-cov
coverage: codecov

numpy:
Expand All @@ -116,13 +116,14 @@ jobs:
# Any env name which does not start with `pyXY` will use this Python version.
default_python: '3.9'
envs: |
- linux: py39-test-numpy119
- linux: py39-test-numpy120
- linux: py39-test-numpy121
- linux: py39-test-numpy122
- 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:
needs: [core, asdf-schemas]
permissions:
contents: none
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1
Expand Down
19 changes: 14 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ description =
cov: and test coverage
numpy119: with numpy 1.19.*
numpy120: with numpy 1.20.*
numpy120: with numpy 1.21.*
numpy120: with numpy 1.22.*
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 =
Expand All @@ -32,12 +34,15 @@ deps =
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.*

devdeps: -rrequirements-dev.txt
oldestdeps: minimum_dependencies

parallel: pytest-xdist
extras =
test
alldeps: all
Expand All @@ -51,8 +56,10 @@ commands_pre=

pip freeze
commands =
!cov: pytest {posargs}
cov: pytest --cov-report xml --cov asdf_astropy {posargs}
pytest \
parallel: --numprocesses auto \
cov: --cov-report xml --cov asdf_astropy
{posargs}

[testenv:asdf]
changedir={envtmpdir}
Expand Down Expand Up @@ -160,6 +167,8 @@ commands=
pytest gwcs

[testenv:jwst]
deps=
pytest-xdist
changedir={envtmpdir}
allowlist_externals=
git
Expand All @@ -177,7 +186,7 @@ commands_pre=
pip install -r {envtmpdir}/requirements.txt
pip freeze
commands=
pytest jwst
pytest --numprocesses auto jwst

[testenv:stdatamodels]
changedir={envtmpdir}
Expand Down

0 comments on commit be948ff

Please sign in to comment.