From 4633ea6d69d6b7eff5db91e263ea85f437026db0 Mon Sep 17 00:00:00 2001 From: Delta Regeer Date: Sat, 26 Oct 2024 14:10:21 -0600 Subject: [PATCH 1/2] Drop Python 3.8 and add Python 3.13 --- .github/workflows/ci-tests.yml | 23 ++++++----------------- README.rst | 4 ++-- setup.cfg | 4 ++-- tox.ini | 3 +-- 4 files changed, 11 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 789982a4..63e496e5 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -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 @@ -35,8 +34,6 @@ jobs: - x86 - arm64 include: - - py: "pypy-3.8" - toxenv: "pypy38" - py: "pypy-3.9" toxenv: "pypy39" - py: "pypy-3.10" @@ -57,23 +54,15 @@ jobs: architecture: x86 - os: "macos-14" architecture: x64 - - os: "macos-14" - py: "3.8" # 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" @@ -101,14 +90,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 @@ -117,7 +106,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 @@ -129,7 +118,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 diff --git a/README.rst b/README.rst index ec48a963..1f7addd6 100644 --- a/README.rst +++ b/README.rst @@ -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 diff --git a/setup.cfg b/setup.cfg index 78f1e6ab..415c8d70 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 @@ -38,7 +38,7 @@ maintainer_email = pylons-discuss@googlegroups.com package_dir= =src packages=find: -python_requires = >=3.8.0 +python_requires = >=3.9.0 [options.entry_points] paste.server_runner = diff --git a/tox.ini b/tox.ini index 9a60fdbc..d87a0f09 100644 --- a/tox.ini +++ b/tox.ini @@ -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 @@ -10,7 +10,6 @@ isolated_build = True commands = python --version python -mpytest \ - pypy38: --no-cov \ pypy39: --no-cov \ pypy310: --no-cov \ {posargs:} From dcd18e7b4b8e78e2abea8f286c23b0b9298bea9b Mon Sep 17 00:00:00 2001 From: Delta Regeer Date: Sat, 26 Oct 2024 14:23:45 -0600 Subject: [PATCH 2/2] Update exclude matrix --- .github/workflows/ci-tests.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 63e496e5..140c4549 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -44,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" @@ -54,6 +58,10 @@ jobs: architecture: x86 - os: "macos-14" architecture: x64 + py: "3.9" + - os: "macos-14" + architecture: x64 + py: "3.10" # Windows does not have arm64 releases - os: "windows-latest" architecture: arm64