From 8ce557ad0be35b512ddd110fa77278add61ac8bc Mon Sep 17 00:00:00 2001 From: Tom Most Date: Fri, 28 Jan 2022 22:10:22 -0800 Subject: [PATCH 1/5] Add Python 3.10 to the test matrix --- .github/workflows/ci.yaml | 3 ++- setup.py | 1 + tox.ini | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 51c9c787..c15b3041 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -63,7 +63,7 @@ jobs: continue-on-error: ${{ matrix.experimental }} strategy: matrix: - python-version: ["3.6", "3.7", "3.8", "3.9", "pypy-3.7"] + python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy-3.7"] twisted-version: ["lowest", "latest"] experimental: [false] @@ -101,6 +101,7 @@ jobs: "3.7": "py37", "3.8": "py38", "3.9": "py39", + "3.10": "py310", "pypy-3.7": "pypy3", } factor = table["${{ matrix.python-version }}"] diff --git a/setup.py b/setup.py index b8ad149a..522b4b43 100644 --- a/setup.py +++ b/setup.py @@ -11,6 +11,7 @@ "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", ] diff --git a/tox.ini b/tox.ini index 68aacbff..e1088df3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = {py36,py37}-twisted_lowest, - {pypy3,py36,py37,py38,py39}-twisted_latest, - {pypy3,py36,py37,py38,py39}-twisted_trunk, + {pypy3,py36,py37,py38,py39,py310}-twisted_latest, + {pypy3,py36,py37,py38,py39,py310}-twisted_trunk, twine, check-manifest, flake8, docs, coverage-report isolated_build = true From 8292e5fa119163c601864ba534e6c2bcbc417abd Mon Sep 17 00:00:00 2001 From: Tom Most Date: Fri, 28 Jan 2022 22:12:22 -0800 Subject: [PATCH 2/5] Add changefragment --- changelog.d/338.feature.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/338.feature.rst diff --git a/changelog.d/338.feature.rst b/changelog.d/338.feature.rst new file mode 100644 index 00000000..eca51d0d --- /dev/null +++ b/changelog.d/338.feature.rst @@ -0,0 +1 @@ +Python 3.10 is now supported. From 58cb9e609e3325bf0c6148ba93a6e27aac05f5a0 Mon Sep 17 00:00:00 2001 From: Tom Most Date: Fri, 28 Jan 2022 22:16:35 -0800 Subject: [PATCH 3/5] Add PyPy 3.8 to the test matrix --- .github/workflows/ci.yaml | 3 ++- changelog.d/338.feature.rst | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c15b3041..c225331f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -63,7 +63,7 @@ jobs: continue-on-error: ${{ matrix.experimental }} strategy: matrix: - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy-3.7"] + python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy-3.7", "pypy-3.8"] twisted-version: ["lowest", "latest"] experimental: [false] @@ -103,6 +103,7 @@ jobs: "3.9": "py39", "3.10": "py310", "pypy-3.7": "pypy3", + "pypy-3.8": "pypy3", } factor = table["${{ matrix.python-version }}"] print("::set-output name=value::" + factor) diff --git a/changelog.d/338.feature.rst b/changelog.d/338.feature.rst index eca51d0d..4b860f44 100644 --- a/changelog.d/338.feature.rst +++ b/changelog.d/338.feature.rst @@ -1 +1 @@ -Python 3.10 is now supported. +Python 3.10 and PyPy 3.8 are now supported. From af8494ea5600c62bb6e1e0456401da420d5388d7 Mon Sep 17 00:00:00 2001 From: Tom Most Date: Fri, 28 Jan 2022 22:18:15 -0800 Subject: [PATCH 4/5] Note that Python 3.6 is EOL --- changelog.d/338.removal.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/338.removal.rst diff --git a/changelog.d/338.removal.rst b/changelog.d/338.removal.rst new file mode 100644 index 00000000..dc198b4f --- /dev/null +++ b/changelog.d/338.removal.rst @@ -0,0 +1 @@ +Support for Python 3.6, which has reached end of support, is deprecated. This is the last release with support for Python 3.6. From 439b89e55186dd55d9801c4fd6377b02d68b9af3 Mon Sep 17 00:00:00 2001 From: Tom Most Date: Fri, 4 Feb 2022 21:55:29 -0800 Subject: [PATCH 5/5] Note non-support of Python 2.7 --- docs/index.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 70a5a8f9..059dfccb 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -83,12 +83,10 @@ Here is a list of `requests`_ features and their status in treq. +----------------------------------+----------+----------+ | Connection Timeouts | yes | yes | +----------------------------------+----------+----------+ -| HTTP(S) Proxy Support | yes | no | +| HTTP(S) Proxy Support | yes | no | +----------------------------------+----------+----------+ | .netrc support | yes | no | +----------------------------------+----------+----------+ -| Python 2.7 | yes | yes | -+----------------------------------+----------+----------+ | Python 3.x | yes | yes | +----------------------------------+----------+----------+