From 17137c3c2f99d4b0851ba20d0e870dc82a2c5c69 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Thu, 26 Dec 2019 17:18:18 +0100 Subject: [PATCH] Changing *-manylinux_pypy_x86_64 build identifiers to *-manylinux_x86_64 --- cibuildwheel/linux.py | 14 +++++++------- docs/options.md | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index c99ee388..39ae3dcd 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -27,8 +27,8 @@ def get_python_configurations(build_selector): PythonConfiguration(identifier='cp36-manylinux_i686', path='/opt/python/cp36-cp36m'), PythonConfiguration(identifier='cp37-manylinux_i686', path='/opt/python/cp37-cp37m'), PythonConfiguration(identifier='cp38-manylinux_i686', path='/opt/python/cp38-cp38'), - PythonConfiguration(identifier='pp27_73-manylinux_pypy_x86_64', path='/opt/python/pp273-pypy_73'), - PythonConfiguration(identifier='pp36_73-manylinux_pypy_x86_64', path='/opt/python/pp373-pypy36_pp73'), + PythonConfiguration(identifier='pp27_73-manylinux_x86_64', path='/opt/python/pp273-pypy_73'), + PythonConfiguration(identifier='pp36_73-manylinux_x86_64', path='/opt/python/pp373-pypy36_pp73'), ] # skip builds as required @@ -47,13 +47,13 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef python_configurations = get_python_configurations(build_selector) platforms = [ - ('manylinux_x86_64', manylinux_images['x86_64']), - ('manylinux_i686', manylinux_images['i686']), - ('manylinux_pypy_x86_64', manylinux_images['pypy_x86_64']), + ('cp', 'manylinux_x86_64', manylinux_images['x86_64']), + ('cp', 'manylinux_i686', manylinux_images['i686']), + ('pp', 'manylinux_x86_64', manylinux_images['pypy_x86_64']), ] - for platform_tag, docker_image in platforms: - platform_configs = [c for c in python_configurations if c.identifier.endswith(platform_tag)] + for implementation, platform_tag, docker_image in platforms: + platform_configs = [c for c in python_configurations if c.identifier.startswith(implementation) and c.identifier.endswith(platform_tag)] if not platform_configs: continue diff --git a/docs/options.md b/docs/options.md index 087076d0..15d79927 100644 --- a/docs/options.md +++ b/docs/options.md @@ -72,15 +72,15 @@ When setting the options, you can use shell-style globbing syntax (as per [`fnma
-| | macOS 64bit | Manylinux 64bit | Manylinux 32bit | Windows 64bit | Windows 32bit | -|-----------------|------------------------|--------------------------------|----------------------|-----------------|----------------| -| Python 2.7 | cp27-macosx_x86_64 | cp27-manylinux_x86_64 | cp27-manylinux_i686 | cp27-win_amd64 | cp27-win32 | -| Python 3.5 | cp35-macosx_x86_64 | cp35-manylinux_x86_64 | cp35-manylinux_i686 | cp35-win_amd64 | cp35-win32 | -| Python 3.6 | cp36-macosx_x86_64 | cp36-manylinux_x86_64 | cp36-manylinux_i686 | cp36-win_amd64 | cp36-win32 | -| Python 3.7 | cp37-macosx_x86_64 | cp37-manylinux_x86_64 | cp37-manylinux_i686 | cp37-win_amd64 | cp37-win32 | -| Python 3.8 | cp38-macosx_x86_64 | cp38-manylinux_x86_64 | cp38-manylinux_i686 | cp38-win_amd64 | cp38-win32 | -| PyPy 2.7 v7.3.0 | pp27_73-macosx_x86_64 | pp27_73-manylinux_pypy_x86_64 | | | pp27_73-win32 | -| PyPy 3.6 v7.3.0 | pp36_73-macosx_x86_64 | pp36_73-manylinux_pypy_x86_64 | | | pp36_73-win32 | +| | macOS 64bit | Manylinux 64bit | Manylinux 32bit | Windows 64bit | Windows 32bit | +|-----------------|------------------------|---------------------------|----------------------|-----------------|----------------| +| Python 2.7 | cp27-macosx_x86_64 | cp27-manylinux_x86_64 | cp27-manylinux_i686 | cp27-win_amd64 | cp27-win32 | +| Python 3.5 | cp35-macosx_x86_64 | cp35-manylinux_x86_64 | cp35-manylinux_i686 | cp35-win_amd64 | cp35-win32 | +| Python 3.6 | cp36-macosx_x86_64 | cp36-manylinux_x86_64 | cp36-manylinux_i686 | cp36-win_amd64 | cp36-win32 | +| Python 3.7 | cp37-macosx_x86_64 | cp37-manylinux_x86_64 | cp37-manylinux_i686 | cp37-win_amd64 | cp37-win32 | +| Python 3.8 | cp38-macosx_x86_64 | cp38-manylinux_x86_64 | cp38-manylinux_i686 | cp38-win_amd64 | cp38-win32 | +| PyPy 2.7 v7.3.0 | pp27_73-macosx_x86_64 | pp27_73-manylinux_x86_64 | | | pp27_73-win32 | +| PyPy 3.6 v7.3.0 | pp36_73-macosx_x86_64 | pp36_73-manylinux_x86_64 | | | pp36_73-win32 | The list of supported and currently selected build identifiers can also be retrieved by passing the `--print-build-identifiers` flag to `cibuildwheel`. The format is `python_tag-platform_tag`, with tags similar to those in [PEP 425](https://www.python.org/dev/peps/pep-0425/#details).