Skip to content

Commit eebfcf6

Browse files
committed
Re-enable Python 3.10-dev in CI builds
- restrict Python 3.10 to pytest >= 3.2.4
1 parent a614d7c commit eebfcf6

File tree

6 files changed

+15
-7
lines changed

6 files changed

+15
-7
lines changed

.github/workflows/pythontests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
fail-fast: false
4141
matrix:
4242
os: [ubuntu-latest, windows-latest]
43-
python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
43+
python-version: [3.6, 3.7, 3.8, 3.9, 3.10-dev, pypy3]
4444
exclude:
4545
- os: windows-latest
4646
python-version: pypy3

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
name without the parameter value,
1919
see [#38](https://github.com/pytest-dev/pytest-order/issues/38)
2020

21+
### Infrastructure
22+
- re-added Python 3.10 to CI tests (for pytest >= 6.2.4)
23+
2124
## [Version 0.11.0](https://pypi.org/project/pytest-order/0.11.0/) (2021-04-11)
2225
Adds support for multiple relative markers for the same test.
2326

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ relationship to other tests.
1212
[pytest-ordering](https://github.com/ftobia/pytest-ordering) that provides
1313
additional features like ordering relative to other tests.
1414

15-
`pytest-order` works with Python 3.6 - 3.9, with pytest
16-
versions >= 5.0.0, and runs on Linux, macOS and Windows.
15+
`pytest-order` works with Python 3.6 - 3.10, with pytest
16+
versions >= 5.0.0 for all versions except Python 3.10, and for pytest >=
17+
6.2.4 for Python 3.10. `pytest-order` runs on Linux, macOS and Windows.
1718

1819
Documentation
1920
-------------

docs/source/intro.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@ ordering, all configuration options) that are not available in
3838

3939
Supported Python and pytest versions
4040
------------------------------------
41-
``pytest-order`` supports python 3.6 - 3.9 and pypy3, and is
41+
``pytest-order`` supports python 3.6 - 3.10 and pypy3, and is
4242
compatible with pytest 5.0.0 or newer (older versions may also work, but are
43-
not tested).
43+
not tested) for Python versions up to 3.9, and with pytest >= 6.2.4 for
44+
Python 3.10.
4445

4546
All supported combinations of Python and pytest versions are tested in
4647
the CI builds. The plugin shall work under Linux, MacOs and Windows.

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
"Programming Language :: Python :: 3.7",
4545
"Programming Language :: Python :: 3.8",
4646
"Programming Language :: Python :: 3.9",
47+
"Programming Language :: Python :: 3.10",
4748
'Programming Language :: Python :: 3 :: Only',
4849
"Programming Language :: Python :: Implementation :: CPython",
4950
"Programming Language :: Python :: Implementation :: PyPy",

tox.ini

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[tox]
22
envlist =
3-
{py36,py37,py38,py39,py310dev,pypy3}-pytest{50,51,52,53,54,60,61,62}
3+
{py36,py37,py38,py39,pypy3}-pytest{50,51,52,53,54,60,61,62}
4+
{py310dev}-pytest{624}
45
[testenv]
56
deps =
67
pytest50: pytest>=5.0,<5.1
@@ -11,9 +12,10 @@ deps =
1112
pytest60: pytest>=6.0,<6.1
1213
pytest61: pytest>=6.1,<6.2
1314
pytest62: pytest>=6.2,<6.3
15+
pytest624: pytest>=6.2.4,<6.3
1416
pytest-cov<2.10
1517
pytest{50,51,52,53,54}: pytest-xdist<2.0.0
16-
pytest{60,61,62}: pytest-xdist
18+
pytest{60,61,62,624}: pytest-xdist
1719
pytest-dependency>=0.5.1
1820
pytest-mock
1921

0 commit comments

Comments
 (0)