From 452631eb60415d638078a041a33f27e6d09e8a38 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Thu, 10 Sep 2020 15:31:12 +0200 Subject: [PATCH 01/12] Updating PyPy to 7.3.2rc1 on macOS and Windows, and adding the Python 3.7 version --- README.md | 5 +++-- cibuildwheel/macos.py | 5 +++-- cibuildwheel/windows.py | 5 +++-- docs/options.md | 8 +++++--- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 51044638..062edf6b 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,9 @@ What does it do? | CPython 3.7 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅² | ✅³ | | CPython 3.8 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅² | ✅³ | | CPython 3.9 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅² | ✅³ | -| PyPy 2.7 v7.3.0 | ✅ | | ✅ | ✅ | | | | | -| PyPy 3.6 v7.3.0 | ✅ | | ✅ | ✅ | | | | | +| PyPy 2.7 v7.3.2 | ✅ | | ✅ | ✅ | | | | | +| PyPy 3.6 v7.3.2 | ✅ | | ✅ | ✅ | | | | | +| PyPy 3.7 (alpha) v7.3.2 | ✅ | | ✅ | ✅ | | | | | ¹ Not supported on Travis
² Only supported on Travis
diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 0d07d32a..9383119b 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -40,8 +40,9 @@ def get_python_configurations(build_selector: BuildSelector) -> List[PythonConfi PythonConfiguration(version='3.8', identifier='cp38-macosx_x86_64', url='https://www.python.org/ftp/python/3.8.4/python-3.8.4-macosx10.9.pkg'), PythonConfiguration(version='3.9', identifier='cp39-macosx_x86_64', url='https://www.python.org/ftp/python/3.9.0/python-3.9.0rc1-macosx10.9.pkg'), # PyPy - PythonConfiguration(version='2.7', identifier='pp27-macosx_x86_64', url='https://downloads.python.org/pypy/pypy2.7-v7.3.1-osx64.tar.bz2'), - PythonConfiguration(version='3.6', identifier='pp36-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.6-v7.3.1-osx64.tar.bz2'), + PythonConfiguration(version='2.7', identifier='pp27-macosx_x86_64', url='https://downloads.python.org/pypy/pypy2.7-v7.3.2rc1-osx64.tar.bz2'), + PythonConfiguration(version='3.6', identifier='pp36-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.6-v7.3.2rc1-osx64.tar.bz2'), + PythonConfiguration(version='3.7', identifier='pp37-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.7-v7.3.2rc1-osx64.tar.bz2'), ] # skip builds as required diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 9eb8c9e9..c21eb60a 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -61,8 +61,9 @@ def get_python_configurations(build_selector: BuildSelector) -> List[PythonConfi PythonConfiguration(version='3.9.0-rc1', arch='32', identifier='cp39-win32', url=None), PythonConfiguration(version='3.9.0-rc1', arch='64', identifier='cp39-win_amd64', url=None), # PyPy - PythonConfiguration(version='2.7', arch='32', identifier='pp27-win32', url='https://downloads.python.org/pypy/pypy2.7-v7.3.1-win32.zip'), - PythonConfiguration(version='3.6', arch='32', identifier='pp36-win32', url='https://downloads.python.org/pypy/pypy3.6-v7.3.1-win32.zip'), + PythonConfiguration(version='2.7', arch='32', identifier='pp27-win32', url='https://downloads.python.org/pypy/pypy2.7-v7.3.2rc1-win32.zip'), + PythonConfiguration(version='3.6', arch='32', identifier='pp36-win32', url='https://downloads.python.org/pypy/pypy3.6-v7.3.2rc1-win32.zip'), + PythonConfiguration(version='3.7', arch='32', identifier='pp37-win32', url='https://downloads.python.org/pypy/pypy3.7-v7.3.2rc1-win32.zip'), ] if IS_RUNNING_ON_TRAVIS: diff --git a/docs/options.md b/docs/options.md index 856f0bad..3d37f3e4 100644 --- a/docs/options.md +++ b/docs/options.md @@ -86,13 +86,15 @@ When setting the options, you can use shell-style globbing syntax (as per [`fnma | Python 3.6 | cp36-macosx_x86_64 | cp36-manylinux_x86_64 | cp36-manylinux_i686 | cp36-win_amd64 | cp36-win32 | cp36-manylinux_aarch64 | cp36-manylinux_ppc64le | cp36-manylinux_s390x | | Python 3.7 | cp37-macosx_x86_64 | cp37-manylinux_x86_64 | cp37-manylinux_i686 | cp37-win_amd64 | cp37-win32 | cp37-manylinux_aarch64 | cp37-manylinux_ppc64le | cp37-manylinux_s390x | | Python 3.8 | cp38-macosx_x86_64 | cp38-manylinux_x86_64 | cp38-manylinux_i686 | cp38-win_amd64 | cp38-win32 | cp38-manylinux_aarch64 | cp38-manylinux_ppc64le | cp38-manylinux_s390x | -| PyPy 2.7 v7.3.0 | pp27-macosx_x86_64 | pp27-manylinux_x86_64 | | | pp27-win32 | | | | -| PyPy 3.6 v7.3.0 | pp36-macosx_x86_64 | pp36-manylinux_x86_64 | | | pp36-win32 | | | | +| PyPy 2.7 v7.3.2 | pp27-macosx_x86_64 | pp27-manylinux_x86_64 | | | pp27-win32 | | | | +| PyPy 3.6 v7.3.2 | pp36-macosx_x86_64 | pp36-manylinux_x86_64 | | | pp36-win32 | | | | +| PyPy 3.7 (alpha) v7.3.2 | pp37-macosx_x86_64 | pp37-manylinux_x86_64 | | | pp37-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). -For CPython, the minimally supported macOS version is 10.9; for PyPy 2.7 and PyPy 3.6, respectively macOS 10.7 and 10.13 or higher is required. +For CPython, the minimally supported macOS version is 10.9; for PyPy 2.7 and PyPy 3.6/3.7, respectively macOS 10.7 and 10.13 or higher is required. #### Examples From 37a65043514fe0e6552cade261ffd06e8e849b78 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Thu, 10 Sep 2020 15:50:21 +0200 Subject: [PATCH 02/12] Adding PyPy Python 3.7 to the tests --- test/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/utils.py b/test/utils.py index 05f2a796..04f3e147 100644 --- a/test/utils.py +++ b/test/utils.py @@ -94,7 +94,7 @@ def expected_wheels(package_name, package_version, manylinux_versions=None, python_abi_tags = ['cp35-cp35m', 'cp36-cp36m', 'cp37-cp37m', 'cp38-cp38', 'cp39-cp39'] if pm.machine() in ['x86_64', 'AMD64', 'x86']: - python_abi_tags += ['cp27-cp27m', 'pp27-pypy_73', 'pp36-pypy36_pp73'] + python_abi_tags += ['cp27-cp27m', 'pp27-pypy_73', 'pp36-pypy36_pp73', 'pp37-pypy37_pp73'] if platform == 'linux': python_abi_tags.append('cp27-cp27mu') # python 2.7 has 2 different ABI on manylinux From acd93000777eed59c0a9b4e3bf8986a50aeb56e6 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Thu, 10 Sep 2020 16:09:31 +0200 Subject: [PATCH 03/12] Update Linux versions as well, with 'yannickjadoul/manylinux2010-pypy_x86_64:7.3.2rc1' temporary docker image --- cibuildwheel/linux.py | 1 + cibuildwheel/resources/pinned_docker_images.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index ce0806c4..e601a8cf 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -60,6 +60,7 @@ def get_python_configurations(build_selector: BuildSelector) -> List[PythonConfi PythonConfiguration(version='3.9', identifier='cp39-manylinux_i686', path_str='/opt/python/cp39-cp39'), PythonConfiguration(version='2.7', identifier='pp27-manylinux_x86_64', path_str='/opt/python/pp27-pypy_73'), PythonConfiguration(version='3.6', identifier='pp36-manylinux_x86_64', path_str='/opt/python/pp36-pypy36_pp73'), + PythonConfiguration(version='3.7', identifier='pp37-manylinux_x86_64', path_str='/opt/python/pp37-pypy37_pp73'), PythonConfiguration(version='3.5', identifier='cp35-manylinux_aarch64', path_str='/opt/python/cp35-cp35m'), PythonConfiguration(version='3.6', identifier='cp36-manylinux_aarch64', path_str='/opt/python/cp36-cp36m'), PythonConfiguration(version='3.7', identifier='cp37-manylinux_aarch64', path_str='/opt/python/cp37-cp37m'), diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 08272bbd..fd88f442 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -9,7 +9,7 @@ manylinux2010 = quay.io/pypa/manylinux2010_i686:2020-09-20-6131e60 manylinux2014 = quay.io/pypa/manylinux2014_i686:2020-09-20-fb9af88 [pypy_x86_64] -manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2020-07-02-fd8c128 +manylinux2010 = yannickjadoul/manylinux2010-pypy_x86_64:7.3.2rc1 [aarch64] manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2020-09-20-fb9af88 From 61c45248bd0a54c7037aa681092777ba47f7609a Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Thu, 10 Sep 2020 16:22:23 +0200 Subject: [PATCH 04/12] Temporarily fixing some tests of default docker images (now that pypywheels/manylinux2010-pypy_x86_64 temporarily moved to yannickjadoul/manylinux2010-pypy_x86_64) --- unit_test/main_tests/main_options_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unit_test/main_tests/main_options_test.py b/unit_test/main_tests/main_options_test.py index c7e6bfdd..58630dc1 100644 --- a/unit_test/main_tests/main_options_test.py +++ b/unit_test/main_tests/main_options_test.py @@ -69,9 +69,9 @@ def test_build_selector(platform, intercepted_build_args, monkeypatch): ('i686', 'manylinux2010', 'quay.io/pypa/manylinux2010_i686:*'), ('i686', 'manylinux2014', 'quay.io/pypa/manylinux2014_i686:*'), ('i686', 'custom_image', 'custom_image'), - ('pypy_x86_64', None, 'pypywheels/manylinux2010-pypy_x86_64:*'), + ('pypy_x86_64', None, 'yannickjadoul/manylinux2010-pypy_x86_64:*'), ('pypy_x86_64', 'manylinux1', 'manylinux1'), # Does not exist - ('pypy_x86_64', 'manylinux2010', 'pypywheels/manylinux2010-pypy_x86_64:*'), + ('pypy_x86_64', 'manylinux2010', 'yannickjadoul/manylinux2010-pypy_x86_64:*'), ('pypy_x86_64', 'manylinux2014', 'manylinux2014'), # Does not exist (yet) ('pypy_x86_64', 'custom_image', 'custom_image'), ]) From 87dfa75dcb6d995f6e4cff6cf08c429a98310a2c Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Fri, 11 Sep 2020 13:54:35 +0200 Subject: [PATCH 05/12] Revert "Allow failures on Appveyor macos" This reverts commit f1c4ebbed062fc76f053ed27cc900600c49b78e3. --- appveyor.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5162f1b6..aefcf59b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,11 +10,6 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: macos-mojave APPVEYOR_JOB_NAME: "python37-x64-macos-mojave" -# while pypy libffi dependency is failing the build, allow failures on macos -matrix: - allow_failures: - - APPVEYOR_BUILD_WORKER_IMAGE: macos-mojave - stack: python 3.7 build: off From a7b69cc16dd8e1ff4d312fec2f68f31a9edfcf2a Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Fri, 11 Sep 2020 18:16:12 +0200 Subject: [PATCH 06/12] Remove workaround for AppVeyor bug on macOS (#318), as the AppVeyor issue is closed now --- appveyor.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index aefcf59b..6c2bdee9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,4 @@ environment: - # workaround an appveyor bug on macos - # see https://github.com/appveyor/ci/issues/3376#issuecomment-611314299 - APPVEYOR_CONSOLE_DISABLE_PTY: true matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu APPVEYOR_JOB_NAME: "python37-x64-ubuntu" From 7f95eb3d8f63bf6cf3b6dd29518d3268b808ca7b Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Fri, 18 Sep 2020 01:23:02 +0200 Subject: [PATCH 07/12] Update PyPy to 7.3.2rc2 --- cibuildwheel/macos.py | 6 +++--- cibuildwheel/resources/pinned_docker_images.cfg | 2 +- cibuildwheel/windows.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 9383119b..965017c7 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -40,9 +40,9 @@ def get_python_configurations(build_selector: BuildSelector) -> List[PythonConfi PythonConfiguration(version='3.8', identifier='cp38-macosx_x86_64', url='https://www.python.org/ftp/python/3.8.4/python-3.8.4-macosx10.9.pkg'), PythonConfiguration(version='3.9', identifier='cp39-macosx_x86_64', url='https://www.python.org/ftp/python/3.9.0/python-3.9.0rc1-macosx10.9.pkg'), # PyPy - PythonConfiguration(version='2.7', identifier='pp27-macosx_x86_64', url='https://downloads.python.org/pypy/pypy2.7-v7.3.2rc1-osx64.tar.bz2'), - PythonConfiguration(version='3.6', identifier='pp36-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.6-v7.3.2rc1-osx64.tar.bz2'), - PythonConfiguration(version='3.7', identifier='pp37-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.7-v7.3.2rc1-osx64.tar.bz2'), + PythonConfiguration(version='2.7', identifier='pp27-macosx_x86_64', url='https://downloads.python.org/pypy/pypy2.7-v7.3.2rc2-osx64.tar.bz2'), + PythonConfiguration(version='3.6', identifier='pp36-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.6-v7.3.2rc2-osx64.tar.bz2'), + PythonConfiguration(version='3.7', identifier='pp37-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.7-v7.3.2rc2-osx64.tar.bz2'), ] # skip builds as required diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index fd88f442..bf6ed544 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -9,7 +9,7 @@ manylinux2010 = quay.io/pypa/manylinux2010_i686:2020-09-20-6131e60 manylinux2014 = quay.io/pypa/manylinux2014_i686:2020-09-20-fb9af88 [pypy_x86_64] -manylinux2010 = yannickjadoul/manylinux2010-pypy_x86_64:7.3.2rc1 +manylinux2010 = yannickjadoul/manylinux2010-pypy_x86_64:7.3.2rc2 [aarch64] manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2020-09-20-fb9af88 diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index c21eb60a..b2339e41 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -61,9 +61,9 @@ def get_python_configurations(build_selector: BuildSelector) -> List[PythonConfi PythonConfiguration(version='3.9.0-rc1', arch='32', identifier='cp39-win32', url=None), PythonConfiguration(version='3.9.0-rc1', arch='64', identifier='cp39-win_amd64', url=None), # PyPy - PythonConfiguration(version='2.7', arch='32', identifier='pp27-win32', url='https://downloads.python.org/pypy/pypy2.7-v7.3.2rc1-win32.zip'), - PythonConfiguration(version='3.6', arch='32', identifier='pp36-win32', url='https://downloads.python.org/pypy/pypy3.6-v7.3.2rc1-win32.zip'), - PythonConfiguration(version='3.7', arch='32', identifier='pp37-win32', url='https://downloads.python.org/pypy/pypy3.7-v7.3.2rc1-win32.zip'), + PythonConfiguration(version='2.7', arch='32', identifier='pp27-win32', url='https://downloads.python.org/pypy/pypy2.7-v7.3.2rc2-win32.zip'), + PythonConfiguration(version='3.6', arch='32', identifier='pp36-win32', url='https://downloads.python.org/pypy/pypy3.6-v7.3.2rc2-win32.zip'), + PythonConfiguration(version='3.7', arch='32', identifier='pp37-win32', url='https://downloads.python.org/pypy/pypy3.7-v7.3.2rc2-win32.zip'), ] if IS_RUNNING_ON_TRAVIS: From b3a16d58cff406585a391f43771654a9d0e51a25 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Fri, 25 Sep 2020 15:27:04 +0200 Subject: [PATCH 08/12] PyPy 7.3.2 was released --- cibuildwheel/macos.py | 6 +++--- cibuildwheel/resources/pinned_docker_images.cfg | 2 +- cibuildwheel/windows.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 965017c7..0df82efb 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -40,9 +40,9 @@ def get_python_configurations(build_selector: BuildSelector) -> List[PythonConfi PythonConfiguration(version='3.8', identifier='cp38-macosx_x86_64', url='https://www.python.org/ftp/python/3.8.4/python-3.8.4-macosx10.9.pkg'), PythonConfiguration(version='3.9', identifier='cp39-macosx_x86_64', url='https://www.python.org/ftp/python/3.9.0/python-3.9.0rc1-macosx10.9.pkg'), # PyPy - PythonConfiguration(version='2.7', identifier='pp27-macosx_x86_64', url='https://downloads.python.org/pypy/pypy2.7-v7.3.2rc2-osx64.tar.bz2'), - PythonConfiguration(version='3.6', identifier='pp36-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.6-v7.3.2rc2-osx64.tar.bz2'), - PythonConfiguration(version='3.7', identifier='pp37-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.7-v7.3.2rc2-osx64.tar.bz2'), + PythonConfiguration(version='2.7', identifier='pp27-macosx_x86_64', url='https://downloads.python.org/pypy/pypy2.7-v7.3.2-osx64.tar.bz2'), + PythonConfiguration(version='3.6', identifier='pp36-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.6-v7.3.2-osx64.tar.bz2'), + PythonConfiguration(version='3.7', identifier='pp37-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.7-v7.3.2-osx64.tar.bz2'), ] # skip builds as required diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index bf6ed544..147951b5 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -9,7 +9,7 @@ manylinux2010 = quay.io/pypa/manylinux2010_i686:2020-09-20-6131e60 manylinux2014 = quay.io/pypa/manylinux2014_i686:2020-09-20-fb9af88 [pypy_x86_64] -manylinux2010 = yannickjadoul/manylinux2010-pypy_x86_64:7.3.2rc2 +manylinux2010 = yannickjadoul/manylinux2010-pypy_x86_64:7.3.2 [aarch64] manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2020-09-20-fb9af88 diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index b2339e41..1a5da2a2 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -61,9 +61,9 @@ def get_python_configurations(build_selector: BuildSelector) -> List[PythonConfi PythonConfiguration(version='3.9.0-rc1', arch='32', identifier='cp39-win32', url=None), PythonConfiguration(version='3.9.0-rc1', arch='64', identifier='cp39-win_amd64', url=None), # PyPy - PythonConfiguration(version='2.7', arch='32', identifier='pp27-win32', url='https://downloads.python.org/pypy/pypy2.7-v7.3.2rc2-win32.zip'), - PythonConfiguration(version='3.6', arch='32', identifier='pp36-win32', url='https://downloads.python.org/pypy/pypy3.6-v7.3.2rc2-win32.zip'), - PythonConfiguration(version='3.7', arch='32', identifier='pp37-win32', url='https://downloads.python.org/pypy/pypy3.7-v7.3.2rc2-win32.zip'), + PythonConfiguration(version='2.7', arch='32', identifier='pp27-win32', url='https://downloads.python.org/pypy/pypy2.7-v7.3.2-win32.zip'), + PythonConfiguration(version='3.6', arch='32', identifier='pp36-win32', url='https://downloads.python.org/pypy/pypy3.6-v7.3.2-win32.zip'), + PythonConfiguration(version='3.7', arch='32', identifier='pp37-win32', url='https://downloads.python.org/pypy/pypy3.7-v7.3.2-win32.zip'), ] if IS_RUNNING_ON_TRAVIS: From 6ef2f92dfc4bffbbd0bfd87a601e5197e1606b58 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Sat, 26 Sep 2020 13:27:49 +0200 Subject: [PATCH 09/12] Reverting to the official PyPy docker image --- .../resources/pinned_docker_images.cfg | 20 +++++++++---------- unit_test/main_tests/main_options_test.py | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 147951b5..29befeb5 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,22 +1,22 @@ [x86_64] -manylinux1 = quay.io/pypa/manylinux1_x86_64:2020-09-20-9444d5c -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2020-09-20-6131e60 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2020-09-20-fb9af88 +manylinux1 = quay.io/pypa/manylinux1_x86_64:2020-09-26-9f151ab +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2020-09-26-58cbbcd +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2020-09-26-7f7a14f [i686] -manylinux1 = quay.io/pypa/manylinux1_i686:2020-09-20-9444d5c -manylinux2010 = quay.io/pypa/manylinux2010_i686:2020-09-20-6131e60 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2020-09-20-fb9af88 +manylinux1 = quay.io/pypa/manylinux1_i686:2020-09-26-9f151ab +manylinux2010 = quay.io/pypa/manylinux2010_i686:2020-09-26-58cbbcd +manylinux2014 = quay.io/pypa/manylinux2014_i686:2020-09-26-7f7a14f [pypy_x86_64] -manylinux2010 = yannickjadoul/manylinux2010-pypy_x86_64:7.3.2 +manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2020-09-26-8f210b5 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2020-09-20-fb9af88 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2020-09-26-7f7a14f [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2020-09-20-fb9af88 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2020-09-26-7f7a14f [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2020-09-20-fb9af88 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2020-09-26-7f7a14f diff --git a/unit_test/main_tests/main_options_test.py b/unit_test/main_tests/main_options_test.py index 58630dc1..c7e6bfdd 100644 --- a/unit_test/main_tests/main_options_test.py +++ b/unit_test/main_tests/main_options_test.py @@ -69,9 +69,9 @@ def test_build_selector(platform, intercepted_build_args, monkeypatch): ('i686', 'manylinux2010', 'quay.io/pypa/manylinux2010_i686:*'), ('i686', 'manylinux2014', 'quay.io/pypa/manylinux2014_i686:*'), ('i686', 'custom_image', 'custom_image'), - ('pypy_x86_64', None, 'yannickjadoul/manylinux2010-pypy_x86_64:*'), + ('pypy_x86_64', None, 'pypywheels/manylinux2010-pypy_x86_64:*'), ('pypy_x86_64', 'manylinux1', 'manylinux1'), # Does not exist - ('pypy_x86_64', 'manylinux2010', 'yannickjadoul/manylinux2010-pypy_x86_64:*'), + ('pypy_x86_64', 'manylinux2010', 'pypywheels/manylinux2010-pypy_x86_64:*'), ('pypy_x86_64', 'manylinux2014', 'manylinux2014'), # Does not exist (yet) ('pypy_x86_64', 'custom_image', 'custom_image'), ]) From 870bf3f740fa06a866862debb39baabb3b79d2b5 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Sun, 27 Sep 2020 13:44:48 +0200 Subject: [PATCH 10/12] Update Travis CI and CircleCI to use macOS 10.14 --- .circleci/config.yml | 2 +- .travis.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 66777904..1ff2edb9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: osx-python3.6: macos: - xcode: "9.4.1" + xcode: 10.2.1 environment: PYTHON: python3 steps: diff --git a/.travis.yml b/.travis.yml index c30a4ab6..51698b97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ jobs: - name: macOS | x86_64 | Python 3.x os: osx + osx_image: xcode10.2 env: PYTHON=python3 - name: Windows | x86_64 | Python 3.6 From cd53552b4bf626c34975fcf4fd956dcd424aca58 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Sat, 3 Oct 2020 21:37:17 +0200 Subject: [PATCH 11/12] Change examples to use macOS >= 10.14 --- README.md | 2 ++ examples/circleci-minimal.yml | 3 ++- examples/travis-ci-deploy.yml | 2 ++ examples/travis-ci-minimal.yml | 2 ++ examples/travis-ci-test-and-deploy.yml | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 062edf6b..c0907425 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,8 @@ jobs: - services: docker # and a mac build - os: osx + # PyPy 7.3.2 needs macOS >= 10.14 + osx_image: xcode10.2 language: shell # and a windows build - os: windows diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index 1ce2b02a..6f1cd665 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -19,7 +19,8 @@ jobs: osx-wheels: working_directory: ~/osx-wheels macos: - xcode: "10.0.0" + # PyPy 7.3.2 needs macOS >= 10.14 + xcode: 10.2.1 steps: - checkout - run: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index 8eea3c4e..a2d6c704 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -9,6 +9,8 @@ jobs: - services: docker # and a mac build - os: osx + # PyPy 7.3.2 needs macOS >= 10.14 + osx_image: xcode10.2 language: shell # and a windows build - os: windows diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index 85c24165..f972fbdb 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -15,6 +15,8 @@ jobs: arch: s390x # and a mac build - os: osx + # PyPy 7.3.2 needs macOS >= 10.14 + osx_image: xcode10.2 language: shell # and a windows build - os: windows diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index 8352f7d3..efdf6df8 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -64,6 +64,8 @@ jobs: - stage: deploy name: Build and deploy macOS wheels os: osx + # PyPy 7.3.2 needs macOS >= 10.14 + osx_image: xcode10.2 language: shell install: python3 -m pip install cibuildwheel==1.6.1 script: python3 -m cibuildwheel --output-dir wheelhouse From 0154a8f99207e8d727f5d420ccb3486d4ae43e47 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Sat, 3 Oct 2020 21:40:42 +0200 Subject: [PATCH 12/12] Run less tests in macOS builds on Travis CI --- .travis.yml | 6 ++++-- appveyor.yml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51698b97..df904eba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,9 @@ jobs: - name: macOS | x86_64 | Python 3.x os: osx osx_image: xcode10.2 - env: PYTHON=python3 + env: + - PYTHON=python3 + - PYTEST_ADDOPTS='-k "unit_test or test_0_basic" --suppress-no-test-exit-code' - name: Windows | x86_64 | Python 3.6 os: windows @@ -53,6 +55,6 @@ jobs: # must repeat the s390x job above exactly to match - *linux_s390x_36 -install: $PYTHON -m pip install -r requirements-dev.txt +install: $PYTHON -m pip install -r requirements-dev.txt pytest-custom-exit-code script: $PYTHON ./bin/run_tests.py diff --git a/appveyor.yml b/appveyor.yml index 6c2bdee9..acc69fdf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,7 +16,7 @@ init: - ps: | $BRANCH = if ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH) { $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH } else { $env:APPVEYOR_REPO_BRANCH } if (-not ($BRANCH -eq 'master' -or $BRANCH.ToLower().StartsWith('appveyor-'))) { - $env:PYTEST_ADDOPTS='-k "unit_test or _basic" --suppress-no-test-exit-code' + $env:PYTEST_ADDOPTS='-k "unit_test or test_0_basic" --suppress-no-test-exit-code' } install: python -m pip install -r requirements-dev.txt pytest-custom-exit-code