PYTHON-1974 Drop support for Python 3.4

behackett · behackett · commit 1f1670cc3546 · 2021-01-22T15:54:26.000-08:00
diff --git a/.evergreen/build-mac.sh b/.evergreen/build-mac.sh
@@ -8,7 +8,7 @@ rm -rf validdist
 mkdir -p validdist
 mv dist/* validdist || true
 
-for VERSION in 3.4 3.5 3.6 3.7 3.8 3.9; do
+for VERSION in 3.5 3.6 3.7 3.8 3.9; do
     PYTHON=/Library/Frameworks/Python.framework/Versions/$VERSION/bin/python3
     rm -rf build
 
diff --git a/.evergreen/build-manylinux-internal.sh b/.evergreen/build-manylinux-internal.sh
@@ -11,7 +11,7 @@ mv dist/* validdist || true
 
 # Compile wheels
 for PYTHON in /opt/python/*/bin/python; do
-    if [[ ! $PYTHON =~ (cp34|cp35|cp36|cp37|cp38|cp39) ]]; then
+    if [[ ! $PYTHON =~ (cp35|cp36|cp37|cp38|cp39) ]]; then
         continue
     fi
     # https://github.com/pypa/manylinux/issues/49
diff --git a/.evergreen/build-manylinux.sh b/.evergreen/build-manylinux.sh
@@ -22,7 +22,6 @@ ls dist
 
 # Check for any unexpected files.
 unexpected=$(find dist \! \( -iname dist -or \
-                             -iname '*cp34*' -or \
                              -iname '*cp35*' -or \
                              -iname '*cp36*' -or \
                              -iname '*cp37*' -or \
diff --git a/.evergreen/build-windows.sh b/.evergreen/build-windows.sh
@@ -8,7 +8,7 @@ rm -rf validdist
 mkdir -p validdist
 mv dist/* validdist || true
 
-for VERSION in 34 35 36 37 38 39; do
+for VERSION in 35 36 37 38 39; do
     _pythons=(C:/Python/Python${VERSION}/python.exe \
               C:/Python/32/Python${VERSION}/python.exe)
     for PYTHON in "${_pythons[@]}"; do
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -1582,10 +1582,6 @@ axes:
         display_name: "Archlinux"
         run_on: archlinux-test
         batchtime: 10080  # 7 days
-      - id: debian81
-        display_name: "Debian 8.1"
-        run_on: debian81-test
-        batchtime: 10080  # 7 days
       - id: debian92
         display_name: "Debian 9.2"
         run_on: debian92-test
@@ -1607,6 +1603,9 @@ axes:
         batchtime: 10080  # 7 days
         variables:
           libmongocrypt_url: https://s3.amazonaws.com/mciuploads/libmongocrypt/rhel-62-64-bit/master/latest/libmongocrypt.tar.gz
+      # Note that rhel70 isn't currently used since it doesn't
+      # have a system Python 3. We'll switch to rhel70 as our main test
+      # system (using /opt/python) in a future change.
       - id: rhel70
         display_name: "RHEL 7.0"
         run_on: rhel70-small
@@ -1623,12 +1622,6 @@ axes:
         batchtime: 10080  # 7 days
         variables:
           libmongocrypt_url: https://s3.amazonaws.com/mciuploads/libmongocrypt/rhel72-zseries-test/master/latest/libmongocrypt.tar.gz
-      - id: suse12-x86-64-test
-        display_name: "SUSE 12 (x86_64)"
-        run_on: suse12-sp5-small
-        batchtime: 10080  # 7 days
-        variables:
-          libmongocrypt_url: https://s3.amazonaws.com/mciuploads/libmongocrypt/suse12-64/master/latest/libmongocrypt.tar.gz
       - id: ubuntu-16.04
         display_name: "Ubuntu 16.04"
         run_on: ubuntu1604-test
@@ -1779,10 +1772,6 @@ axes:
     values:
       # Note: always display platform with python-version to avoid ambiguous display names.
       # Linux
-      - id: "3.4"
-        display_name: "Python 3.4"
-        variables:
-           PYTHON_BINARY: "/opt/python/3.4/bin/python3"
       - id: "3.5"
         display_name: "Python 3.5"
         batchtime: 10080  # 7 days
@@ -1820,10 +1809,6 @@ axes:
   - id: python-version-windows
     display_name: "Python"
     values:
-      - id: "3.4"
-        display_name: "Python 3.4"
-        variables:
-          PYTHON_BINARY: "C:/python/Python34/python.exe"
       - id: "3.5"
         display_name: "Python 3.5"
         variables:
@@ -1848,10 +1833,6 @@ axes:
   - id: python-version-windows-32
     display_name: "Python"
     values:
-      - id: "3.4"
-        display_name: "32-bit Python 3.4"
-        variables:
-          PYTHON_BINARY: "C:/python/32/Python34/python.exe"
       - id: "3.5"
         display_name: "32-bit Python 3.5"
         variables:
@@ -2047,7 +2028,6 @@ buildvariants:
     platform:
       # OSes that support versions of MongoDB>=3.2 with SSL.
       - ubuntu-16.04
-      - suse12-x86-64-test
       - rhel71-power8-test
     auth-ssl: "*"
   display_name: "${platform} ${auth-ssl}"
@@ -2106,7 +2086,6 @@ buildvariants:
   matrix_spec:
     platform:
       # OSes that support versions of MongoDB>=3.4 <4.2 with SSL.
-      - debian81
       - ubuntu1604-power8-test
       - ubuntu1604-arm64-small
     auth-ssl: "*"
@@ -2147,7 +2126,7 @@ buildvariants:
   matrix_spec:
     platform: rhel62
     # RHEL 6.2 does not support Python 3.7.x and later.
-    python-version: &rhel62-pythons ["3.4", "3.5", "3.6", "pypy3.5", "pypy3.6"]
+    python-version: &rhel62-pythons ["3.5", "3.6", "pypy3.5", "pypy3.6"]
     auth: "*"
     ssl: "*"
     coverage: "*"
@@ -2163,14 +2142,14 @@ buildvariants:
 - matrix_name: "tests-pyopenssl"
   matrix_spec:
     platform: ubuntu-16.04
-    python-version: ["3.4", "3.5", "3.6", "3.7", "3.8", "3.9"]
+    python-version: ["3.5", "3.6", "3.7", "3.8", "3.9"]
     auth: "*"
     ssl: "ssl"
     pyopenssl: "*"
   # Only test "noauth" with Python 3.7.
   exclude_spec:
     platform: ubuntu-16.04
-    python-version: ["3.4", "3.5", "3.6", "3.8", "3.9"]
+    python-version: ["3.5", "3.6", "3.8", "3.9"]
     auth: "noauth"
     ssl: "ssl"
     pyopenssl: "*"
@@ -2218,7 +2197,7 @@ buildvariants:
   matrix_spec:
     platform: rhel62
     # RHEL 6.2 does not support Python 3.7.x and later.
-    python-version: ["3.4", "3.5", "3.6"]
+    python-version: ["3.5", "3.6"]
     auth-ssl: noauth-nossl
 # TODO: dependency error for 'coverage-report' task:
 # dependency tests-python-version-rhel62-test-encryption_.../test-2.6-standalone is not present in the project config
@@ -2273,7 +2252,7 @@ buildvariants:
   matrix_spec:
     # Ubuntu 16.04 images have libsnappy-dev installed, and provides OpenSSL 1.0.2 for testing Python 3.7
     platform: ubuntu-16.04
-    python-version: ["3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "pypy3.5", "pypy3.6"]
+    python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "pypy3.5", "pypy3.6"]
     c-extensions: "*"
     compression: "*"
   exclude_spec:
@@ -2450,7 +2429,13 @@ buildvariants:
 - matrix_name: "tests-mod-wsgi"
   matrix_spec:
     platform: rhel62
-    python-version: ["3.4", "3.6"]
+    # The toolchain doesn't currently include mod-wsgi
+    # built for CPython 3.5 or 3.8, mod-wsgi doesn't yet
+    # claim to support 3.9. Python 3.7+ won't build on rhel6
+    # and we need to do some work to migrate mod-wsgi testing
+    # to a different OS. For now we're stuck just testing with
+    # Python 3.6.
+    python-version: ["3.6"]
     mod-wsgi-version: "*"
   display_name: "${mod-wsgi-version} ${python-version} ${platform}"
   tasks:
@@ -2468,7 +2453,7 @@ buildvariants:
 - matrix_name: "tests-doctests"
   matrix_spec:
     platform: rhel62
-    python-version: ["3.4"]
+    python-version: ["3.5"]
   display_name: "Doctests ${python-version} ${platform}"
   tasks:
      - name: "doctests"
@@ -2510,7 +2495,7 @@ buildvariants:
 - matrix_name: "data-lake-spec-tests"
   matrix_spec:
     platform: ubuntu-16.04
-    python-version: ["3.4", "3.8"]
+    python-version: ["3.5", "3.9"]
     auth: "auth"
     c-extensions: "*"
   display_name: "Atlas Data Lake ${python-version} ${c-extensions}"
@@ -2532,7 +2517,7 @@ buildvariants:
 - matrix_name: "ocsp-test"
   matrix_spec:
     platform: ubuntu-16.04
-    python-version: ["3.4", "3.8", "3.9"]
+    python-version: ["3.5", "3.8", "3.9"]
     mongodb-version: ["4.4", "latest"]
     auth: "noauth"
     ssl: "ssl"
@@ -2556,7 +2541,7 @@ buildvariants:
 - matrix_name: "ocsp-test-windows"
   matrix_spec:
     platform: windows-64-vsMulti-small
-    python-version-windows: ["3.4", "3.9"]
+    python-version-windows: ["3.5", "3.9"]
     mongodb-version: ["4.4", "latest"]
     auth: "noauth"
     ssl: "ssl"
diff --git a/.evergreen/test-encryption-requirements.txt b/.evergreen/test-encryption-requirements.txt
@@ -1,4 +1,2 @@
-# cffi==1.14.3 was the last installable release on RHEL 6.2 with Python 3.4
-cffi==1.14.3;python_version=="3.4"
-cffi>=1.12.0,<2;python_version!="3.4"
+cffi>=1.12.0,<2
 cryptography>=2,<4
diff --git a/.evergreen/utils.sh b/.evergreen/utils.sh
@@ -25,10 +25,7 @@ createvirtualenv () {
     # Upgrade to the latest versions of pip setuptools wheel so that
     # pip can always download the latest cryptography+cffi wheels.
     PYTHON_VERSION=$(python -c 'import sys;print("%s.%s" % sys.version_info[:2])')
-    if [[ $PYTHON_VERSION == "3.4" ]]; then
-        # pip 19.2 dropped support for Python 3.4.
-        python -m pip install --upgrade 'pip<19.2'
-    elif [[ $PYTHON_VERSION == "3.5" ]]; then
+    if [[ $PYTHON_VERSION == "3.5" ]]; then
         # pip 21 will drop support for 3.5.
         python -m pip install --upgrade 'pip<21'
     else
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: python
 
 python:
-  - 3.4
   - 3.5
   - 3.6
   - 3.7
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -19,7 +19,7 @@ that might not be of interest or that has already been addressed.
 Supported Interpreters
 ----------------------
 
-PyMongo supports CPython 3.4+ and PyPy3.5+. Language
+PyMongo supports CPython 3.5+ and PyPy3.5+. Language
 features not supported by all interpreters can not be used.
 
 Style Guide
diff --git a/README.rst b/README.rst
@@ -89,7 +89,7 @@ is incompatible with PyMongo.
 Dependencies
 ============
 
-PyMongo supports CPython 3.4+ and PyPy3.5+.
+PyMongo supports CPython 3.5+ and PyPy3.5+.
 
 Optional dependencies:
 
diff --git a/doc/faq.rst b/doc/faq.rst
@@ -134,7 +134,7 @@ they are returned to the pool.
 Does PyMongo support Python 3?
 ------------------------------
 
-PyMongo supports CPython 3.4+ and PyPy3.5+. See the :doc:`python3` for details.
+PyMongo supports CPython 3.5+ and PyPy3.5+. See the :doc:`python3` for details.
 
 Does PyMongo support asynchronous frameworks like Gevent, asyncio, Tornado, or Twisted?
 ---------------------------------------------------------------------------------------
diff --git a/doc/installation.rst b/doc/installation.rst
@@ -28,7 +28,7 @@ To upgrade using pip::
 Dependencies
 ------------
 
-PyMongo supports CPython 3.4+ and PyPy3.5+.
+PyMongo supports CPython 3.5+ and PyPy3.5+.
 
 Optional dependencies:
 
@@ -133,7 +133,7 @@ See `http://bugs.python.org/issue11623 <http://bugs.python.org/issue11623>`_
 for a more detailed explanation.
 
 **Lion (10.7) and newer** - PyMongo's C extensions can be built against
-versions of Python 3.4+ downloaded from python.org. In all cases Xcode must be
+versions of Python 3.5+ downloaded from python.org. In all cases Xcode must be
 installed with 'UNIX Development Support'.
 
 **Xcode 5.1**: Starting with version 5.1 the version of clang that ships with
@@ -163,20 +163,10 @@ Installing from source on Windows
 If you want to install PyMongo with C extensions from source the following
 requirements apply to both CPython and ActiveState's ActivePython:
 
-64-bit Windows
-~~~~~~~~~~~~~~
+Windows
+~~~~~~~
 
-For Python 3.5 and newer install Visual Studio 2015. For Python 3.4
-install Visual Studio 2010. You must use the full version of Visual Studio
-2010 as Visual C++ Express does not provide 64-bit compilers. Make sure that
-you check the "x64 Compilers and Tools" option under Visual C++.
-
-32-bit Windows
-~~~~~~~~~~~~~~
-
-For Python 3.5 and newer install Visual Studio 2015.
-
-For Python 3.4 install Visual C++ 2010 Express.
+Install Visual Studio 2015+.
 
 .. _install-no-c:
 
diff --git a/doc/python3.rst b/doc/python3.rst
@@ -6,7 +6,7 @@ Python 3 FAQ
 What Python 3 versions are supported?
 -------------------------------------
 
-PyMongo supports CPython 3.4+ and PyPy3.5+.
+PyMongo supports CPython 3.5+ and PyPy3.5+.
 
 Are there any PyMongo behavior changes with Python 3?
 -----------------------------------------------------
diff --git a/pymongo/pool.py b/pymongo/pool.py
@@ -151,15 +151,13 @@ def _set_keepalive_times(sock):
 ])
 
 if sys.platform.startswith('linux'):
-    # platform.linux_distribution was deprecated in Python 3.5.
-    if sys.version_info[:2] < (3, 5):
-        # Distro name and version (e.g. Ubuntu 16.04 xenial)
-        _name = ' '.join([part for part in
-                          platform.linux_distribution() if part])
-    else:
-        _name = platform.system()
+    # platform.linux_distribution was deprecated in Python 3.5
+    # and removed in Python 3.8. Starting in Python 3.5 it
+    # raises DeprecationWarning
+    # DeprecationWarning: dist() and linux_distribution() functions are deprecated in Python 3.5
+    _name = platform.system()
     _METADATA['os'] = SON([
-        ('type', platform.system()),
+        ('type', _name),
         ('name', _name),
         ('architecture', platform.machine()),
         # Kernel version (e.g. 4.4.0-17-generic).
diff --git a/pymongo/ssl_support.py b/pymongo/ssl_support.py
@@ -132,17 +132,13 @@ def get_ssl_context(*args):
             if _ssl.IS_PYOPENSSL:
                 raise ConfigurationError(
                     "ssl_crlfile cannot be used with PyOpenSSL")
-            if not hasattr(ctx, "verify_flags"):
-                raise ConfigurationError(
-                    "Support for ssl_crlfile requires "
-                    "python 2.7.9+ (pypy 2.5.1+) or  3.4+")
             # Match the server's behavior.
             ctx.verify_flags = getattr(_ssl, "VERIFY_CRL_CHECK_LEAF", 0)
             ctx.load_verify_locations(crlfile)
         if ca_certs is not None:
             ctx.load_verify_locations(ca_certs)
         elif cert_reqs != CERT_NONE:
-            # CPython 3.4+ ssl module only, doesn't exist in PyOpenSSL
+            # CPython ssl module only, doesn't exist in PyOpenSSL
             if hasattr(ctx, "load_default_certs"):
                 ctx.load_default_certs()
             # Always useless on Windows.
diff --git a/setup.py b/setup.py
@@ -5,8 +5,8 @@
 import warnings
 
 
-if sys.version_info[:2] < (3, 4):
-    raise RuntimeError("Python version >= 3.4 required.")
+if sys.version_info[:2] < (3, 5):
+    raise RuntimeError("Python version >= 3.5 required.")
 
 
 # Hack to silence atexit traceback in some Python versions
@@ -322,7 +322,7 @@ def build_extension(self, ext):
     keywords=["mongo", "mongodb", "pymongo", "gridfs", "bson"],
     install_requires=[],
     license="Apache License, Version 2.0",
-    python_requires=">=3.4",
+    python_requires=">=3.5",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
@@ -331,7 +331,7 @@ def build_extension(self, ext):
         "Operating System :: Microsoft :: Windows",
         "Operating System :: POSIX",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
diff --git a/test/test_bson.py b/test/test_bson.py
diff --git a/test/test_client.py b/test/test_client.py

-Original file line number
+Diff line change
@@ @@ -1,7 +1,6 @@ @@
 language: python
 python:
 -  - 3.4
   - 3.5
   - 3.6
   - 3.7