Drop Python 2.7 & 3.5

README.md

@@ -24,23 +24,20 @@ What does it do?
 
 |   | macOS Intel | macOS Apple Silicon | Windows 64bit | Windows 32bit | manylinux x86_64 | manylinux i686 | manylinux aarch64 | manylinux ppc64le | manylinux s390x |
 |---|---|---|---|---|---|---|---|---|---|
-| CPython 2.7     | ✅ |   | ✅¹ | ✅¹ | ✅ | ✅ |    |    |   |
-| CPython 3.5     | ✅ |   | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
 | CPython 3.6     | ✅ |   | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
 | CPython 3.7     | ✅ |   | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
 | CPython 3.8     | ✅ |   | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
 | CPython 3.9     | ✅ | ✅ | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
-| PyPy 2.7 v7.3.3 | ✅ |    |    | ✅  | ✅ |    |    |    |   |
 | PyPy 3.6 v7.3.3 | ✅ |    |    | ✅  | ✅ |    |    |    |   |
 | PyPy 3.7 (beta) v7.3.3 | ✅ | |  | ✅  | ✅ |    |    |   |    |
 
-<sup>¹ Only using a workaround with a newer compiler; Microsoft removed the 2008 compiler for Python 2.7 in April 2021.</sup><br>
-
 - Builds manylinux, macOS 10.9+, and Windows wheels for CPython and PyPy
 - Works on GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, and GitLab CI
 - Bundles shared library dependencies on Linux and macOS through [auditwheel](https://github.com/pypa/auditwheel) and [delocate](https://github.com/matthew-brett/delocate)
 - Runs your library's tests against the wheel-installed version of your library
 
+See the [cibuildwheel 1 documentation](https://cibuildwheel.readthedocs.io/en/1.x/) if you need to build unsupported versions of Python, such as Python 2.
+
 Usage
 -----
 
@@ -99,7 +96,7 @@ jobs:
           path: ./wheelhouse/*.whl
 ```
 
-For more information, including building on Python 2, PyPI deployment, and the use of other CI services or the dedicated GitHub Action, check out the [documentation](https://cibuildwheel.readthedocs.org) and the [examples](https://github.com/joerick/cibuildwheel/tree/master/examples).
+For more information, including PyPI deployment, and the use of other CI services or the dedicated GitHub Action, check out the [documentation](https://cibuildwheel.readthedocs.org) and the [examples](https://github.com/joerick/cibuildwheel/tree/master/examples).
 
 Options
 -------

bin/update_dependencies.py

@@ -17,7 +17,7 @@
 # regenerate the constraints files
 os.environ["CUSTOM_COMPILE_COMMAND"] = "bin/update_dependencies.py"
 
-PYTHON_VERSIONS = ["27", "35", "36", "37", "38", "39"]
+PYTHON_VERSIONS = ["36", "37", "38", "39"]
 
 if "--no-docker" in sys.argv:
     for python_version in PYTHON_VERSIONS:
@@ -32,8 +32,7 @@
             check=True,
         )
 else:
-    # latest manylinux2010 image with cpython 2.7 support
-    image_runner = "quay.io/pypa/manylinux2010_x86_64:2021-02-06-3d322a5"
+    image_runner = "quay.io/pypa/manylinux2010_x86_64:latest"
     subprocess.run(["docker", "pull", image_runner], check=True)
     for python_version in PYTHON_VERSIONS:
         abi_flags = "" if int(python_version) >= 38 else "m"
@@ -77,9 +76,9 @@ class Image(NamedTuple):
 images = [
     Image("manylinux1", "x86_64", "quay.io/pypa/manylinux1_x86_64", None),
     Image("manylinux1", "i686", "quay.io/pypa/manylinux1_i686", None),
-    # Images for manylinux2010 are pinned to the latest tag supporting cp27
-    Image("manylinux2010", "x86_64", "quay.io/pypa/manylinux2010_x86_64", "2021-02-06-3d322a5"),
-    Image("manylinux2010", "i686", "quay.io/pypa/manylinux2010_i686", "2021-02-06-3d322a5"),
+    # 2010 images
+    Image("manylinux2010", "x86_64", "quay.io/pypa/manylinux2010_x86_64", None),
+    Image("manylinux2010", "i686", "quay.io/pypa/manylinux2010_i686", None),
     Image("manylinux2010", "pypy_x86_64", "pypywheels/manylinux2010-pypy_x86_64", None),
     # 2014 images
     Image("manylinux2014", "x86_64", "quay.io/pypa/manylinux2014_x86_64", None),

cibuildwheel/linux.py

@@ -124,8 +124,7 @@ def build(options: BuildOptions) -> None:
                     dependency_constraint_flags: List[PathOrStr] = []
                     if config.identifier.startswith("pp"):
                         # Patch PyPy to make sure headers get installed into a venv
-                        patch_version = "_27" if config.version == "2.7" else ""
-                        patch_path = resources_dir / f"pypy_venv{patch_version}.patch"
+                        patch_path = resources_dir / "pypy_venv.patch"
                         patch_docker_path = PurePath("/pypy_venv.patch")
                         docker.copy_into(patch_path, patch_docker_path)
                         try:

cibuildwheel/macos.py

@@ -111,21 +111,6 @@ def get_python_configurations(
                 c for c in python_configurations if not c.identifier.startswith("pp")
             ]
 
-        if any(c.identifier.startswith("cp35") for c in python_configurations):
-            # CPython 3.5 doesn't work on macOS 11
-            log.warning(
-                unwrap(
-                    """
-                    CPython 3.5 is unsupported when building on macOS 11. To build CPython 3.5
-                    wheels, build on an older OS, such as macOS 10.15. To silence this warning,
-                    deselect CPython 3.5 by adding "cp35-macosx_x86_64" to your CIBW_SKIP option.
-                    """
-                )
-            )
-            python_configurations = [
-                c for c in python_configurations if not c.identifier.startswith("cp35")
-            ]
-
     return python_configurations
 
 
@@ -156,32 +141,17 @@ def install_cpython(version: str, url: str) -> Path:
 
     # if this version of python isn't installed, get it from python.org and install
     python_package_identifier = f"org.python.Python.PythonFramework-{version}"
-    python_executable = "python3" if version[0] == "3" else "python"
+    python_executable = "python3"
     installation_bin_path = Path(f"/Library/Frameworks/Python.framework/Versions/{version}/bin")
 
     if python_package_identifier not in installed_system_packages:
         # download the pkg
         download(url, Path("/tmp/Python.pkg"))
         # install
         call(["sudo", "installer", "-pkg", "/tmp/Python.pkg", "-target", "/"])
-        # patch open ssl
-        if version == "3.5":
-            open_ssl_patch_url = f"https://github.com/mayeut/patch-macos-python-openssl/releases/download/v1.1.1h/patch-macos-python-{version}-openssl-v1.1.1h.tar.gz"
-            download(open_ssl_patch_url, Path("/tmp/python-patch.tar.gz"))
-            call(
-                [
-                    "sudo",
-                    "tar",
-                    "-C",
-                    f"/Library/Frameworks/Python.framework/Versions/{version}/",
-                    "-xmf",
-                    "/tmp/python-patch.tar.gz",
-                ]
-            )
-
         call(["sudo", str(installation_bin_path / python_executable), str(install_certifi_script)])
 
-    pip_executable = "pip3" if version[0] == "3" else "pip"
+    pip_executable = "pip3"
     make_symlinks(installation_bin_path, python_executable, pip_executable)
 
     return installation_bin_path
@@ -198,13 +168,12 @@ def install_pypy(version: str, url: str) -> Path:
         download(url, downloaded_tar_bz2)
         call(["tar", "-C", "/tmp", "-xf", downloaded_tar_bz2])
         # Patch PyPy to make sure headers get installed into a venv
-        patch_version = "_27" if version == "2.7" else ""
-        patch_path = resources_dir / f"pypy_venv{patch_version}.patch"
+        patch_path = resources_dir / "pypy_venv.patch"
         call(["patch", "--force", "-p1", "-d", installation_path, "-i", patch_path])
 
     installation_bin_path = installation_path / "bin"
-    python_executable = "pypy3" if version[0] == "3" else "pypy"
-    pip_executable = "pip3" if version[0] == "3" else "pip"
+    python_executable = "pypy3"
+    pip_executable = "pip3"
     make_symlinks(installation_bin_path, python_executable, pip_executable)
 
     return installation_bin_path
@@ -279,20 +248,12 @@ def setup_python(
         sys.exit(1)
 
     # Set MACOSX_DEPLOYMENT_TARGET to 10.9, if the user didn't set it.
-    # CPython 3.5 defaults to 10.6, and pypy defaults to 10.7, causing
-    # inconsistencies if it's left unset.
+    # PyPy defaults to 10.7, causing inconsistencies if it's left unset.
     env.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.9")
 
     config_is_arm64 = python_configuration.identifier.endswith("arm64")
     config_is_universal2 = python_configuration.identifier.endswith("universal2")
 
-    if python_configuration.version == "3.5":
-        # Cross-compilation platform override - CPython 3.5 has an
-        # i386/x86_64 version of Python, but we only want a x64_64 build
-        env.setdefault("_PYTHON_HOST_PLATFORM", "macosx-10.9-x86_64")
-        # https://github.com/python/cpython/blob/a5ed2fe0eedefa1649aa93ee74a0bafc8e628a10/Lib/_osx_support.py#L260
-        env.setdefault("ARCHFLAGS", "-arch x86_64")
-
     if python_configuration.version == "3.9":
         if python_configuration.identifier.endswith("x86_64"):
             # even on the macos11.0 Python installer, on the x86_64 side it's

cibuildwheel/resources/build-platforms.toml

@@ -1,33 +1,23 @@
 [linux]
 python_configurations = [
-  { identifier = "cp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/cp27-cp27m" },
-  { identifier = "cp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/cp27-cp27mu" },
-  { identifier = "cp35-manylinux_x86_64", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
   { identifier = "cp36-manylinux_x86_64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-manylinux_x86_64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-manylinux_x86_64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
   { identifier = "cp39-manylinux_x86_64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
-  { identifier = "cp27-manylinux_i686", version = "2.7", path_str = "/opt/python/cp27-cp27m" },
-  { identifier = "cp27-manylinux_i686", version = "2.7", path_str = "/opt/python/cp27-cp27mu" },
-  { identifier = "cp35-manylinux_i686", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
   { identifier = "cp36-manylinux_i686", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-manylinux_i686", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-manylinux_i686", version = "3.8", path_str = "/opt/python/cp38-cp38" },
   { identifier = "cp39-manylinux_i686", version = "3.9", path_str = "/opt/python/cp39-cp39" },
-  { identifier = "pp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/pp27-pypy_73" },
   { identifier = "pp36-manylinux_x86_64", version = "3.6", path_str = "/opt/python/pp36-pypy36_pp73" },
   { identifier = "pp37-manylinux_x86_64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
-  { identifier = "cp35-manylinux_aarch64", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
   { identifier = "cp36-manylinux_aarch64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-manylinux_aarch64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-manylinux_aarch64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
   { identifier = "cp39-manylinux_aarch64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
-  { identifier = "cp35-manylinux_ppc64le", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
   { identifier = "cp36-manylinux_ppc64le", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-manylinux_ppc64le", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-manylinux_ppc64le", version = "3.8", path_str = "/opt/python/cp38-cp38" },
   { identifier = "cp39-manylinux_ppc64le", version = "3.9", path_str = "/opt/python/cp39-cp39" },
-  { identifier = "cp35-manylinux_s390x", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
   { identifier = "cp36-manylinux_s390x", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-manylinux_s390x", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-manylinux_s390x", version = "3.8", path_str = "/opt/python/cp38-cp38" },
@@ -36,25 +26,18 @@ python_configurations = [
 
 [macos]
 python_configurations = [
-  { identifier = "cp27-macosx_x86_64", version = "2.7", url = "https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg" },
-  { identifier = "cp35-macosx_x86_64", version = "3.5", url = "https://www.python.org/ftp/python/3.5.4/python-3.5.4-macosx10.6.pkg" },
   { identifier = "cp36-macosx_x86_64", version = "3.6", url = "https://www.python.org/ftp/python/3.6.8/python-3.6.8-macosx10.9.pkg" },
   { identifier = "cp37-macosx_x86_64", version = "3.7", url = "https://www.python.org/ftp/python/3.7.9/python-3.7.9-macosx10.9.pkg" },
   { identifier = "cp38-macosx_x86_64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.9/python-3.8.9-macosx10.9.pkg" },
   { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.4/python-3.9.4-macos11.pkg" },
   { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.4/python-3.9.4-macos11.pkg" },
   { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.4/python-3.9.4-macos11.pkg" },
-  { identifier = "pp27-macosx_x86_64", version = "2.7", url = "https://downloads.python.org/pypy/pypy2.7-v7.3.3-osx64.tar.bz2" },
   { identifier = "pp36-macosx_x86_64", version = "3.6", url = "https://downloads.python.org/pypy/pypy3.6-v7.3.3-osx64.tar.bz2" },
   { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.3-osx64.tar.bz2" },
 ]
 
 [windows]
 python_configurations = [
-  { identifier = "cp27-win32", version = "2.7.18", arch = "32" },
-  { identifier = "cp27-win_amd64", version = "2.7.18", arch = "64" },
-  { identifier = "cp35-win32", version = "3.5.4", arch = "32" },
-  { identifier = "cp35-win_amd64", version = "3.5.4", arch = "64" },
   { identifier = "cp36-win32", version = "3.6.8", arch = "32" },
   { identifier = "cp36-win_amd64", version = "3.6.8", arch = "64" },
   { identifier = "cp37-win32", version = "3.7.9", arch = "32" },
@@ -63,7 +46,6 @@ python_configurations = [
   { identifier = "cp38-win_amd64", version = "3.8.9", arch = "64" },
   { identifier = "cp39-win32", version = "3.9.4", arch = "32" },
   { identifier = "cp39-win_amd64", version = "3.9.4", arch = "64" },
-  { identifier = "pp27-win32", version = "2.7", arch = "32", url = "https://downloads.python.org/pypy/pypy2.7-v7.3.3-win32.zip" },
   { identifier = "pp36-win32", version = "3.6", arch = "32", url = "https://downloads.python.org/pypy/pypy3.6-v7.3.3-win32.zip" },
   { identifier = "pp37-win32", version = "3.7", arch = "32", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.3-win32.zip" },
 ]

cibuildwheel/resources/install_certifi.py

@@ -24,9 +24,6 @@
     | stat.S_IXOTH
 )
 
-if sys.version_info[0] == 2:
-    FileNotFoundError = OSError
-
 
 def main():
     openssl_dir, openssl_cafile = os.path.split(ssl.get_default_verify_paths().openssl_cafile)

cibuildwheel/resources/pinned_docker_images.cfg

@@ -1,12 +1,12 @@
 [x86_64]
 manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-04-05-14df3a6
-manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-02-06-3d322a5
+manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-04-05-b4fd19d
 manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-04-05-b4fd19d
 manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-04-05-b4fd19d
 
 [i686]
 manylinux1 = quay.io/pypa/manylinux1_i686:2021-04-05-14df3a6
-manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-02-06-3d322a5
+manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-04-05-b4fd19d
 manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-04-05-b4fd19d
 manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-04-05-b4fd19d
 

cibuildwheel/util.py

@@ -163,7 +163,7 @@ def get_for_python_version(self, version: str) -> Path:
         version_parts = version.split(".")
 
         # try to find a version-specific dependency file e.g. if
-        # ./constraints.txt is the base, look for ./constraints-python27.txt
+        # ./constraints.txt is the base, look for ./constraints-python36.txt
         specific_stem = self.base_file_path.stem + f"-python{version_parts[0]}{version_parts[1]}"
         specific_name = specific_stem + self.base_file_path.suffix
         specific_file_path = self.base_file_path.with_name(specific_name)