Skip to content

Commit 88fc4a4

Browse files
benoitcbenoitc
authored
Merge pull request #3131 from pajod/patch-py12-rebased
CI: add CPython 3.12 and PyPy3.10, stop promising untested versions
2 parents 660fd8d + deae2fc commit 88fc4a4

11 files changed

+46
-13
lines changed

‎.github/workflows/tox.yml

+13-1
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,24 @@ env:
88
jobs:
99
tox:
1010
name: ${{ matrix.os }} / ${{ matrix.python-version }}
11+
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idtimeout-minutes
12+
timeout-minutes: 20
1113
runs-on: ${{ matrix.os }}
1214
strategy:
1315
fail-fast: false
1416
matrix:
1517
os: [ubuntu-latest, macos-latest] # All OSes pass except Windows because tests need Unix-only fcntl, grp, pwd, etc.
16-
python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11", "pypy-3.8" ]
18+
python-version:
19+
# CPython <= 3.7 is EoL since 2023-06-27
20+
- "3.7"
21+
- "3.8"
22+
- "3.9"
23+
- "3.10"
24+
- "3.11"
25+
- "3.12"
26+
# PyPy <= 3.8 is EoL since 2023-06-16
27+
- "pypy-3.9"
28+
- "pypy-3.10"
1729
steps:
1830
- uses: actions/checkout@v4
1931
- name: Using Python ${{ matrix.python-version }}

‎README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The documentation is hosted at https://docs.gunicorn.org.
3232
Installation
3333
------------
3434

35-
Gunicorn requires **Python 3.x >= 3.5**.
35+
Gunicorn requires **Python 3.x >= 3.7**.
3636

3737
Install from PyPI::
3838

‎appveyor.yml

+6
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ environment:
2424
# PYTHON: "C:\\Python38-x64"
2525
#- TOXENV: py39
2626
# PYTHON: "C:\\Python39-x64"
27+
#- TOXENV: py310
28+
# PYTHON: "C:\\Python310-x64"
29+
#- TOXENV: py311
30+
# PYTHON: "C:\\Python311-x64"
31+
#- TOXENV: py312
32+
# PYTHON: "C:\\Python312-x64"
2733
matrix:
2834
allow_failures:
2935
- TOXENV: py35

‎docs/source/2023-news.rst

+2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ Changelog - 2023
1010
- on HTTP versions < 1.1 support for chunked transfer is refused (only used in exploits)
1111
- requests conflicting configured or passed SCRIPT_NAME now produce a verbose error
1212
- Trailer fields are no longer inspected for headers indicating secure scheme
13+
- support Python 3.12
1314

1415
** Breaking changes **
1516

17+
- minimum version is Python 3.7
1618
- the limitations on valid characters in the HTTP method have been bounded to Internet Standards
1719
- requests specifying unsupported transfer coding (order) are refused by default (rare)
1820
- HTTP methods are no longer casefolded by default (IANA method registry contains none affacted)

‎docs/source/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Features
2323
* Simple Python configuration
2424
* Multiple worker configurations
2525
* Various server hooks for extensibility
26-
* Compatible with Python 3.x >= 3.5
26+
* Compatible with Python 3.x >= 3.7
2727

2828

2929
Contents

‎docs/source/install.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Installation
44

55
.. highlight:: bash
66

7-
:Requirements: **Python 3.x >= 3.5**
7+
:Requirements: **Python 3.x >= 3.7**
88

99
To install the latest released version of Gunicorn::
1010

‎pyproject.toml

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ requires = ["setuptools>=61.2"]
33
build-backend = "setuptools.build_meta"
44

55
[project]
6+
# see https://packaging.python.org/en/latest/specifications/pyproject-toml/
67
name = "gunicorn"
78
authors = [{name = "Benoit Chesneau", email = "[email protected]"}]
89
license = {text = "MIT"}
@@ -17,13 +18,12 @@ classifiers = [
1718
"Operating System :: POSIX",
1819
"Programming Language :: Python",
1920
"Programming Language :: Python :: 3",
20-
"Programming Language :: Python :: 3.5",
21-
"Programming Language :: Python :: 3.6",
2221
"Programming Language :: Python :: 3.7",
2322
"Programming Language :: Python :: 3.8",
2423
"Programming Language :: Python :: 3.9",
2524
"Programming Language :: Python :: 3.10",
2625
"Programming Language :: Python :: 3.11",
26+
"Programming Language :: Python :: 3.12",
2727
"Programming Language :: Python :: 3 :: Only",
2828
"Programming Language :: Python :: Implementation :: CPython",
2929
"Programming Language :: Python :: Implementation :: PyPy",
@@ -35,7 +35,7 @@ classifiers = [
3535
"Topic :: Internet :: WWW/HTTP :: WSGI :: Server",
3636
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
3737
]
38-
requires-python = ">=3.5"
38+
requires-python = ">=3.7"
3939
dependencies = [
4040
'importlib_metadata; python_version<"3.8"',
4141
"packaging",
@@ -47,6 +47,7 @@ Homepage = "https://gunicorn.org"
4747
Documentation = "https://docs.gunicorn.org"
4848
"Issue tracker" = "https://github.com/benoitc/gunicorn/issues"
4949
"Source code" = "https://github.com/benoitc/gunicorn"
50+
Changelog = "https://docs.gunicorn.org/en/stable/news.html"
5051

5152
[project.optional-dependencies]
5253
gevent = ["gevent>=1.4.0"]

‎requirements_test.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
gevent
22
eventlet
33
coverage
4-
pytest
4+
pytest>=7.2.0
55
pytest-cov

‎setup.cfg

-4
This file was deleted.

‎tests/workers/test_geventlet.py

+10
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,15 @@
33
# This file is part of gunicorn released under the MIT license.
44
# See the NOTICE for more information.
55

6+
import pytest
7+
import sys
8+
69
def test_import():
10+
11+
try:
12+
import eventlet
13+
except AttributeError:
14+
if (3,13) > sys.version_info >= (3, 12):
15+
pytest.skip("Ignoring eventlet failures on Python 3.12")
16+
raise
717
__import__('gunicorn.workers.geventlet')

‎tox.ini

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
[tox]
2-
envlist = py{37,38,39,310,311,py3}, lint, docs-lint, pycodestyle, run-entrypoint, run-module
2+
envlist =
3+
py{37,38,39,310,311,312,py3},
4+
lint,
5+
docs-lint,
6+
pycodestyle,
7+
run-entrypoint,
8+
run-module,
39
skipsdist = false
410
; Can't set skipsdist and use_develop in tox v4 to true due to https://github.com/tox-dev/tox/issues/2730
511

0 commit comments

Comments
 (0)