Skip to content

Commit

Permalink
Merge pull request #445 from Pylons/feature/support-py-3-13
Browse files Browse the repository at this point in the history
Drop Python 3.8 and add Python 3.13
  • Loading branch information
digitalresistor authored Oct 26, 2024
2 parents 4584936 + dcd18e7 commit fdd2ecf
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 24 deletions.
33 changes: 15 additions & 18 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ jobs:
strategy:
matrix:
py:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
- "pypy-3.8"
- "3.13"
- "pypy-3.9"
- "pypy-3.10"
# Pre-release
Expand All @@ -35,8 +34,6 @@ jobs:
- x86
- arm64
include:
- py: "pypy-3.8"
toxenv: "pypy38"
- py: "pypy-3.9"
toxenv: "pypy39"
- py: "pypy-3.10"
Expand All @@ -47,8 +44,12 @@ jobs:
architecture: x86
- os: "ubuntu-22.04"
architecture: arm64
# MacOS we need to make sure to remove x86 on all, but x64
# on the arm runners and arm64 on the x64 runners
# MacOS we need to make sure to remove x86 on all
# We need to run no arm64 on macos-13 (Intel), but some
# Python versions: 3.9/3.10
#
# From 3.11 onward, there is support for running x64 and
# arm64 on Apple Silicon based systems (macos-14)
- os: "macos-13"
architecture: x86
- os: "macos-13"
Expand All @@ -57,23 +58,19 @@ jobs:
architecture: x86
- os: "macos-14"
architecture: x64
py: "3.9"
- os: "macos-14"
py: "3.8"
architecture: x64
py: "3.10"
# Windows does not have arm64 releases
- os: "windows-latest"
architecture: arm64
# Don't run all PyPy versions except latest on
# Windows/macOS. They are expensive to run.
- os: "windows-latest"
py: "pypy-3.8"
- os: "macos-13"
py: "pypy-3.8"
- os: "windows-latest"
py: "pypy-3.9"
- os: "macos-13"
py: "pypy-3.9"
- os: "macos-14"
py: "pypy-3.8"
- os: "macos-14"
py: "pypy-3.9"

Expand Down Expand Up @@ -101,14 +98,14 @@ jobs:
name: Validate coverage
steps:
- uses: actions/checkout@v4
- name: Setup python 3.10
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.13"
architecture: x64

- run: pip install tox
- run: tox -e py310,coverage
- run: tox -e py313,coverage
docs:
runs-on: ubuntu-22.04
name: Build the documentation
Expand All @@ -117,7 +114,7 @@ jobs:
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.13"
architecture: x64
- run: pip install tox
- run: tox -e docs
Expand All @@ -129,7 +126,7 @@ jobs:
- name: Setup python
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.13"
architecture: x64
- run: pip install tox
- run: tox -e lint
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Waitress

Waitress is a production-quality pure-Python WSGI server with very acceptable
performance. It has no dependencies except ones which live in the Python
standard library. It runs on CPython on Unix and Windows under Python 3.8+. It
is also known to run on PyPy 3 (version 3.8 compatible python and above) on
standard library. It runs on CPython on Unix and Windows under Python 3.9+. It
is also known to run on PyPy 3 (version 3.9 compatible python and above) on
UNIX. It supports HTTP/1.0 and HTTP/1.1.

For more information, see the "docs" directory of the Waitress package or visit
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ classifiers =
License :: OSI Approved :: Zope Public License
Programming Language :: Python
Programming Language :: Python :: 3
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
Operating System :: OS Independent
Expand All @@ -38,7 +38,7 @@ maintainer_email = [email protected]
package_dir=
=src
packages=find:
python_requires = >=3.8.0
python_requires = >=3.9.0

[options.entry_points]
paste.server_runner =
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
envlist =
lint,
py38,py39,py310,py311,py312,pypy38,pypy39,pypy310
py39,py310,py311,py312,py313,pypy39,pypy310
coverage,
docs
isolated_build = True
Expand All @@ -10,7 +10,6 @@ isolated_build = True
commands =
python --version
python -mpytest \
pypy38: --no-cov \
pypy39: --no-cov \
pypy310: --no-cov \
{posargs:}
Expand Down

0 comments on commit fdd2ecf

Please sign in to comment.