From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 1 Nov 2020 15:41:11 +0000 (-0500)
Subject: fix notes regarding Python 3.5
X-Git-Tag: rel_1_4_0b1~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8df842212cdb3af1c6fec8744290519bbd518047;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix notes regarding Python 3.5

Clarify python 3.6 as the minimum python version,
references #5634

Change-Id: Ib93bc1b2a69e509bff8b00809d3db4f0ec5108f3
---

diff --git a/doc/build/changelog/migration_14.rst b/doc/build/changelog/migration_14.rst
index 7d0ecf4f63..5eac879645 100644
--- a/doc/build/changelog/migration_14.rst
+++ b/doc/build/changelog/migration_14.rst
@@ -25,6 +25,16 @@ What's New in SQLAlchemy 1.4?
 Major API changes and features - General
 =========================================
 
+.. _change_5634:
+
+Python 3.6 is the minimum Python 3 version; Python 2.7 still supported
+----------------------------------------------------------------------
+
+As Python 3.5 reached EOL in September of 2020, SQLAlchemy 1.4 now places
+version 3.6 as the minimum Python 3 version.  Python 2.7 is still supported,
+however the SQLAlchemy 1.4 series will be the last series to support Python 2.
+
+
 .. _change_5159:
 
 ORM Query is internally unified with select, update, delete; 2.0 style execution available
diff --git a/doc/build/changelog/migration_20.rst b/doc/build/changelog/migration_20.rst
index 39ca2099c2..eadabd7f0e 100644
--- a/doc/build/changelog/migration_20.rst
+++ b/doc/build/changelog/migration_20.rst
@@ -129,9 +129,9 @@ that release 1.4 will be the last Python 2 supporting version, even if
 there is a SQLAlchemy 1.5 (which is also unlikely at the moment).
 
 In order to use SQLAlchemy 2.0, the application will need to be runnable on
-at least **Python 3.6** as of this writing; Python 3.5, still supported
-by SQLAlchemy 1.4, is EOL as of September, 2020.  Throughout the 1.4 series,
-the application can remain running on Python 2.7 or on at least Python 3.5.
+at least **Python 3.6** as of this writing.  SQLAlchemy 1.4 now supports
+Python 3.6 or newer within the Python 3 series; throughout the 1.4 series,
+the application can remain running on Python 2.7 or on at least Python 3.6.
 
 .. _migration_20_deprecations_mode:
 
diff --git a/doc/build/changelog/unreleased_14/5634.rst b/doc/build/changelog/unreleased_14/5634.rst
index 44e866e89f..e37601fd21 100644
--- a/doc/build/changelog/unreleased_14/5634.rst
+++ b/doc/build/changelog/unreleased_14/5634.rst
@@ -2,5 +2,9 @@
     :tags: change
     :tickets: 5634
 
-    Dropped support for python 3.5 that has reached EOL.
-    SQLAlchemy 1.4 series requires python 2.7 or 3.6+.
+    Dropped support for python 3.5 that has reached EOL. SQLAlchemy 1.4 series
+    requires python 2.7 or 3.6+.
+
+    .. seealso::
+
+        :ref:`change_5634`
diff --git a/doc/build/intro.rst b/doc/build/intro.rst
index 2beec697e6..af76b0caa1 100644
--- a/doc/build/intro.rst
+++ b/doc/build/intro.rst
@@ -74,12 +74,13 @@ SQLAlchemy has been tested against the following platforms:
 * cPython 3.6 and higher
 * `PyPy <http://pypy.org/>`_ 2.1 or greater
 
-.. versionchanged:: 1.2
-   Python 2.7 is now the minimum Python version supported.
-
 .. versionchanged:: 1.4
    Within the Python 3 series, 3.6 is now the minimum Python 3 version supported.
 
+   .. seealso::
+
+      :ref:`change_5634`
+
 Supported Installation Methods
 -------------------------------