Skip to content

Commit 7992398

Browse files
Merge pull request #91 from hugovk/test-me-3.14
Support Python 3.13 and pytest 8, drop Python 3.7-3.8 and pytest 4
2 parents 3f35ea3 + a7da5e3 commit 7992398

File tree

6 files changed

+30
-25
lines changed

6 files changed

+30
-25
lines changed

.github/workflows/pypi-package.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ permissions:
1010
contents: read
1111
id-token: write
1212

13+
env:
14+
FORCE_COLOR: 1
15+
1316
jobs:
1417
build-package:
1518
name: Build & verify package

.github/workflows/test.yml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88

99
pull_request:
1010

11+
env:
12+
FORCE_COLOR: 1
1113

1214
concurrency:
1315
group: ${{ github.workflow }}-${{ github.ref }}
@@ -31,23 +33,23 @@ jobs:
3133
strategy:
3234
fail-fast: false
3335
matrix:
34-
python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.10"]
36+
python: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14", "pypy3.10"]
3537
os: [ubuntu-latest, windows-latest]
3638
include:
37-
- python: "3.7"
38-
tox_env: "py37-pytest7"
39-
- python: "3.8"
40-
tox_env: "py38-pytest7"
4139
- python: "3.9"
42-
tox_env: "py39-pytest7"
40+
tox_env: "py39-pytest8"
4341
- python: "3.10"
44-
tox_env: "py310-pytest7"
42+
tox_env: "py310-pytest8"
4543
- python: "3.11"
46-
tox_env: "py311-pytest7"
44+
tox_env: "py311-pytest8"
4745
- python: "3.12"
48-
tox_env: "py312-pytest7"
46+
tox_env: "py312-pytest8"
47+
- python: "3.13"
48+
tox_env: "py313-pytest8"
49+
- python: "3.14"
50+
tox_env: "py314-pytest8"
4951
- python: "pypy3.10"
50-
tox_env: "pypy3-pytest7"
52+
tox_env: "pypy3-pytest8"
5153

5254
steps:
5355
- uses: actions/checkout@v4
@@ -62,6 +64,7 @@ jobs:
6264
uses: actions/setup-python@v5
6365
with:
6466
python-version: ${{ matrix.python }}
67+
allow-prereleases: true
6568

6669
- name: Install tox
6770
run: |
@@ -82,14 +85,14 @@ jobs:
8285
strategy:
8386
fail-fast: false
8487
matrix:
85-
pytest: ["4", "5", "6"]
88+
pytest: ["5", "6", "7"]
8689
include:
87-
- pytest: "4"
88-
tox_env: "py37-pytest4"
8990
- pytest: "5"
90-
tox_env: "py37-pytest5"
91+
tox_env: "py39-pytest5"
9192
- pytest: "6"
92-
tox_env: "py37-pytest6"
93+
tox_env: "py39-pytest6"
94+
- pytest: "7"
95+
tox_env: "py39-pytest7"
9396

9497
steps:
9598
- uses: actions/checkout@v4
@@ -103,7 +106,7 @@ jobs:
103106
- name: Set up Python
104107
uses: actions/setup-python@v5
105108
with:
106-
python-version: "3.7"
109+
python-version: "3.9"
107110

108111
- name: Install tox
109112
run: |

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Requirements
3030

3131
You will need the following prerequisites in order to use pytest-repeat:
3232

33-
- Python 3.7+ or PyPy3
34-
- pytest 4 or newer
33+
- Python 3.9+ or PyPy3
34+
- pytest 5 or newer
3535

3636
Installation
3737
------------

pyproject.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description = "pytest plugin for repeating tests"
44
readme = "README.rst"
55
license = {file = "LICENSE"}
66
authors = [{name = "Bob Silverberg"}]
7-
requires-python = ">=3.7"
7+
requires-python = ">=3.9"
88
classifiers = [
99
"Development Status :: 5 - Production/Stable",
1010
"Framework :: Pytest",
@@ -15,12 +15,11 @@ classifiers = [
1515
"Operating System :: POSIX",
1616
"Programming Language :: Python",
1717
"Programming Language :: Python :: 3 :: Only",
18-
"Programming Language :: Python :: 3.7",
19-
"Programming Language :: Python :: 3.8",
2018
"Programming Language :: Python :: 3.9",
2119
"Programming Language :: Python :: 3.10",
2220
"Programming Language :: Python :: 3.11",
2321
"Programming Language :: Python :: 3.12",
22+
"Programming Language :: Python :: 3.13",
2423
"Topic :: Software Development :: Quality Assurance",
2524
"Topic :: Software Development :: Testing",
2625
"Topic :: Utilities",

pytest_repeat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def pytest_generate_tests(metafunc):
6161
metafunc.fixturenames.append("__pytest_repeat_step_number")
6262

6363
def make_progress_id(i, n=count):
64-
return '{0}-{1}'.format(i + 1, n)
64+
return f'{i + 1}-{n}'
6565

6666
scope = metafunc.config.option.repeat_scope
6767
metafunc.parametrize(

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
minversion = 4.0
33
isolated_build = true
44
envlist =
5-
py{37,38,39,310,311,312,py3}-pytest7
6-
py37-pytest{4,5,6}
5+
py{310,311,312,313,314,py3}-pytest8
6+
py39-pytest{5,6,7}
77
flake8
88

99

@@ -12,10 +12,10 @@ commands = pytest {posargs}
1212
package = wheel
1313
wheel_build_env = .pkg
1414
deps =
15-
pytest4: pytest~=4.6
1615
pytest5: pytest~=5.4
1716
pytest6: pytest~=6.2
1817
pytest7: pytest>=7
18+
pytest8: pytest>=8
1919

2020

2121
[testenv:flake8]

0 commit comments

Comments
 (0)