Skip to content

Commit aed5a2b

Browse files
committed
Refactor CI tox matrix
1 parent 475f6be commit aed5a2b

3 files changed

Lines changed: 10 additions & 19 deletions

File tree

.github/workflows/test.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
python-version:
21+
- "3.14"
2122
- "3.13"
2223
- "3.12"
2324
- "3.11"
@@ -28,21 +29,6 @@ jobs:
2829
- "pypy3.9"
2930
- "pypy3.10"
3031
- "pypy3.11"
31-
pytest-version:
32-
- "pytest<8"
33-
- "pytest<9"
34-
- "pytest<10"
35-
- "pytest"
36-
- "git+https://github.com/pytest-dev/pytest.git@main"
37-
exclude:
38-
- python-version: "3.8"
39-
pytest-version: "git+https://github.com/pytest-dev/pytest.git@main"
40-
- python-version: "3.9"
41-
pytest-version: "git+https://github.com/pytest-dev/pytest.git@main"
42-
- python-version: "pypy3.8"
43-
pytest-version: "git+https://github.com/pytest-dev/pytest.git@main"
44-
- python-version: "pypy3.9"
45-
pytest-version: "git+https://github.com/pytest-dev/pytest.git@main"
4632
runs-on: ubuntu-latest
4733
steps:
4834
- uses: actions/checkout@v4
@@ -53,10 +39,13 @@ jobs:
5339
with:
5440
python-version: "${{ matrix.python-version }}"
5541
- name: Install dependencies
56-
run: python -m pip install tox "${{ matrix.pytest-version }}" pytest-cov .
42+
run: python -m pip install coverage tox
5743
- name: Test
5844
run: |
59-
coverage run --branch --source=pytest_unordered -m pytest tests/
45+
tox_factor="${{ matrix.python-version }}"
46+
tox_factor="${tox_factor//./}"
47+
tox_factor="${tox_factor/#3/py3}"
48+
tox run -f "$tox_factor" --skip-missing-interpreters true
6049
coverage xml -o ./coverage.xml
6150
- name: Upload coverage to Codecov
6251
uses: codecov/codecov-action@v4

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def read(fname: str) -> str:
3939
"Programming Language :: Python :: 3.11",
4040
"Programming Language :: Python :: 3.12",
4141
"Programming Language :: Python :: 3.13",
42+
"Programming Language :: Python :: 3.14",
4243
"Programming Language :: Python :: Implementation :: PyPy",
4344
"Topic :: Software Development :: Libraries",
4445
"Topic :: Software Development :: Testing",

tox.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
3-
{py38,py39}-{pytest7,pytest8},
4-
{py310,py311,py312,py313,pypy3}-{pytest7,pytest8,pytest9,pytestlatest},
3+
{py38,py39,pypy38,pypy39}-{pytest7,pytest8},
4+
{py310,py311,py312,py313,py314,pypy310,pypy311}-{pytest7,pytest8,pytest9,pytestlatest,pytestmain},
55
prek
66

77
[testenv]
@@ -14,6 +14,7 @@ deps =
1414
pytest8: pytest>=8.1.1,<9
1515
pytest9: pytest>=9.1,<10
1616
pytestlatest: pytest
17+
pytestmain: git+https://github.com/pytest-dev/pytest.git@main
1718

1819
[testenv:prek]
1920
skip_install = true

0 commit comments

Comments
 (0)