Skip to content

Commit 91fac49

Browse files
committed
Update lock files and CI workflow to support tox version
1 parent c0ee55b commit 91fac49

File tree

3 files changed

+349
-286
lines changed

3 files changed

+349
-286
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
python-version: [3.8, 3.9, "3.10"]
14-
tox-version: ["<4", ">=4.0.0b0"]
14+
tox-version: [3, 4]
1515

1616
steps:
1717
- uses: actions/checkout@v3
@@ -21,12 +21,13 @@ jobs:
2121
python-version: ${{ matrix.python-version }}
2222
- name: Install dependencies
2323
run: |
24-
python -m pip install "tox${{ matrix.tox-version }}" .
24+
python -m pip install "tox>=${{ matrix.tox-version }}.0.0b0,<${{ matrix.tox-version }}.999" .
2525
- name: Test with tox
2626
run: |
27+
tox --version
2728
pyversion="${{ matrix.python-version }}"
28-
if which tox4 > /dev/null
29-
then
30-
mv pdm.tox4.lock pdm.lock
29+
toxversion="${{ matrix.tox-version }}"
30+
if [[ $toxversion == "4" ]]; then
31+
mv pdm.tox4.lock pdm.lock;
3132
fi
32-
tox -e py${pyversion/./}
33+
tox -e py${pyversion/./}-tox${toxversion}

0 commit comments

Comments
 (0)