Skip to content

Commit e6942b5

Browse files
committed
chore: modernize supported Python versions
- Add support for Python 3.12 and 3.13. - Drop support for Python 3.7 and 3.8. tests: parallel tox invocation ci: update action versions
1 parent 0490581 commit e6942b5

File tree

4 files changed

+31
-35
lines changed

4 files changed

+31
-35
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
strategy:
1515
matrix:
1616
python:
17-
- "3.7"
18-
- "3.8"
1917
- "3.9"
2018
- "3.10"
2119
- "3.11"
20+
- "3.12"
21+
- "3.13"
2222
steps:
2323

2424
- name: Checkout
@@ -38,12 +38,6 @@ jobs:
3838
run: |
3939
tox -e py${{ matrix.python }}
4040
41-
- name: Upload coverage results
42-
uses: actions/upload-artifact@v2
43-
with:
44-
name: coverage-artifacts
45-
path: .coverage.py${{ matrix.python }}
46-
4741
run-unittests-w-deps:
4842
name: unit-w-deps
4943
runs-on: ubuntu-latest
@@ -55,7 +49,7 @@ jobs:
5549
- name: Setup Python
5650
uses: actions/setup-python@v2
5751
with:
58-
python-version: 3.8
52+
python-version: 3.9
5953

6054
- name: Install tox
6155
run: |
@@ -67,17 +61,14 @@ jobs:
6761
tox -e w_deps
6862
6963
- name: Upload coverage results
70-
uses: actions/upload-artifact@v2
64+
uses: actions/upload-artifact@v4
7165
with:
7266
name: coverage-artifacts
7367
path: .coverage.w_deps
7468

7569
report-coverage:
7670
name: cover
7771
runs-on: ubuntu-latest
78-
needs:
79-
- run-unittests
80-
- run-unittests-w-deps
8172

8273
steps:
8374

@@ -87,20 +78,7 @@ jobs:
8778
- name: Setup Python
8879
uses: actions/setup-python@v2
8980
with:
90-
python-version: "3.10"
81+
python-version: "3.12"
9182

92-
- name: Install coverage
93-
run: |
94-
python -m pip install --upgrade setuptools pip wheel
95-
python -m pip install coverage
96-
97-
- name: Download coverage results
98-
uses: actions/download-artifact@v2
99-
with:
100-
name: coverage-artifacts
101-
path: .coverage-results/
102-
103-
- name: Report coverage results
104-
run: |
105-
coverage combine .coverage-results/.coverage*
106-
coverage report --show-missing --fail-under=100
83+
- run: pip install tox
84+
- run: tox -e py312-cover,w_deps,cover

CHANGES.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
``repoze.retry`` Changelog
22
==========================
33

4+
2.1 (unreleased)
5+
----------------
6+
7+
- Add support for Python 3.12 and 3.13
8+
9+
- Drop support for Python 3.7 and 3.8.
10+
411
2.0 (2023-01-23)
512
----------------
613

setup.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,21 @@ def _read_file(filename):
2121
"Intended Audience :: Developers",
2222
"Programming Language :: Python",
2323
"Programming Language :: Python :: 3",
24-
"Programming Language :: Python :: 3.7",
25-
"Programming Language :: Python :: 3.8",
2624
"Programming Language :: Python :: 3.9",
2725
"Programming Language :: Python :: 3.10",
2826
"Programming Language :: Python :: 3.11",
27+
"Programming Language :: Python :: 3.12",
28+
"Programming Language :: Python :: 3.13",
2929
"Programming Language :: Python :: Implementation :: CPython",
3030
"Programming Language :: Python :: Implementation :: PyPy",
3131
"Topic :: Internet :: WWW/HTTP",
3232
"Topic :: Internet :: WWW/HTTP :: WSGI",
3333
"Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware",
3434
],
35+
python_requires=">=3.9",
36+
install_requires=[
37+
'setuptools',
38+
],
3539
keywords='wsgi middleware retry',
3640
author="Agendaless Consulting",
3741
author_email="[email protected]",

tox.ini

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py37,py38,py39,py310,py311,pypy3,w_deps,cover,docs
3+
py39,py310,py311,py312,py313,pypy3,w_deps,cover,docs
44

55
[testenv]
66
usedevelop=true
@@ -14,18 +14,23 @@ setenv =
1414

1515
[testenv:w_deps]
1616
basepython =
17-
python3.8
17+
python3.9
1818
deps =
1919
transaction
2020
ZODB
2121
Zope>=4.0
2222
pytest
2323
pytest-cov
2424

25+
[testenv:py312-cover]
26+
commands =
27+
python --version
28+
pytest --cov {posargs:}
29+
2530
[testenv:cover]
2631
skip_install = true
2732
basepython =
28-
python3.10
33+
python3.12
2934
commands =
3035
coverage combine
3136
coverage report --fail-under=100 --show-missing
@@ -34,10 +39,12 @@ deps =
3439
coverage
3540
setenv =
3641
COVERAGE_FILE=.coverage
42+
#depends = py39,py310,py311,py312,py313,pypy3,w_deps
43+
depends = py312-cover,w_deps
3744

3845
[testenv:docs]
3946
basepython =
40-
python3.10
47+
python3.12
4148
commands =
4249
sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
4350
deps =

0 commit comments

Comments
 (0)