Merge pull request #3694 from Pylons/cleanup/py36

Cleanup remnants of Py3.6 support

5 files changed, 11 insertions, 8 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index 4bb847a25..0ee6fd30d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,5 +10,7 @@ Bug Fixes
 Backward Incompatibilities
 --------------------------
 
+- Pyramid is no longer tested on, nor supports Python 3.6
+
 Documentation Changes
 ---------------------
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 078209e26..882b40d10 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -5,7 +5,7 @@ Installing :app:`Pyramid`
 
 .. note::
 
-    This installation guide emphasizes the use of Python 3.6 and greater for
+    This installation guide emphasizes the use of Python 3.7 and greater for
     simplicity.
 
 
@@ -15,13 +15,14 @@ Installing :app:`Pyramid`
 Before You Install Pyramid
 --------------------------
 
-Install Python version 3.6 or greater for your operating system, and satisfy
+Install Python version 3.7 or greater for your operating system, and satisfy
 the :ref:`requirements-for-installing-packages`, as described in
 the following sections.
 
 .. sidebar:: Python Versions
 
-    As of this writing, :app:`Pyramid` is tested against Python 3.7, 3.8, 3.9, and 3.10 and PyPy3.
+    As of this writing, :app:`Pyramid` is tested against Python 3.7, 3.8, 3.9,
+    and 3.10 and PyPy (matches CPython version 3.8).
 
 :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 d6882809a..020f2ed37 100644
--- a/docs/narr/upgrading.rst
+++ b/docs/narr/upgrading.rst
@@ -86,10 +86,10 @@ At the time of a Pyramid version release, each supports all versions of Python
 through the end of their lifespans. The end-of-life for a given version of
 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.
+- `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>`_ 2025-10.
+- `Python 3.10 Lifespan <https://devguide.python.org/#status-of-python-branches>`_ 2026-10.
 
 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/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index 901f6134d..5f5c0b10b 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -19,7 +19,7 @@ virtual environment.)
 
 This *Quick Tutorial* is based on:
 
-* **Python 3.8**. Pyramid fully supports Python 3.6+.
+* **Python 3.8**. Pyramid fully supports Python 3.7+.
   This tutorial uses **Python 3.8**.
 
 * **venv**. We believe in virtual environments.
diff --git a/setup.py b/setup.py
index 9f9176e29..127eec807 100644
--- a/setup.py
+++ b/setup.py
@@ -98,7 +98,7 @@ setup(
     package_dir={'': 'src'},
     include_package_data=True,
     zip_safe=False,
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     install_requires=install_requires,
     extras_require={'testing': testing_extras, 'docs': docs_extras},
     tests_require=tests_require,