Skip to content

Commit

Permalink
use tox>=4
Browse files Browse the repository at this point in the history
  • Loading branch information
zacharyburnett committed Jan 25, 2023
1 parent 093ec3e commit d317b21
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
toxenv: [ check-style, check-security, check-dependencies, check-build ]
toxenv: [ check-style, check-security, check-dependencies, build-dist ]
python-version: [ '3.11' ]
os: [ ubuntu-latest ]
steps:
Expand All @@ -39,7 +39,7 @@ jobs:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: setup.cfg
- run: pip install "tox<4.0"
- run: pip install "tox>=4.0"
- run: tox -e ${{ matrix.toxenv }}
test:
name: ${{ matrix.toxenv }} (Python ${{ matrix.python-version }}, ${{ matrix.os }})
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: setup.cfg
- run: pip install "tox<4.0"
- run: pip install "tox>=4.0"
- run: >
echo "pmap=$(
curl -s -X POST -d '{"jsonrpc": "1.0", "method": "get_default_context", "params": ["jwst"], "id": 1}' ${{ env.CRDS_SERVER_URL }}/json/ |
Expand Down
23 changes: 10 additions & 13 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
[tox]
envlist =
check-{style,security,dependencies,build}
check-{style,security,dependencies}
test{,-oldestdeps,-devdeps,-sdpdeps}{,-pyargs,-warnings,-regtests,-cov}
build-docs
isolated_build = true
build-{docs,dist}

# tox environments are constructed with so-called 'factors' (or terms)
# separated by hyphens, e.g. test-devdeps-cov. Lines below starting with factor:
Expand Down Expand Up @@ -39,16 +38,6 @@ deps =
commands =
verify_install_requires

[testenv:check-build]
description = check build sdist/wheel and a strict twine check for metadata
skip_install = true
deps =
twine>=3.3
build
commands =
python -m build .
twine check --strict dist/*

[testenv]
description =
run tests
Expand Down Expand Up @@ -111,3 +100,11 @@ description = invoke sphinx-build to build the HTML docs
extras = docs
commands =
sphinx-build -W docs docs/_build

[testenv:build-dist]
description = check build sdist/wheel and a strict twine check for metadata
skip_install = true
deps =
build
commands =
python -m build

0 comments on commit d317b21

Please sign in to comment.