Drop support for Python 2.7, 3.5, 3.6. (#266)

Co-authored-by: Jens Vagelpohl <[email protected]>

Author: Michael Howitz

.github/workflows/tests.yml

@@ -96,24 +96,16 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "2.7"
-          - "3.5"
-          - "pypy-2.7"
           - "pypy-3.7"
-          - "3.6"
           - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
         os: [ubuntu-20.04, macos-latest]
         exclude:
-          - os: macos-latest
-            python-version: "pypy-2.7"
           - os: macos-latest
             python-version: "pypy-3.7"
-          - os: macos-latest
-            python-version: "3.5"
 
     steps:
       - name: checkout
@@ -141,15 +133,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pip-
 
-      - name: Install Build Dependencies (PyPy2)
-        if: >
-          startsWith(matrix.python-version, 'pypy-2.7')
-        run: |
-          pip install -U pip
-          pip install -U setuptools wheel twine "cffi != 1.15.1"
-      - name: Install Build Dependencies (other Python versions)
-        if: >
-          !startsWith(matrix.python-version, 'pypy-2.7')
+      - name: Install Build Dependencies
         run: |
           pip install -U pip
           pip install -U setuptools wheel twine cffi
@@ -158,9 +142,6 @@ jobs:
         if: >
           startsWith(runner.os, 'Mac')
           && !(startsWith(matrix.python-version, 'pypy')
-               || matrix.python-version == '2.7'
-               || matrix.python-version == '3.5'
-               || matrix.python-version == '3.6'
                || matrix.python-version == '3.7')
         env:
           MACOSX_DEPLOYMENT_TARGET: 10.9
@@ -175,9 +156,6 @@ jobs:
         if: >
           startsWith(runner.os, 'Mac')
           && !(startsWith(matrix.python-version, 'pypy')
-               || matrix.python-version == '2.7'
-               || matrix.python-version == '3.5'
-               || matrix.python-version == '3.6'
                || matrix.python-version == '3.7')
         env:
           MACOSX_DEPLOYMENT_TARGET: 11.0
@@ -192,9 +170,6 @@ jobs:
         if: >
           !startsWith(runner.os, 'Mac')
           || startsWith(matrix.python-version, 'pypy')
-          || matrix.python-version == '2.7'
-          || matrix.python-version == '3.5'
-          || matrix.python-version == '3.6'
           || matrix.python-version == '3.7'
         run: |
           # Next, build the wheel *in place*. This helps ccache, and also lets us cache the configure
@@ -205,7 +180,6 @@ jobs:
       - name: Install zope.interface and dependencies
         run: |
           # Install to collect dependencies into the (pip) cache.
-          pip install -U 'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"'
           pip install .[test]
 
       - name: Check zope.interface build
@@ -223,9 +197,6 @@ jobs:
         if: >
           startsWith(runner.os, 'Mac')
           && !(startsWith(matrix.python-version, 'pypy')
-               || matrix.python-version == '2.7'
-               || matrix.python-version == '3.5'
-               || matrix.python-version == '3.6'
                || matrix.python-version == '3.7')
         uses: actions/upload-artifact@v3
         with:
@@ -262,24 +233,16 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "2.7"
-          - "3.5"
-          - "pypy-2.7"
           - "pypy-3.7"
-          - "3.6"
           - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
         os: [ubuntu-20.04, macos-latest]
         exclude:
-          - os: macos-latest
-            python-version: "pypy-2.7"
           - os: macos-latest
             python-version: "pypy-3.7"
-          - os: macos-latest
-            python-version: "3.5"
 
     steps:
       - name: checkout
@@ -320,7 +283,6 @@ jobs:
         run: |
           pip install -U wheel
           pip install -U --no-binary :all: coverage
-          pip install -U 'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"'
           # Unzip into src/ so that testrunner can find the .so files
           # when we ask it to load tests from that directory. This
           # might also save some build time?
@@ -495,8 +457,6 @@ jobs:
         # An alternate way to do this is to run the container directly with a uses:
         # and then the script runs inside it. That may work better with caching.
         # See https://github.com/pyca/bcrypt/blob/f6b5ee2eda76d077c531362ac65e16f045cf1f29/.github/workflows/wheel-builder.yml
-        # The 2010 image is the most recent spec that comes with Python 2.7,
-        # and only up through the tag 2021-02-06-3d322a5
         env:
           DOCKER_IMAGE: quay.io/pypa/${{ matrix.image }}
         run: |

.manylinux-install.sh

@@ -28,9 +28,6 @@ yum -y install libffi-devel
 
 tox_env_map() {
     case $1 in
-        *"cp27"*) echo 'py27';;
-        *"cp35"*) echo 'py35';;
-        *"cp36"*) echo 'py36';;
         *"cp37"*) echo 'py37';;
         *"cp38"*) echo 'py38';;
         *"cp39"*) echo 'py39';;
@@ -43,10 +40,7 @@ tox_env_map() {
 # Compile wheels
 for PYBIN in /opt/python/*/bin; do
     if \
-       [[ "${PYBIN}" == *"cp27"* ]] || \
-       [[ "${PYBIN}" == *"cp35"* ]] || \
        [[ "${PYBIN}" == *"cp311"* ]] || \
-       [[ "${PYBIN}" == *"cp36"* ]] || \
        [[ "${PYBIN}" == *"cp37"* ]] || \
        [[ "${PYBIN}" == *"cp38"* ]] || \
        [[ "${PYBIN}" == *"cp39"* ]] || \

.meta.toml

@@ -2,12 +2,11 @@
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
 [meta]
 template = "c-code"
-commit-id = "342271a70d886e753e5cc629e8a81b3cfab692ac"
+commit-id = "be727608"
 
 [python]
 with-appveyor = true
 with-pypy = true
-with-legacy-python = true
 with-sphinx-doctests = true
 with-windows = false
 with-future-python = false
@@ -26,7 +25,7 @@ testenv-setenv = [
     ]
 coverage-command = "coverage combine"
 coverage-additional = [
-    "depends = py27,py27-pure,py35,py35-pure,py36,py36-pure,py37,py37-pure,py38,py38-pure,py39,py39-pure,py310,py310-pure,pypy,pypy3,docs",
+    "depends = py37,py37-pure,py38,py38-pure,py39,py39-pure,py310,py310-pure,py311,py311-pure,pypy,pypy3,docs",
     "parallel_show_output = true",
     ]
 
@@ -63,7 +62,6 @@ additional-install = [
     "  run: |",
     "    pip install -U wheel",
     "    pip install -U --no-binary :all: coverage",
-    "    pip install -U 'faulthandler; python_version == \"2.7\" and platform_python_implementation == \"CPython\"'",
     "    # Unzip into src/ so that testrunner can find the .so files",
     "    # when we ask it to load tests from that directory. This",
     "    # might also save some build time?",

CHANGES.rst

@@ -2,11 +2,18 @@
  Changes
 =========
 
-5.5.3 (unreleased)
-==================
+6.0 (unreleased)
+================
+
+- Drop support for Python 2.7, 3.5, 3.6.
 
 - Fix test deprecation warning on Python 3.11.
 
+- Drop:
+
+    + `zope.interface.implements`
+    + `zope.interface.implementsOnly`
+    + `zope.interface.classProvides`
 
 5.5.2 (2022-11-17)
 ==================

appveyor.yml

@@ -10,9 +10,6 @@ environment:
       secure: aoZC/+rvJKg8B5GMGIxd1X2q2bz7SMl8G3810BID9U8PXFqM0FbWaK9fZ9qcU0UyG2xJsK56Fb6+L6g27I0Lg8UFNhlU1zLAuMSgJQbHsqawFgSY067IdJB68pp34d/oEyxMrJvAKENHH77Fe4KGDssLlk5WnnYS3DA9b66p5imP+1DTtkq5/gMtoG4nZTBtVos7J2kkYTQ5t4BjzTQxPMC3bStNnvuuB0orX4AoCyTrOR1wdZFiNKLzbVnrJCNn24t/n3kG9WrxbnKlrbOm4A==
 
   matrix:
-    - python: 27-x64
-    - python: 35-x64
-    - python: 36-x64
     - python: 37-x64
     - python: 38-x64
     - python: 39-x64

docs/api/declarations.rst

@@ -515,33 +515,6 @@ When registering an adapter or utility component, the registry looks for the
 provided.
 
 
-Deprecated Functions
---------------------
-
-implements
-~~~~~~~~~~
-
-.. caution:: Does not work on Python 3.  Use the `implementer` decorator instead.
-
-.. autofunction:: implements
-
-
-implementsOnly
-~~~~~~~~~~~~~~
-
-.. caution:: Does not work on Python 3.  Use the `implementer_only` decorator instead.
-
-.. autofunction:: implementsOnly
-
-
-classProvides
-~~~~~~~~~~~~~
-
-.. caution:: Does not work on Python 3.  Use the `provider` decorator instead.
-
-.. autofunction:: classProvides
-
-
 Querying The Interfaces Of Objects
 ==================================
 

setup.cfg

@@ -1,7 +1,7 @@
 # Generated from:
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
 [bdist_wheel]
-universal = 1
+universal = 0
 
 [zest.releaser]
 create-wheel = no

setup.py

@@ -100,7 +100,7 @@ def read(*rnames):
         )
 
 setup(name='zope.interface',
-      version='5.5.3.dev0',
+      version='6.0.dev0',
       url='https://github.com/zopefoundation/zope.interface',
       license='ZPL 2.1',
       description='Interfaces for Python',
@@ -113,11 +113,7 @@ def read(*rnames):
           "License :: OSI Approved :: Zope Public License",
           "Operating System :: OS Independent",
           "Programming Language :: Python",
-          "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",
           "Programming Language :: Python :: 3.9",
@@ -139,14 +135,7 @@ def read(*rnames):
       zip_safe=False,
       tests_require=tests_require,
       install_requires=['setuptools'],
-      python_requires=', '.join([
-          '>=2.7',
-          '!=3.0.*',
-          '!=3.1.*',
-          '!=3.2.*',
-          '!=3.3.*',
-          '!=3.4.*',
-      ]),
+      python_requires='>=3.7',
       extras_require={
           'docs': ['Sphinx', 'repoze.sphinx.autointerface'],
           'test': tests_require,

src/zope/interface/__init__.py

@@ -62,14 +62,11 @@ def meth(arg1, arg2):
 from zope.interface.declarations import classImplements
 from zope.interface.declarations import classImplementsFirst
 from zope.interface.declarations import classImplementsOnly
-from zope.interface.declarations import classProvides
 from zope.interface.declarations import directlyProvidedBy
 from zope.interface.declarations import directlyProvides
 from zope.interface.declarations import implementedBy
 from zope.interface.declarations import implementer
 from zope.interface.declarations import implementer_only
-from zope.interface.declarations import implements
-from zope.interface.declarations import implementsOnly
 from zope.interface.declarations import moduleProvides
 from zope.interface.declarations import named
 from zope.interface.declarations import noLongerProvides

src/zope/interface/_compat.py

@@ -20,51 +20,16 @@
 """
 import os
 import sys
-import types
 
-if sys.version_info[0] < 3:
 
-    def _normalize_name(name):
-        if isinstance(name, basestring):
-            return unicode(name)
-        raise TypeError("name must be a regular or unicode string")
-
-    CLASS_TYPES = (type, types.ClassType)
-    STRING_TYPES = (basestring,)
-
-    _BUILTINS = '__builtin__'
-
-    PYTHON3 = False
-    PYTHON2 = True
-
-else:
-
-    def _normalize_name(name):
-        if isinstance(name, bytes):
-            name = str(name, 'ascii')
-        if isinstance(name, str):
-            return name
-        raise TypeError("name must be a string or ASCII-only bytes")
-
-    CLASS_TYPES = (type,)
-    STRING_TYPES = (str,)
-
-    _BUILTINS = 'builtins'
-
-    PYTHON3 = True
-    PYTHON2 = False
+def _normalize_name(name):
+    if isinstance(name, bytes):
+        name = str(name, 'ascii')
+    if isinstance(name, str):
+        return name
+    raise TypeError("name must be a string or ASCII-only bytes")
 
 PYPY = hasattr(sys, 'pypy_version_info')
-PYPY2 = PYTHON2 and PYPY
-
-def _skip_under_py3k(test_method):
-    import unittest
-    return unittest.skipIf(sys.version_info[0] >= 3, "Only on Python 2")(test_method)
-
-
-def _skip_under_py2(test_method):
-    import unittest
-    return unittest.skipIf(sys.version_info[0] < 3, "Only on Python 3")(test_method)
 
 
 def _c_optimizations_required():