Revert "Add support for Python 2.7 on SQLAlchemy 1.4."

This reverts commit 447bb7a.
zopefoundation · Aug 24, 2021 · 69d4ced · 69d4ced
1 parent 447bb7a
commit 69d4ced
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/.meta.toml b/.meta.toml
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/zope-product
 [meta]
 template = "zope-product"
-commit-id = "81a3fca06e30c8fba7256352591a7a298d676a41"
+commit-id = "bf824746f106a5f6314af285f3d5642e3ce490ce"
 
 [python]
 with-pypy = false
@@ -18,7 +18,7 @@ fail-under = 70
 additional-envlist = [
     "py{27,35,36}-sqlalchemy{09,10}",
     "py{27,35,36,37,38,39}-sqlalchemy{11,12,13}",
-    "py{27,36,37,38,39}-sqlalchemy{14}",
+    "py{36,37,38,39}-sqlalchemy{14}",
     ]
 testenv-deps = [
     "py27: psycopg2 < 2.9",

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,8 +4,7 @@ Changes
 1.6 (unreleased)
 ----------------
 
-- Add support for Python 2.7 on SQLAlchemy 1.4.
-  (`#71 <https://github.com/zopefoundation/zope.sqlalchemy/issues/71>`_)
+- Nothing changed yet.
 
 
 1.5 (2021-07-14)

diff --git a/setup.py b/setup.py
@@ -51,7 +51,7 @@
     install_requires=[
         'setuptools',
         'SQLAlchemy>=0.9,!=1.4.0,!=1.4.1,!=1.4.2,!=1.4.3,!=1.4.4,!=1.4.5,!=1.4.6',  # noqa: E501 line too long
-        'SQLAlchemy>=0.9, <1.4; python_version == "3.5"',
+        'SQLAlchemy>=0.9, <1.4; python_version <= "3.5"',
         'transaction>=1.6.0',
         'zope.interface>=3.6.0',
     ],

diff --git a/tox.ini b/tox.ini
@@ -13,7 +13,7 @@ envlist =
     coverage
     py{27,35,36}-sqlalchemy{09,10}
     py{27,35,36,37,38,39}-sqlalchemy{11,12,13}
-    py{27,36,37,38,39}-sqlalchemy{14}
+    py{36,37,38,39}-sqlalchemy{14}
 
 [testenv]
 skip_install = true