diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ff2edb9..7a70f273 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: osx-python3.6: macos: - xcode: 10.2.1 + xcode: 9.4.1 environment: PYTHON: python3 steps: diff --git a/.travis.yml b/.travis.yml index df904eba..6e4925f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,6 @@ jobs: - name: macOS | x86_64 | Python 3.x os: osx - osx_image: xcode10.2 env: - PYTHON=python3 - PYTEST_ADDOPTS='-k "unit_test or test_0_basic" --suppress-no-test-exit-code' diff --git a/README.md b/README.md index 19d7d450..ca9b6985 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ What does it do? | CPython 3.7 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅² | ✅³ | | CPython 3.8 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅² | ✅³ | | CPython 3.9 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅² | ✅³ | -| PyPy 2.7 v7.3.2 | ✅ | | ✅ | ✅ | | | | | -| PyPy 3.6 v7.3.2 | ✅ | | ✅ | ✅ | | | | | -| PyPy 3.7 (alpha) v7.3.2 | ✅ | | ✅ | ✅ | | | | | +| PyPy 2.7 v7.3.3 | ✅ | | ✅ | ✅ | | | | | +| PyPy 3.6 v7.3.3 | ✅ | | ✅ | ✅ | | | | | +| PyPy 3.7 (beta) v7.3.3 | ✅ | | ✅ | ✅ | | | | | ¹ Not supported on Travis
² Only supported on Travis
@@ -67,8 +67,6 @@ 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/cibuildwheel/macos.py b/cibuildwheel/macos.py index 5dfd1cd6..8541ec72 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.0-macosx10.9.pkg'), # PyPy - 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'), + PythonConfiguration(version='2.7', identifier='pp27-macosx_x86_64', url='https://downloads.python.org/pypy/pypy2.7-v7.3.3-osx64.tar.bz2'), + PythonConfiguration(version='3.6', identifier='pp36-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.6-v7.3.3-osx64.tar.bz2'), + PythonConfiguration(version='3.7', identifier='pp37-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.7-v7.3.3-osx64.tar.bz2'), ] # skip builds as required diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 446c120a..852ed441 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,21 +1,22 @@ [x86_64] -manylinux1 = quay.io/pypa/manylinux1_x86_64:2020-10-06-c4a4a7c -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2020-10-06-786a931 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2020-10-06-b2ca7a1 +manylinux1 = quay.io/pypa/manylinux1_x86_64:2020-11-11-0f1f128 +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2020-11-11-201fb79 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2020-11-11-bc8ce45 [i686] -manylinux1 = quay.io/pypa/manylinux1_i686:2020-10-06-c4a4a7c -manylinux2010 = quay.io/pypa/manylinux2010_i686:2020-10-06-786a931 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2020-10-06-b2ca7a1 +manylinux1 = quay.io/pypa/manylinux1_i686:2020-11-11-0f1f128 +manylinux2010 = quay.io/pypa/manylinux2010_i686:2020-11-11-201fb79 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2020-11-11-bc8ce45 [pypy_x86_64] -manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2020-09-26-8f210b5 +manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2020-11-21-a03b9e9 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2020-10-06-b2ca7a1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2020-11-11-bc8ce45 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2020-10-06-b2ca7a1 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2020-11-11-bc8ce45 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2020-10-06-b2ca7a1 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2020-11-11-bc8ce45 + diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 9e8c1df5..2679324f 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', arch='32', identifier='cp39-win32', url=None), PythonConfiguration(version='3.9.0', 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.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'), + PythonConfiguration(version='2.7', arch='32', identifier='pp27-win32', url='https://downloads.python.org/pypy/pypy2.7-v7.3.3-win32.zip'), + PythonConfiguration(version='3.6', arch='32', identifier='pp36-win32', url='https://downloads.python.org/pypy/pypy3.6-v7.3.3-win32.zip'), + PythonConfiguration(version='3.7', arch='32', identifier='pp37-win32', url='https://downloads.python.org/pypy/pypy3.7-v7.3.3-win32.zip'), ] if IS_RUNNING_ON_TRAVIS: diff --git a/docs/options.md b/docs/options.md index 2f33d629..73c25b3b 100644 --- a/docs/options.md +++ b/docs/options.md @@ -87,9 +87,9 @@ When setting the options, you can use shell-style globbing syntax (as per [`fnma | 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 | | Python 3.9 | cp39-macosx_x86_64 | cp39-manylinux_x86_64 | cp39-manylinux_i686 | cp39-win_amd64 | cp39-win32 | cp39-manylinux_aarch64 | cp39-manylinux_ppc64le | cp39-manylinux_s390x | -| 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 | | | | +| PyPy 2.7 v7.3.3 | pp27-macosx_x86_64 | pp27-manylinux_x86_64 | | | pp27-win32 | | | | +| PyPy 3.6 v7.3.3 | pp36-macosx_x86_64 | pp36-manylinux_x86_64 | | | pp36-win32 | | | | +| PyPy 3.7 (beta) v7.3.3 | 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`. diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index 6e7a315f..77b8a003 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -19,8 +19,7 @@ jobs: osx-wheels: working_directory: ~/osx-wheels macos: - # PyPy 7.3.2 needs macOS >= 10.14 - xcode: 10.2.1 + xcode: 10.0.0 steps: - checkout - run: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index feba9a65..9643546e 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -9,8 +9,6 @@ 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 8074d08c..7f681fd4 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -15,8 +15,6 @@ 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 df5e9065..e9617a81 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -64,8 +64,6 @@ 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.4 script: python3 -m cibuildwheel --output-dir wheelhouse