Skip to content

Commit d8866f7

Browse files
committed
ci: update the action and tox
Signed-off-by: Henry Schreiner <[email protected]>
1 parent 8646218 commit d8866f7

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
- main
88
pull_request:
99

10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
1014
env:
1115
FORCE_COLOR: "1"
1216

@@ -34,24 +38,20 @@ jobs:
3438
python-version: ${{ matrix.python-version }}
3539

3640
- name: Install test dependencies
37-
run: |
38-
python -m pip install --upgrade pip
39-
pip install tox tox-gh-actions
41+
run: pip install tox tox-gh-actions
4042

4143
- name: Test packaging
4244
run: tox -e pkg
4345

4446
- name: Run tests with PyTest 6
4547
run: tox
4648
env:
47-
PLATFORM: ${{ matrix.os }}
4849
PYTEST_MAJOR_VERSION: 6
4950
PYTEST_PLUGINS: pytest_github_actions_annotate_failures
5051

5152
- name: Run tests with PyTest 7
5253
run: tox
5354
env:
54-
PLATFORM: ${{ matrix.os }}
5555
PYTEST_MAJOR_VERSION: 7
5656
PYTEST_PLUGINS: pytest_github_actions_annotate_failures
5757

tox.ini

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py{37,38,39,310,311,312}-pytest{6,7}-{linux,windows}
3+
py{37,38,39,310,311,312}-pytest{6,7,8}
44
pkg
55

66
[gh-actions]
@@ -13,21 +13,19 @@ python =
1313
3.12: py312
1414

1515
[gh-actions:env]
16-
PLATFORM =
17-
ubuntu-latest: linux
18-
windows-latest: windows
19-
2016
PYTEST_MAJOR_VERSION =
2117
6: pytest6
2218
7: pytest7
19+
8: pytest8
2320

2421
[testenv]
2522
deps =
2623
-rrequirements.txt
2724
pytest6: pytest>=6.0.0,<7.0.0
2825
pytest7: pytest>=7.0.0,<7.4.0
26+
pytest8: pytest>=8.0.0,<9.0.0
2927

30-
commands = {envpython} -m pytest
28+
commands = {envpython} -m pytest {posargs}
3129

3230
[testenv:pkg]
3331
skip_install = true

0 commit comments

Comments
 (0)