Merge "Drop python 3.5 support"

zzzeek · Gerrit Code Review · commit d0b5ce2ad4cb · 2020-10-10T16:02:26.000Z
diff --git a/.github/workflows/create-wheels.yaml b/.github/workflows/create-wheels.yaml
@@ -24,7 +24,6 @@ jobs:
           - "macos-latest"
         python-version:
           - "2.7"
-          - "3.5"
           - "3.6"
           - "3.7"
           - "3.8"
@@ -84,10 +83,9 @@ jobs:
           pip install -f dist --no-index sqlalchemy
 
       - name: Check c extensions
-        # on windows in python 2.7 and 3.5 the cextension fail to build.
+        # on windows in python 2.7 the cextension fail to build.
         # for python 2.7 visual studio 9 is missing
-        # for python 3.5 the linker has an error "cannot run 'rc.exe'"
-        if: matrix.os != 'windows-latest' || ( matrix.python-version != '2.7' && matrix.python-version != '3.5' )
+        if: matrix.os != 'windows-latest' || matrix.python-version != '2.7'
         run: |
           python -c 'from sqlalchemy import cprocessors, cresultproxy, cutils'
 
@@ -146,7 +144,6 @@ jobs:
           # the versions are <python tag>-<abi tag> as specified in PEP 425.
           - cp27-cp27m
           - cp27-cp27mu
-          - cp35-cp35m
           - cp36-cp36m
           - cp37-cp37m
           - cp38-cp38
@@ -296,7 +293,6 @@ jobs:
           - "ubuntu-latest"
         python-version:
           # the versions are <python tag>-<abi tag> as specified in PEP 425.
-          - cp35-cp35m
           - cp36-cp36m
           - cp37-cp37m
           - cp38-cp38
diff --git a/.github/workflows/run-test.yaml b/.github/workflows/run-test.yaml
@@ -29,7 +29,6 @@ jobs:
           - "macos-latest"
         python-version:
           - "2.7"
-          - "3.5"
           - "3.6"
           - "3.7"
           - "3.8"
@@ -48,13 +47,10 @@ jobs:
             pytest-args: "-k 'not test_autocommit_on and not test_turn_autocommit_off_via_default_iso_level and not test_autocommit_isolation_level'"
 
         exclude:
-          # c-extensions fail to build on windows for python 3.5 and 2.7
+          # c-extensions fail to build on windows for python 2.7
           - os: "windows-latest"
             python-version: "2.7"
             build-type: "cext"
-          - os: "windows-latest"
-            python-version: "3.5"
-            build-type: "cext"
           # linux and osx do not have x86 python
           - os: "ubuntu-latest"
             architecture: x86
@@ -95,7 +91,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - cp35-cp35m
           - cp36-cp36m
           - cp37-cp37m
           - cp38-cp38
diff --git a/doc/build/changelog/unreleased_14/5634.rst b/doc/build/changelog/unreleased_14/5634.rst
@@ -0,0 +1,6 @@
+.. change::
+    :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+.
diff --git a/doc/build/intro.rst b/doc/build/intro.rst
@@ -71,14 +71,14 @@ Supported Platforms
 SQLAlchemy has been tested against the following platforms:
 
 * cPython 2.7
-* cPython 3.5 and higher
+* 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.5 is now the minimum Python 3 version supported.
+   Within the Python 3 series, 3.6 is now the minimum Python 3 version supported.
 
 Supported Installation Methods
 -------------------------------
diff --git a/lib/sqlalchemy/dialects/postgresql/__init__.py b/lib/sqlalchemy/dialects/postgresql/__init__.py
@@ -59,7 +59,7 @@
 from .ranges import TSTZRANGE
 from ...util import compat
 
-if compat.py36:
+if compat.py3k:
     from . import asyncpg  # noqa
 
 base.dialect = dialect = psycopg2.dialect
diff --git a/lib/sqlalchemy/testing/util.py b/lib/sqlalchemy/testing/util.py
@@ -17,7 +17,6 @@
 from ..util import has_refcount_gc
 from ..util import inspect_getfullargspec
 from ..util import py2k
-from ..util import py36
 
 if not has_refcount_gc:
 
@@ -54,7 +53,7 @@ def picklers():
             yield pickle_.loads, lambda d: pickle_.dumps(d, protocol)
 
 
-if py2k or not py36:
+if py2k:
 
     def random_choices(population, k=1):
         pop = list(population)
diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
@@ -72,7 +72,6 @@
 from .compat import pickle  # noqa
 from .compat import print_  # noqa
 from .compat import py2k  # noqa
-from .compat import py36  # noqa
 from .compat import py37  # noqa
 from .compat import py3k  # noqa
 from .compat import pypy  # noqa
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
@@ -17,7 +17,6 @@
 
 py38 = sys.version_info >= (3, 8)
 py37 = sys.version_info >= (3, 7)
-py36 = sys.version_info >= (3, 6)
 py3k = sys.version_info >= (3, 0)
 py2k = sys.version_info < (3, 0)
 pypy = platform.python_implementation() == "PyPy"
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,3 @@
 [tool.black]
 line-length = 79
-target-version = ['py27', 'py35']
+target-version = ['py27', 'py36']
diff --git a/setup.cfg b/setup.cfg
@@ -21,7 +21,6 @@ classifiers =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
@@ -35,7 +34,7 @@ project_urls =
 
 [options]
 packages = find:
-python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
+python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*
 package_dir =
     =lib
 install_requires =
diff --git a/test/base/test_utils.py b/test/base/test_utils.py
@@ -1674,12 +1674,10 @@ def _create_sets(self):
         return super_, sub_, twin1, twin2, unique1, unique2
 
     def _assert_unorderable_types(self, callable_):
-        if util.py36:
+        if util.py3k:
             assert_raises_message(
                 TypeError, "not supported between instances of", callable_
             )
-        elif util.py3k:
-            assert_raises_message(TypeError, "unorderable types", callable_)
         else:
             assert_raises_message(
                 TypeError, "cannot compare sets using cmp()", callable_
@@ -3201,8 +3199,6 @@ class TimezoneTest(fixtures.TestBase):
         ),
     )
     def test_tzname(self, td, expected):
-        if expected == "UTC" and util.py3k and not util.py36:
-            expected += "+00:00"
         eq_(timezone(td).tzname(None), expected)
 
     def test_utcoffset(self):
diff --git a/test/orm/test_unitofwork.py b/test/orm/test_unitofwork.py
@@ -3505,19 +3505,12 @@ def test_exception_persistent_flush_py3k(self):
         a.data = "bar"
         b.data = "foo"
         if sa.util.py3k:
-            if sa.util.py36:
-                message = (
-                    r"Could not sort objects by primary key; primary key "
-                    r"values must be sortable in Python \(was: '<' not "
-                    r"supported between instances of 'MyNotSortableEnum'"
-                    r" and 'MyNotSortableEnum'\)"
-                )
-            else:
-                message = (
-                    r"Could not sort objects by primary key; primary key "
-                    r"values must be sortable in Python \(was: unorderable "
-                    r"types: MyNotSortableEnum\(\) < MyNotSortableEnum\(\)\)"
-                )
+            message = (
+                r"Could not sort objects by primary key; primary key "
+                r"values must be sortable in Python \(was: '<' not "
+                r"supported between instances of 'MyNotSortableEnum'"
+                r" and 'MyNotSortableEnum'\)"
+            )
 
             assert_raises_message(
                 sa.exc.InvalidRequestError,
