Skip to content

Commit edc0aaa

Browse files
committed
Add Python 3.12 to supported versions
- also add pypy-3.9 and pypy-3.10 to CI
1 parent ee5c2fc commit edc0aaa

File tree

7 files changed

+26
-17
lines changed

7 files changed

+26
-17
lines changed

.github/workflows/pythontests.yml

+11-7
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: [ubuntu-latest, windows-latest]
17-
python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "pypy-3.7"]
18-
exclude:
19-
- os: windows-latest
20-
python-version: "pypy-3.7"
17+
python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
18+
include:
19+
- python-version: "pypy-3.7"
20+
os: ubuntu-latest
21+
- python-version: "pypy-3.9"
22+
os: ubuntu-latest
23+
- python-version: "pypy-3.10"
24+
os: ubuntu-latest
2125
env:
2226
OS: ${{ matrix.os }}
2327
steps:
@@ -42,11 +46,11 @@ jobs:
4246
python -m pip install pytest pytest-cov tox
4347
- name: Run tests
4448
run: |
45-
TOX_PYTHON_VERSION=$(if [ ${{ matrix.python-version }} = pypy-3.7 ]; then echo "pypy3"; else echo py${{ matrix.python-version }} | tr -d .-; fi)
46-
COV_CMD=$(if [ ${{ matrix.python-version }} = 3.8 ]; then echo "--cov=./pytest_order/ --cov-report=xml"; else echo ; fi) tox -e $(tox -l | grep $TOX_PYTHON_VERSION | paste -sd "," -)
49+
TOX_PYTHON_VERSION=$(if [[ ${{ matrix.python-version }} == pypy* ]]; then echo ${{ matrix.python-version }} | tr -d .-; else echo py${{ matrix.python-version }} | tr -d .-; fi)
50+
COV_CMD=$(if [ ${{ matrix.python-version }} == 3.10 ]; then echo "--cov=./pytest_order/ --cov-report=xml"; else echo ; fi) tox -e $(tox -l | grep "$TOX_PYTHON_VERSION" | paste -sd "," -)
4751
- name: Upload coverage to Codecov
4852
uses: codecov/codecov-action@v1
49-
if: ${{ success() && matrix.python-version == 3.8 }}
53+
if: ${{ success() && matrix.python-version == 3.10 }}
5054
with:
5155
env_vars: OS
5256
name: codecov-pytest-order

CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
# pytest-order Release Notes
22

3+
## [Version 1.2.0](https://pypi.org/project/pytest-order/1.2.0/) (2023-11-18)
4+
Allows using custom markers for ordering.
5+
36
### New features
47
* added option `--order-marker-prefix` to allow using custom markers for ordering
58

69
### Infrastructure
7-
* added pre-commit hook for linters
10+
- added pre-commit hook for linters
11+
- added Python 3.12 to supported versions
812

913
## [Version 1.1.0](https://pypi.org/project/pytest-order/1.1.0/) (2023-03-10)
1014
Adds support for executing tests more than once using order marks.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +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.7 - 3.11, with pytest
15+
`pytest-order` works with Python 3.7 - 3.12, with pytest
1616
versions >= 5.0.0 for all versions up to Python 3.9, and for pytest >=
17-
6.2.4 for Python 3.10 and 3.11. `pytest-order` runs on Linux, macOS and Windows.
17+
6.2.4 for Python >= 3.10. `pytest-order` runs on Linux, macOS and Windows.
1818

1919
Documentation
2020
-------------

docs/source/intro.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,10 +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.7 - 3.11 and pypy3, and is
41+
``pytest-order`` supports python 3.7 - 3.12 and pypy3, and is
4242
compatible with pytest 5.0.0 or newer (older versions may also work, but are
4343
not tested) for Python versions up to 3.9, and with pytest >= 6.2.4 for
44-
Python 3.10 and 3.11.
44+
Python versions >= 3.10.
4545

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

pytest_order/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.2.dev0"
1+
__version__ = "1.2.0"

setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"Programming Language :: Python :: 3.9",
5050
"Programming Language :: Python :: 3.10",
5151
"Programming Language :: Python :: 3.11",
52+
"Programming Language :: Python :: 3.12",
5253
"Programming Language :: Python :: 3 :: Only",
5354
"Programming Language :: Python :: Implementation :: CPython",
5455
"Programming Language :: Python :: Implementation :: PyPy",

tox.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
3-
{py37,py38,py39,pypy3}-pytest{50,51,52,53,54,60,61,62,70,72}
4-
{py310,py311}-pytest{624,70,72}
3+
{py37,py38,py39,pypy37,pypy39}-pytest{50,51,52,53,54,60,61,62,70,73}
4+
{py310,py311,py312,pypy310}-pytest{624,70,73}
55
[testenv]
66
deps =
77
pytest50: pytest>=5.0,<5.1
@@ -14,10 +14,10 @@ deps =
1414
pytest62: pytest>=6.2,<6.3
1515
pytest624: pytest>=6.2.4,<6.3
1616
pytest70: pytest>=7.0,<7.1
17-
pytest72: pytest>=7.2,<7.3
17+
pytest73: pytest>=7.3,<7.4
1818
pytest-cov<2.10
1919
pytest{50,51,52,53,54}: pytest-xdist<2.0.0
20-
pytest{60,61,62,624,70,72}: pytest-xdist
20+
pytest{60,61,62,624,70,73}: pytest-xdist
2121
pytest-dependency>=0.5.1
2222
pytest-mock
2323

0 commit comments

Comments
 (0)