Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add python 3.13 support, drop 3.7 and 3.8 #790

Open
wants to merge 9 commits into
base: trunk
Choose a base branch
from
Open

Add python 3.13 support, drop 3.7 and 3.8 #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d6a26b3
Add support for 3.13 to tox.
pythonspeed Sep 17, 2024
6124999
Add more supported versions
pythonspeed Sep 17, 2024
79341e1
Run tests on 3.13.
pythonspeed Oct 30, 2024
3729209
Drop EOL Python 3.7 and 3.8.
pythonspeed Oct 30, 2024
94f322d
Merge branch 'trunk' into 774-python-313-support
itamarst Oct 30, 2024
93ae917
Restore necessary fields
pythonspeed Oct 30, 2024
23b69a8
Merge remote-tracking branch 'origin/774-python-313-support' into 774…
pythonspeed Oct 30, 2024
14b9b95
Make 3.13 tests actually run.
pythonspeed Oct 30, 2024
5680af2
Unbreak old Python.
pythonspeed Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/cicd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,27 +193,26 @@ jobs:
strategy:
matrix:
os: ["ubuntu-latest"]
python-version: ["3.7", "3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11"]
twisted-version: ["21.2", "22.1", "23.8"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this also should be updated...
and add a comment to describe what rule do we use to define the targeted twisted versions ...

Suggested change
twisted-version: ["21.2", "22.1", "23.8"]
# We have the oldest Twisted version that we support.
# We also add the last 2 newer versions.
twisted-version: ["21.2", "24.7", "24.10"]

tox-prefix: ["coverage"]
optional: [false]
include:
- os: "ubuntu-latest"
python-version: "pypy-3.8"
python-version: "pypy-3.9"
twisted-version: "23.8"
tox-prefix: "test"
optional: false
- os: "ubuntu-latest"
python-version: "pypy-3.9"
python-version: "3.12.0"
twisted-version: "23.8"
tox-prefix: "test"
optional: false
# Test Python 3.12 but allow it to fail
- os: "ubuntu-latest"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that a comment describing this job can help with future updates of these values.

Suggested change
- os: "ubuntu-latest"
# Test latest supported Python
# and latest Twisted release.
- os: "ubuntu-latest"

python-version: "3.12.0"
twisted-version: "23.8"
python-version: "3.13.0"
twisted-version: "24.10"
tox-prefix: "test"
optional: true
optional: false

steps:

Expand Down
6 changes: 4 additions & 2 deletions requirements/tox-pin-base.txt
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading