Merge pull request #338 from twisted/new-pythons

Update the Python support matrix
twisted · Feb 9, 2022 · 8a92360 · 8a92360
2 parents 226ed2d + 7f72f35
commit 8a92360
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git 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", "pypy-3.8"]
           twisted-version: ["lowest", "latest"]
           experimental: [false]
 
@@ -101,7 +101,9 @@ jobs:
           "3.7": "py37",
           "3.8": "py38",
           "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
@@ -0,0 +1 @@
+Python 3.10 and PyPy 3.8 are now supported.
diff --git a/changelog.d/338.removal.rst 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.
diff --git 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      |
 +----------------------------------+----------+----------+
 

diff --git 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
@@ -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