Skip to content

Commit

Permalink
Merge pull request #790 from twisted/774-python-313-support
Browse files Browse the repository at this point in the history
Add python 3.13 support, drop 3.7 and 3.8
  • Loading branch information
glyph authored Feb 4, 2025
2 parents ebcc604 + c762e4b commit 479e069
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 11 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-latest"]
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11"]
twisted-version: ["21.2", "22.1", "23.8"]
tox-prefix: ["coverage"]
optional: [false]
Expand All @@ -208,12 +208,16 @@ jobs:
twisted-version: "23.8"
tox-prefix: "test"
optional: false
# Test Python 3.12 but allow it to fail
- os: "ubuntu-latest"
python-version: "3.12.0"
twisted-version: "23.8"
tox-prefix: "test"
optional: true
optional: false
- os: "ubuntu-latest"
python-version: "3.13.0"
twisted-version: "24.10"
tox-prefix: "test"
optional: false

steps:

Expand Down
6 changes: 4 additions & 2 deletions requirements/tox-pin-base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
attrs==24.2.0
Automat==22.10.0
Automat==22.10.0; python_version < '3.13'
Automat==24.8.1; python_version >= '3.13'
characteristic==14.3.0
constantly==15.1.0
hyperlink==21.0.0
Expand All @@ -10,4 +11,5 @@ six==1.16.0
Tubes==0.2.1
Werkzeug==3.0.1; python_version > '3.7'
Werkzeug==2.1.2; python_version <= '3.7'
zope.interface==6.2
zope.interface==6.2; python_version < '3.13'
zope.interface==7.0.3; python_version >= '3.13'
3 changes: 2 additions & 1 deletion requirements/tox-tests.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
idna==3.6
treq==22.2.0
treq==22.2.0; python_version < '3.13'
treq==24.9.1; python_version >= '3.13'
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
Expand All @@ -25,7 +25,7 @@
description="werkzeug + twisted.web",
long_description=long_description,
long_description_content_type="text/x-rst",
python_requires=">=3.7",
python_requires=">=3.9",
setup_requires=["incremental"],
use_incremental=True,
install_requires=[
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

envlist =
lint, mypy
coverage-py{38,39,310,311,312,py3}-tw{212,221,238,trunk}
coverage-py37-tw{212,221,238}
coverage-py{39,310,311,312,313,py3}-tw{212,221,238,2410,trunk}
coverage_report
docs, docs-linkcheck
packaging
Expand All @@ -18,6 +17,8 @@ basepython = python3.11
deps =
tw212: Twisted==21.2.0
tw221: Twisted==22.1.0
tw238: Twisted==23.8.0
tw2410: Twisted==24.10.0
twcurrent: Twisted
# See https://github.com/twisted/klein/issues/486
twtrunk: --use-deprecated=legacy-resolver
Expand Down Expand Up @@ -51,6 +52,7 @@ basepython =
py310: python3.10
py311: python3.11
py312: python3.12
py313: python3.13
pypy3: pypy3
pypy38: pypy3.8
pypy39: pypy3.9
Expand Down

0 comments on commit 479e069

Please sign in to comment.