Merge pull request #1000 from hugovk/rm-3.4

Drop support for EOL Python 3.4
psycopg · Nov 17, 2020 · 490c53b · 490c53b
2 parents 8764a85 + 60ed277
commit 490c53b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -21,8 +21,6 @@ environment:
         - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "36", PY_ARCH: "64"}
         - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "35", PY_ARCH: "32"}
         - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "35", PY_ARCH: "64"}
-        - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "34", PY_ARCH: "32"}
-        - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "34", PY_ARCH: "64"}
         - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "27", PY_ARCH: "32"}
         - {APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015, PY_VER: "27", PY_ARCH: "64"}
 

diff --git a/NEWS b/NEWS
@@ -1,6 +1,11 @@
 Current release
 ---------------
 
+What's new in psycopg 2.9.0
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- Dropped support for Python 3.4 (:ticket:`#1000`).
+
 What's new in psycopg 2.8.6
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

diff --git a/doc/src/install.rst b/doc/src/install.rst
@@ -132,7 +132,7 @@ The current `!psycopg2` implementation supports:
     NOTE: keep consistent with setup.py and the /features/ page.
 
 - Python version 2.7
-- Python 3 versions from 3.4 to 3.9
+- Python 3 versions from 3.5 to 3.9
 - PostgreSQL server versions from 7.4 to 13
 - PostgreSQL client library version from 9.1
 

diff --git a/psycopg/python.h b/psycopg/python.h
@@ -34,8 +34,8 @@
 #error "psycopg requires Python 2.7"
 #endif
 
-#if PY_3 && PY_VERSION_HEX < 0x03040000
-#error "psycopg requires Python 3.4"
+#if PY_3 && PY_VERSION_HEX < 0x03050000
+#error "psycopg requires Python 3.5"
 #endif
 
 #include <structmember.h>

diff --git a/scripts/appveyor.py b/scripts/appveyor.py
@@ -696,7 +696,7 @@ class Options:
     def py_ver(self):
         """The Python version to build as 2 digits string."""
         rv = os.environ['PY_VER']
-        assert rv in ('27', '34', '35', '36', '37', '38', '39'), rv
+        assert rv in ('27', '35', '36', '37', '38', '39'), rv
         return rv
 
     @property
@@ -780,13 +780,10 @@ def vs_ver(self):
         # https://wiki.python.org/moin/WindowsCompilers
         # https://www.appveyor.com/docs/windows-images-software/#python
         # Py 2.7 = VS Ver. 9.0 (VS 2008)
-        # Py 3.3, 3.4 = VS Ver. 10.0 (VS 2010)
         # Py 3.5--3.8 = VS Ver. 14.0 (VS 2015)
         # Py 3.9 = VS Ver. 16.0 (VS 2019)
         vsvers = {
             '27': '9.0',
-            '33': '10.0',
-            '34': '10.0',
             '35': '14.0',
             '36': '14.0',
             '37': '14.0',

diff --git a/setup.py b/setup.py
@@ -61,7 +61,6 @@
 Programming Language :: Python :: 2
 Programming Language :: Python :: 2.7
 Programming Language :: Python :: 3
-Programming Language :: Python :: 3.4
 Programming Language :: Python :: 3.5
 Programming Language :: Python :: 3.6
 Programming Language :: Python :: 3.7
@@ -600,7 +599,7 @@ def is_py_64():
       url="https://psycopg.org/",
       license="LGPL with exceptions",
       platforms=["any"],
-      python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
+      python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
       description=readme.split("\n")[0],
       long_description="\n".join(readme.split("\n")[2:]).lstrip(),
       classifiers=[x for x in classifiers.split("\n") if x],

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34,35,36,37,38}
+envlist = py{27,35,36,37,38}
 
 [testenv]
 commands = make check