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

Tox CI fix #1656

Merged
merged 6 commits into from
Aug 22, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/ci_cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
os: [ubuntu-latest]
python: ['3.9', '3.10', '3.11']
toxenv: [test-alldeps, test-numpydev, test-linetoolsdev, test-gingadev, test-astropydev, conda]
toxenv: [test-alldeps, test-numpydev, test-linetoolsdev, test-gingadev, test-astropydev]
steps:
- name: Check out repository
uses: actions/checkout@v3
Expand All @@ -31,4 +31,4 @@ jobs:
python -m pip install --upgrade pip tox
- name: Test with tox
run: |
tox -e ${{ matrix.toxenv }}
tox -e ${{ matrix.python }}-${{ matrix.toxenv }}
21 changes: 18 additions & 3 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
matrix:
os: [ubuntu-latest]
python: ['3.9', '3.10', '3.11']
toxenv: [test, test-alldeps-cov, test-linetoolsdev, test-gingadev, test-astropydev, conda]
toxenv: [test, test-alldeps-cov, test-linetoolsdev, test-gingadev, test-astropydev]
steps:
- name: Check out repository
uses: actions/checkout@v3
Expand All @@ -31,7 +31,7 @@ jobs:
python -m pip install --upgrade pip tox
- name: Test with tox
run: |
tox -e ${{ matrix.toxenv }}
tox -e ${{ matrix.python }}-${{ matrix.toxenv }}
- name: Upload coverage to codecov
if: "contains(matrix.toxenv, '-cov')"
uses: codecov/codecov-action@v3
Expand Down Expand Up @@ -62,7 +62,22 @@ jobs:
python -m pip install --upgrade pip tox
- name: Test with tox
run: |
tox -e ${{ matrix.toxenv }}
tox -e ${{ matrix.python }}-${{ matrix.toxenv }}

conda:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Conda environment check
uses: actions/setup-python@v4
with:
python-version: '3.11'
- name: Install base dependencies
run: |
python -m pip install --upgrade pip tox
- name: Run pypeit tests from environment built with conda
run: |
tox -e conda

codestyle:
runs-on: ubuntu-latest
Expand Down
12 changes: 5 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[tox]
envlist =
py{39,310,311}-test{,-alldeps,-shapely,-specutils}{,-cov}
py{39,310,311}-test-numpy{120,121,122,123}
py{39,310,311}-test-{numpy,astropy,linetools,ginga}dev
{3.9,3.10,3.11}-test{,-alldeps,-shapely,-specutils}{,-cov}
{3.9,3.10,3.11}-test-numpy{122,123,124,125}
{3.9,3.10,3.11}-test-{numpy,astropy,linetools,ginga}dev
codestyle
requires =
setuptools >= 30.3.0
Expand Down Expand Up @@ -36,21 +36,19 @@ description =
devdeps: with the latest developer version of key dependencies
oldestdeps: with the oldest supported version of key dependencies
cov: and test coverage
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.*
numpy125: with numpy 1.25.*

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

cov: coverage
numpy120: numpy==1.20.*
numpy121: numpy==1.21.*
numpy122: numpy==1.22.*
numpy123: numpy==1.23.*
numpy124: numpy==1.24.*
numpy125: numpy==1.25.*

numpydev: numpy>=0.0.dev0
astropydev: git+https://github.com/astropy/astropy.git#egg=astropy
Expand Down