Skip to content

Commit 26f453e

Browse files
committed
Remove EOL Python 3.7 and 3.8 from CI
- add Python 3.13
1 parent e62fc31 commit 26f453e

File tree

7 files changed

+41
-40
lines changed

7 files changed

+41
-40
lines changed

.github/workflows/pythontests.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,14 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: [ubuntu-latest, windows-latest]
17-
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
17+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
1818
include:
19-
- python-version: "pypy-3.7"
20-
os: ubuntu-22.04
2119
- python-version: "pypy-3.9"
2220
os: ubuntu-latest
2321
- python-version: "pypy-3.10"
2422
os: ubuntu-latest
25-
- python-version: "3.7"
26-
os: ubuntu-22.04
27-
- python-version: "3.7"
28-
os: windows-latest
23+
- python-version: "pypy-3.11"
24+
os: ubuntu-latest
2925
env:
3026
OS: ${{ matrix.os }}
3127
steps:
@@ -51,10 +47,10 @@ jobs:
5147
- name: Run tests
5248
run: |
5349
TOX_PYTHON_VERSION=$(if [[ ${{ matrix.python-version }} == pypy* ]]; then echo ${{ matrix.python-version }} | tr -d .-; else echo py${{ matrix.python-version }} | tr -d .-; fi)
54-
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 "," -)
50+
COV_CMD=$(if [ ${{ matrix.python-version }} == 3.12 ]; then echo "--cov=./pytest_order/ --cov-report=xml"; else echo ; fi) tox -e $(tox -l | grep "$TOX_PYTHON_VERSION" | paste -sd "," -)
5551
- name: Upload coverage to Codecov
5652
uses: codecov/codecov-action@v5
57-
if: ${{ success() && matrix.python-version == 3.10 }}
53+
if: ${{ success() && matrix.python-version == 3.12 }}
5854
with:
5955
env_vars: OS
6056
name: codecov-pytest-order

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## Unreleased
44

5+
### Changes
6+
* removed official support for Python 3.7 and 3.8 (EOL), added Python 3.13
7+
58
### Infrastructure
69
* use trusted publisher for release (see https://docs.pypi.org/trusted-publishers/)
710
* pin Python 3.7 builds to ubuntu 22.04 (not available in 24.04)

README.md

Lines changed: 3 additions & 3 deletions
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.12, with pytest
16-
versions >= 5.0.0 for all versions up to Python 3.9, and for pytest >=
17-
6.2.4 for Python >= 3.10. `pytest-order` runs on Linux, macOS and Windows.
15+
`pytest-order` works with Python 3.9 - 3.13, with pytest
16+
versions >= 5.0.0 for Python 3.9, and for pytest >= 6.2.4 for Python >= 3.10.
17+
`pytest-order` runs on Linux, macOS and Windows.
1818

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

docs/source/intro.rst

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ 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.12 and pypy3, and is
41+
``pytest-order`` supports python 3.9 - 3.13 and pypy3, and is
4242
compatible with pytest 5.0.0 or newer (older versions may also work, but are
43-
not tested) for Python versions up to 3.9, and with pytest >= 6.2.4 for
44-
Python versions >= 3.10.
43+
not tested) for Python 3.9, and with pytest >= 6.2.4 for Python versions >= 3.10.
4544

4645
All supported combinations of Python and pytest versions are tested in
4746
the CI builds. The plugin shall work under Linux, MacOs and Windows.
@@ -83,15 +82,17 @@ For example, for the following tests:
8382
8483
the output is something like::
8584

86-
$ pytest test_foo.py -vv
87-
============================= test session starts ==============================
88-
platform darwin -- Python 3.7.1, pytest-5.4.3, py-1.8.1, pluggy-0.13.1 -- env/bin/python
89-
collected 2 items
9085

91-
test_foo.py:2: test_foo PASSED
92-
test_foo.py:6: test_bar PASSED
86+
$ pytest -vv example/introduction/test_quickstart.py
87+
============================================ test session starts =============================================
88+
platform linux -- Python 3.13.2, pytest-8.3.5, pluggy-1.5.0 -- /home/user/.venv/pytest-order-3.13/bin/python3.13
89+
rootdir: /home/user/projects/git/pytest-order
90+
plugins: order-1.3.0
91+
collected 2 items
9392

94-
=========================== 2 passed in 0.01 seconds ===========================
93+
example/introduction/test_quickstart.py::test_foo PASSED [ 50%]
94+
example/introduction/test_quickstart.py::test_bar PASSED [100%]
95+
============================================= 2 passed in 0.02s ==============================================
9596

9697
With ``pytest-order``, you can change the default ordering as follows:
9798

@@ -112,12 +113,14 @@ With ``pytest-order``, you can change the default ordering as follows:
112113
This will generate the output::
113114

114115
$ pytest test_foo.py -vv
115-
============================= test session starts ==============================
116-
platform darwin -- Python 3.7.1, pytest-5.4.3, py-1.8.1, pluggy-0.13.1 -- env/bin/python
117-
plugins: order
116+
============================================ test session starts =============================================
117+
platform linux -- Python 3.13.2, pytest-8.3.5, pluggy-1.5.0 -- /home/user/.venv/pytest-order-3.13/bin/python3.13
118+
rootdir: /home/user/projects/git/pytest-order
119+
plugins: order-1.3.0
118120
collected 2 items
119121

120-
test_foo.py:7: test_bar PASSED
121-
test_foo.py:3: test_foo PASSED
122+
example/introduction/test_quickstart.py::test_bar PASSED [ 50%]
123+
example/introduction/test_quickstart.py::test_foo PASSED [100%]
124+
=========================== 2 passed in 0.02 seconds ===========================
122125

123-
=========================== 2 passed in 0.01 seconds ===========================
126+
Note the changed test execution order.

docs/source/usage.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ are used in Python lists, e.g. to count from the end:
5454

5555
$ pytest test_foo.py -vv
5656
============================= test session starts ==============================
57-
platform darwin -- Python 3.7.1, pytest-5.4.3, py-1.8.1, pluggy-0.13.1 -- env/bin/python
58-
plugins: order
57+
platform linux -- Python 3.13.2, pytest-8.3.5, pluggy-1.5.0 -- /home/user/.venv/pytest-order-3.13/bin/python3.13
58+
plugins: order-1.3.0
5959
collected 4 items
6060

6161
test_foo.py:17: test_one PASSED
@@ -103,8 +103,8 @@ above:
103103

104104
$ pytest test_foo.py -vv
105105
============================= test session starts ==============================
106-
platform darwin -- Python 3.7.1, pytest-5.4.3, py-1.8.1, pluggy-0.13.1 -- env/bin/python
107-
plugins: order
106+
platform linux -- Python 3.13.2, pytest-8.3.5, pluggy-1.5.0 -- /home/user/.venv/pytest-order-3.13/bin/python3.13
107+
plugins: order-1.3.0
108108
collected 4 items
109109

110110
test_foo.py:17: test_one PASSED
@@ -213,8 +213,8 @@ define the order relative to these tests:
213213

214214
$ pytest test_foo.py -vv
215215
============================= test session starts ==============================
216-
platform darwin -- Python 3.7.1, pytest-5.4.3, py-1.8.1, pluggy-0.13.1 -- env/bin/python
217-
plugins: order
216+
platform linux -- Python 3.13.2, pytest-8.3.5, pluggy-1.5.0 -- /home/user/.venv/pytest-order-3.13/bin/python3.13
217+
plugins: order-1.3.0
218218
collected 3 items
219219

220220
test_foo.py:11: test_first PASSED

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,11 @@
4444
"Topic :: Utilities",
4545
"Programming Language :: Python",
4646
"Programming Language :: Python :: 3",
47-
"Programming Language :: Python :: 3.7",
48-
"Programming Language :: Python :: 3.8",
4947
"Programming Language :: Python :: 3.9",
5048
"Programming Language :: Python :: 3.10",
5149
"Programming Language :: Python :: 3.11",
5250
"Programming Language :: Python :: 3.12",
51+
"Programming Language :: Python :: 3.13",
5352
"Programming Language :: Python :: 3 :: Only",
5453
"Programming Language :: Python :: Implementation :: CPython",
5554
"Programming Language :: Python :: Implementation :: PyPy",

tox.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
[tox]
22
envlist =
3-
{py37,pypy37}-pytest{50,54,60,62,624,70,74}
4-
{py38,py39,pypy39}-pytest{50,54,60,62,624,70,74,80}
5-
{py310,py311,py312,pypy310}-pytest{624,70,74,80}
3+
{py39,pypy39}-pytest{50,54,60,62,624,70,74,80,83}
4+
{py310,py311,py312,py313,pypy310,pypy311}-pytest{624,70,74,80,83}
65
[testenv]
76
deps =
87
pytest50: pytest>=5.0,<5.1
@@ -13,9 +12,10 @@ deps =
1312
pytest70: pytest>=7.0,<7.1
1413
pytest74: pytest>=7.3,<8.0
1514
pytest80: pytest==8.0.1
15+
pytest83: pytest>=8.3,<9.0
1616
pytest-cov<2.10
1717
pytest{50,54}: pytest-xdist<2.0.0
18-
pytest{60,62,624,70,74,80}: pytest-xdist
18+
pytest{60,62,624,70,74,80,83}: pytest-xdist
1919
pytest-dependency>=0.5.1
2020
pytest-mock
2121

0 commit comments

Comments
 (0)