Drop Python 2.7

pypa · Feb 18, 2021 · c3626e5 · c3626e5
1 parent 66195bf
commit c3626e5
Show file tree

Hide file tree

Showing 29 changed files with 135 additions and 448 deletions.
diff --git a/README.md b/README.md
@@ -24,18 +24,14 @@ 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>¹ Not supported on Travis</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)
@@ -99,7 +95,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
 -------

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -26,8 +26,6 @@ jobs:
     - task: UsePythonVersion@0
       inputs:
         versionSpec: '3.6'
-    - script: choco install vcpython27 -f -y
-      displayName: Install Visual C++ for Python 2.7
     - bash: |
         python -m pip install -e ".[dev]" pytest-azurepipelines
         python ./bin/run_tests.py
@@ -39,8 +37,6 @@ jobs:
     - task: UsePythonVersion@0
       inputs:
         versionSpec: '3.8'
-    - script: choco install vcpython27 -f -y
-      displayName: Install Visual C++ for Python 2.7
     - bash: |
         python -m pip install -e ".[dev]" pytest-azurepipelines
         python ./bin/run_tests.py
diff --git a/bin/update_dependencies.py b/bin/update_dependencies.py
@@ -16,7 +16,7 @@
 # regenerate the constraints files
 os.environ['CUSTOM_COMPILE_COMMAND'] = "bin/update_dependencies.py"
 
-PYTHON_VERSIONS = ['27', '35', '36', '37', '38', '39']
+PYTHON_VERSIONS = ['35', '36', '37', '38', '39']
 
 if '--no-docker' in sys.argv:
     for python_version in PYTHON_VERSIONS:
@@ -28,8 +28,7 @@
             '--output-file', f'cibuildwheel/resources/constraints-python{python_version}.txt'
         ], 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'
@@ -60,9 +59,8 @@
     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'),
+    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),
 

diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py
@@ -107,8 +107,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:

diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py
@@ -131,7 +131,7 @@ 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:
@@ -147,7 +147,7 @@ def install_cpython(version: str, url: str) -> Path:
 
         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
@@ -164,13 +164,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

diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml
@@ -1,20 +1,15 @@
 [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" },
@@ -36,23 +31,19 @@ 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.7/python-3.8.7-macosx10.9.pkg" },
   { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.1/python-3.9.1-macos11.0.pkg" },
   { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.1/python-3.9.1-macos11.0.pkg" },
   { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.1/python-3.9.1-macos11.0.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" },
@@ -63,7 +54,6 @@ python_configurations = [
   { identifier = "cp38-win_amd64", version = "3.8.7", arch = "64" },
   { identifier = "cp39-win32", version = "3.9.1", arch = "32" },
   { identifier = "cp39-win_amd64", version = "3.9.1", 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" },
 ]
diff --git a/cibuildwheel/resources/constraints-python27.txt b/cibuildwheel/resources/constraints-python27.txt
diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg
@@ -1,12 +1,12 @@
 [x86_64]
 manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-02-17-c08b6ab
-manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-02-06-3d322a5
+manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-02-17-8d1372a
 manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-02-17-8d1372a
 manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-02-17-8d1372a
 
 [i686]
 manylinux1 = quay.io/pypa/manylinux1_i686:2021-02-17-c08b6ab
-manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-02-06-3d322a5
+manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-02-17-8d1372a
 manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-02-17-8d1372a
 manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-02-17-8d1372a
 

diff --git a/cibuildwheel/resources/pypy_venv_27.patch b/cibuildwheel/resources/pypy_venv_27.patch
diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py
@@ -161,7 +161,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)

diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py
@@ -24,9 +24,6 @@
     read_python_configs,
 )
 
-IS_RUNNING_ON_AZURE = Path('C:\\hostedtoolcache').exists()
-IS_RUNNING_ON_TRAVIS = os.environ.get('TRAVIS_OS_NAME') == 'windows'
-
 
 def call(args: Sequence[PathOrStr], env: Optional[Dict[str, str]] = None,
          cwd: Optional[str] = None) -> None:
@@ -42,7 +39,7 @@ def shell(command: str, env: Optional[Dict[str, str]] = None, cwd: Optional[str]
 
 
 def get_nuget_args(version: str, arch: str) -> List[str]:
-    python_name = 'python' if version[0] == '3' else 'python2'
+    python_name = 'python'
     if arch == '32':
         python_name = python_name + 'x86'
     return [python_name, '-Version', version, '-OutputDirectory', 'C:\\cibw\\python']
@@ -69,12 +66,6 @@ def get_python_configurations(
         '64': Architecture.AMD64,
     }
 
-    custom_compiler = os.environ.get('DISTUTILS_USE_SDK') and os.environ.get('MSSdk')
-    if IS_RUNNING_ON_TRAVIS and not custom_compiler:
-        # cannot install VCForPython27.msi which is needed for compiling C software
-        # try with (and similar): msiexec /i VCForPython27.msi ALLUSERS=1 ACCEPT=YES /passive
-        python_configurations = [c for c in python_configurations if not c.version.startswith('2.7')]
-
     # skip builds as required
     python_configurations = [
         c for c in python_configurations
@@ -108,8 +99,7 @@ def install_pypy(version: str, arch: str, url: str) -> Path:
         download(url, pypy_zip)
         # Extract to the parent directory because the zip file still contains a directory
         extract_zip(pypy_zip, installation_path.parent)
-        pypy_exe = 'pypy3.exe' if version[0] == '3' else 'pypy.exe'
-        (installation_path / 'python.exe').symlink_to(installation_path / pypy_exe)
+        (installation_path / 'python.exe').symlink_to(installation_path / 'pypy3.exe')
     return installation_path
 
 

diff --git a/docs/contributing.md b/docs/contributing.md
@@ -66,7 +66,6 @@ This has been moved to using docker, so you only need the following instructions
 The dependency update script in the next section requires multiple python versions installed. One way to do this is to use `pyenv`:
 
 ```bash
-pyenv install 2.7.18
 pyenv install 3.5.9
 pyenv install 3.6.11
 pyenv install 3.7.8
@@ -77,8 +76,6 @@ pyenv install 3.7.8
 Then, you need to make the required virtual environments:
 
 ```bash
-$(pyenv prefix 2.7.18)/bin/python -m pip install virtualenv
-$(pyenv prefix 2.7.18)/bin/python -m virtualenv env27
 $(pyenv prefix 3.5.9)/bin/python -m venv env35
 $(pyenv prefix 3.6.11)/bin/python -m venv env36
 $(pyenv prefix 3.7.8)/bin/python -m venv env37