Add support for Python 3.9

7 files changed, 12 insertions, 6 deletions

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index a16421a0b..b56a638a3 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -19,6 +19,7 @@ jobs:
                     - "3.6"
                     - "3.7"
                     - "3.8"
+                    - "3.9"
                     - "pypy3"
                 os:
                     - "ubuntu-latest"
diff --git a/CHANGES.rst b/CHANGES.rst
index 3ad62669c..32e260037 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ unreleased
 Features
 --------
 
+- Add support for Python 3.9.
+  See https://github.com/Pylons/pyramid/issue/3622
+
 - The ``aslist`` method now handles non-string object when flattening.
   See https://github.com/Pylons/pyramid/pull/3594
 
diff --git a/HACKING.txt b/HACKING.txt
index 730d08208..7bf05080c 100644
--- a/HACKING.txt
+++ b/HACKING.txt
@@ -50,7 +50,7 @@ In order to add a feature to Pyramid:
 - The feature must be documented in both the API and narrative documentation
   (in `docs/`).
 
-- The feature must work fully on the following CPython versions: 3.5, 3.6, 3.7, and 3.8 on both UNIX and Windows.
+- The feature must work fully on the following CPython versions: 3.5, 3.6, 3.7, 3.8, and 3.9 on both UNIX and Windows.
 
 - The feature must work on the latest version of PyPy3.
 
@@ -80,9 +80,9 @@ Running Tests
 
     $ $TOX -e py
 
-  To run `tox` for Python 3.8 explicitly, you may use:
+  To run `tox` for Python 3.9 explicitly, you may use:
 
-    $ $TOX -e py38
+    $ $TOX -e py39
 
 - To run individual tests (i.e., during development), you can use `pytest`
   syntax as follows, where `$VENV` is an environment variable set to the path
@@ -103,7 +103,7 @@ Test Coverage
 -------------
 
 - The codebase *must* have 100% test statement coverage after each commit. You
-  can test coverage via `tox -e py38`.
+  can test coverage via `tox -e py39`.
 
 
 Documentation Coverage and Building HTML Documentation
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 8e2bfa866..23bf0cfd3 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -21,7 +21,7 @@ the following sections.
 
 .. sidebar:: Python Versions
 
-    As of this writing, :app:`Pyramid` is tested against Python 3.5, 3.6, Python 3.7, Python 3.8, and PyPy3.
+    As of this writing, :app:`Pyramid` is tested against Python 3.5, 3.6, 3.7, 3.8, and 3.9 and PyPy3.
 
 :app:`Pyramid` is known to run on all popular Unix-like systems such as Linux,
 macOS, and FreeBSD, as well as on Windows platforms.  It is also known to
diff --git a/docs/narr/upgrading.rst b/docs/narr/upgrading.rst
index 31ca6adfa..e5541e248 100644
--- a/docs/narr/upgrading.rst
+++ b/docs/narr/upgrading.rst
@@ -90,6 +90,7 @@ Python is when security updates are no longer released.
 - `Python 3.6 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2021-12-23.
 - `Python 3.7 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2023-06-27.
 - `Python 3.8 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2024-10-??.
+- `Python 3.9 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ TBD.
 
 To determine the Python support for a specific release of Pyramid, view its
 ``tox.ini`` file at the root of the repository's version.
diff --git a/setup.py b/setup.py
index 0c7fc22e0..a37afad9e 100644
--- a/setup.py
+++ b/setup.py
@@ -77,6 +77,7 @@ setup(
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Framework :: Pyramid",
diff --git a/tox.ini b/tox.ini
index 99aeb67d2..d4a1b24ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     lint,
-    py35,py36,py37,py38,pypy3,
+    py35,py36,py37,py38,py39,pypy3,
     py38-cover,coverage,
     docs