Bump version: v2.0.0a1

[pre-commit.ci] pre-commit autoupdate

.github/auto-merge.yml

@@ -1,7 +0,0 @@
-# config file for https://github.com/bobvanderlinden/probot-auto-merge
-
-# no approvals required, just the label is enough
-minApprovals: {}
-
-requiredLabels:
-- merge when green

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    ignore:
+      - dependency-name: "actions/*"
+        update-types: ["version-update:semver-minor", "version-update:semver-patch"]

.github/workflows/test.yml

@@ -3,7 +3,7 @@ name: Test
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     paths-ignore:
       - 'docs/**'
@@ -17,10 +17,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
-    - uses: pre-commit/action@v2.0.0
+    - uses: pre-commit/action@v2.0.3
 
   test:
     name: Test cibuildwheel on ${{ matrix.os }}
+    needs: pre-commit
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -38,17 +39,8 @@ jobs:
       run: |
         python -m pip install -e ".[dev]"
 
-    - name: Install Visual C++ for Python 2.7
-      if: runner.os == 'Windows'
-      run: |
-        choco install vcpython27 -f -y
-
-    - name: Get PR labels
-      id: pr-labels
-      uses: joerick/pr-labels-action@v1.0.6
-
     - name: Sample build
-      if: contains(steps.pr-labels.outputs.labels, ' ci-sample-build ')
+      if: "contains(github.event.pull_request.labels.*.name, 'CI: Sample build')"
       run: |
         python bin/sample_build.py
 
@@ -70,6 +62,7 @@ jobs:
 
   test-emulated:
     name: Test emulated cibuildwheel using qemu
+    needs: pre-commit
     runs-on: ubuntu-latest
     timeout-minutes: 180
     steps:

.github/workflows/update-dependencies.yml

@@ -11,19 +11,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-      name: Install Python 3.9
-      with:
-        python-version: 3.9
-        architecture: x64
-    - name: Install dependencies
-      run: python -m pip install ".[dev]"
+    - uses: excitedleigh/setup-nox@v2.0.0
+
     - name: "Run update: dependencies"
-      run: python ./bin/update_dependencies.py
+      run: nox --force-color -s update_constraints
     - name: "Run update: python configs"
-      run: python ./bin/update_pythons.py --force
+      run: nox --force-color -s update_pins
+
+    # we use this step to grab a Github App auth token, so that PRs generated by this workflow
+    # run the GHA tests.
+    - uses: tibdex/github-app-token@v1
+      id: generate-token
+      with:
+        app_id: ${{ secrets.CIBUILDWHEEL_BOT_APP_ID }}
+        private_key: ${{ secrets.CIBUILDWHEEL_BOT_APP_PRIVATE_KEY }}
+
     - name: Create Pull Request
-      if: github.ref == 'refs/heads/master'
+      if: github.ref == 'refs/heads/main' && github.repository == 'pypa/cibuildwheel'
       uses: peter-evans/create-pull-request@v3
       with:
         commit-message: Update dependencies
@@ -33,4 +37,5 @@ jobs:
 
           PR generated by "Update dependencies" [workflow](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}).
         branch: update-dependencies-pr
+        token: ${{ steps.generate-token.outputs.token }}
         delete-branch: true

.gitignore

@@ -114,3 +114,6 @@ site/
 
 # Virtual environments
 venv*
+
+# PyCharm
+.idea/

.pre-commit-config.yaml

@@ -1,29 +1,48 @@
 repos:
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.4.0
+  rev: v4.0.1
   hooks:
   - id: check-case-conflict
   - id: check-merge-conflict
   - id: check-yaml
+  - id: check-toml
+  - id: debug-statements
   - id: end-of-file-fixer
     exclude: (cibuildwheel/resources/pinned_docker_images.cfg)|(.svg$)
   - id: mixed-line-ending
   - id: trailing-whitespace
 
+- repo: https://github.com/asottile/pyupgrade
+  rev: v2.19.0
+  hooks:
+  - id: pyupgrade
+    name: PyUpgrade 3.6+
+    args: ["--py36-plus"]
+    exclude: ^bin/
+  - id: pyupgrade
+    name: PyUpgrade 3.7+ on bin
+    exclude: ^(cibuildwheel|unit_test|test)/
+    args: ["--py37-plus"]
+
 - repo: https://github.com/PyCQA/isort
-  rev: 5.7.0
+  rev: 5.8.0
   hooks:
   - id: isort
 
 - repo: https://github.com/psf/black
-  rev: 20.8b1
+  rev: 21.5b2
   hooks:
   - id: black
-    files: ^bin/update_pythons.py|setup.py$
+
+- repo: https://github.com/asottile/setup-cfg-fmt
+  rev: v1.17.0
+  hooks:
+  - id: setup-cfg-fmt
+    stages: [manual]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.800
+  rev: v0.812
   hooks:
   - id: mypy
     exclude: ^(bin/|cibuildwheel/resources/).*py$
@@ -35,21 +54,13 @@ repos:
     additional_dependencies: [packaging]
     args: ["--python-version=3.7", "--ignore-missing-imports", "--scripts-are-modules"]
 
-- repo: https://github.com/asottile/pyupgrade
-  rev: v2.9.0
-  hooks:
-  - id: pyupgrade
-    args: ["--py36-plus"]
-
-- repo: https://gitlab.com/pycqa/flake8
-  rev: 3.8.4
+- repo: https://github.com/PyCQA/flake8
+  rev: 3.9.2
   hooks:
   - id: flake8
     exclude: cibuildwheel/resources/
     additional_dependencies: [flake8-bugbear]
 
-
-# The original pybind11 checks for a few C++ style items
 - repo: local
   hooks:
   - id: disallow-caps

.travis.yml

@@ -1,59 +1,53 @@
-language: minimal
+os: linux
+dist: focal
+language: python
 
 branches:
   only:
-  - master
+  - main
 
 jobs:
   include:
     - name: Linux | x86_64 + i686 | Python 3.6
-      language: python
       python: 3.6
       services: docker
       env: PYTHON=python
 
     - name: Linux | arm64 | Python 3.6
-      language: python
       python: 3.6
       services: docker
-      arch: arm64
+      arch: arm64-graviton2
+      group: edge
+      virt: vm
       env: PYTHON=python
 
     - name: Linux | ppc64le | Python 3.6
-      language: python
       python: 3.6
       services: docker
       arch: ppc64le
-      env: PYTHON=python
-
-    - name: macOS | x86_64 | Python 3.x
-      os: osx
+      allow_failure: True
       env:
-        - PYTHON=python3
-        - PYTEST_ADDOPTS='-k "unit_test or test_0_basic" --suppress-no-test-exit-code'
+        - PYTHON=python
+        # skip test_manylinuxXXXX_only, it uses too much disk space
+        # c.f. https://travis-ci.community/t/running-out-of-disk-space-quota-when-using-docker-on-ppc64le/11634
+        - PYTEST_ADDOPTS='-k "not test_manylinuxXXXX_only"'
 
     - name: Windows | x86_64 | Python 3.6
       os: windows
       language: shell
       before_install:
-       - choco install python3 --version 3.6.8 --no-progress -y
-       # Update root certificates to fix SSL error; see http://www.chawn.com/RootCerts.htm
-       - powershell "md C:\temp\certs; CertUtil -generateSSTFromWU C:\temp\certs\RootStore.sst; Get-ChildItem -Path C:\\temp\certs\Rootstore.sst | Import-Certificate -CertStoreLocation Cert:\\LocalMachine\\Root\\ | out-null"
+        - choco upgrade python3 -y --version 3.6.8 --limit-output
+        # Update root certificates to fix SSL error; see http://www.chawn.com/RootCerts.htm
+        - powershell "md C:\temp\certs; CertUtil -generateSSTFromWU C:\temp\certs\RootStore.sst; Get-ChildItem -Path C:\\temp\certs\Rootstore.sst | Import-Certificate -CertStoreLocation Cert:\\LocalMachine\\Root\\ | out-null"
       env:
         - PYTHON=C:\\Python36\\python
 
-    - &linux_s390x_36
-      name: Linux | s390x | Python 3.6
-      language: python
+    - name: Linux | s390x | Python 3.6
       python: 3.6
       services: docker
       arch: s390x
       env: PYTHON=python
 
-  allow_failures:
-    # must repeat the s390x job above exactly to match
-    - *linux_s390x_36
-
 install: $PYTHON -m pip install -e ".[dev]" pytest-custom-exit-code
 
 script: $PYTHON ./bin/run_tests.py

CI.md

@@ -1,12 +1,11 @@
 This is a summary of the Python versions and platforms covered by the different CI platforms:
 
-|          | 3.6                          | 3.7                                      | 3.8              |
-|----------|------------------------------|------------------------------------------|------------------|
-| Linux    | Travis CI / CircleCI         | AppVeyor² / GitHub Actions               | Azure Pipelines  |
-| macOS    | CircleCI                     | AppVeyor² / Travis CI¹ / GitHub Actions  | Azure Pipelines  |
-| Windows  | Travis CI / Azure Pipelines  | AppVeyor² / GitHub Actions               | Azure Pipelines  |
+|          | 3.6                          | 3.7                         | 3.8              |
+|----------|------------------------------|-----------------------------|------------------|
+| Linux    | Travis CI / CircleCI         | AppVeyor¹ / GitHub Actions  | Azure Pipelines  |
+| macOS    | CircleCI                     | AppVeyor¹ / GitHub Actions  | Azure Pipelines  |
+| Windows  | Travis CI / Azure Pipelines  | AppVeyor¹ / GitHub Actions  | Azure Pipelines  |
 
-> ¹ Python version not really pinned, but dependent on the (default) version of image used.
-> ² AppVeyor only runs the "basic" test to reduce load.
+> ¹ AppVeyor only runs the "basic" test to reduce load.
 
 Non-x86 architectures are covered on Travis CI using Python 3.6.

CODE_OF_CONDUCT.md

@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at joerick@mac.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

LICENSE

@@ -22,7 +22,3 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Get-pip and Pip (bundled in cibuildwheel/resources) are licensed under the MIT
-license. See https://github.com/pypa/get-pip/blob/master/LICENSE.txt

README.md

@@ -3,11 +3,11 @@ cibuildwheel
 
 [![PyPI](https://img.shields.io/pypi/v/cibuildwheel.svg)](https://pypi.python.org/pypi/cibuildwheel)
 [![Documentation Status](https://readthedocs.org/projects/cibuildwheel/badge/?version=stable)](https://cibuildwheel.readthedocs.io/en/stable/?badge=stable)
-[![Actions Status](https://github.com/joerick/cibuildwheel/workflows/Test/badge.svg)](https://github.com/joerick/cibuildwheel/actions)
-[![Travis Status](https://img.shields.io/travis/joerick/cibuildwheel/master?logo=travis)](https://travis-ci.org/joerick/cibuildwheel)
-[![AppVeyor status](https://ci.appveyor.com/api/projects/status/wbsgxshp05tt1tif/branch/master?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/master)
-[![CircleCI Status](https://img.shields.io/circleci/build/gh/joerick/cibuildwheel/master?logo=circleci)](https://circleci.com/gh/joerick/cibuildwheel)
-[![Azure Status](https://dev.azure.com/joerick0429/cibuildwheel/_apis/build/status/joerick.cibuildwheel?branchName=master)](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=2&branchName=master)
+[![Actions Status](https://github.com/pypa/cibuildwheel/workflows/Test/badge.svg)](https://github.com/pypa/cibuildwheel/actions)
+[![Travis Status](https://img.shields.io/travis/com/pypa/cibuildwheel/main?logo=travis)](https://travis-ci.com/pypa/cibuildwheel)
+[![Appveyor status](https://ci.appveyor.com/api/projects/status/gt3vwl88yt0y3hur/branch/main?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/main)
+[![CircleCI Status](https://img.shields.io/circleci/build/gh/pypa/cibuildwheel/main?logo=circleci)](https://circleci.com/gh/pypa/cibuildwheel)
+[![Azure Status](https://dev.azure.com/joerick0429/cibuildwheel/_apis/build/status/pypa.cibuildwheel?branchName=main)](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=4&branchName=main)
 
 
 [Documentation](https://cibuildwheel.readthedocs.org)
@@ -23,24 +23,23 @@ 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 | ✅ | |  | ✅  | ✅ |    |    |   |    |
+|---------------|----|-----|-----|-----|----|-----|----|-----|-----|
+| CPython 3.6   | ✅ | N/A | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
+| CPython 3.7   | ✅ | N/A | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
+| CPython 3.8   | ✅ | ✅  | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
+| CPython 3.9   | ✅ | ✅  | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
+| CPython 3.10¹ | ✅ | ✅  | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
+| PyPy 3.7 v7.3 | ✅ | N/A | ✅  | N/A | ✅ | ✅  | ✅ | N/A | N/A |
 
-<sup>¹ Not supported on Travis</sup><br>
+<sup>¹ Available as a prerelease under a [flag](https://cibuildwheel.readthedocs.io/en/stable/options/#prerelease-pythons)</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
 -----
 
@@ -48,9 +47,9 @@ Usage
 
 |                 | Linux | macOS | Windows | Linux ARM |
 |-----------------|-------|-------|---------|--------------|
-| GitHub Actions  | ✅    | ✅    | ✅      | ✅¹           |
+| GitHub Actions  | ✅    | ✅    | ✅      | ✅¹          |
 | Azure Pipelines | ✅    | ✅    | ✅      |              |
-| Travis CI       | ✅    | ✅    | ✅      | ✅           |
+| Travis CI       | ✅    |       | ✅      | ✅           |
 | AppVeyor        | ✅    | ✅    | ✅      |              |
 | CircleCI        | ✅    | ✅    |         |              |
 | Gitlab CI       | ✅    |       |         |              |
@@ -86,7 +85,7 @@ jobs:
       - uses: actions/setup-python@v2
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==1.9.0
+        run: python -m pip install cibuildwheel==2.0.0a1
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
@@ -99,7 +98,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/pypa/cibuildwheel/tree/main/examples).
 
 Options
 -------
@@ -110,11 +109,12 @@ Options
 |   | [`CIBW_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip)  <br> [`CIBW_SKIP`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip)  | Choose the Python versions to build |
 |   | [`CIBW_ARCHS`](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)  | Change the architectures built on your machine by default |
 |   | [`CIBW_PROJECT_REQUIRES_PYTHON`](https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python)  | Manually set the Python compatibility of your project |
+|   | [`CIBW_PRERELEASE_PYTHONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#prerelease-pythons)  | Enable building with pre-release versions of Python |
 | **Build customization** | [`CIBW_ENVIRONMENT`](https://cibuildwheel.readthedocs.io/en/stable/options/#environment)  | Set environment variables needed during the build |
 |   | [`CIBW_BEFORE_ALL`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-all)  | Execute a shell command on the build system before any wheels are built. |
 |   | [`CIBW_BEFORE_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-build)  | Execute a shell command preparing each wheel's build |
 |   | [`CIBW_REPAIR_WHEEL_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#repair-wheel-command)  | Execute a shell command to repair each (non-pure Python) built wheel |
-|   | [`CIBW_MANYLINUX_X86_64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_I686_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_PYPY_X86_64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_AARCH64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_PPC64LE_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_S390X_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  | Specify alternative manylinux docker images |
+|   | [`CIBW_MANYLINUX_X86_64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_I686_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_PYPY_X86_64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_AARCH64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_PPC64LE_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_S390X_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_PYPY_AARCH64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_PYPY_I686_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  | Specify alternative manylinux docker images |
 |   | [`CIBW_DEPENDENCY_VERSIONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#dependency-versions)  | Specify how cibuildwheel controls the versions of the tools it uses |
 | **Testing** | [`CIBW_TEST_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-command)  | Execute a shell command to test each built wheel |
 |   | [`CIBW_BEFORE_TEST`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-test)  | Execute a shell command before testing each wheel |
@@ -146,43 +146,55 @@ Here are some repos that use cibuildwheel.
 | [websockets][]                    | ![travisci icon][] | ![apple icon][] ![linux icon][] | Library for building WebSocket servers and clients. Mostly written in Python, with a small C 'speedups' extension module.  |
 | [pyzmq][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython and CFFI.  |
 | [aiortc][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | WebRTC and ORTC implementation for Python using asyncio. |
+| [River][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python |
+| [coverage.py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python |
 | [numexpr][]                       | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas, bcolz and more |
 | [h5py][]                          | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. |
-| [coverage.py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python |
-| [River][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python |
-| [PyAV][]                          | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Pythonic bindings for FFmpeg's libraries. |
 | [Dependency Injector][]           | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI |
+| [PyAV][]                          | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Pythonic bindings for FFmpeg's libraries. |
 | [PyTables][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data |
 | [ruptures][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. |
 | [aioquic][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python |
+| [pikepdf][]                       | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by qpdf |
+| [DeepForest][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) |
 | [google neuroglancer][]           | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data |
 | [AutoPy][]                        | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
-| [pikepdf][]                       | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by qpdf |
 | [Parselmouth][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. |
 | [python-rapidjson][]              | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson |
 | [Rtree][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS ¶ |
+| [python-snappy][]                 | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for the snappy google library |
+| [markupsafe][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. |
+| [H3-py][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system |
+| [pybind11 cmake_example][]        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system |
 | [KDEpy][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Kernel Density Estimation in Python |
 | [cyvcf2][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing |
-| [pybind11 cmake_example][]        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system |
 | [pybind11 python_example][]       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a Python-based build system |
+| [sourmash][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. |
 | [dd-trace-py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub |
 | [iminuit][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 |
-| [jq.py][]                         | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq |
+| [time-machine][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. |
 | [matrixprofile][]                 | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. |
 | [CTranslate2][]                   | ![github icon][] | ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://software.intel.com/content/www/us/en/develop/tools/oneapi/base-toolkit.html). The Linux wheels also include CUDA libraries for GPU execution. |
+| [jq.py][]                         | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq |
 | [Tokenizer][]                     | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support |
+| [PyGLM][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Fast OpenGL Mathematics (GLM) for Python |
 | [bx-python][]                     | ![travisci icon][] | ![apple icon][] ![linux icon][] | A library that includes Cython extensions. |
 | [boost-histogram][]               | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. |
-| [pybase64][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python |
+| [iDynTree][]                      | ![github icon][] | ![linux icon][] | Uses manylinux_2_24 |
 | [TgCrypto][]                      | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
+| [pybase64][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python |
 | [etebase-py][]                    | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. |
 | [pyjet][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy |
 | [numpythia][]                     | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy |
 | [fathon][]                        | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms |
-| [pyinstrument_cext][]             | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies |
-| [Imagecodecs (fork)][]            | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. |
-| [xmlstarlet][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. |
+| [polaroid][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. |
+| [GSD][]                           | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Cython and NumPy project with 64-bit wheels. |
 | [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 |
+| [pyinstrument_cext][]             | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies |
+| [xmlstarlet][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. |
+| [CorrectionLib][]                 | ![github icon][] | ![apple icon][] ![linux icon][] | Structured JSON powered correction library for HEP, designed for the CMS experiment at CERN. |
+| [Imagecodecs (fork)][]            | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. |
+| [SiPM][]                          | ![github icon][] | ![apple icon][] ![linux icon][] | High performance library for SiPM detectors simulation using C++17, OpenMP and AVX2 intrinsics. |
 
 [scikit-learn]: https://github.com/scikit-learn/scikit-learn
 [Matplotlib]: https://github.com/matplotlib/matplotlib
@@ -193,43 +205,55 @@ Here are some repos that use cibuildwheel.
 [websockets]: https://github.com/aaugustin/websockets
 [pyzmq]: https://github.com/zeromq/pyzmq
 [aiortc]: https://github.com/aiortc/aiortc
+[River]: https://github.com/online-ml/river
+[coverage.py]: https://github.com/nedbat/coveragepy
 [numexpr]: https://github.com/pydata/numexpr
 [h5py]: https://github.com/h5py/h5py
-[coverage.py]: https://github.com/nedbat/coveragepy
-[River]: https://github.com/online-ml/river
-[PyAV]: https://github.com/PyAV-Org/PyAV
 [Dependency Injector]: https://github.com/ets-labs/python-dependency-injector
+[PyAV]: https://github.com/PyAV-Org/PyAV
 [PyTables]: https://github.com/PyTables/PyTables
 [ruptures]: https://github.com/deepcharles/ruptures
 [aioquic]: https://github.com/aiortc/aioquic
+[pikepdf]: https://github.com/pikepdf/pikepdf
+[DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest
 [google neuroglancer]: https://github.com/google/neuroglancer
 [AutoPy]: https://github.com/autopilot-rs/autopy
-[pikepdf]: https://github.com/pikepdf/pikepdf
 [Parselmouth]: https://github.com/YannickJadoul/Parselmouth
 [python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson
 [Rtree]: https://github.com/Toblerity/rtree
+[python-snappy]: https://github.com/andrix/python-snappy
+[markupsafe]: https://github.com/pallets/markupsafe
+[H3-py]: https://github.com/uber/h3-py
+[pybind11 cmake_example]: https://github.com/pybind/cmake_example
 [KDEpy]: https://github.com/tommyod/KDEpy
 [cyvcf2]: https://github.com/brentp/cyvcf2
-[pybind11 cmake_example]: https://github.com/pybind/cmake_example
 [pybind11 python_example]: https://github.com/pybind/python_example
+[sourmash]: https://github.com/dib-lab/sourmash
 [dd-trace-py]: https://github.com/DataDog/dd-trace-py
 [iminuit]: https://github.com/scikit-hep/iminuit
-[jq.py]: https://github.com/mwilliamson/jq.py
+[time-machine]: https://github.com/adamchainz/time-machine
 [matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile
 [CTranslate2]: https://github.com/OpenNMT/CTranslate2
+[jq.py]: https://github.com/mwilliamson/jq.py
 [Tokenizer]: https://github.com/OpenNMT/Tokenizer
+[PyGLM]: https://github.com/Zuzu-Typ/PyGLM
 [bx-python]: https://github.com/bxlab/bx-python
 [boost-histogram]: https://github.com/scikit-hep/boost-histogram
-[pybase64]: https://github.com/mayeut/pybase64
+[iDynTree]: https://github.com/robotology/idyntree
 [TgCrypto]: https://github.com/pyrogram/tgcrypto
+[pybase64]: https://github.com/mayeut/pybase64
 [etebase-py]: https://github.com/etesync/etebase-py
 [pyjet]: https://github.com/scikit-hep/pyjet
 [numpythia]: https://github.com/scikit-hep/numpythia
 [fathon]: https://github.com/stfbnc/fathon
-[pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext
-[Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build
-[xmlstarlet]: https://github.com/dimitern/xmlstarlet
+[polaroid]: https://github.com/daggy1234/polaroid
+[GSD]: https://github.com/glotzerlab/gsd
 [pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example
+[pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext
+[xmlstarlet]: https://github.com/dimitern/xmlstarlet
+[CorrectionLib]: https://github.com/cms-nanoAOD/correctionlib
+[Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build
+[SiPM]: https://github.com/EdoPro98/SimSiPM
 
 [appveyor icon]: docs/data/readme_icons/appveyor.svg
 [github icon]: docs/data/readme_icons/github.svg
@@ -241,56 +265,68 @@ Here are some repos that use cibuildwheel.
 [apple icon]: docs/data/readme_icons/apple.svg
 [linux icon]: docs/data/readme_icons/linux.svg
 
-<!-- scikit-learn: 43800, last pushed 0 days ago -->
-<!-- Matplotlib: 12963, last pushed 0 days ago -->
-<!-- MyPy: 9770, last pushed 0 days ago -->
-<!-- psutil: 6990, last pushed 5 days ago -->
-<!-- scikit-image: 4143, last pushed 0 days ago -->
-<!-- twisted-iocpsupport: 4140, last pushed 7 days ago -->
-<!-- websockets: 3146, last pushed 9 days ago -->
-<!-- pyzmq: 2675, last pushed 1 days ago -->
-<!-- aiortc: 2113, last pushed 7 days ago -->
-<!-- numexpr: 1512, last pushed 16 days ago -->
-<!-- h5py: 1474, last pushed 2 days ago -->
-<!-- coverage.py: 1471, last pushed 2 days ago -->
-<!-- River: 1296, last pushed 0 days ago -->
-<!-- PyAV: 1142, last pushed 13 days ago -->
-<!-- Dependency Injector: 1070, last pushed 0 days ago -->
-<!-- PyTables: 1001, last pushed 6 days ago -->
-<!-- ruptures: 589, last pushed 3 days ago -->
-<!-- aioquic: 571, last pushed 78 days ago -->
-<!-- google neuroglancer: 555, last pushed 0 days ago -->
-<!-- AutoPy: 517, last pushed 134 days ago -->
-<!-- pikepdf: 517, last pushed 5 days ago -->
-<!-- Parselmouth: 450, last pushed 1 days ago -->
-<!-- python-rapidjson: 410, last pushed 39 days ago -->
-<!-- Rtree: 387, last pushed 28 days ago -->
-<!-- KDEpy: 235, last pushed 37 days ago -->
-<!-- cyvcf2: 233, last pushed 0 days ago -->
-<!-- pybind11 cmake_example: 226, last pushed 35 days ago -->
-<!-- pybind11 python_example: 224, last pushed 73 days ago -->
-<!-- dd-trace-py: 206, last pushed 0 days ago -->
-<!-- iminuit: 166, last pushed 25 days ago -->
-<!-- jq.py: 140, last pushed 102 days ago -->
-<!-- matrixprofile: 124, last pushed 2 days ago -->
-<!-- CTranslate2: 123, last pushed 0 days ago -->
-<!-- Tokenizer: 115, last pushed 3 days ago -->
-<!-- bx-python: 95, last pushed 30 days ago -->
-<!-- boost-histogram: 66, last pushed 0 days ago -->
-<!-- pybase64: 54, last pushed 0 days ago -->
-<!-- TgCrypto: 51, last pushed 65 days ago -->
-<!-- etebase-py: 40, last pushed 17 days ago -->
-<!-- pyjet: 27, last pushed 3 days ago -->
-<!-- numpythia: 24, last pushed 9 days ago -->
-<!-- fathon: 20, last pushed 4 days ago -->
-<!-- pyinstrument_cext: 10, last pushed 57 days ago -->
-<!-- Imagecodecs (fork): 10, last pushed 7 days ago -->
-<!-- xmlstarlet: 7, last pushed 2 days ago -->
-<!-- pybind11 scikit_build_example: 2, last pushed 18 days ago -->
+<!-- scikit-learn: 45793, last pushed 0 days ago -->
+<!-- Matplotlib: 13636, last pushed 0 days ago -->
+<!-- MyPy: 10696, last pushed 0 days ago -->
+<!-- psutil: 7319, last pushed 4 days ago -->
+<!-- scikit-image: 4342, last pushed 0 days ago -->
+<!-- twisted-iocpsupport: 4266, last pushed 0 days ago -->
+<!-- websockets: 3349, last pushed 0 days ago -->
+<!-- pyzmq: 2792, last pushed 1 days ago -->
+<!-- aiortc: 2396, last pushed 32 days ago -->
+<!-- River: 1604, last pushed 0 days ago -->
+<!-- coverage.py: 1592, last pushed 6 days ago -->
+<!-- numexpr: 1586, last pushed 75 days ago -->
+<!-- h5py: 1517, last pushed 1 days ago -->
+<!-- Dependency Injector: 1318, last pushed 20 days ago -->
+<!-- PyAV: 1246, last pushed 2 days ago -->
+<!-- PyTables: 1023, last pushed 53 days ago -->
+<!-- ruptures: 704, last pushed 0 days ago -->
+<!-- aioquic: 644, last pushed 13 days ago -->
+<!-- pikepdf: 624, last pushed 9 days ago -->
+<!-- DeepForest: 591, last pushed 6 days ago -->
+<!-- google neuroglancer: 586, last pushed 3 days ago -->
+<!-- AutoPy: 533, last pushed 251 days ago -->
+<!-- Parselmouth: 511, last pushed 0 days ago -->
+<!-- python-rapidjson: 420, last pushed 156 days ago -->
+<!-- Rtree: 403, last pushed 59 days ago -->
+<!-- python-snappy: 398, last pushed 82 days ago -->
+<!-- markupsafe: 390, last pushed 0 days ago -->
+<!-- H3-py: 376, last pushed 0 days ago -->
+<!-- pybind11 cmake_example: 271, last pushed 6 days ago -->
+<!-- KDEpy: 264, last pushed 7 days ago -->
+<!-- cyvcf2: 260, last pushed 19 days ago -->
+<!-- pybind11 python_example: 250, last pushed 6 days ago -->
+<!-- sourmash: 241, last pushed 0 days ago -->
+<!-- dd-trace-py: 237, last pushed 0 days ago -->
+<!-- iminuit: 181, last pushed 0 days ago -->
+<!-- time-machine: 160, last pushed 0 days ago -->
+<!-- matrixprofile: 158, last pushed 68 days ago -->
+<!-- CTranslate2: 157, last pushed 0 days ago -->
+<!-- jq.py: 152, last pushed 15 days ago -->
+<!-- Tokenizer: 140, last pushed 14 days ago -->
+<!-- PyGLM: 103, last pushed 7 days ago -->
+<!-- bx-python: 102, last pushed 47 days ago -->
+<!-- boost-histogram: 78, last pushed 0 days ago -->
+<!-- iDynTree: 75, last pushed 3 days ago -->
+<!-- TgCrypto: 64, last pushed 16 days ago -->
+<!-- pybase64: 62, last pushed 1 days ago -->
+<!-- etebase-py: 50, last pushed 134 days ago -->
+<!-- pyjet: 28, last pushed 6 days ago -->
+<!-- numpythia: 28, last pushed 15 days ago -->
+<!-- fathon: 25, last pushed 65 days ago -->
+<!-- polaroid: 16, last pushed 69 days ago -->
+<!-- GSD: 16, last pushed 1 days ago -->
+<!-- pybind11 scikit_build_example: 14, last pushed 6 days ago -->
+<!-- pyinstrument_cext: 10, last pushed 95 days ago -->
+<!-- xmlstarlet: 7, last pushed 29 days ago -->
+<!-- CorrectionLib: 5, last pushed 5 days ago -->
+<!-- Imagecodecs (fork): 3, last pushed 19 days ago -->
+<!-- SiPM: 2, last pushed 15 days ago -->
 
 <!-- END bin/projects.py -->
 
-> Add your repo here! Let us know on [GitHub Discussions](https://github.com/joerick/cibuildwheel/discussions/485), or send a PR, adding your information to `docs/data/projects.yml`.
+> Add your repo here! Let us know on [GitHub Discussions](https://github.com/pypa/cibuildwheel/discussions/485), or send a PR, adding your information to `docs/data/projects.yml`.
 >
 > <sup>I'd like to include notes here to indicate why an example might be interesting to cibuildwheel users - the styles/technologies/techniques used in each. Please include that in future additions!</sup>
 
@@ -310,6 +346,51 @@ Changelog
 
 <!--changelog-start-->
 
+### v2.0.0 (prerelease)
+
+_This release is currently in prerelease. The below release notes will be condensed into a single entry when we do a final release._
+
+_v2.0.0a1 (1 Jun 2021)_
+
+- 🌟 Added the ability to test building wheels on CPython 3.10! Because CPython 3.10 is in beta, these wheels should not be distributed, because they might not be compatible with the final release, but it's available to build for testing purposes. Use the flag [`--prerelease-pythons` or `CIBW_PRERELEASE_PYTHONS`](https://cibuildwheel.readthedocs.io/en/latest/options/#prerelease-pythons) to test. (#675)
+- ✨ Added the ability to build CPython 3.8 wheels on Apple Silicon. (#704)
+- 🛠 Update to the latest build dependencies, including auditwheel 4. (#633)
+- 🛠 Use the unified pypa/manylinux images to build PyPy (#671)
+- ⚠️ Removed support for building Python 2.7 and Python 3.5 wheels, for both CPython and PyPy. If you still need to build on these versions, please use the latest v1.x version. (#596)
+
+
+### v1.11.1
+
+_28 May 2021_
+
+- ✨ cibuildwheel is now part of the PyPA!
+- 📚 Minor docs changes, fixing links related to the above transition
+- 🛠 Update manylinux pins to the last version containing Python 2.7 and 3.5. (#674)
+
+### v1.11.0
+
+_1 May 2021_
+
+- 📚 Lots of docs improvements! (#650, #623, #616, #609, #606)
+- 🐛 Fix nuget "Package is not found" error on Windows. (#653)
+- ⚠️ cibuildwheel will no longer build Windows 2.7 wheels, unless you specify a custom toolchain using `DISTUTILS_USE_SDK=1` and `MSSdk=1`. This is because Microsoft have stopped distributing Visual C++ Compiler for Python 2.7. See [this FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#windows-and-python-27) for more details. (#649)
+- 🐛 Fix crash on Windows due to missing `which` command (#641).
+
+### v1.10.0
+
+_22 Feb 2021_
+
+- ✨ Added `manylinux_2_24` support. To use these new Debian-based manylinux
+  images, set your [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)
+  options to `manylinux_2_24`.
+- 🛠 On macOS, we now set `MACOSX_DEPLOYMENT_TARGET` in before running
+  `CIBW_BEFORE_ALL`. This is useful when using `CIBW_BEFORE_ALL` to build a
+  shared library.
+- 🛠 An empty `CIBW_BUILD` option is now the same as being unset i.e, `*`.
+  This makes some build matrix configuration easier. (#588)
+- 📚 Neatened up documentation - added tabs to a few places (#576), fixed some
+  formatting issues.
+
 ### v1.9.0
 
 _5 February 2021_
@@ -337,14 +418,16 @@ _5 February 2021_
 
   ```yaml
   - name: Build wheels
-    uses: joerick/cibuildwheel@v1.9.0
+    uses: pypa/cibuildwheel@version # e.g. v1.9.0
     with:
       output-dir: wheelhouse
     # env:
     #   CIBW_SOME_OPTION: value
   ```
+
   This saves a bit of boilerplate, and you can [use Dependabot to keep the
   pinned version up-to-date](https://cibuildwheel.readthedocs.io/en/stable/faq/#automatic-updates).
+
 - ✨ Added `auto64` and `auto32` shortcuts to the
   [CIBW_ARCHS](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)
   option. (#553)
@@ -459,6 +542,7 @@ _9 September 2020_
   [still on Python 3.9b3](https://github.com/pypa/manylinux/issues/758), not a
   release candidate. We'd advise holding off on distributing 3.9 ppc64le wheels
   until a subsequent version of cibuildwheel.
+
 - 🌟 Add Gitlab CI support. Gitlab CI can now build Linux wheels, using
   cibuildwheel. (#419)
 - 🐛 Fix a bug that causes pyproject.toml dependencies to fail to install on
@@ -556,6 +640,7 @@ _2 May 2020_
   options - if you always want to use the latest toolchain, you can still do
   that, or you can specify your own pip constraints file and manylinux image.
   (#256)
+
 - ✨ Added `package_dir` command line option, meaning we now support building
   a package that lives in a subdirectory and pulls in files from the wider
   project. See [the `package_dir` option help](https://cibuildwheel.readthedocs.io/en/stable/options/#command-line-options)
@@ -566,6 +651,7 @@ _2 May 2020_
   will be copied into the Docker container. If your builds are slower on this
   version, that's likely the reason. `cd` to your project and then call
   `cibuildwheel` from there. (#319, #295)
+
 - 🛠 On macOS, we make `MACOSX_DEPLOYMENT_TARGET` default to `10.9` if it's
   not set. This should make things more consistent between Python versions.
 - 🛠 Dependency updates - CPython 3.7.7, CPython 2.7.18, Pypy 7.3.1.
@@ -660,7 +746,7 @@ _26 May 2019_
 - 🌟 Add support for building on Azure pipelines! This lets you build all
   Linux, Mac and Windows wheels on one service, so it promises to be the
   easiest to set up! Check out the quickstart in the docs, or
-  [cibuildwheel-azure-example](https://github.com/joerick/cibuildwheel-azure-example)
+  [cibuildwheel-azure-example](https://github.com/pypa/cibuildwheel-azure-example)
   for an example project. (#126, #132)
 - 🛠 Internal change - the end-to-end test projects format was updated, so we
   can more precisely assert what should be produced for each one. (#136, #137).
@@ -815,6 +901,8 @@ Contributing
 
 For more info on how to contribute to cibuildwheel, see the [docs](https://cibuildwheel.readthedocs.io/en/latest/contributing/).
 
+Everyone interacting with the cibuildwheel project via codebase, issue tracker, chat rooms, or otherwise is expected to follow the [PSF Code of Conduct](https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md).
+
 Maintainers
 -----------
 
@@ -834,9 +922,9 @@ Credits
 
 Massive props also to-
 
-- @zfrenchee for [help debugging many issues](https://github.com/joerick/cibuildwheel/issues/2)
-- @lelit for some great bug reports and [contributions](https://github.com/joerick/cibuildwheel/pull/73)
-- @mayeut for a [phenomenal PR](https://github.com/joerick/cibuildwheel/pull/71) patching Python itself for better compatibility!
+- @zfrenchee for [help debugging many issues](https://github.com/pypa/cibuildwheel/issues/2)
+- @lelit for some great bug reports and [contributions](https://github.com/pypa/cibuildwheel/pull/73)
+- @mayeut for a [phenomenal PR](https://github.com/pypa/cibuildwheel/pull/71) patching Python itself for better compatibility!
 - @czaki for being a super-contributor over many PRs and helping out with countless issues!
 - @mattip for his help with adding PyPy support to cibuildwheel
 

appveyor.yml

@@ -15,19 +15,19 @@ init:
 - cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH%
 - 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-'))) {
+      if (-not ($BRANCH -eq 'main' -or $BRANCH.ToLower().StartsWith('appveyor-'))) {
         $env:PYTEST_ADDOPTS='-k "unit_test or test_0_basic" --suppress-no-test-exit-code'
       }
 
 install: python -m pip install -e ".[dev]" pytest-custom-exit-code
 
 # the '-u' flag is required so the output is in the correct order.
-# See https://github.com/joerick/cibuildwheel/pull/24 for more info.
+# See https://github.com/pypa/cibuildwheel/pull/24 for more info.
 test_script: python -u ./bin/run_tests.py
 
 branches:
   only:
-    - master
+    - main
 
 skip_commits:
   files:

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

bin/bump_version.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 
 
+from __future__ import annotations
+
 import glob
 import os
 import subprocess
@@ -15,55 +17,66 @@ import cibuildwheel
 
 config = [
     # file path, version find/replace format
-    ('README.md', "cibuildwheel=={}"),
-    ('cibuildwheel/__init__.py', "__version__ = '{}'"),
-    ('docs/faq.md', "cibuildwheel=={}"),
-    ('docs/faq.md', "cibuildwheel@v{}"),
-    ('docs/setup.md', "cibuildwheel@v{}"),
-    ('examples/*', "cibuildwheel=={}"),
-    ('examples/*', "cibuildwheel@v{}"),
-    ('setup.cfg', "version = {}"),
+    ("README.md", "cibuildwheel=={}"),
+    ("cibuildwheel/__init__.py", '__version__ = "{}"'),
+    ("docs/faq.md", "cibuildwheel=={}"),
+    ("docs/faq.md", "cibuildwheel@v{}"),
+    ("docs/setup.md", "cibuildwheel=={}"),
+    ("examples/*", "cibuildwheel=={}"),
+    ("examples/*", "cibuildwheel@v{}"),
+    ("setup.cfg", "version = {}"),
 ]
 
+RED = "\u001b[31m"
+GREEN = "\u001b[32m"
+OFF = "\u001b[0m"
+
 
-# This file requires Python 3.7
-# Setting -> None will cause MyPy to notice this.
 @click.command()
-def bump_version():
+def bump_version() -> None:
     current_version = cibuildwheel.__version__
 
     try:
-        commit_date_str = subprocess.run([
-            'git',
-            'show', '-s', '--pretty=format:%ci',
-            f'v{current_version}^{{commit}}'
-        ], check=True, capture_output=True, encoding='utf8').stdout
-        commit_date_parts = commit_date_str.split(' ')
+        commit_date_str = subprocess.run(
+            [
+                "git",
+                "show",
+                "--no-patch",
+                "--pretty=format:%ci",
+                f"v{current_version}^{{commit}}",
+            ],
+            check=True,
+            capture_output=True,
+            encoding="utf8",
+        ).stdout
+        cd_date, cd_time, cd_tz = commit_date_str.split(" ")
 
-        url = 'https://github.com/joerick/cibuildwheel/pulls?' + urllib.parse.urlencode({
-            'q': f'is:pr merged:>{commit_date_parts[0]}T{commit_date_parts[1]}{commit_date_parts[2]}',
-        })
-        print(f'PRs merged since last release:\n  {url}')
+        url_opts = urllib.parse.urlencode({"q": f"is:pr merged:>{cd_date}T{cd_time}{cd_tz}"})
+        url = f"https://github.com/pypa/cibuildwheel/pulls?{url_opts}"
+
+        print(f"PRs merged since last release:\n  {url}")
         print()
     except subprocess.CalledProcessError as e:
         print(e)
-        print('Failed to get previous version tag information.')
+        print("Failed to get previous version tag information.")
 
-    git_changes_result = subprocess.run(['git diff-index --quiet HEAD --'], shell=True)
+    git_changes_result = subprocess.run(["git diff-index --quiet HEAD --"], shell=True)
     repo_has_uncommitted_changes = git_changes_result.returncode != 0
 
     if repo_has_uncommitted_changes:
-        print('error: Uncommitted changes detected.')
+        print("error: Uncommitted changes detected.")
         sys.exit(1)
 
+    # fmt: off
     print(              'Current version:', current_version)  # noqa
     new_version = input('    New version: ').strip()
+    # fmt: on
 
     try:
         Version(new_version)
     except InvalidVersion:
         print("error: This version doesn't conform to PEP440")
-        print('       https://www.python.org/dev/peps/pep-0440/')
+        print("       https://www.python.org/dev/peps/pep-0440/")
         sys.exit(1)
 
     actions = []
@@ -72,7 +85,7 @@ def bump_version():
         paths = [Path(p) for p in glob.glob(path_pattern)]
 
         if not paths:
-            print(f'error: Pattern {path_pattern} didn’t match any files')
+            print(f"error: Pattern {path_pattern} didn't match any files")
             sys.exit(1)
 
         find_pattern = version_pattern.format(current_version)
@@ -80,15 +93,19 @@ def bump_version():
         found_at_least_one_file_needing_update = False
 
         for path in paths:
-            contents = path.read_text(encoding='utf8')
+            contents = path.read_text(encoding="utf8")
             if find_pattern in contents:
                 found_at_least_one_file_needing_update = True
                 actions.append(
-                    (path, find_pattern, replace_pattern)
+                    (
+                        path,
+                        find_pattern,
+                        replace_pattern,
+                    )
                 )
 
         if not found_at_least_one_file_needing_update:
-            print(f'error: Didn’t find any occurrences of “{find_pattern}” in “{path_pattern}”')
+            print(f'''error: Didn't find any occurrences of "{find_pattern}" in "{path_pattern}"''')
             sys.exit(1)
 
     print()
@@ -96,48 +113,53 @@ def bump_version():
     print()
 
     for action in actions:
-        print('{}  {red}{}{off} → {green}{}{off}'.format(
-            *action,
-            red="\u001b[31m", green="\u001b[32m", off="\u001b[0m"
-        ))
+        path, find, replace = action
+        print(f"{path}  {RED}{find}{OFF} → {GREEN}{replace}{OFF}")
 
-    print(f'Then commit, and tag as v{new_version}')
+    print(f"Then commit, and tag as v{new_version}")
 
-    answer = input('Proceed? [y/N] ').strip()
+    answer = input("Proceed? [y/N] ").strip()
 
-    if answer != 'y':
-        print('Aborted')
+    if answer != "y":
+        print("Aborted")
         sys.exit(1)
 
     for path, find, replace in actions:
-        contents = path.read_text(encoding='utf8')
+        contents = path.read_text(encoding="utf8")
         contents = contents.replace(find, replace)
-        path.write_text(contents, encoding='utf8')
+        path.write_text(contents, encoding="utf8")
 
-    print('Files updated. If you want to update the changelog as part of this')
-    print('commit, do that now.')
+    print("Files updated. If you want to update the changelog as part of this")
+    print("commit, do that now.")
     print()
 
-    while input('Type "done" to continue: ').strip().lower() != 'done':
+    while input('Type "done" to continue: ').strip().lower() != "done":
         pass
 
-    subprocess.run([
-        'git', 'commit',
-        '-a',
-        '-m', f'Bump version: v{new_version}'
-    ], check=True)
+    subprocess.run(
+        [
+            "git",
+            "commit",
+            "--all",
+            f"--message=Bump version: v{new_version}",
+        ],
+        check=True,
+    )
 
-    subprocess.run([
-        'git', 'tag',
-        '-a',
-        '-m', f'v{new_version}',
-        f'v{new_version}'
-    ], check=True)
+    subprocess.run(
+        [
+            "git",
+            "tag",
+            "--annotate",
+            f"--message=v{new_version}",
+            f"v{new_version}",
+        ],
+        check=True,
+    )
 
-    print('Done.')
+    print("Done.")
 
 
-if __name__ == '__main__':
-    os.chdir(os.path.dirname(__file__))
-    os.chdir('..')
+if __name__ == "__main__":
+    os.chdir(Path(__file__).parent.parent.resolve())
     bump_version()

bin/make_dependency_update_pr.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 
+from __future__ import annotations
+
 import os
 import sys
 import textwrap
@@ -15,62 +17,66 @@ def shell(cmd, **kwargs):
 
 
 def git_repo_has_changes():
-    unstaged_changes = shell('git diff-index --quiet HEAD --').returncode != 0
-    staged_changes = shell('git diff-index --quiet --cached HEAD --').returncode != 0
+    unstaged_changes = shell("git diff-index --quiet HEAD --").returncode != 0
+    staged_changes = shell("git diff-index --quiet --cached HEAD --").returncode != 0
     return unstaged_changes or staged_changes
 
 
 @click.command()
 def main():
-    project_root = Path(__file__).parent / '..'
+    project_root = Path(__file__).parent / ".."
     os.chdir(project_root)
 
     if git_repo_has_changes():
-        print('Your git repo has uncommitted changes. Commit or stash before continuing.')
+        print("Your git repo has uncommitted changes. Commit or stash before continuing.")
         sys.exit(1)
 
-    previous_branch = shell('git rev-parse --abbrev-ref HEAD',
-                            check=True,
-                            capture_output=True,
-                            encoding='utf8').stdout.strip()
+    previous_branch = shell(
+        "git rev-parse --abbrev-ref HEAD", check=True, capture_output=True, encoding="utf8"
+    ).stdout.strip()
 
-    shell('git fetch origin', check=True)
+    shell("git fetch origin", check=True)
 
-    timestamp = time.strftime('%Y-%m-%dT%H-%M-%S', time.gmtime())
-    branch_name = f'update-constraints-{timestamp}'
+    timestamp = time.strftime("%Y-%m-%dT%H-%M-%S", time.gmtime())
+    branch_name = f"update-constraints-{timestamp}"
 
-    shell(f'git checkout -b {branch_name} origin/master', check=True)
+    shell(f"git checkout -b {branch_name} origin/main", check=True)
 
     try:
-        shell('bin/update_dependencies.py', check=True)
+        shell("bin/update_dependencies.py", check=True)
 
         if not git_repo_has_changes():
-            print('Done: no constraint updates required.')
+            print("Done: no constraint updates required.")
             return
 
         shell('git commit -a -m "Update dependencies"', check=True)
+        body = textwrap.dedent(
+            f"""
+            Update the versions of our dependencies.
+
+            PR generated by `{os.path.basename(__file__)}`.
+            """
+        )
         run(
             [
-                'gh', 'pr', 'create',
-                '--repo', 'joerick/cibuildwheel',
-                '--base', 'master',
-                '--title', 'Update dependencies',
-                '--body', textwrap.dedent(f'''
-                    Update the versions of our dependencies.
-
-                    PR generated by `{os.path.basename(__file__)}`.
-                ''')
+                "gh",
+                "pr",
+                "create",
+                "--repo=pypa/cibuildwheel",
+                "--base=main",
+                "--title=Update dependencies",
+                f"--body='{body}'",
             ],
-            check=True
+            check=True,
         )
 
-        print('Done.')
+        print("Done.")
     finally:
         # remove any local changes
-        shell('git checkout -- .')
-        shell(f'git checkout {previous_branch}', check=True)
-        shell(f'git branch -D --force {branch_name}', check=True)
+        shell("git checkout -- .")
+        shell(f"git checkout {previous_branch}", check=True)
+        shell(f"git branch -D --force {branch_name}", check=True)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main.main(standalone_mode=True)

bin/projects.py

@@ -9,14 +9,17 @@ Suggested usage:
     git diff
 """
 
+from __future__ import annotations
+
 import builtins
 import functools
+import textwrap
 import urllib.request
 import xml.dom.minidom
 from datetime import datetime
 from io import StringIO
 from pathlib import Path
-from typing import Any, Dict, List, Optional, TextIO
+from typing import Any, TextIO
 
 import click
 import yaml
@@ -38,7 +41,7 @@ ICONS = (
 class Project:
     NAME: int = 0
 
-    def __init__(self, config: Dict[str, Any], github: Optional[Github] = None):
+    def __init__(self, config: dict[str, Any], github: Github | None = None):
         try:
             self.name: str = config["name"]
             self.gh: str = config["gh"]
@@ -48,8 +51,8 @@ class Project:
 
         self.stars_repo: str = config.get("stars", self.gh)
         self.notes: str = config.get("notes", "")
-        self.ci: List[str] = config.get("ci", [])
-        self.os: List[str] = config.get("os", [])
+        self.ci: list[str] = config.get("ci", [])
+        self.os: list[str] = config.get("os", [])
 
         self.online = github is not None
         if github is not None:
@@ -72,7 +75,7 @@ class Project:
         name_len = len(self.name) + 4
         self.__class__.NAME = max(self.__class__.NAME, name_len)
 
-    def __lt__(self, other: "Project") -> bool:
+    def __lt__(self, other: Project) -> bool:
         if self.online:
             return self.num_stars < other.num_stars
         else:
@@ -80,9 +83,10 @@ class Project:
 
     @classmethod
     def header(cls) -> str:
-        return (
-            f"| {'Name':{cls.NAME}} | CI | OS | Notes |\n"
-            f"|{'':-^{cls.NAME+2  }}|----|----|:------|"
+        return textwrap.dedent(
+            f"""\
+                | {'Name':{cls.NAME}} | CI | OS | Notes |
+                |{'':-^{cls.NAME+2  }}|----|----|:------|"""
         )
 
     @property
@@ -106,7 +110,7 @@ class Project:
         return " ".join(f"![{icon} icon][]" for icon in self.os)
 
     def table_row(self) -> str:
-        notes = self.notes.replace('\n', ' ')
+        notes = self.notes.replace("\n", " ")
         return f"| {self.namelink: <{self.NAME}} | {self.ci_icons} | {self.os_icons} | {notes} |"
 
     def links(self) -> str:
@@ -118,29 +122,32 @@ class Project:
 
 
 def fetch_icon(icon_name: str) -> None:
-    url = f'https://cdn.jsdelivr.net/npm/simple-icons@v4/icons/{icon_name}.svg'
+    url = f"https://cdn.jsdelivr.net/npm/simple-icons@v4/icons/{icon_name}.svg"
     with urllib.request.urlopen(url) as f:
         original_svg_data = f.read()
 
     document = xml.dom.minidom.parseString(original_svg_data)
     svgElement = document.documentElement
-    assert svgElement.nodeName == 'svg'
-    svgElement.setAttribute('width', '16px')
-    svgElement.setAttribute('fill', '#606060')
+    assert svgElement.nodeName == "svg"
+    svgElement.setAttribute("width", "16px")
+    svgElement.setAttribute("fill", "#606060")
 
     icon_path = path_for_icon(icon_name)
     icon_path.parent.mkdir(parents=True, exist_ok=True)
 
-    with open(path_for_icon(icon_name), 'w') as f:
+    with open(path_for_icon(icon_name), "w") as f:
         f.write(svgElement.toxml())
 
 
 def path_for_icon(icon_name: str) -> Path:
-    return Path('.') / 'docs' / 'data' / 'readme_icons' / f'{icon_name}.svg'
+    return Path(".") / "docs" / "data" / "readme_icons" / f"{icon_name}.svg"
 
 
 def str_projects(
-    config: List[Dict[str, Any]], *, online: bool = True, auth: Optional[str] = None
+    config: list[dict[str, Any]],
+    *,
+    online: bool = True,
+    auth: str | None = None,
 ) -> str:
     io = StringIO()
     print = functools.partial(builtins.print, file=io)
@@ -178,7 +185,10 @@ def str_projects(
 @click.option("--auth", help="GitHub authentication token")
 @click.option("--readme", type=click.File("r+"), help="Modify a readme file if given")
 def projects(
-    input: TextIO, online: bool, auth: Optional[str], readme: Optional[TextIO]
+    input: TextIO,
+    online: bool,
+    auth: str | None,
+    readme: TextIO | None,
 ) -> None:
     config = yaml.safe_load(input)
     output = str_projects(config, online=online, auth=auth)
@@ -190,7 +200,7 @@ def projects(
         start_str = "<!-- START bin/projects.py -->\n"
         start = text.find(start_str)
         end = text.find("<!-- END bin/projects.py -->\n")
-        generated_note = f'<!-- this section is generated by bin/projects.py. Don\'t edit it directly, instead, edit {input.name} -->'
+        generated_note = f"<!-- this section is generated by bin/projects.py. Don't edit it directly, instead, edit {input.name} -->"
         new_text = f"{text[:start + len(start_str)]}\n{generated_note}\n\n{output}\n{text[end:]}"
 
         readme.seek(0)

bin/run_example_ci_configs.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 
+from __future__ import annotations
+
 import os
 import shutil
 import sys
@@ -19,99 +21,98 @@ def shell(cmd, **kwargs):
 
 
 def git_repo_has_changes():
-    unstaged_changes = shell('git diff-index --quiet HEAD --').returncode != 0
-    staged_changes = shell('git diff-index --quiet --cached HEAD --').returncode != 0
+    unstaged_changes = shell("git diff-index --quiet HEAD --").returncode != 0
+    staged_changes = shell("git diff-index --quiet --cached HEAD --").returncode != 0
     return unstaged_changes or staged_changes
 
 
 def generate_basic_project(path):
-    sys.path.insert(0, '')
+    sys.path.insert(0, "")
     from test.test_projects.c import new_c_project
 
     project = new_c_project()
     project.generate(path)
 
 
-CIService = namedtuple('CIService', 'name dst_config_path badge_md')
+CIService = namedtuple("CIService", "name dst_config_path badge_md")
 services = [
     CIService(
-        name='appveyor',
-        dst_config_path='appveyor.yml',
-        badge_md='[![Build status](https://ci.appveyor.com/api/projects/status/wbsgxshp05tt1tif/branch/{branch}?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/{branch})',
+        name="appveyor",
+        dst_config_path="appveyor.yml",
+        badge_md="[![Build status](https://ci.appveyor.com/api/projects/status/wbsgxshp05tt1tif/branch/{branch}?svg=true)](https://ci.appveyor.com/project/pypa/cibuildwheel/branch/{branch})",
     ),
     CIService(
-        name='azure-pipelines',
-        dst_config_path='azure-pipelines.yml',
-        badge_md='[![Build Status](https://dev.azure.com/joerick0429/cibuildwheel/_apis/build/status/joerick.cibuildwheel?branchName={branch})](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=2&branchName={branch})',
+        name="azure-pipelines",
+        dst_config_path="azure-pipelines.yml",
+        badge_md="[![Build Status](https://dev.azure.com/joerick0429/cibuildwheel/_apis/build/status/joerick.cibuildwheel?branchName={branch})](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=2&branchName={branch})",
     ),
     CIService(
-        name='circleci',
-        dst_config_path='.circleci/config.yml',
-        badge_md='[![CircleCI](https://circleci.com/gh/joerick/cibuildwheel/tree/{branch_escaped}.svg?style=svg)](https://circleci.com/gh/joerick/cibuildwheel/tree/{branch})',
+        name="circleci",
+        dst_config_path=".circleci/config.yml",
+        badge_md="[![CircleCI](https://circleci.com/gh/pypa/cibuildwheel/tree/{branch_escaped}.svg?style=svg)](https://circleci.com/gh/pypa/cibuildwheel/tree/{branch})",
     ),
     CIService(
-        name='github',
-        dst_config_path='.github/workflows/example.yml',
-        badge_md='[![Build](https://github.com/joerick/cibuildwheel/workflows/Build/badge.svg?branch={branch})](https://github.com/joerick/cibuildwheel/actions)',
+        name="github",
+        dst_config_path=".github/workflows/example.yml",
+        badge_md="[![Build](https://github.com/pypa/cibuildwheel/workflows/Build/badge.svg?branch={branch})](https://github.com/pypa/cibuildwheel/actions)",
     ),
     CIService(
-        name='travis-ci',
-        dst_config_path='.travis.yml',
-        badge_md='[![Build Status](https://travis-ci.org/joerick/cibuildwheel.svg?branch={branch})](https://travis-ci.org/joerick/cibuildwheel)',
+        name="travis-ci",
+        dst_config_path=".travis.yml",
+        badge_md="[![Build Status](https://travis-ci.org/pypa/cibuildwheel.svg?branch={branch})](https://travis-ci.org/pypa/cibuildwheel)",
     ),
     CIService(
-        name='gitlab',
-        dst_config_path='.gitlab-ci.yml',
-        badge_md='[![Gitlab](https://gitlab.com/joerick/cibuildwheel/badges/{branch}/pipeline.svg)](https://gitlab.com/joerick/cibuildwheel/-/commits/{branch})'
+        name="gitlab",
+        dst_config_path=".gitlab-ci.yml",
+        badge_md="[![Gitlab](https://gitlab.com/pypa/cibuildwheel/badges/{branch}/pipeline.svg)](https://gitlab.com/pypa/cibuildwheel/-/commits/{branch})",
     ),
 ]
 
 
 def ci_service_for_config_file(config_file):
-    service_name = Path(config_file).name.rsplit('-', 1)[0]
+    service_name = Path(config_file).name.rsplit("-", 1)[0]
 
     for service in services:
         if service.name == service_name:
             return service
 
-    raise ValueError(f'unknown ci service for config file {config_file}')
+    raise ValueError(f"unknown ci service for config file {config_file}")
 
 
 @click.command()
-@click.argument('config_files', nargs=-1, type=click.Path())
+@click.argument("config_files", nargs=-1, type=click.Path())
 def run_example_ci_configs(config_files=None):
-    '''
-        Test the example configs. If no files are specified, will test
-        examples/*-minimal.yml
-    '''
+    """
+    Test the example configs. If no files are specified, will test
+    examples/*-minimal.yml
+    """
 
     if len(config_files) == 0:
-        config_files = glob('examples/*-minimal.yml')
+        config_files = glob("examples/*-minimal.yml")
 
     # check each CI service has at most 1 config file
     configs_by_service = {}
     for config_file in config_files:
         service = ci_service_for_config_file(config_file)
         if service.name in configs_by_service:
-            raise Exception('You cannot specify more than one config per CI service')
+            raise Exception("You cannot specify more than one config per CI service")
         configs_by_service[service.name] = config_file
 
     if git_repo_has_changes():
-        print('Your git repo has uncommitted changes. Commit or stash before continuing.')
+        print("Your git repo has uncommitted changes. Commit or stash before continuing.")
         sys.exit(1)
 
-    previous_branch = shell('git rev-parse --abbrev-ref HEAD',
-                            check=True,
-                            capture_output=True,
-                            encoding='utf8').stdout.strip()
+    previous_branch = shell(
+        "git rev-parse --abbrev-ref HEAD", check=True, capture_output=True, encoding="utf8"
+    ).stdout.strip()
 
-    timestamp = time.strftime('%Y-%m-%dT%H-%M-%S', time.gmtime())
-    branch_name = f'example-config-test---{previous_branch}-{timestamp}'
+    timestamp = time.strftime("%Y-%m-%dT%H-%M-%S", time.gmtime())
+    branch_name = f"example-config-test---{previous_branch}-{timestamp}"
 
     try:
-        shell(f'git checkout --orphan {branch_name}', check=True)
+        shell(f"git checkout --orphan {branch_name}", check=True)
 
-        example_project = Path('example_root')
+        example_project = Path("example_root")
         generate_basic_project(example_project)
 
         for config_file in config_files:
@@ -122,41 +123,46 @@ def run_example_ci_configs(config_files=None):
             dst_config_file.parent.mkdir(parents=True, exist_ok=True)
             shutil.copyfile(src_config_file, dst_config_file)
 
-        run(['git', 'add', example_project], check=True)
-        run(['git', 'commit', '--no-verify', '-m', textwrap.dedent(f'''
+        run(["git", "add", example_project], check=True)
+        message = textwrap.dedent(
+            f"""\
             Test example minimal configs
 
             Testing files: {config_files}
             Generated from branch: {previous_branch}
             Time: {timestamp}
-        ''')], check=True)
-        shell(f'git subtree --prefix={example_project} push origin {branch_name}', check=True)
+            """
+        )
+        run(["git", "commit", "--no-verify", "--message", message], check=True)
+        shell(f"git subtree --prefix={example_project} push origin {branch_name}", check=True)
 
-        print('---')
+        print("---")
         print()
-        print('> **Examples test run**')
-        print('> ')
-        print(f'> Branch: [{branch_name}](https://github.com/joerick/cibuildwheel/tree/{branch_name})')
-        print('> ')
-        print('> | Service | Config | Status |')
-        print('> |---|---|---|')
+        print("> **Examples test run**")
+        print("> ")
+        print(f"> Branch: [{branch_name}](https://github.com/pypa/cibuildwheel/tree/{branch_name})")
+        print("> ")
+        print("> | Service | Config | Status |")
+        print("> |---|---|---|")
         for config_file in config_files:
             service = ci_service_for_config_file(config_file)
-            badge = service.badge_md.format(branch=branch_name, branch_escaped=quote(branch_name, safe=''))
-            print(f'> | {service.name} | `{config_file}` | {badge} |')
-        print('> ')
-        print('> Generated by `bin/run_example_ci_config.py`')
+            badge = service.badge_md.format(
+                branch=branch_name, branch_escaped=quote(branch_name, safe="")
+            )
+            print(f"> | {service.name} | `{config_file}` | {badge} |")
+        print("> ")
+        print("> Generated by `bin/run_example_ci_config.py`")
         print()
-        print('---')
+        print("---")
     finally:
         # remove any local changes
         shutil.rmtree(example_project, ignore_errors=True)
-        shell('git checkout -- .')
-        shell(f'git checkout {previous_branch}', check=True)
-        shell(f'git branch -D --force {branch_name}', check=True)
+        shell("git checkout -- .")
+        shell(f"git checkout {previous_branch}", check=True)
+        shell(f"git branch -D --force {branch_name}", check=True)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     os.chdir(os.path.dirname(__file__))
-    os.chdir('..')
+    os.chdir("..")
     run_example_ci_configs(standalone_mode=True)

bin/run_tests.py

@@ -5,16 +5,19 @@ import subprocess
 import sys
 from pathlib import Path
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     # move cwd to the project root
     os.chdir(Path(__file__).resolve().parents[1])
 
     # run the unit tests
-    unit_test_args = [sys.executable, '-m', 'pytest', 'unit_test']
+    unit_test_args = [sys.executable, "-m", "pytest", "unit_test"]
     # run the docker unit tests only on Linux
-    if sys.platform.startswith('linux'):
-        unit_test_args += ['--run-docker']
-    subprocess.check_call(unit_test_args)
+    if sys.platform.startswith("linux"):
+        unit_test_args += ["--run-docker"]
+    subprocess.run(unit_test_args, check=True)
 
     # run the integration tests
-    subprocess.check_call([sys.executable, '-m', 'pytest', '-x', '--durations', '0', '--timeout=2400', 'test'])
+    subprocess.run(
+        [sys.executable, "-m", "pytest", "-x", "--durations", "0", "--timeout=2400", "test"],
+        check=True,
+    )

bin/sample_build.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 
+from __future__ import annotations
+
 import argparse
 import os
 import subprocess
@@ -7,19 +9,19 @@ import sys
 import tempfile
 from pathlib import Path
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     # move cwd to the project root
     os.chdir(Path(__file__).resolve().parents[1])
 
-    parser = argparse.ArgumentParser(description='Runs a sample build')
-    parser.add_argument('project_python_path', nargs='?', default='test.test_0_basic.basic_project')
+    parser = argparse.ArgumentParser(description="Runs a sample build")
+    parser.add_argument("project_python_path", nargs="?", default="test.test_0_basic.basic_project")
 
     options = parser.parse_args()
 
     project_dir = tempfile.mkdtemp()
-    subprocess.run([
-        sys.executable, '-m', 'test.test_projects',
-        options.project_python_path, project_dir
-    ], check=True)
+    subprocess.run(
+        [sys.executable, "-m", "test.test_projects", options.project_python_path, project_dir],
+        check=True,
+    )
 
-    sys.exit(subprocess.run([sys.executable, '-m', 'cibuildwheel'], cwd=project_dir).returncode)
+    sys.exit(subprocess.run([sys.executable, "-m", "cibuildwheel"], cwd=project_dir).returncode)

bin/update_dependencies.py

@@ -1,119 +1,40 @@
 #!/usr/bin/env python3
+# This file supports 3.6+
 
-import configparser
 import os
 import shutil
 import subprocess
 import sys
-from collections import namedtuple
+from pathlib import Path
 
-import requests
+DIR = Path(__file__).parent.resolve()
+RESOURCES = DIR.parent / "cibuildwheel/resources"
 
-os.chdir(os.path.dirname(__file__))
-os.chdir('..')
+python_version = "".join(str(v) for v in sys.version_info[:2])
+
+env = os.environ.copy()
 
 # CUSTOM_COMPILE_COMMAND is a pip-compile option that tells users how to
 # regenerate the constraints files
-os.environ['CUSTOM_COMPILE_COMMAND'] = "bin/update_dependencies.py"
+env["CUSTOM_COMPILE_COMMAND"] = "bin/update_dependencies.py"
 
-PYTHON_VERSIONS = ['27', '35', '36', '37', '38', '39']
+os.chdir(DIR.parent)
 
-if '--no-docker' in sys.argv:
-    for python_version in PYTHON_VERSIONS:
-        subprocess.check_call([
-            f'./env{python_version}/bin/pip-compile',
-            '--allow-unsafe',
-            '--upgrade',
-            'cibuildwheel/resources/constraints.in',
-            '--output-file', f'cibuildwheel/resources/constraints-python{python_version}.txt'
-        ])
-else:
-    image_runner = 'quay.io/pypa/manylinux2010_x86_64:latest'
-    subprocess.check_call(['docker', 'pull', image_runner])
-    for python_version in PYTHON_VERSIONS:
-        abi_flags = '' if int(python_version) >= 38 else 'm'
-        python_path = f'/opt/python/cp{python_version}-cp{python_version}{abi_flags}/bin/'
-        subprocess.check_call([
-            'docker', 'run', '--rm',
-            '-e', 'CUSTOM_COMPILE_COMMAND',
-            '-v', f'{os.getcwd()}:/volume',
-            '--workdir', '/volume', image_runner,
-            'bash', '-c',
-            f'{python_path}pip install pip-tools &&'
-            f'{python_path}pip-compile --allow-unsafe --upgrade '
-            'cibuildwheel/resources/constraints.in '
-            f'--output-file cibuildwheel/resources/constraints-python{python_version}.txt'
-        ])
+subprocess.run(
+    [
+        "pip-compile",
+        "--allow-unsafe",
+        "--upgrade",
+        "cibuildwheel/resources/constraints.in",
+        f"--output-file=cibuildwheel/resources/constraints-python{python_version}.txt",
+    ],
+    check=True,
+    env=env,
+)
 
 # default constraints.txt
-shutil.copyfile(f'cibuildwheel/resources/constraints-python{PYTHON_VERSIONS[-1]}.txt', 'cibuildwheel/resources/constraints.txt')
-
-Image = namedtuple('Image', [
-    'manylinux_version',
-    'platform',
-    'image_name',
-])
-
-images = [
-    Image('manylinux1', 'x86_64', 'quay.io/pypa/manylinux1_x86_64'),
-    Image('manylinux1', 'i686', 'quay.io/pypa/manylinux1_i686'),
-
-    Image('manylinux2010', 'x86_64', 'quay.io/pypa/manylinux2010_x86_64'),
-    Image('manylinux2010', 'i686', 'quay.io/pypa/manylinux2010_i686'),
-    Image('manylinux2010', 'pypy_x86_64', 'pypywheels/manylinux2010-pypy_x86_64'),
-
-    Image('manylinux2014', 'x86_64', 'quay.io/pypa/manylinux2014_x86_64'),
-    Image('manylinux2014', 'i686', 'quay.io/pypa/manylinux2014_i686'),
-    Image('manylinux2014', 'aarch64', 'quay.io/pypa/manylinux2014_aarch64'),
-    Image('manylinux2014', 'ppc64le', 'quay.io/pypa/manylinux2014_ppc64le'),
-    Image('manylinux2014', 's390x', 'quay.io/pypa/manylinux2014_s390x'),
-]
-
-config = configparser.ConfigParser()
-
-for image in images:
-    # get the tag name whose digest matches 'latest'
-    if image.image_name.startswith('quay.io/'):
-        _, _, repository_name = image.image_name.partition('/')
-        response = requests.get(
-            f'https://quay.io/api/v1/repository/{repository_name}?includeTags=true'
-        )
-        response.raise_for_status()
-        repo_info = response.json()
-        tags_dict = repo_info['tags']
-
-        latest_tag = tags_dict.pop('latest')
-        # find the tag whose manifest matches 'latest'
-        tag_name = next(
-            name
-            for (name, info) in tags_dict.items()
-            if info['manifest_digest'] == latest_tag['manifest_digest']
-        )
-    else:
-        response = requests.get(
-            f'https://hub.docker.com/v2/repositories/{image.image_name}/tags'
-        )
-        response.raise_for_status()
-        tags = response.json()['results']
-
-        latest_tag = next(
-            tag for tag in tags if tag['name'] == 'latest'
-        )
-        # i don't know what it would mean to have multiple images per tag
-        assert len(latest_tag['images']) == 1
-        digest = latest_tag['images'][0]['digest']
-
-        pinned_tag = next(
-            tag
-            for tag in tags
-            if tag != latest_tag and tag['images'][0]['digest'] == digest
-        )
-        tag_name = pinned_tag['name']
-
-    if not config.has_section(image.platform):
-        config[image.platform] = {}
-
-    config[image.platform][image.manylinux_version] = f'{image.image_name}:{tag_name}'
-
-with open('cibuildwheel/resources/pinned_docker_images.cfg', 'w') as f:
-    config.write(f)
+if python_version == "39":
+    shutil.copyfile(
+        RESOURCES / f"constraints-python{python_version}.txt",
+        RESOURCES / "constraints.txt",
+    )

bin/update_docker.py

@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import configparser
+from pathlib import Path
+from typing import NamedTuple
+
+import requests
+
+DIR = Path(__file__).parent.resolve()
+RESOURCES = DIR.parent / "cibuildwheel/resources"
+
+
+class Image(NamedTuple):
+    manylinux_version: str
+    platform: str
+    image_name: str
+    tag: str | None  # Set this to pin the image
+
+
+images = [
+    Image("manylinux1", "x86_64", "quay.io/pypa/manylinux1_x86_64", None),
+    Image("manylinux1", "i686", "quay.io/pypa/manylinux1_i686", None),
+    # 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", "quay.io/pypa/manylinux2010_x86_64", None),
+    Image("manylinux2010", "pypy_i686", "quay.io/pypa/manylinux2010_i686", None),
+    # 2014 images
+    Image("manylinux2014", "x86_64", "quay.io/pypa/manylinux2014_x86_64", None),
+    Image("manylinux2014", "i686", "quay.io/pypa/manylinux2014_i686", None),
+    Image("manylinux2014", "aarch64", "quay.io/pypa/manylinux2014_aarch64", None),
+    Image("manylinux2014", "ppc64le", "quay.io/pypa/manylinux2014_ppc64le", None),
+    Image("manylinux2014", "s390x", "quay.io/pypa/manylinux2014_s390x", None),
+    Image("manylinux2014", "pypy_x86_64", "quay.io/pypa/manylinux2014_x86_64", None),
+    Image("manylinux2014", "pypy_i686", "quay.io/pypa/manylinux2014_i686", None),
+    Image("manylinux2014", "pypy_aarch64", "quay.io/pypa/manylinux2014_aarch64", None),
+    # 2_24 images
+    Image("manylinux_2_24", "x86_64", "quay.io/pypa/manylinux_2_24_x86_64", None),
+    Image("manylinux_2_24", "i686", "quay.io/pypa/manylinux_2_24_i686", None),
+    Image("manylinux_2_24", "aarch64", "quay.io/pypa/manylinux_2_24_aarch64", None),
+    Image("manylinux_2_24", "ppc64le", "quay.io/pypa/manylinux_2_24_ppc64le", None),
+    Image("manylinux_2_24", "s390x", "quay.io/pypa/manylinux_2_24_s390x", None),
+    Image("manylinux_2_24", "pypy_x86_64", "quay.io/pypa/manylinux_2_24_x86_64", None),
+    Image("manylinux_2_24", "pypy_i686", "quay.io/pypa/manylinux_2_24_i686", None),
+    Image("manylinux_2_24", "pypy_aarch64", "quay.io/pypa/manylinux_2_24_aarch64", None),
+]
+
+config = configparser.ConfigParser()
+
+for image in images:
+    # get the tag name whose digest matches 'latest'
+    if image.tag is not None:
+        # image has been pinned, do not update
+        tag_name = image.tag
+    elif image.image_name.startswith("quay.io/"):
+        _, _, repository_name = image.image_name.partition("/")
+        response = requests.get(
+            f"https://quay.io/api/v1/repository/{repository_name}?includeTags=true"
+        )
+        response.raise_for_status()
+        repo_info = response.json()
+        tags_dict = repo_info["tags"]
+
+        latest_tag = tags_dict.pop("latest")
+        # find the tag whose manifest matches 'latest'
+        tag_name = next(
+            name
+            for (name, info) in tags_dict.items()
+            if info["manifest_digest"] == latest_tag["manifest_digest"]
+        )
+    else:
+        response = requests.get(f"https://hub.docker.com/v2/repositories/{image.image_name}/tags")
+        response.raise_for_status()
+        tags = response.json()["results"]
+
+        latest_tag = next(tag for tag in tags if tag["name"] == "latest")
+        # i don't know what it would mean to have multiple images per tag
+        assert len(latest_tag["images"]) == 1
+        digest = latest_tag["images"][0]["digest"]
+
+        pinned_tag = next(
+            tag for tag in tags if tag != latest_tag and tag["images"][0]["digest"] == digest
+        )
+        tag_name = pinned_tag["name"]
+
+    if not config.has_section(image.platform):
+        config[image.platform] = {}
+
+    config[image.platform][image.manylinux_version] = f"{image.image_name}:{tag_name}"
+
+with open(RESOURCES / "pinned_docker_images.cfg", "w") as f:
+    config.write(f)

bin/update_pythons.py

@@ -1,10 +1,12 @@
 #!/usr/bin/env python3
 
+from __future__ import annotations
+
 import copy
 import difflib
 import logging
 from pathlib import Path
-from typing import Dict, Optional, Union
+from typing import Any, Iterable, Union, cast
 
 import click
 import requests
@@ -77,26 +79,28 @@ class WindowsVersions:
         response.raise_for_status()
         cp_info = response.json()
 
-        versions = (Version(v) for v in cp_info["versions"])
-        self.versions = sorted(v for v in versions if not v.is_devrelease)
+        self.version_dict = {Version(v): v for v in cp_info["versions"]}
+
+    def update_version_windows(self, spec: Specifier) -> ConfigWinCP | None:
+
+        # Specifier.filter selects all non pre-releases that match the spec,
+        # unless there are only pre-releases, then it selects pre-releases
+        # instead (like pip)
+        unsorted_versions = cast(Iterable[Version], spec.filter(self.version_dict))
+        versions = sorted(unsorted_versions, reverse=True)
 
-    def update_version_windows(self, spec: Specifier) -> Optional[ConfigWinCP]:
-        versions = sorted(v for v in self.versions if spec.contains(v))
-        if not all(v.is_prerelease for v in versions):
-            versions = [v for v in versions if not v.is_prerelease]
         log.debug(f"Windows {self.arch} {spec} has {', '.join(str(v) for v in versions)}")
 
         if not versions:
             return None
 
-        version = versions[-1]
+        version = versions[0]
         identifier = f"cp{version.major}{version.minor}-{self.arch}"
-        result = ConfigWinCP(
+        return ConfigWinCP(
             identifier=identifier,
-            version=str(version),
+            version=self.version_dict[version],
             arch=self.arch_str,
         )
-        return result
 
 
 class PyPyVersions:
@@ -111,30 +115,39 @@ class PyPyVersions:
             release["python_version"] = Version(release["python_version"])
 
         self.releases = [
-            r for r in releases if not r["pypy_version"].is_prerelease and not r["pypy_version"].is_devrelease
+            r
+            for r in releases
+            if not r["pypy_version"].is_prerelease and not r["pypy_version"].is_devrelease
         ]
         self.arch = arch_str
 
-    def update_version_windows(self, spec: Specifier) -> ConfigWinCP:
-        if self.arch != "32":
-            raise RuntimeError("64 bit releases not supported yet on Windows")
+    def get_arch_file(self, release: dict[str, Any]) -> str:
+        urls = [
+            rf["download_url"]
+            for rf in release["files"]
+            if "" in rf["platform"] == f"win{self.arch}"
+        ]
+        return urls[0] if urls else ""
 
+    def update_version_windows(self, spec: Specifier) -> ConfigWinCP:
         releases = [r for r in self.releases if spec.contains(r["python_version"])]
         releases = sorted(releases, key=lambda r: r["pypy_version"])
+        releases = [r for r in releases if self.get_arch_file(r)]
 
         if not releases:
             raise RuntimeError(f"PyPy Win {self.arch} not found for {spec}! {self.releases}")
 
+        version_arch = "win32" if self.arch == "32" else "win_amd64"
+
         release = releases[-1]
         version = release["python_version"]
-        identifier = f"pp{version.major}{version.minor}-win32"
-
-        (url,) = [rf["download_url"] for rf in release["files"] if "" in rf["platform"] == "win32"]
+        identifier = f"pp{version.major}{version.minor}-{version_arch}"
+        url = self.get_arch_file(release)
 
         return ConfigWinPP(
             identifier=identifier,
             version=f"{version.major}.{version.minor}",
-            arch="32",
+            arch=self.arch,
             url=url,
         )
 
@@ -152,9 +165,11 @@ class PyPyVersions:
         version = release["python_version"]
         identifier = f"pp{version.major}{version.minor}-macosx_x86_64"
 
-        (url,) = [
-            rf["download_url"] for rf in release["files"] if "" in rf["platform"] == "darwin" and rf["arch"] == "x64"
-        ]
+        (url,) = (
+            rf["download_url"]
+            for rf in release["files"]
+            if "" in rf["platform"] == "darwin" and rf["arch"] == "x64"
+        )
 
         return ConfigMacOS(
             identifier=identifier,
@@ -166,39 +181,50 @@ class PyPyVersions:
 class CPythonVersions:
     def __init__(self) -> None:
 
-        response = requests.get("https://www.python.org/api/v2/downloads/release/?is_published=true")
+        response = requests.get(
+            "https://www.python.org/api/v2/downloads/release/?is_published=true"
+        )
         response.raise_for_status()
 
         releases_info = response.json()
 
-        self.versions_dict: Dict[Version, int] = {}
+        self.versions_dict: dict[Version, int] = {}
         for release in releases_info:
             # Removing the prefix, Python 3.9 would use: release["name"].removeprefix("Python ")
             version = Version(release["name"][7:])
 
-            if not version.is_prerelease and not version.is_devrelease:
-                uri = int(release["resource_uri"].rstrip("/").split("/")[-1])
-                self.versions_dict[version] = uri
+            uri = int(release["resource_uri"].rstrip("/").split("/")[-1])
+            self.versions_dict[version] = uri
 
-    def update_version_macos(self, identifier: str, spec: Specifier) -> Optional[ConfigMacOS]:
-        file_idents = ("macos11.0.pkg", "macosx10.9.pkg", "macosx10.6.pkg")
-        sorted_versions = sorted(v for v in self.versions_dict if spec.contains(v))
+    def update_version_macos(
+        self, identifier: str, version: Version, spec: Specifier
+    ) -> ConfigMacOS | None:
 
-        for version in reversed(sorted_versions):
+        # see note above on Specifier.filter
+        unsorted_versions = cast(Iterable[Version], spec.filter(self.versions_dict))
+        sorted_versions = sorted(unsorted_versions, reverse=True)
+
+        if version <= Version("3.8.9999"):
+            file_ident = "macosx10.9.pkg"
+        else:
+            file_ident = "macos11.pkg"
+
+        for new_version in sorted_versions:
             # Find the first patch version that contains the requested file
-            uri = self.versions_dict[version]
-            response = requests.get(f"https://www.python.org/api/v2/downloads/release_file/?release={uri}")
+            uri = self.versions_dict[new_version]
+            response = requests.get(
+                f"https://www.python.org/api/v2/downloads/release_file/?release={uri}"
+            )
             response.raise_for_status()
             file_info = response.json()
 
-            for file_ident in file_idents:
-                urls = [rf["url"] for rf in file_info if file_ident in rf["url"]]
-                if urls:
-                    return ConfigMacOS(
-                        identifier=identifier,
-                        version=f"{version.major}.{version.minor}",
-                        url=urls[0],
-                    )
+            urls = [rf["url"] for rf in file_info if file_ident in rf["url"]]
+            if urls:
+                return ConfigMacOS(
+                    identifier=identifier,
+                    version=f"{new_version.major}.{new_version.minor}",
+                    url=urls[0],
+                )
 
         return None
 
@@ -211,39 +237,36 @@ class AllVersions:
     def __init__(self) -> None:
         self.windows_32 = WindowsVersions("32")
         self.windows_64 = WindowsVersions("64")
-        self.windows_pypy = PyPyVersions("32")
+        self.windows_pypy_64 = PyPyVersions("64")
 
         self.macos_cpython = CPythonVersions()
         self.macos_pypy = PyPyVersions("64")
 
-    def update_config(self, config: Dict[str, str]) -> None:
+    def update_config(self, config: dict[str, str]) -> None:
         identifier = config["identifier"]
         version = Version(config["version"])
         spec = Specifier(f"=={version.major}.{version.minor}.*")
         log.info(f"Reading in '{identifier}' -> {spec} @ {version}")
         orig_config = copy.copy(config)
-        config_update: Optional[AnyConfig]
+        config_update: AnyConfig | None = None
 
         # We need to use ** in update due to MyPy (probably a bug)
         if "macos" in identifier:
-            if identifier.startswith("pp"):
+            if identifier.startswith("cp"):
+                config_update = self.macos_cpython.update_version_macos(identifier, version, spec)
+            elif identifier.startswith("pp"):
                 config_update = self.macos_pypy.update_version_macos(spec)
-            else:
-                config_update = self.macos_cpython.update_version_macos(identifier, spec)
-
-            assert config_update is not None, f"MacOS {spec} not found!"
-            config.update(**config_update)
         elif "win32" in identifier:
-            if identifier.startswith("pp"):
-                config.update(**self.windows_pypy.update_version_windows(spec))
-            else:
+            if identifier.startswith("cp"):
                 config_update = self.windows_32.update_version_windows(spec)
-                if config_update:
-                    config.update(**config_update)
         elif "win_amd64" in identifier:
-            config_update = self.windows_64.update_version_windows(spec)
-            if config_update:
-                config.update(**config_update)
+            if identifier.startswith("cp"):
+                config_update = self.windows_64.update_version_windows(spec)
+            elif identifier.startswith("pp"):
+                config_update = self.windows_pypy_64.update_version_windows(spec)
+
+        assert config_update is not None, f"{identifier} not found!"
+        config.update(**config_update)
 
         if config != orig_config:
             log.info(f"  Updated {orig_config} to {config}")
@@ -251,7 +274,9 @@ class AllVersions:
 
 @click.command()
 @click.option("--force", is_flag=True)
-@click.option("--level", default="INFO", type=click.Choice(["INFO", "DEBUG", "TRACE"], case_sensitive=False))
+@click.option(
+    "--level", default="INFO", type=click.Choice(["WARNING", "INFO", "DEBUG"], case_sensitive=False)
+)
 def update_pythons(force: bool, level: str) -> None:
 
     logging.basicConfig(

cibuildwheel/__init__.py

@@ -1 +1 @@
-__version__ = '1.9.0'
+__version__ = "2.0.0a1"

cibuildwheel/__main__.py

@@ -30,11 +30,23 @@ from cibuildwheel.util import (
 
 
 @overload
-def get_option_from_environment(option_name: str, *, platform: Optional[str] = None, default: str) -> str: ...  # noqa: E704
+def get_option_from_environment(
+    option_name: str, *, platform: Optional[str] = None, default: str
+) -> str:
+    ...  # noqa: E704
+
+
 @overload
-def get_option_from_environment(option_name: str, *, platform: Optional[str] = None, default: None = None) -> Optional[str]: ...  # noqa: E704 E302
-def get_option_from_environment(option_name: str, *, platform: Optional[str] = None, default: Optional[str] = None) -> Optional[str]:  # noqa: E302
-    '''
+def get_option_from_environment(
+    option_name: str, *, platform: Optional[str] = None, default: None = None
+) -> Optional[str]:
+    ...  # noqa: E704 E302
+
+
+def get_option_from_environment(
+    option_name: str, *, platform: Optional[str] = None, default: Optional[str] = None
+) -> Optional[str]:  # noqa: E302
+    """
     Returns an option from the environment, optionally scoped by the platform.
 
     Example:
@@ -42,9 +54,9 @@ def get_option_from_environment(option_name: str, *, platform: Optional[str] = N
 
       This will return the value of CIBW_COLOR_MACOS if it exists, otherwise the value of
       CIBW_COLOR.
-    '''
+    """
     if platform:
-        option = os.environ.get(f'{option_name}_{platform.upper()}')
+        option = os.environ.get(f"{option_name}_{platform.upper()}")
         if option is not None:
             return option
 
@@ -55,123 +67,178 @@ def main() -> None:
     platform: PlatformName
 
     parser = argparse.ArgumentParser(
-        description='Build wheels for all the platforms.',
-        epilog='''
+        description="Build wheels for all the platforms.",
+        epilog="""
             Most options are supplied via environment variables.
-            See https://github.com/joerick/cibuildwheel#options for info.
-        ''')
+            See https://github.com/pypa/cibuildwheel#options for info.
+        """,
+    )
 
-    parser.add_argument('--platform',
-                        choices=['auto', 'linux', 'macos', 'windows'],
-                        default=os.environ.get('CIBW_PLATFORM', 'auto'),
-                        help='''
-                            Platform to build for. For "linux" you need docker running, on Mac
-                            or Linux. For "macos", you need a Mac machine, and note that this
-                            script is going to automatically install MacPython on your system,
-                            so don't run on your development machine. For "windows", you need to
-                            run in Windows, and it will build and test for all versions of
-                            Python. Default: auto.
-                        ''')
+    parser.add_argument(
+        "--platform",
+        choices=["auto", "linux", "macos", "windows"],
+        default=os.environ.get("CIBW_PLATFORM", "auto"),
+        help="""
+            Platform to build for. For "linux" you need docker running, on Mac
+            or Linux. For "macos", you need a Mac machine, and note that this
+            script is going to automatically install MacPython on your system,
+            so don't run on your development machine. For "windows", you need to
+            run in Windows, and it will build and test for all versions of
+            Python. Default: auto.
+        """,
+    )
 
-    parser.add_argument('--archs',
-                        default=None,
-                        help='''
-                            Comma-separated list of CPU architectures to build for.
-                            When set to 'auto', builds the architectures natively supported
-                            on this machine. Set this option to build an architecture
-                            via emulation, for example, using binfmt_misc and QEMU.
-                            Default: auto.
-                            Choices: auto, auto64, auto32, native, all, {}
-                        '''.format(", ".join(a.name for a in Architecture)))
-    parser.add_argument('--output-dir',
-                        default=os.environ.get('CIBW_OUTPUT_DIR', 'wheelhouse'),
-                        help='Destination folder for the wheels.')
-    parser.add_argument('package_dir',
-                        default='.',
-                        nargs='?',
-                        help='''
-                            Path to the package that you want wheels for. Must be a subdirectory of
-                            the working directory. When set, the working directory is still
-                            considered the 'project' and is copied into the Docker container on
-                            Linux. Default: the working directory.
-                        ''')
+    arch_list_str = ", ".join(a.name for a in Architecture)
+    parser.add_argument(
+        "--archs",
+        default=None,
+        help=f"""
+            Comma-separated list of CPU architectures to build for.
+            When set to 'auto', builds the architectures natively supported
+            on this machine. Set this option to build an architecture
+            via emulation, for example, using binfmt_misc and QEMU.
+            Default: auto.
+            Choices: auto, auto64, auto32, native, all, {arch_list_str}
+        """,
+    )
 
-    parser.add_argument('--print-build-identifiers',
-                        action='store_true',
-                        help='Print the build identifiers matched by the current invocation and exit.')
-    parser.add_argument('--allow-empty',
-                        action='store_true',
-                        help='Do not report an error code if the build does not match any wheels.')
+    parser.add_argument(
+        "--output-dir",
+        default=os.environ.get("CIBW_OUTPUT_DIR", "wheelhouse"),
+        help="Destination folder for the wheels.",
+    )
+
+    parser.add_argument(
+        "package_dir",
+        default=".",
+        nargs="?",
+        help="""
+            Path to the package that you want wheels for. Must be a subdirectory of
+            the working directory. When set, the working directory is still
+            considered the 'project' and is copied into the Docker container on
+            Linux. Default: the working directory.
+        """,
+    )
+
+    parser.add_argument(
+        "--print-build-identifiers",
+        action="store_true",
+        help="Print the build identifiers matched by the current invocation and exit.",
+    )
+
+    parser.add_argument(
+        "--allow-empty",
+        action="store_true",
+        help="Do not report an error code if the build does not match any wheels.",
+    )
+
+    parser.add_argument(
+        "--prerelease-pythons",
+        action="store_true",
+        help="Enable pre-release Python versions if available.",
+    )
 
     args = parser.parse_args()
 
-    detect_obsolete_options()
-
-    if args.platform != 'auto':
+    if args.platform != "auto":
         platform = args.platform
     else:
         ci_provider = detect_ci_provider()
         if ci_provider is None:
-            print(textwrap.dedent('''
-                cibuildwheel: Unable to detect platform. cibuildwheel should run on your CI server;
-                Travis CI, AppVeyor, Azure Pipelines, GitHub Actions, CircleCI, and Gitlab are
-                supported. You can run on your development machine or other CI providers using the
-                --platform argument. Check --help output for more information.
-            '''), file=sys.stderr)
+            print(
+                textwrap.dedent(
+                    """
+                    cibuildwheel: Unable to detect platform. cibuildwheel should run on your CI server;
+                    Travis CI, AppVeyor, Azure Pipelines, GitHub Actions, CircleCI, and Gitlab are
+                    supported. You can run on your development machine or other CI providers using the
+                    --platform argument. Check --help output for more information.
+                    """
+                ),
+                file=sys.stderr,
+            )
             sys.exit(2)
-        if sys.platform.startswith('linux'):
-            platform = 'linux'
-        elif sys.platform == 'darwin':
-            platform = 'macos'
-        elif sys.platform == 'win32':
-            platform = 'windows'
+        if sys.platform.startswith("linux"):
+            platform = "linux"
+        elif sys.platform == "darwin":
+            platform = "macos"
+        elif sys.platform == "win32":
+            platform = "windows"
         else:
-            print('cibuildwheel: Unable to detect platform from "sys.platform" in a CI environment. You can run '
-                  'cibuildwheel using the --platform argument. Check --help output for more information.',
-                  file=sys.stderr)
+            print(
+                'cibuildwheel: Unable to detect platform from "sys.platform" in a CI environment. You can run '
+                "cibuildwheel using the --platform argument. Check --help output for more information.",
+                file=sys.stderr,
+            )
             sys.exit(2)
 
     if platform not in PLATFORMS:
-        print(f'cibuildwheel: Unsupported platform: {platform}', file=sys.stderr)
+        print(f"cibuildwheel: Unsupported platform: {platform}", file=sys.stderr)
         sys.exit(2)
 
     package_dir = Path(args.package_dir)
     output_dir = Path(args.output_dir)
 
-    if platform == 'linux':
-        repair_command_default = 'auditwheel repair -w {dest_dir} {wheel}'
-    elif platform == 'macos':
-        repair_command_default = 'delocate-listdeps {wheel} && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}'
-    elif platform == 'windows':
-        repair_command_default = ''
+    if platform == "linux":
+        repair_command_default = "auditwheel repair -w {dest_dir} {wheel}"
+    elif platform == "macos":
+        repair_command_default = "delocate-listdeps {wheel} && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}"
+    elif platform == "windows":
+        repair_command_default = ""
     else:
         assert_never(platform)
 
-    build_config, skip_config = os.environ.get('CIBW_BUILD', '*'), os.environ.get('CIBW_SKIP', '')
-    test_skip = os.environ.get('CIBW_TEST_SKIP', '')
-    environment_config = get_option_from_environment('CIBW_ENVIRONMENT', platform=platform, default='')
-    before_all = get_option_from_environment('CIBW_BEFORE_ALL', platform=platform, default='')
-    before_build = get_option_from_environment('CIBW_BEFORE_BUILD', platform=platform)
-    repair_command = get_option_from_environment('CIBW_REPAIR_WHEEL_COMMAND', platform=platform, default=repair_command_default)
-    dependency_versions = get_option_from_environment('CIBW_DEPENDENCY_VERSIONS', platform=platform, default='pinned')
-    test_command = get_option_from_environment('CIBW_TEST_COMMAND', platform=platform)
-    before_test = get_option_from_environment('CIBW_BEFORE_TEST', platform=platform)
-    test_requires = get_option_from_environment('CIBW_TEST_REQUIRES', platform=platform, default='').split()
-    test_extras = get_option_from_environment('CIBW_TEST_EXTRAS', platform=platform, default='')
-    build_verbosity_str = get_option_from_environment('CIBW_BUILD_VERBOSITY', platform=platform, default='')
+    build_config = os.environ.get("CIBW_BUILD") or "*"
+    skip_config = os.environ.get("CIBW_SKIP", "")
+    test_skip = os.environ.get("CIBW_TEST_SKIP", "")
+    environment_config = get_option_from_environment(
+        "CIBW_ENVIRONMENT", platform=platform, default=""
+    )
+    before_all = get_option_from_environment("CIBW_BEFORE_ALL", platform=platform, default="")
+    before_build = get_option_from_environment("CIBW_BEFORE_BUILD", platform=platform)
+    repair_command = get_option_from_environment(
+        "CIBW_REPAIR_WHEEL_COMMAND", platform=platform, default=repair_command_default
+    )
+    dependency_versions = get_option_from_environment(
+        "CIBW_DEPENDENCY_VERSIONS", platform=platform, default="pinned"
+    )
+    test_command = get_option_from_environment("CIBW_TEST_COMMAND", platform=platform)
+    before_test = get_option_from_environment("CIBW_BEFORE_TEST", platform=platform)
+    test_requires = get_option_from_environment(
+        "CIBW_TEST_REQUIRES", platform=platform, default=""
+    ).split()
+    test_extras = get_option_from_environment("CIBW_TEST_EXTRAS", platform=platform, default="")
+    build_verbosity_str = get_option_from_environment(
+        "CIBW_BUILD_VERBOSITY", platform=platform, default=""
+    )
+    prerelease_pythons = args.prerelease_pythons or cibuildwheel.util.strtobool(
+        os.environ.get("CIBW_PRERELEASE_PYTHONS", "0")
+    )
 
-    package_files = {'setup.py', 'setup.cfg', 'pyproject.toml'}
+    package_files = {"setup.py", "setup.cfg", "pyproject.toml"}
 
     if not any(package_dir.joinpath(name).exists() for name in package_files):
-        names = ', '.join(sorted(package_files, reverse=True))
-        print(f'cibuildwheel: Could not find any of {{{names}}} at root of package', file=sys.stderr)
+        names = ", ".join(sorted(package_files, reverse=True))
+        print(
+            f"cibuildwheel: Could not find any of {{{names}}} at root of package", file=sys.stderr
+        )
         sys.exit(2)
 
     # Passing this in as an environment variable will override pyproject.toml, setup.cfg, or setup.py
-    requires_python_str: Optional[str] = os.environ.get('CIBW_PROJECT_REQUIRES_PYTHON') or get_requires_python_str(package_dir)
+    requires_python_str: Optional[str] = os.environ.get(
+        "CIBW_PROJECT_REQUIRES_PYTHON"
+    ) or get_requires_python_str(package_dir)
     requires_python = None if requires_python_str is None else SpecifierSet(requires_python_str)
 
-    build_selector = BuildSelector(build_config=build_config, skip_config=skip_config, requires_python=requires_python)
+    deprecated_selectors("CIBW_BUILD", build_config, error=True)
+    deprecated_selectors("CIBW_SKIP", skip_config)
+    deprecated_selectors("CIBW_TEST_SKIP", test_skip)
+
+    build_selector = BuildSelector(
+        build_config=build_config,
+        skip_config=skip_config,
+        requires_python=requires_python,
+        prerelease_pythons=prerelease_pythons,
+    )
     test_selector = TestSelector(skip_config=test_skip)
 
     try:
@@ -181,16 +248,18 @@ def main() -> None:
         traceback.print_exc(None, sys.stderr)
         sys.exit(2)
 
-    if dependency_versions == 'pinned':
-        dependency_constraints: Optional[DependencyConstraints] = DependencyConstraints.with_defaults()
-    elif dependency_versions == 'latest':
+    if dependency_versions == "pinned":
+        dependency_constraints: Optional[
+            DependencyConstraints
+        ] = DependencyConstraints.with_defaults()
+    elif dependency_versions == "latest":
         dependency_constraints = None
     else:
         dependency_versions_path = Path(dependency_versions)
         dependency_constraints = DependencyConstraints(dependency_versions_path)
 
     if test_extras:
-        test_extras = f'[{test_extras}]'
+        test_extras = f"[{test_extras}]"
 
     try:
         build_verbosity = min(3, max(-3, int(build_verbosity_str)))
@@ -199,12 +268,14 @@ def main() -> None:
 
     # Add CIBUILDWHEEL environment variable
     # This needs to be passed on to the docker container in linux.py
-    os.environ['CIBUILDWHEEL'] = '1'
+    os.environ["CIBUILDWHEEL"] = "1"
 
     if args.archs is not None:
         archs_config_str = args.archs
     else:
-        archs_config_str = get_option_from_environment('CIBW_ARCHS', platform=platform, default='auto')
+        archs_config_str = get_option_from_environment(
+            "CIBW_ARCHS", platform=platform, default="auto"
+        )
 
     archs = Architecture.parse_config(archs_config_str, platform=platform)
 
@@ -216,8 +287,8 @@ def main() -> None:
         sys.exit(0)
 
     manylinux_images: Optional[Dict[str, str]] = None
-    if platform == 'linux':
-        pinned_docker_images_file = resources_dir / 'pinned_docker_images.cfg'
+    if platform == "linux":
+        pinned_docker_images_file = resources_dir / "pinned_docker_images.cfg"
         all_pinned_docker_images = ConfigParser()
         all_pinned_docker_images.read(pinned_docker_images_file)
         # all_pinned_docker_images looks like a dict of dicts, e.g.
@@ -228,15 +299,24 @@ def main() -> None:
 
         manylinux_images = {}
 
-        for build_platform in ['x86_64', 'i686', 'pypy_x86_64', 'aarch64', 'ppc64le', 's390x']:
+        for build_platform in [
+            "x86_64",
+            "i686",
+            "pypy_x86_64",
+            "aarch64",
+            "ppc64le",
+            "s390x",
+            "pypy_aarch64",
+            "pypy_i686",
+        ]:
             pinned_images = all_pinned_docker_images[build_platform]
 
-            config_name = f'CIBW_MANYLINUX_{build_platform.upper()}_IMAGE'
+            config_name = f"CIBW_MANYLINUX_{build_platform.upper()}_IMAGE"
             config_value = os.environ.get(config_name)
 
             if config_value is None:
                 # default to manylinux2010 if it's available, otherwise manylinux2014
-                image = pinned_images.get('manylinux2010') or pinned_images.get('manylinux2014')
+                image = pinned_images.get("manylinux2010") or pinned_images.get("manylinux2014")
             elif config_value in pinned_images:
                 image = pinned_images[config_value]
             else:
@@ -275,84 +355,83 @@ def main() -> None:
         sys.exit(4)
 
     if not identifiers:
-        print(f'cibuildwheel: No build identifiers selected: {build_selector}', file=sys.stderr)
+        print(f"cibuildwheel: No build identifiers selected: {build_selector}", file=sys.stderr)
         if not args.allow_empty:
             sys.exit(3)
 
     if not output_dir.exists():
         output_dir.mkdir(parents=True)
 
-    with cibuildwheel.util.print_new_wheels("{n} wheels produced in {m:.0f} minutes:", output_dir):
-        if platform == 'linux':
+    with cibuildwheel.util.print_new_wheels(
+        "\n{n} wheels produced in {m:.0f} minutes:", output_dir
+    ):
+        if platform == "linux":
             cibuildwheel.linux.build(build_options)
-        elif platform == 'windows':
+        elif platform == "windows":
             cibuildwheel.windows.build(build_options)
-        elif platform == 'macos':
+        elif platform == "macos":
             cibuildwheel.macos.build(build_options)
         else:
             assert_never(platform)
 
 
-def detect_obsolete_options() -> None:
-    # Check the old 'MANYLINUX1_*_IMAGE' options
-    for (deprecated, alternative) in [('CIBW_MANYLINUX1_X86_64_IMAGE', 'CIBW_MANYLINUX_X86_64_IMAGE'),
-                                      ('CIBW_MANYLINUX1_I686_IMAGE', 'CIBW_MANYLINUX_I686_IMAGE')]:
-        if deprecated in os.environ:
-            print(f"'{deprecated}' has been deprecated, and will be removed in a future release. Use the option '{alternative}' instead.")
-            if alternative not in os.environ:
-                print(f"Using value of option '{deprecated}' as replacement for '{alternative}'")
-                os.environ[alternative] = os.environ[deprecated]
-            else:
-                print(f"Option '{alternative}' is not empty. Please unset '{deprecated}'")
-                sys.exit(2)
-
-    # Check for deprecated identifiers in 'CIBW_BUILD' and 'CIBW_SKIP' options
-    for option in ['CIBW_BUILD', 'CIBW_SKIP']:
-        for deprecated, alternative in [('manylinux1', 'manylinux'),
-                                        ('macosx_10_6_intel', 'macosx_x86_64'),
-                                        ('macosx_10_9_x86_64', 'macosx_x86_64')]:
-            if option in os.environ and deprecated in os.environ[option]:
-                print(f"Build identifiers with '{deprecated}' have been deprecated. Replacing all occurences of '{deprecated}' with '{alternative}' in the option '{option}'")
-                os.environ[option] = os.environ[option].replace(deprecated, alternative)
+def deprecated_selectors(name: str, selector: str, *, error: bool = False) -> None:
+    if "p2" in selector or "p35" in selector:
+        msg = f"cibuildwheel 2.x no longer supports Python < 3.6. Please use the 1.x series or update {name}"
+        print(msg, file=sys.stderr)
+        if error:
+            sys.exit(4)
 
 
 def print_preamble(platform: str, build_options: BuildOptions) -> None:
-    print(textwrap.dedent('''
-             _ _       _ _   _       _           _
-         ___|_| |_ _ _|_| |_| |_ _ _| |_ ___ ___| |
-        |  _| | . | | | | | . | | | |   | -_| -_| |
-        |___|_|___|___|_|_|___|_____|_|_|___|___|_|
-        '''))
+    print(
+        textwrap.dedent(
+            """
+                 _ _       _ _   _       _           _
+             ___|_| |_ _ _|_| |_| |_ _ _| |_ ___ ___| |
+            |  _| | . | | | | | . | | | |   | -_| -_| |
+            |___|_|___|___|_|_|___|_____|_|_|___|___|_|
+            """
+        )
+    )
 
-    print(f'cibuildwheel version {cibuildwheel.__version__}\n')
+    print(f"cibuildwheel version {cibuildwheel.__version__}\n")
 
-    print('Build options:')
-    print(f'  platform: {platform!r}')
+    print("Build options:")
+    print(f"  platform: {platform!r}")
     for option, value in sorted(build_options._asdict().items()):
-        print(f'  {option}: {value!r}')
+        print(f"  {option}: {value!r}")
 
     warnings = detect_warnings(platform, build_options)
     if warnings:
-        print('\nWarnings:')
+        print("\nWarnings:")
         for warning in warnings:
-            print('  ' + warning)
+            print("  " + warning)
 
-    print('\nHere we go!\n')
+    print("\nHere we go!\n")
 
 
 def get_build_identifiers(
     platform: PlatformName, build_selector: BuildSelector, architectures: Set[Architecture]
 ) -> List[str]:
-    python_configurations: Union[List[cibuildwheel.linux.PythonConfiguration],
-                                 List[cibuildwheel.windows.PythonConfiguration],
-                                 List[cibuildwheel.macos.PythonConfiguration]]
+    python_configurations: Union[
+        List[cibuildwheel.linux.PythonConfiguration],
+        List[cibuildwheel.windows.PythonConfiguration],
+        List[cibuildwheel.macos.PythonConfiguration],
+    ]
 
-    if platform == 'linux':
-        python_configurations = cibuildwheel.linux.get_python_configurations(build_selector, architectures)
-    elif platform == 'windows':
-        python_configurations = cibuildwheel.windows.get_python_configurations(build_selector, architectures)
-    elif platform == 'macos':
-        python_configurations = cibuildwheel.macos.get_python_configurations(build_selector, architectures)
+    if platform == "linux":
+        python_configurations = cibuildwheel.linux.get_python_configurations(
+            build_selector, architectures
+        )
+    elif platform == "windows":
+        python_configurations = cibuildwheel.windows.get_python_configurations(
+            build_selector, architectures
+        )
+    elif platform == "macos":
+        python_configurations = cibuildwheel.macos.get_python_configurations(
+            build_selector, architectures
+        )
     else:
         assert_never(platform)
 
@@ -363,15 +442,19 @@ def detect_warnings(platform: str, build_options: BuildOptions) -> List[str]:
     warnings = []
 
     # warn about deprecated {python} and {pip}
-    for option_name in ['test_command', 'before_build']:
+    for option_name in ["test_command", "before_build"]:
         option_value = getattr(build_options, option_name)
 
-        if option_value:
-            if '{python}' in option_value or '{pip}' in option_value:
-                warnings.append(option_name + ": '{python}' and '{pip}' are no longer needed, and will be removed in a future release. Simply use 'python' or 'pip' instead.")
+        if option_value and ("{python}" in option_value or "{pip}" in option_value):
+            # Reminder: in an f-string, double braces means literal single brace
+            msg = (
+                f"{option_name}: '{{python}}' and '{{pip}}' are no longer needed, "
+                "and will be removed in a future release. Simply use 'python' or 'pip' instead."
+            )
+            warnings.append(msg)
 
     return warnings
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

cibuildwheel/architecture.py

@@ -6,7 +6,7 @@ from typing import Set
 
 from .typing import Literal, PlatformName, assert_never
 
-PRETTY_NAMES = {'linux': 'Linux', 'macos': 'macOS', 'windows': 'Windows'}
+PRETTY_NAMES = {"linux": "Linux", "macos": "macOS", "windows": "Windows"}
 
 
 @functools.total_ordering
@@ -14,81 +14,87 @@ class Architecture(Enum):
     value: str
 
     # mac/linux archs
-    x86_64 = 'x86_64'
+    x86_64 = "x86_64"
 
     # linux archs
-    i686 = 'i686'
-    aarch64 = 'aarch64'
-    ppc64le = 'ppc64le'
-    s390x = 's390x'
+    i686 = "i686"
+    aarch64 = "aarch64"
+    ppc64le = "ppc64le"
+    s390x = "s390x"
 
     # mac archs
-    universal2 = 'universal2'
-    arm64 = 'arm64'
+    universal2 = "universal2"
+    arm64 = "arm64"
 
     # windows archs
-    x86 = 'x86'
-    AMD64 = 'AMD64'
+    x86 = "x86"
+    AMD64 = "AMD64"
 
     # Allow this to be sorted
     def __lt__(self, other: "Architecture") -> bool:
         return self.value < other.value
 
     @staticmethod
-    def parse_config(config: str, platform: PlatformName) -> 'Set[Architecture]':
+    def parse_config(config: str, platform: PlatformName) -> "Set[Architecture]":
         result = set()
-        for arch_str in re.split(r'[\s,]+', config):
-            if arch_str == 'auto':
+        for arch_str in re.split(r"[\s,]+", config):
+            if arch_str == "auto":
                 result |= Architecture.auto_archs(platform=platform)
-            elif arch_str == 'native':
+            elif arch_str == "native":
                 result.add(Architecture(platform_module.machine()))
-            elif arch_str == 'all':
+            elif arch_str == "all":
                 result |= Architecture.all_archs(platform=platform)
-            elif arch_str == 'auto64':
+            elif arch_str == "auto64":
                 result |= Architecture.bitness_archs(platform=platform, bitness="64")
-            elif arch_str == 'auto32':
+            elif arch_str == "auto32":
                 result |= Architecture.bitness_archs(platform=platform, bitness="32")
             else:
                 result.add(Architecture(arch_str))
         return result
 
     @staticmethod
-    def auto_archs(platform: PlatformName) -> 'Set[Architecture]':
+    def auto_archs(platform: PlatformName) -> "Set[Architecture]":
         native_architecture = Architecture(platform_module.machine())
         result = {native_architecture}
 
-        if platform == 'linux' and native_architecture == Architecture.x86_64:
+        if platform == "linux" and native_architecture == Architecture.x86_64:
             # x86_64 machines can run i686 docker containers
             result.add(Architecture.i686)
 
-        if platform == 'windows' and native_architecture == Architecture.AMD64:
+        if platform == "windows" and native_architecture == Architecture.AMD64:
             result.add(Architecture.x86)
 
-        if platform == 'macos' and native_architecture == Architecture.arm64:
+        if platform == "macos" and native_architecture == Architecture.arm64:
             # arm64 can build and test both archs of a universal2 wheel.
             result.add(Architecture.universal2)
 
         return result
 
     @staticmethod
-    def all_archs(platform: PlatformName) -> 'Set[Architecture]':
-        if platform == 'linux':
-            return {Architecture.x86_64, Architecture.i686, Architecture.aarch64, Architecture.ppc64le, Architecture.s390x}
-        elif platform == 'macos':
+    def all_archs(platform: PlatformName) -> "Set[Architecture]":
+        if platform == "linux":
+            return {
+                Architecture.x86_64,
+                Architecture.i686,
+                Architecture.aarch64,
+                Architecture.ppc64le,
+                Architecture.s390x,
+            }
+        elif platform == "macos":
             return {Architecture.x86_64, Architecture.arm64, Architecture.universal2}
-        elif platform == 'windows':
+        elif platform == "windows":
             return {Architecture.x86, Architecture.AMD64}
         else:
             assert_never(platform)
 
     @staticmethod
-    def bitness_archs(platform: PlatformName, bitness: Literal['64', '32']) -> 'Set[Architecture]':
+    def bitness_archs(platform: PlatformName, bitness: Literal["64", "32"]) -> "Set[Architecture]":
         archs_32 = {Architecture.i686, Architecture.x86}
         auto_archs = Architecture.auto_archs(platform)
 
-        if bitness == '64':
+        if bitness == "64":
             return auto_archs - archs_32
-        elif bitness == '32':
+        elif bitness == "32":
             return auto_archs & archs_32
         else:
             assert_never(bitness)
@@ -101,15 +107,15 @@ def allowed_architectures_check(
 
     allowed_architectures = Architecture.all_archs(platform)
 
-    msg = f'{PRETTY_NAMES[platform]} only supports {sorted(allowed_architectures)} at the moment.'
+    msg = f"{PRETTY_NAMES[platform]} only supports {sorted(allowed_architectures)} at the moment."
 
-    if platform != 'linux':
-        msg += ' If you want to set emulation architectures on Linux, use CIBW_ARCHS_LINUX instead.'
+    if platform != "linux":
+        msg += " If you want to set emulation architectures on Linux, use CIBW_ARCHS_LINUX instead."
 
     if not architectures <= allowed_architectures:
-        msg = f'Invalid archs option {architectures}. ' + msg
+        msg = f"Invalid archs option {architectures}. " + msg
         raise ValueError(msg)
 
     if not architectures:
-        msg = 'Empty archs option set. ' + msg
+        msg = "Empty archs option set. " + msg
         raise ValueError(msg)

cibuildwheel/bashlex_eval.py

@@ -8,7 +8,9 @@ EnvironmentExecutor = Callable[[List[str], Dict[str, str]], str]
 
 
 def local_environment_executor(command: List[str], env: Dict[str, str]) -> str:
-    return subprocess.check_output(command, env=env, universal_newlines=True)
+    return subprocess.run(
+        command, env=env, universal_newlines=True, stdout=subprocess.PIPE, check=True
+    ).stdout
 
 
 class NodeExecutionContext(NamedTuple):
@@ -17,11 +19,13 @@ class NodeExecutionContext(NamedTuple):
     executor: EnvironmentExecutor
 
 
-def evaluate(value: str, environment: Dict[str, str], executor: Optional[EnvironmentExecutor] = None) -> str:
+def evaluate(
+    value: str, environment: Dict[str, str], executor: Optional[EnvironmentExecutor] = None
+) -> str:
     if not value:
         # empty string evaluates to empty string
         # (but trips up bashlex)
-        return ''
+        return ""
 
     command_node = bashlex.parsesingle(value)
 
@@ -32,18 +36,20 @@ def evaluate(value: str, environment: Dict[str, str], executor: Optional[Environ
 
     return evaluate_node(
         value_word_node,
-        context=NodeExecutionContext(environment=environment, input=value, executor=executor or local_environment_executor)
+        context=NodeExecutionContext(
+            environment=environment, input=value, executor=executor or local_environment_executor
+        ),
     )
 
 
 def evaluate_node(node: bashlex.ast.node, context: NodeExecutionContext) -> str:
-    if node.kind == 'word':
+    if node.kind == "word":
         return evaluate_word_node(node, context=context)
-    elif node.kind == 'commandsubstitution':
+    elif node.kind == "commandsubstitution":
         node_result = evaluate_command_node(node.command, context=context)
         # bash removes training newlines in command substitution
         return node_result.rstrip()
-    elif node.kind == 'parameter':
+    elif node.kind == "parameter":
         return evaluate_parameter_node(node, context=context)
     else:
         raise ValueError(f'Unsupported bash construct: "{node.kind}"')
@@ -53,14 +59,13 @@ def evaluate_word_node(node: bashlex.ast.node, context: NodeExecutionContext) ->
     value: str = node.word
 
     for part in node.parts:
-        part_string = context.input[part.pos[0]:part.pos[1]]
+        part_string = context.input[part.pos[0] : part.pos[1]]
         part_value = evaluate_node(part, context=context)
 
         if part_string not in value:
             raise RuntimeError(
-                'bash parse failed. part "{}" not found in "{}". Word was "{}". Full input was "{}"'.format(
-                    part_string, value, node.word, context.input,
-                )
+                f'bash parse failed. part "{part_string}" not found in "{value}". '
+                f'Word was "{node.word}". Full input was "{context.input}"'
             )
 
         value = value.replace(part_string, part_value, 1)
@@ -69,25 +74,25 @@ def evaluate_word_node(node: bashlex.ast.node, context: NodeExecutionContext) ->
 
 
 def evaluate_command_node(node: bashlex.ast.node, context: NodeExecutionContext) -> str:
-    if any(n.kind == 'operator' for n in node.parts):
+    if any(n.kind == "operator" for n in node.parts):
         return evaluate_nodes_as_compound_command(node.parts, context=context)
     else:
         return evaluate_nodes_as_simple_command(node.parts, context=context)
 
 
-def evaluate_nodes_as_compound_command(nodes: Sequence[bashlex.ast.node], context: NodeExecutionContext) -> str:
+def evaluate_nodes_as_compound_command(
+    nodes: Sequence[bashlex.ast.node], context: NodeExecutionContext
+) -> str:
     # bashlex doesn't support any operators besides ';' inside command
     # substitutions, so we only need to handle that case. We do so assuming
     # that `set -o errexit` is on, because it's easier to code!
 
-    result = ''
+    result = ""
     for node in nodes:
-        if node.kind == 'command':
+        if node.kind == "command":
             result += evaluate_command_node(node, context=context)
-        elif node.kind == 'operator':
-            if node.op == ';':
-                pass
-            else:
+        elif node.kind == "operator":
+            if node.op != ";":
                 raise ValueError(f'Unsupported bash operator: "{node.op}"')
         else:
             raise ValueError(f'Unsupported bash node in compound command: "{node.kind}"')
@@ -95,10 +100,12 @@ def evaluate_nodes_as_compound_command(nodes: Sequence[bashlex.ast.node], contex
     return result
 
 
-def evaluate_nodes_as_simple_command(nodes: List[bashlex.ast.node], context: NodeExecutionContext) -> str:
+def evaluate_nodes_as_simple_command(
+    nodes: List[bashlex.ast.node], context: NodeExecutionContext
+) -> str:
     command = [evaluate_node(part, context=context) for part in nodes]
     return context.executor(command, context.environment)
 
 
 def evaluate_parameter_node(node: bashlex.ast.node, context: NodeExecutionContext) -> str:
-    return context.environment.get(node.value, '')
+    return context.environment.get(node.value, "")

cibuildwheel/docker_container.py

@@ -13,7 +13,7 @@ from .typing import PathOrStr, PopenBytes
 
 
 class DockerContainer:
-    '''
+    """
     An object that represents a running Docker container.
 
     Intended for use as a context manager e.g.
@@ -22,14 +22,17 @@ class DockerContainer:
     A bash shell is running in the remote container. When `call()` is invoked,
     the command is relayed to the remote shell, and the results are streamed
     back to cibuildwheel.
-    '''
-    UTILITY_PYTHON = '/opt/python/cp38-cp38/bin/python'
+    """
+
+    UTILITY_PYTHON = "/opt/python/cp38-cp38/bin/python"
 
     process: PopenBytes
     bash_stdin: IO[bytes]
     bash_stdout: IO[bytes]
 
-    def __init__(self, docker_image: str, simulate_32_bit: bool = False, cwd: Optional[PathOrStr] = None):
+    def __init__(
+        self, docker_image: str, simulate_32_bit: bool = False, cwd: Optional[PathOrStr] = None
+    ):
         if not docker_image:
             raise ValueError("Must have a non-empty docker image to run.")
 
@@ -38,27 +41,30 @@ class DockerContainer:
         self.cwd = cwd
         self.name: Optional[str] = None
 
-    def __enter__(self) -> 'DockerContainer':
-        self.name = f'cibuildwheel-{uuid.uuid4()}'
-        cwd_args = ['-w', str(self.cwd)] if self.cwd else []
-        shell_args = ['linux32', '/bin/bash'] if self.simulate_32_bit else ['/bin/bash']
+    def __enter__(self) -> "DockerContainer":
+        self.name = f"cibuildwheel-{uuid.uuid4()}"
+        cwd_args = ["-w", str(self.cwd)] if self.cwd else []
+        shell_args = ["linux32", "/bin/bash"] if self.simulate_32_bit else ["/bin/bash"]
         subprocess.run(
             [
-                'docker', 'create',
-                '--env', 'CIBUILDWHEEL',
-                '--name', self.name,
-                '-i',
-                '-v', '/:/host',  # ignored on CircleCI
+                "docker",
+                "create",
+                "--env=CIBUILDWHEEL",
+                f"--name={self.name}",
+                "--interactive",
+                "--volume=/:/host",  # ignored on CircleCI
                 *cwd_args,
                 self.docker_image,
-                *shell_args
+                *shell_args,
             ],
             check=True,
         )
         self.process = subprocess.Popen(
             [
-                'docker', 'start',
-                '--attach', '--interactive',
+                "docker",
+                "start",
+                "--attach",
+                "--interactive",
                 self.name,
             ],
             stdin=subprocess.PIPE,
@@ -70,15 +76,16 @@ class DockerContainer:
         self.bash_stdout = self.process.stdout
 
         # run a noop command to block until the container is responding
-        self.call(['/bin/true'])
+        self.call(["/bin/true"])
 
         return self
 
     def __exit__(
-            self,
-            exc_type: Optional[Type[BaseException]],
-            exc_val: Optional[BaseException],
-            exc_tb: Optional[TracebackType]) -> None:
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_val: Optional[BaseException],
+        exc_tb: Optional[TracebackType],
+    ) -> None:
 
         self.bash_stdin.close()
         self.process.terminate()
@@ -86,7 +93,7 @@ class DockerContainer:
 
         assert isinstance(self.name, str)
 
-        subprocess.run(['docker', 'rm', '--force', '-v', self.name], stdout=subprocess.DEVNULL)
+        subprocess.run(["docker", "rm", "--force", "-v", self.name], stdout=subprocess.DEVNULL)
         self.name = None
 
     def copy_into(self, from_path: Path, to_path: PurePath) -> None:
@@ -96,55 +103,66 @@ class DockerContainer:
         # Use `docker exec` instead.
 
         if from_path.is_dir():
-            self.call(['mkdir', '-p', to_path])
+            self.call(["mkdir", "-p", to_path])
             subprocess.run(
-                f'tar cf - . | docker exec -i {self.name} tar -xC {shell_quote(to_path)} -f -',
+                f"tar cf - . | docker exec -i {self.name} tar -xC {shell_quote(to_path)} -f -",
                 shell=True,
                 check=True,
-                cwd=from_path)
+                cwd=from_path,
+            )
         else:
             subprocess.run(
                 f'cat {shell_quote(from_path)} | docker exec -i {self.name} sh -c "cat > {shell_quote(to_path)}"',
                 shell=True,
-                check=True)
+                check=True,
+            )
 
     def copy_out(self, from_path: PurePath, to_path: Path) -> None:
         # note: we assume from_path is a dir
         to_path.mkdir(parents=True, exist_ok=True)
 
         subprocess.run(
-            f'docker exec -i {self.name} tar -cC {shell_quote(from_path)} -f - . | tar -xf -',
+            f"docker exec -i {self.name} tar -cC {shell_quote(from_path)} -f - . | tar -xf -",
             shell=True,
             check=True,
-            cwd=to_path
+            cwd=to_path,
         )
 
     def glob(self, path: PurePath, pattern: str) -> List[PurePath]:
         glob_pattern = os.path.join(str(path), pattern)
 
-        path_strs = json.loads(self.call([
-            self.UTILITY_PYTHON,
-            '-c',
-            f'import sys, json, glob; json.dump(glob.glob({glob_pattern!r}), sys.stdout)'
-        ], capture_output=True))
+        path_strs = json.loads(
+            self.call(
+                [
+                    self.UTILITY_PYTHON,
+                    "-c",
+                    f"import sys, json, glob; json.dump(glob.glob({glob_pattern!r}), sys.stdout)",
+                ],
+                capture_output=True,
+            )
+        )
 
         return [PurePath(p) for p in path_strs]
 
     def call(
-            self,
-            args: Sequence[PathOrStr],
-            env: Optional[Dict[str, str]] = None,
-            capture_output: bool = False,
-            cwd: Optional[PathOrStr] = None) -> str:
+        self,
+        args: Sequence[PathOrStr],
+        env: Optional[Dict[str, str]] = None,
+        capture_output: bool = False,
+        cwd: Optional[PathOrStr] = None,
+    ) -> str:
 
-        chdir = f'cd {cwd}' if cwd else ''
-        env_assignments = ' '.join(f'{shlex.quote(k)}={shlex.quote(v)}'
-                                   for k, v in env.items()) if env is not None else ''
-        command = ' '.join(shlex.quote(str(a)) for a in args)
+        chdir = f"cd {cwd}" if cwd else ""
+        env_assignments = (
+            " ".join(f"{shlex.quote(k)}={shlex.quote(v)}" for k, v in env.items())
+            if env is not None
+            else ""
+        )
+        command = " ".join(shlex.quote(str(a)) for a in args)
         end_of_message = str(uuid.uuid4())
 
         # log the command we're executing
-        print(f'    + {command}')
+        print(f"    + {command}")
 
         # Write a command to the remote shell. First we change the
         # cwd, if that's required. Then, we use the `env` utility to run
@@ -153,12 +171,18 @@ class DockerContainer:
         # Finally, the remote shell is told to write a footer - this will show
         # up in the output so we know when to stop reading, and will include
         # the returncode of `command`.
-        self.bash_stdin.write(bytes(f'''(
+        self.bash_stdin.write(
+            bytes(
+                f"""(
             {chdir}
             env {env_assignments} {command}
             printf "%04d%s\n" $? {end_of_message}
         )
-        ''', encoding='utf8', errors='surrogateescape'))
+        """,
+                encoding="utf8",
+                errors="surrogateescape",
+            )
+        )
         self.bash_stdin.flush()
 
         if capture_output:
@@ -169,14 +193,16 @@ class DockerContainer:
         while True:
             line = self.bash_stdout.readline()
 
-            if line.endswith(b'%s\n' % (bytes(end_of_message, encoding='utf8'))):
+            if line.endswith(bytes(end_of_message, encoding="utf8") + b"\n"):
+                # fmt: off
                 footer_offset = (
                     len(line)
                     - 1  # newline character
                     - len(end_of_message)  # delimiter
                     - 4  # 4 returncode decimals
                 )
-                returncode_str = line[footer_offset:footer_offset+4]
+                # fmt: on
+                returncode_str = line[footer_offset : footer_offset + 4]
                 returncode = int(returncode_str)
                 # add the last line to output, without the footer
                 output_io.write(line[0:footer_offset])
@@ -185,9 +211,9 @@ class DockerContainer:
                 output_io.write(line)
 
         if isinstance(output_io, io.BytesIO):
-            output = str(output_io.getvalue(), encoding='utf8', errors='surrogateescape')
+            output = str(output_io.getvalue(), encoding="utf8", errors="surrogateescape")
         else:
-            output = ''
+            output = ""
 
         if returncode != 0:
             raise subprocess.CalledProcessError(returncode, args, output)
@@ -195,11 +221,16 @@ class DockerContainer:
         return output
 
     def get_environment(self) -> Dict[str, str]:
-        env = json.loads(self.call([
-            self.UTILITY_PYTHON,
-            '-c',
-            'import sys, json, os; json.dump(os.environ.copy(), sys.stdout)'
-        ], capture_output=True))
+        env = json.loads(
+            self.call(
+                [
+                    self.UTILITY_PYTHON,
+                    "-c",
+                    "import sys, json, os; json.dump(os.environ.copy(), sys.stdout)",
+                ],
+                capture_output=True,
+            )
+        )
         return cast(Dict[str, str], env)
 
     def environment_executor(self, command: List[str], environment: Dict[str, str]) -> str:

cibuildwheel/environment.py

@@ -10,7 +10,7 @@ class EnvironmentParseError(Exception):
 
 
 def split_env_items(env_string: str) -> List[str]:
-    '''Splits space-separated variable assignments into a list of individual assignments.
+    """Splits space-separated variable assignments into a list of individual assignments.
 
     >>> split_env_items('VAR=abc')
     ['VAR=abc']
@@ -24,7 +24,7 @@ def split_env_items(env_string: str) -> List[str]:
     ['PATH="$PATH;/opt/cibw_test_path"']
     >>> split_env_items('PATH2="something with spaces"')
     ['PATH2="something with spaces"']
-    '''
+    """
     if not env_string:
         return []
 
@@ -32,7 +32,7 @@ def split_env_items(env_string: str) -> List[str]:
     result = []
 
     for word_node in command_node.parts:
-        part_string = env_string[word_node.pos[0]:word_node.pos[1]]
+        part_string = env_string[word_node.pos[0] : word_node.pos[1]]
         result.append(part_string)
 
     return result
@@ -40,30 +40,36 @@ def split_env_items(env_string: str) -> List[str]:
 
 class EnvironmentAssignment:
     def __init__(self, assignment: str):
-        name, equals, value = assignment.partition('=')
+        name, equals, value = assignment.partition("=")
         if not equals:
             raise EnvironmentParseError(assignment)
         self.name = name
         self.value = value
 
-    def evaluated_value(self, environment: Dict[str, str], executor: Optional[bashlex_eval.EnvironmentExecutor] = None) -> str:
-        '''Returns the value of this assignment, as evaluated in the environment'''
+    def evaluated_value(
+        self,
+        environment: Dict[str, str],
+        executor: Optional[bashlex_eval.EnvironmentExecutor] = None,
+    ) -> str:
+        """Returns the value of this assignment, as evaluated in the environment"""
         return bashlex_eval.evaluate(self.value, environment=environment, executor=executor)
 
     def as_shell_assignment(self) -> str:
-        return f'export {self.name}={self.value}'
+        return f"export {self.name}={self.value}"
 
     def __repr__(self) -> str:
-        return f'{self.name}={self.value}'
+        return f"{self.name}={self.value}"
 
 
 class ParsedEnvironment:
     def __init__(self, assignments: List[EnvironmentAssignment]):
         self.assignments = assignments
 
-    def as_dictionary(self,
-                      prev_environment: Mapping[str, str],
-                      executor: Optional[bashlex_eval.EnvironmentExecutor] = None) -> Dict[str, str]:
+    def as_dictionary(
+        self,
+        prev_environment: Mapping[str, str],
+        executor: Optional[bashlex_eval.EnvironmentExecutor] = None,
+    ) -> Dict[str, str]:
         environment = dict(**prev_environment)
 
         for assignment in self.assignments:
@@ -76,7 +82,7 @@ class ParsedEnvironment:
         return [a.as_shell_assignment() for a in self.assignments]
 
     def __repr__(self) -> str:
-        return f'ParsedEnvironment({[repr(a) for a in self.assignments]!r})'
+        return f"ParsedEnvironment({[repr(a) for a in self.assignments]!r})"
 
 
 def parse_environment(env_string: str) -> ParsedEnvironment:

cibuildwheel/extra.py

@@ -14,11 +14,10 @@ class InlineArrayDictEncoder(toml.encoder.TomlEncoder):  # type: ignore
         self.dump_funcs[Version] = lambda v: f'"{v}"'
 
     def dump_sections(self, o: Dict[str, Any], sup: str) -> Any:
-        if all(isinstance(a, list) for a in o.values()):
-            val = ""
-            for k, v in o.items():
-                inner = ",\n  ".join(self.dump_inline_table(d_i).strip() for d_i in v)
-                val += f"{k} = [\n  {inner},\n]\n"
-            return val, self._dict()
-        else:
+        if not all(isinstance(a, list) for a in o.values()):
             return super().dump_sections(o, sup)
+        val = ""
+        for k, v in o.items():
+            inner = ",\n  ".join(self.dump_inline_table(d_i).strip() for d_i in v)
+            val += f"{k} = [\n  {inner},\n]\n"
+        return val, self._dict()

cibuildwheel/linux.py

@@ -15,7 +15,6 @@ from .util import (
     get_build_verbosity_extra_flags,
     prepare_command,
     read_python_configs,
-    resources_dir,
 )
 
 
@@ -31,17 +30,18 @@ class PythonConfiguration(NamedTuple):
 
 def get_python_configurations(
     build_selector: BuildSelector,
-    architectures: Set[Architecture]
+    architectures: Set[Architecture],
 ) -> List[PythonConfiguration]:
 
-    full_python_configs = read_python_configs('linux')
+    full_python_configs = read_python_configs("linux")
 
     python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
 
     # return all configurations whose arch is in our `architectures` set,
     # and match the build/skip rules
     return [
-        c for c in python_configurations
+        c
+        for c in python_configurations
         if any(c.identifier.endswith(arch.value) for arch in architectures)
         and build_selector(c.identifier)
     ]
@@ -49,154 +49,197 @@ def get_python_configurations(
 
 def build(options: BuildOptions) -> None:
     try:
-        subprocess.check_output(['docker', '--version'])
+        # check docker is installed
+        subprocess.run(["docker", "--version"], check=True, stdout=subprocess.DEVNULL)
     except Exception:
-        print('cibuildwheel: Docker not found. Docker is required to run Linux builds. '
-              'If you\'re building on Travis CI, add `services: [docker]` to your .travis.yml.'
-              'If you\'re building on Circle CI in Linux, add a `setup_remote_docker` step to your .circleci/config.yml',
-              file=sys.stderr)
+        print(
+            "cibuildwheel: Docker not found. Docker is required to run Linux builds. "
+            "If you're building on Travis CI, add `services: [docker]` to your .travis.yml."
+            "If you're building on Circle CI in Linux, add a `setup_remote_docker` step to your .circleci/config.yml",
+            file=sys.stderr,
+        )
         sys.exit(2)
 
     assert options.manylinux_images is not None
     python_configurations = get_python_configurations(options.build_selector, options.architectures)
     platforms = [
-        ('cp', 'manylinux_x86_64', options.manylinux_images['x86_64']),
-        ('cp', 'manylinux_i686', options.manylinux_images['i686']),
-        ('cp', 'manylinux_aarch64', options.manylinux_images['aarch64']),
-        ('cp', 'manylinux_ppc64le', options.manylinux_images['ppc64le']),
-        ('cp', 'manylinux_s390x', options.manylinux_images['s390x']),
-        ('pp', 'manylinux_x86_64', options.manylinux_images['pypy_x86_64']),
+        ("cp", "manylinux_x86_64", options.manylinux_images["x86_64"]),
+        ("cp", "manylinux_i686", options.manylinux_images["i686"]),
+        ("cp", "manylinux_aarch64", options.manylinux_images["aarch64"]),
+        ("cp", "manylinux_ppc64le", options.manylinux_images["ppc64le"]),
+        ("cp", "manylinux_s390x", options.manylinux_images["s390x"]),
+        ("pp", "manylinux_x86_64", options.manylinux_images["pypy_x86_64"]),
+        ("pp", "manylinux_aarch64", options.manylinux_images["pypy_aarch64"]),
+        ("pp", "manylinux_i686", options.manylinux_images["pypy_i686"]),
     ]
 
     cwd = Path.cwd()
     abs_package_dir = options.package_dir.resolve()
     if cwd != abs_package_dir and cwd not in abs_package_dir.parents:
-        raise Exception('package_dir must be inside the working directory')
+        raise Exception("package_dir must be inside the working directory")
 
-    container_project_path = PurePath('/project')
+    container_project_path = PurePath("/project")
     container_package_dir = container_project_path / abs_package_dir.relative_to(cwd)
-    container_output_dir = PurePath('/output')
+    container_output_dir = PurePath("/output")
 
     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)]
+        platform_configs = [
+            c
+            for c in python_configurations
+            if c.identifier.startswith(implementation) and c.identifier.endswith(platform_tag)
+        ]
         if not platform_configs:
             continue
 
         try:
-            log.step(f'Starting Docker image {docker_image}...')
-            with DockerContainer(docker_image, simulate_32_bit=platform_tag.endswith('i686'), cwd=container_project_path) as docker:
+            log.step(f"Starting Docker image {docker_image}...")
+            with DockerContainer(
+                docker_image,
+                simulate_32_bit=platform_tag.endswith("i686"),
+                cwd=container_project_path,
+            ) as docker:
 
-                log.step('Copying project into Docker...')
+                log.step("Copying project into Docker...")
                 docker.copy_into(Path.cwd(), container_project_path)
 
                 if options.before_all:
-                    log.step('Running before_all...')
+                    log.step("Running before_all...")
 
                     env = docker.get_environment()
-                    env['PATH'] = f'/opt/python/cp38-cp38/bin:{env["PATH"]}'
-                    env['PIP_DISABLE_PIP_VERSION_CHECK'] = '1'
-                    env = options.environment.as_dictionary(env, executor=docker.environment_executor)
+                    env["PATH"] = f'/opt/python/cp38-cp38/bin:{env["PATH"]}'
+                    env["PIP_DISABLE_PIP_VERSION_CHECK"] = "1"
+                    env = options.environment.as_dictionary(
+                        env, executor=docker.environment_executor
+                    )
 
-                    before_all_prepared = prepare_command(options.before_all, project=container_project_path, package=container_package_dir)
-                    docker.call(['sh', '-c', before_all_prepared], env=env)
+                    before_all_prepared = prepare_command(
+                        options.before_all,
+                        project=container_project_path,
+                        package=container_package_dir,
+                    )
+                    docker.call(["sh", "-c", before_all_prepared], env=env)
 
                 for config in platform_configs:
                     log.build_start(config.identifier)
 
                     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_docker_path = PurePath('/pypy_venv.patch')
-                        docker.copy_into(patch_path, patch_docker_path)
-                        try:
-                            docker.call(['patch', '--force', '-p1', '-d', config.path, '-i', patch_docker_path])
-                        except subprocess.CalledProcessError:
-                            print("PyPy patch not applied", file=sys.stderr)
 
                     if options.dependency_constraints:
-                        constraints_file = options.dependency_constraints.get_for_python_version(config.version)
-                        container_constraints_file = PurePath('/constraints.txt')
+                        constraints_file = options.dependency_constraints.get_for_python_version(
+                            config.version
+                        )
+                        container_constraints_file = PurePath("/constraints.txt")
 
                         docker.copy_into(constraints_file, container_constraints_file)
-                        dependency_constraint_flags = ['-c', container_constraints_file]
+                        dependency_constraint_flags = ["-c", container_constraints_file]
 
-                    log.step('Setting up build environment...')
+                    log.step("Setting up build environment...")
 
                     env = docker.get_environment()
 
                     # put this config's python top of the list
-                    python_bin = config.path / 'bin'
-                    env['PATH'] = f'{python_bin}:{env["PATH"]}'
+                    python_bin = config.path / "bin"
+                    env["PATH"] = f'{python_bin}:{env["PATH"]}'
 
-                    env = options.environment.as_dictionary(env, executor=docker.environment_executor)
+                    env = options.environment.as_dictionary(
+                        env, executor=docker.environment_executor
+                    )
 
                     # check config python and pip are still on PATH
-                    which_python = docker.call(['which', 'python'], env=env, capture_output=True).strip()
-                    if PurePath(which_python) != python_bin / 'python':
-                        print("cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", file=sys.stderr)
+                    which_python = docker.call(
+                        ["which", "python"], env=env, capture_output=True
+                    ).strip()
+                    if PurePath(which_python) != python_bin / "python":
+                        print(
+                            "cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.",
+                            file=sys.stderr,
+                        )
                         sys.exit(1)
 
-                    which_pip = docker.call(['which', 'pip'], env=env, capture_output=True).strip()
-                    if PurePath(which_pip) != python_bin / 'pip':
-                        print("cibuildwheel: pip available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert pip above it.", file=sys.stderr)
+                    which_pip = docker.call(["which", "pip"], env=env, capture_output=True).strip()
+                    if PurePath(which_pip) != python_bin / "pip":
+                        print(
+                            "cibuildwheel: pip available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert pip above it.",
+                            file=sys.stderr,
+                        )
                         sys.exit(1)
 
                     if options.before_build:
-                        log.step('Running before_build...')
-                        before_build_prepared = prepare_command(options.before_build, project=container_project_path, package=container_package_dir)
-                        docker.call(['sh', '-c', before_build_prepared], env=env)
+                        log.step("Running before_build...")
+                        before_build_prepared = prepare_command(
+                            options.before_build,
+                            project=container_project_path,
+                            package=container_package_dir,
+                        )
+                        docker.call(["sh", "-c", before_build_prepared], env=env)
 
-                    log.step('Building wheel...')
+                    log.step("Building wheel...")
 
-                    temp_dir = PurePath('/tmp/cibuildwheel')
-                    built_wheel_dir = temp_dir / 'built_wheel'
-                    docker.call(['rm', '-rf', built_wheel_dir])
-                    docker.call(['mkdir', '-p', built_wheel_dir])
+                    temp_dir = PurePath("/tmp/cibuildwheel")
+                    built_wheel_dir = temp_dir / "built_wheel"
+                    docker.call(["rm", "-rf", built_wheel_dir])
+                    docker.call(["mkdir", "-p", built_wheel_dir])
 
-                    docker.call([
-                        'pip', 'wheel',
-                        container_package_dir,
-                        '-w', built_wheel_dir,
-                        '--no-deps',
-                        *get_build_verbosity_extra_flags(options.build_verbosity)
-                    ], env=env)
+                    docker.call(
+                        [
+                            "pip",
+                            "wheel",
+                            container_package_dir,
+                            "--wheel-dir",
+                            built_wheel_dir,
+                            "--no-deps",
+                            *get_build_verbosity_extra_flags(options.build_verbosity),
+                        ],
+                        env=env,
+                    )
 
-                    built_wheel = docker.glob(built_wheel_dir, '*.whl')[0]
+                    built_wheel = docker.glob(built_wheel_dir, "*.whl")[0]
 
-                    repaired_wheel_dir = temp_dir / 'repaired_wheel'
-                    docker.call(['rm', '-rf', repaired_wheel_dir])
-                    docker.call(['mkdir', '-p', repaired_wheel_dir])
+                    repaired_wheel_dir = temp_dir / "repaired_wheel"
+                    docker.call(["rm", "-rf", repaired_wheel_dir])
+                    docker.call(["mkdir", "-p", repaired_wheel_dir])
 
-                    if built_wheel.name.endswith('none-any.whl'):
+                    if built_wheel.name.endswith("none-any.whl"):
                         raise NonPlatformWheelError()
 
                     if options.repair_command:
-                        log.step('Repairing wheel...')
-                        repair_command_prepared = prepare_command(options.repair_command, wheel=built_wheel, dest_dir=repaired_wheel_dir)
-                        docker.call(['sh', '-c', repair_command_prepared], env=env)
+                        log.step("Repairing wheel...")
+                        repair_command_prepared = prepare_command(
+                            options.repair_command, wheel=built_wheel, dest_dir=repaired_wheel_dir
+                        )
+                        docker.call(["sh", "-c", repair_command_prepared], env=env)
                     else:
-                        docker.call(['mv', built_wheel, repaired_wheel_dir])
+                        docker.call(["mv", built_wheel, repaired_wheel_dir])
 
-                    repaired_wheels = docker.glob(repaired_wheel_dir, '*.whl')
+                    repaired_wheels = docker.glob(repaired_wheel_dir, "*.whl")
 
                     if options.test_command and options.test_selector(config.identifier):
-                        log.step('Testing wheel...')
+                        log.step("Testing wheel...")
 
                         # set up a virtual environment to install and test from, to make sure
                         # there are no dependencies that were pulled in at build time.
-                        docker.call(['pip', 'install', 'virtualenv', *dependency_constraint_flags], env=env)
-                        venv_dir = PurePath(docker.call(['mktemp', '-d'], capture_output=True).strip()) / 'venv'
+                        docker.call(
+                            ["pip", "install", "virtualenv", *dependency_constraint_flags], env=env
+                        )
+                        venv_dir = (
+                            PurePath(docker.call(["mktemp", "-d"], capture_output=True).strip())
+                            / "venv"
+                        )
 
-                        docker.call(['python', '-m', 'virtualenv', '--no-download', venv_dir], env=env)
+                        docker.call(
+                            ["python", "-m", "virtualenv", "--no-download", venv_dir], env=env
+                        )
 
                         virtualenv_env = env.copy()
-                        virtualenv_env['PATH'] = f"{venv_dir / 'bin'}:{virtualenv_env['PATH']}"
+                        virtualenv_env["PATH"] = f"{venv_dir / 'bin'}:{virtualenv_env['PATH']}"
 
                         if options.before_test:
-                            before_test_prepared = prepare_command(options.before_test, project=container_project_path, package=container_package_dir)
-                            docker.call(['sh', '-c', before_test_prepared], env=virtualenv_env)
+                            before_test_prepared = prepare_command(
+                                options.before_test,
+                                project=container_project_path,
+                                package=container_package_dir,
+                            )
+                            docker.call(["sh", "-c", before_test_prepared], env=virtualenv_env)
 
                         # Install the wheel we just built
                         # Note: If auditwheel produced two wheels, it's because the earlier produced wheel
@@ -205,52 +248,70 @@ def build(options: BuildOptions) -> None:
                         # different external shared libraries. so it doesn't matter which one we run the tests on.
                         # Let's just pick the first one.
                         wheel_to_test = repaired_wheels[0]
-                        docker.call(['pip', 'install', str(wheel_to_test) + options.test_extras], env=virtualenv_env)
+                        docker.call(
+                            ["pip", "install", str(wheel_to_test) + options.test_extras],
+                            env=virtualenv_env,
+                        )
 
                         # Install any requirements to run the tests
                         if options.test_requires:
-                            docker.call(['pip', 'install', *options.test_requires], env=virtualenv_env)
+                            docker.call(
+                                ["pip", "install", *options.test_requires], env=virtualenv_env
+                            )
 
                         # Run the tests from a different directory
-                        test_command_prepared = prepare_command(options.test_command, project=container_project_path, package=container_package_dir)
-                        docker.call(['sh', '-c', test_command_prepared], cwd='/root', env=virtualenv_env)
+                        test_command_prepared = prepare_command(
+                            options.test_command,
+                            project=container_project_path,
+                            package=container_package_dir,
+                        )
+                        docker.call(
+                            ["sh", "-c", test_command_prepared], cwd="/root", env=virtualenv_env
+                        )
 
                         # clean up test environment
-                        docker.call(['rm', '-rf', venv_dir])
+                        docker.call(["rm", "-rf", venv_dir])
 
                     # move repaired wheels to output
-                    docker.call(['mkdir', '-p', container_output_dir])
-                    docker.call(['mv', *repaired_wheels, container_output_dir])
+                    docker.call(["mkdir", "-p", container_output_dir])
+                    docker.call(["mv", *repaired_wheels, container_output_dir])
 
                     log.build_end()
 
-                log.step('Copying wheels back to host...')
+                log.step("Copying wheels back to host...")
                 # copy the output back into the host
                 docker.copy_out(container_output_dir, options.output_dir)
                 log.step_end()
         except subprocess.CalledProcessError as error:
-            log.step_end_with_error(f'Command {error.cmd} failed with code {error.returncode}. {error.stdout}')
+            log.step_end_with_error(
+                f"Command {error.cmd} failed with code {error.returncode}. {error.stdout}"
+            )
             troubleshoot(options.package_dir, error)
             sys.exit(1)
 
 
 def troubleshoot(package_dir: Path, error: Exception) -> None:
-    if (isinstance(error, subprocess.CalledProcessError) and error.cmd[0:2] == ['pip', 'wheel']):
+    if isinstance(error, subprocess.CalledProcessError) and error.cmd[0:2] == ["pip", "wheel"]:
         # the 'pip wheel' step failed.
-        print('Checking for common errors...')
-        so_files = list(package_dir.glob('**/*.so'))
+        print("Checking for common errors...")
+        so_files = list(package_dir.glob("**/*.so"))
 
         if so_files:
-            print(textwrap.dedent('''
-                NOTE: Shared object (.so) files found in this project.
+            print(
+                textwrap.dedent(
+                    """
+                    NOTE: Shared object (.so) files found in this project.
 
-                  These files might be built against the wrong OS, causing problems with
-                  auditwheel.
+                    These files might be built against the wrong OS, causing problems with
+                    auditwheel.
 
-                  If you're using Cython and have previously done an in-place build,
-                  remove those build files (*.so and *.c) before starting cibuildwheel.
-            '''), file=sys.stderr)
+                    If you're using Cython and have previously done an in-place build,
+                    remove those build files (*.so and *.c) before starting cibuildwheel.
+                    """
+                ),
+                file=sys.stderr,
+            )
 
-            print('  Files detected:')
-            print('\n'.join([f'    {f}' for f in so_files]))
-            print('')
+            print("  Files detected:")
+            print("\n".join(f"    {f}" for f in so_files))
+            print("")

cibuildwheel/logger.py

@@ -7,24 +7,24 @@ from typing import IO, AnyStr, Optional, Union
 
 from cibuildwheel.util import CIProvider, detect_ci_provider
 
-DEFAULT_FOLD_PATTERN = ('{name}', '')
+DEFAULT_FOLD_PATTERN = ("{name}", "")
 FOLD_PATTERNS = {
-    'azure': ('##[group]{name}', '##[endgroup]'),
-    'travis': ('travis_fold:start:{identifier}\n{name}', 'travis_fold:end:{identifier}'),
-    'github': ('::group::{name}', '::endgroup::{name}'),
+    "azure": ("##[group]{name}", "##[endgroup]"),
+    "travis": ("travis_fold:start:{identifier}\n{name}", "travis_fold:end:{identifier}"),
+    "github": ("::group::{name}", "::endgroup::{name}"),
 }
 
 PLATFORM_IDENTIFIER_DESCIPTIONS = {
-    'manylinux_x86_64': 'manylinux x86_64',
-    'manylinux_i686': 'manylinux i686',
-    'manylinux_aarch64': 'manylinux aarch64',
-    'manylinux_ppc64le': 'manylinux ppc64le',
-    'manylinux_s390x': 'manylinux s390x',
-    'win32': 'Windows 32bit',
-    'win_amd64': 'Windows 64bit',
-    'macosx_x86_64': 'macOS x86_64',
-    'macosx_universal2': 'macOS Universal 2 - x86_64 and arm64',
-    'macosx_arm64': 'macOS arm64 - Apple Silicon',
+    "manylinux_x86_64": "manylinux x86_64",
+    "manylinux_i686": "manylinux i686",
+    "manylinux_aarch64": "manylinux aarch64",
+    "manylinux_ppc64le": "manylinux ppc64le",
+    "manylinux_s390x": "manylinux s390x",
+    "win32": "Windows 32bit",
+    "win_amd64": "Windows 64bit",
+    "macosx_x86_64": "macOS x86_64",
+    "macosx_universal2": "macOS Universal 2 - x86_64 and arm64",
+    "macosx_arm64": "macOS arm64 - Apple Silicon",
 }
 
 
@@ -38,33 +38,33 @@ class Logger:
     active_fold_group_name: Optional[str] = None
 
     def __init__(self) -> None:
-        if sys.platform == 'win32' and hasattr(sys.stdout, 'reconfigure'):
+        if sys.platform == "win32" and hasattr(sys.stdout, "reconfigure"):
             # the encoding on Windows can be a 1-byte charmap, but all CIs
             # support utf8, so we hardcode that
-            sys.stdout.reconfigure(encoding='utf8')
+            sys.stdout.reconfigure(encoding="utf8")
 
         self.unicode_enabled = file_supports_unicode(sys.stdout)
 
         ci_provider = detect_ci_provider()
 
         if ci_provider == CIProvider.azure_pipelines:
-            self.fold_mode = 'azure'
+            self.fold_mode = "azure"
             self.colors_enabled = True
 
         elif ci_provider == CIProvider.github_actions:
-            self.fold_mode = 'github'
+            self.fold_mode = "github"
             self.colors_enabled = True
 
         elif ci_provider == CIProvider.travis_ci:
-            self.fold_mode = 'travis'
+            self.fold_mode = "travis"
             self.colors_enabled = True
 
         elif ci_provider == CIProvider.appveyor:
-            self.fold_mode = 'disabled'
+            self.fold_mode = "disabled"
             self.colors_enabled = True
 
         else:
-            self.fold_mode = 'disabled'
+            self.fold_mode = "disabled"
             self.colors_enabled = file_supports_color(sys.stdout)
 
     def build_start(self, identifier: str) -> None:
@@ -72,8 +72,8 @@ class Logger:
         c = self.colors
         description = build_description_from_identifier(identifier)
         print()
-        print(f'{c.bold}{c.blue}Building {identifier} wheel{c.end}')
-        print(f'{description}')
+        print(f"{c.bold}{c.blue}Building {identifier} wheel{c.end}")
+        print(f"{description}")
         print()
 
         self.build_start_time = time.time()
@@ -89,7 +89,9 @@ class Logger:
         duration = time.time() - self.build_start_time
 
         print()
-        print(f'{c.green}{s.done} {c.end}{self.active_build_identifier} finished in {duration:.2f}s')
+        print(
+            f"{c.green}{s.done} {c.end}{self.active_build_identifier} finished in {duration:.2f}s"
+        )
         self.build_start_time = None
         self.active_build_identifier = None
 
@@ -105,9 +107,9 @@ class Logger:
             s = self.symbols
             duration = time.time() - self.step_start_time
             if success:
-                print(f'{c.green}{s.done} {c.end}{duration:.2f}s'.rjust(78))
+                print(f"{c.green}{s.done} {c.end}{duration:.2f}s".rjust(78))
             else:
-                print(f'{c.red}{s.error} {c.end}{duration:.2f}s'.rjust(78))
+                print(f"{c.red}{s.error} {c.end}{duration:.2f}s".rjust(78))
 
             self.step_start_time = None
 
@@ -116,18 +118,18 @@ class Logger:
         self.error(error)
 
     def warning(self, message: str) -> None:
-        if self.fold_mode == 'github':
-            print(f'::warning::{message}\n', file=sys.stderr)
+        if self.fold_mode == "github":
+            print(f"::warning::{message}\n", file=sys.stderr)
         else:
             c = self.colors
-            print(f'{c.yellow}Warning{c.end}: {message}\n', file=sys.stderr)
+            print(f"{c.yellow}Warning{c.end}: {message}\n", file=sys.stderr)
 
     def error(self, error: Union[BaseException, str]) -> None:
-        if self.fold_mode == 'github':
-            print(f'::error::{error}\n', file=sys.stderr)
+        if self.fold_mode == "github":
+            print(f"::error::{error}\n", file=sys.stderr)
         else:
             c = self.colors
-            print(f'{c.bright_red}Error{c.end}: {error}\n', file=sys.stderr)
+            print(f"{c.bright_red}Error{c.end}: {error}\n", file=sys.stderr)
 
     def _start_fold_group(self, name: str) -> None:
         self._end_fold_group()
@@ -143,21 +145,23 @@ class Logger:
         if self.active_fold_group_name:
             fold_start_pattern = FOLD_PATTERNS.get(self.fold_mode, DEFAULT_FOLD_PATTERN)[1]
             identifier = self._fold_group_identifier(self.active_fold_group_name)
-            print(fold_start_pattern.format(name=self.active_fold_group_name, identifier=identifier))
+            print(
+                fold_start_pattern.format(name=self.active_fold_group_name, identifier=identifier)
+            )
             sys.stdout.flush()
             self.active_fold_group_name = None
 
     def _fold_group_identifier(self, name: str) -> str:
-        '''
+        """
         Travis doesn't like fold groups identifiers that have spaces in. This
         method converts them to ascii identifiers
-        '''
+        """
         # whitespace to underscores
-        identifier = re.sub(r'\s+', '_', name)
+        identifier = re.sub(r"\s+", "_", name)
         # remove non-alphanum
-        identifier = re.sub(r'[^A-Za-z\d_]+', '', identifier)
+        identifier = re.sub(r"[^A-Za-z\d_]+", "", identifier)
         # trim underscores
-        identifier = identifier.strip('_')
+        identifier = identifier.strip("_")
         # lowercase, shorten
         return identifier.lower()[:20]
 
@@ -177,53 +181,53 @@ class Logger:
 
 
 def build_description_from_identifier(identifier: str) -> str:
-    python_identifier, _, platform_identifier = identifier.partition('-')
+    python_identifier, _, platform_identifier = identifier.partition("-")
 
-    build_description = ''
+    build_description = ""
 
     python_interpreter = python_identifier[0:2]
-    python_version = python_identifier[2:4]
+    python_version = python_identifier[2:]
 
-    if python_interpreter == 'cp':
-        build_description += 'CPython'
-    elif python_interpreter == 'pp':
-        build_description += 'PyPy'
+    if python_interpreter == "cp":
+        build_description += "CPython"
+    elif python_interpreter == "pp":
+        build_description += "PyPy"
     else:
-        raise Exception('unknown python')
+        raise Exception("unknown python")
 
-    build_description += f' {python_version[0]}.{python_version[1]} '
+    build_description += f" {python_version[0]}.{python_version[1:]} "
 
     try:
         build_description += PLATFORM_IDENTIFIER_DESCIPTIONS[platform_identifier]
     except KeyError as e:
-        raise Exception('unknown platform') from e
+        raise Exception("unknown platform") from e
 
     return build_description
 
 
 class Colors:
     def __init__(self, *, enabled: bool) -> None:
-        self.red = '\033[31m' if enabled else ''
-        self.green = '\033[32m' if enabled else ''
-        self.yellow = '\033[33m' if enabled else ''
-        self.blue = '\033[34m' if enabled else ''
-        self.cyan = '\033[36m' if enabled else ''
-        self.bright_red = '\033[91m' if enabled else ''
-        self.bright_green = '\033[92m' if enabled else ''
-        self.white = '\033[37m\033[97m' if enabled else ''
+        self.red = "\033[31m" if enabled else ""
+        self.green = "\033[32m" if enabled else ""
+        self.yellow = "\033[33m" if enabled else ""
+        self.blue = "\033[34m" if enabled else ""
+        self.cyan = "\033[36m" if enabled else ""
+        self.bright_red = "\033[91m" if enabled else ""
+        self.bright_green = "\033[92m" if enabled else ""
+        self.white = "\033[37m\033[97m" if enabled else ""
 
-        self.bg_grey = '\033[48;5;235m' if enabled else ''
+        self.bg_grey = "\033[48;5;235m" if enabled else ""
 
-        self.bold = '\033[1m' if enabled else ''
-        self.faint = '\033[2m' if enabled else ''
+        self.bold = "\033[1m" if enabled else ""
+        self.faint = "\033[2m" if enabled else ""
 
-        self.end = '\033[0m' if enabled else ''
+        self.end = "\033[0m" if enabled else ""
 
 
 class Symbols:
     def __init__(self, *, unicode: bool) -> None:
-        self.done = '✓' if unicode else 'done'
-        self.error = '✕' if unicode else 'failed'
+        self.done = "✓" if unicode else "done"
+        self.error = "✕" if unicode else "failed"
 
 
 def file_supports_color(file_obj: IO[AnyStr]) -> bool:
@@ -231,29 +235,29 @@ def file_supports_color(file_obj: IO[AnyStr]) -> bool:
     Returns True if the running system's terminal supports color.
     """
     plat = sys.platform
-    supported_platform = (plat != 'win32' or 'ANSICON' in os.environ)
+    supported_platform = plat != "win32" or "ANSICON" in os.environ
 
     is_a_tty = file_is_a_tty(file_obj)
 
-    return (supported_platform and is_a_tty)
+    return supported_platform and is_a_tty
 
 
 def file_is_a_tty(file_obj: IO[AnyStr]) -> bool:
-    return hasattr(file_obj, 'isatty') and file_obj.isatty()
+    return hasattr(file_obj, "isatty") and file_obj.isatty()
 
 
 def file_supports_unicode(file_obj: IO[AnyStr]) -> bool:
-    encoding = getattr(file_obj, 'encoding', None)
+    encoding = getattr(file_obj, "encoding", None)
     if not encoding:
         return False
 
     codec_info = codecs.lookup(encoding)
 
-    return ('utf' in codec_info.name)
+    return "utf" in codec_info.name
 
 
-'''
+"""
 Global instance of the Logger.
-'''
+"""
 # (there's only one stdout per-process, so a global instance is justified)
 log = Logger()

cibuildwheel/macos.py

@@ -19,46 +19,51 @@ from .util import (
     NonPlatformWheelError,
     download,
     get_build_verbosity_extra_flags,
-    get_pip_script,
     install_certifi_script,
     prepare_command,
     read_python_configs,
-    resources_dir,
     unwrap,
 )
 
 
-def call(args: Sequence[PathOrStr], env: Optional[Dict[str, str]] = None, cwd: Optional[str] = None, shell: bool = False) -> int:
+def call(
+    args: Sequence[PathOrStr],
+    env: Optional[Dict[str, str]] = None,
+    cwd: Optional[str] = None,
+    shell: bool = False,
+) -> None:
     # print the command executing for the logs
     if shell:
-        print(f'+ {args}')
+        print(f"+ {args}")
     else:
-        print('+ ' + ' '.join(shlex.quote(str(a)) for a in args))
+        print("+ " + " ".join(shlex.quote(str(a)) for a in args))
 
-    return subprocess.check_call(args, env=env, cwd=cwd, shell=shell)
+    subprocess.run(args, env=env, cwd=cwd, shell=shell, check=True)
 
 
 def get_macos_version() -> Tuple[int, int]:
-    '''
+    """
     Returns the macOS major/minor version, as a tuple, e.g. (10, 15) or (11, 0)
 
     These tuples can be used in comparisons, e.g.
         (10, 14) <= (11, 0) == True
         (10, 14) <= (10, 16) == True
         (11, 2) <= (11, 0) != True
-    '''
+    """
     version_str, _, _ = platform.mac_ver()
     version = tuple(map(int, version_str.split(".")[:2]))
     return cast(Tuple[int, int], version)
 
 
 def get_macos_sdks() -> List[str]:
-    output = subprocess.check_output(
-        ['xcodebuild', '-showsdks'],
+    output = subprocess.run(
+        ["xcodebuild", "-showsdks"],
         universal_newlines=True,
-    )
+        check=True,
+        stdout=subprocess.PIPE,
+    ).stdout
 
-    return [m.group(1) for m in re.finditer(r'-sdk (macosx\S+)', output)]
+    return [m.group(1) for m in re.finditer(r"-sdk (macosx\S+)", output)]
 
 
 class PythonConfiguration(NamedTuple):
@@ -67,16 +72,20 @@ class PythonConfiguration(NamedTuple):
     url: str
 
 
-def get_python_configurations(build_selector: BuildSelector,
-                              architectures: Set[Architecture]) -> List[PythonConfiguration]:
+def get_python_configurations(
+    build_selector: BuildSelector, architectures: Set[Architecture]
+) -> List[PythonConfiguration]:
 
-    full_python_configs = read_python_configs('macos')
+    full_python_configs = read_python_configs("macos")
 
     python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
 
     # filter out configs that don't match any of the selected architectures
-    python_configurations = [c for c in python_configurations
-                             if any(c.identifier.endswith(a.value) for a in architectures)]
+    python_configurations = [
+        c
+        for c in python_configurations
+        if any(c.identifier.endswith(a.value) for a in architectures)
+    ]
 
     # skip builds as required by BUILD/SKIP
     python_configurations = [c for c in python_configurations if build_selector(c.identifier)]
@@ -84,29 +93,26 @@ def get_python_configurations(build_selector: BuildSelector,
     # When running on macOS 11 and x86_64, the reported OS is '10.16', but
     # there is no such OS - it really means macOS 11.
     if get_macos_version() >= (10, 16):
-        if any(c.identifier.startswith('pp') for c in python_configurations):
+        if any(c.identifier.startswith("pp") for c in python_configurations):
             # pypy doesn't work on macOS 11 yet
             # See https://foss.heptapod.net/pypy/pypy/-/issues/3314
-            log.warning(unwrap('''
-                PyPy is currently unsupported when building on macOS 11. To build macOS PyPy wheels,
-                build on an older OS, such as macOS 10.15. To silence this warning, deselect PyPy by
-                adding "pp*-macosx*" to your CIBW_SKIP option.
-            '''))
-            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')]
+            log.warning(
+                unwrap(
+                    """
+                    PyPy is currently unsupported when building on macOS 11. To build macOS PyPy
+                    wheels, build on an older OS, such as macOS 10.15. To silence this warning,
+                    deselect PyPy by adding "pp*-macosx*" to your CIBW_SKIP option.
+                    """
+                )
+            )
+            python_configurations = [
+                c for c in python_configurations if not c.identifier.startswith("pp")
+            ]
 
     return python_configurations
 
 
-SYMLINKS_DIR = Path('/tmp/cibw_bin')
+SYMLINKS_DIR = Path("/tmp/cibw_bin")
 
 
 def make_symlinks(installation_bin_path: Path, python_executable: str, pip_executable: str) -> None:
@@ -119,82 +125,82 @@ def make_symlinks(installation_bin_path: Path, python_executable: str, pip_execu
         shutil.rmtree(SYMLINKS_DIR)
     SYMLINKS_DIR.mkdir(parents=True)
 
-    (SYMLINKS_DIR / 'python').symlink_to(installation_bin_path / python_executable)
-    (SYMLINKS_DIR / 'python-config').symlink_to(installation_bin_path / (python_executable + '-config'))
-    (SYMLINKS_DIR / 'pip').symlink_to(installation_bin_path / pip_executable)
+    (SYMLINKS_DIR / "python").symlink_to(installation_bin_path / python_executable)
+    (SYMLINKS_DIR / "python-config").symlink_to(
+        installation_bin_path / (python_executable + "-config")
+    )
+    (SYMLINKS_DIR / "pip").symlink_to(installation_bin_path / pip_executable)
 
 
 def install_cpython(version: str, url: str) -> Path:
-    installed_system_packages = subprocess.check_output(['pkgutil', '--pkgs'], universal_newlines=True).splitlines()
+    installed_system_packages = subprocess.run(
+        ["pkgutil", "--pkgs"], universal_newlines=True, check=True, stdout=subprocess.PIPE
+    ).stdout.splitlines()
 
     # 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'
-    installation_bin_path = Path(f'/Library/Frameworks/Python.framework/Versions/{version}/bin')
+    python_package_identifier = f"org.python.Python.PythonFramework-{version}"
+    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'))
+        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", "installer", "-pkg", "/tmp/Python.pkg", "-target", "/"])
+        call(["sudo", str(installation_bin_path / python_executable), str(install_certifi_script)])
 
-        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
 
 
 def install_pypy(version: str, url: str) -> Path:
-    pypy_tar_bz2 = url.rsplit('/', 1)[-1]
+    pypy_tar_bz2 = url.rsplit("/", 1)[-1]
     extension = ".tar.bz2"
     assert pypy_tar_bz2.endswith(extension)
-    pypy_base_filename = pypy_tar_bz2[:-len(extension)]
-    installation_path = Path('/tmp') / pypy_base_filename
+    pypy_base_filename = pypy_tar_bz2[: -len(extension)]
+    installation_path = Path("/tmp") / pypy_base_filename
     if not installation_path.exists():
         downloaded_tar_bz2 = Path("/tmp") / pypy_tar_bz2
         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'
-        call(['patch', '--force', '-p1', '-d', installation_path, '-i', patch_path])
+        call(["tar", "-C", "/tmp", "-xf", downloaded_tar_bz2])
 
-    installation_bin_path = installation_path / 'bin'
-    python_executable = 'pypy3' if version[0] == '3' else 'pypy'
-    pip_executable = 'pip3' if version[0] == '3' else 'pip'
+    installation_bin_path = installation_path / "bin"
+    python_executable = "pypy3"
+    pip_executable = "pip3"
     make_symlinks(installation_bin_path, python_executable, pip_executable)
 
     return installation_bin_path
 
 
-def setup_python(python_configuration: PythonConfiguration,
-                 dependency_constraint_flags: Sequence[PathOrStr],
-                 environment: ParsedEnvironment) -> Dict[str, str]:
+def setup_python(
+    python_configuration: PythonConfiguration,
+    dependency_constraint_flags: Sequence[PathOrStr],
+    environment: ParsedEnvironment,
+) -> Dict[str, str]:
     implementation_id = python_configuration.identifier.split("-")[0]
-    log.step(f'Installing Python {implementation_id}...')
+    log.step(f"Installing Python {implementation_id}...")
 
-    if implementation_id.startswith('cp'):
-        installation_bin_path = install_cpython(python_configuration.version, python_configuration.url)
-    elif implementation_id.startswith('pp'):
+    if implementation_id.startswith("cp"):
+        installation_bin_path = install_cpython(
+            python_configuration.version, python_configuration.url
+        )
+    elif implementation_id.startswith("pp"):
         installation_bin_path = install_pypy(python_configuration.version, python_configuration.url)
     else:
         raise ValueError("Unknown Python implementation")
 
-    log.step('Setting up build environment...')
+    log.step("Setting up build environment...")
 
     env = os.environ.copy()
-    env['PATH'] = os.pathsep.join([
-        str(SYMLINKS_DIR),
-        str(installation_bin_path),
-        env['PATH'],
-    ])
+    env["PATH"] = os.pathsep.join(
+        [
+            str(SYMLINKS_DIR),
+            str(installation_bin_path),
+            env["PATH"],
+        ]
+    )
 
     # Fix issue with site.py setting the wrong `sys.prefix`, `sys.exec_prefix`,
     # `sys.path`, ... for PyPy: https://foss.heptapod.net/pypy/pypy/issues/3175
@@ -202,146 +208,201 @@ def setup_python(python_configuration: PythonConfiguration,
     # testing virtualenv- see https://github.com/theacodes/nox/issues/44 and
     # https://github.com/pypa/virtualenv/issues/620
     # Also see https://github.com/python/cpython/pull/9516
-    env.pop('__PYVENV_LAUNCHER__', None)
+    env.pop("__PYVENV_LAUNCHER__", None)
     env = environment.as_dictionary(prev_environment=env)
 
     # we version pip ourselves, so we don't care about pip version checking
-    env['PIP_DISABLE_PIP_VERSION_CHECK'] = '1'
+    env["PIP_DISABLE_PIP_VERSION_CHECK"] = "1"
 
     # check what version we're on
-    call(['which', 'python'], env=env)
-    call(['python', '--version'], env=env)
-    which_python = subprocess.check_output(['which', 'python'], env=env, universal_newlines=True).strip()
-    if which_python != '/tmp/cibw_bin/python':
-        print("cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", file=sys.stderr)
+    call(["which", "python"], env=env)
+    call(["python", "--version"], env=env)
+    which_python = subprocess.run(
+        ["which", "python"], env=env, universal_newlines=True, check=True, stdout=subprocess.PIPE
+    ).stdout.strip()
+    if which_python != "/tmp/cibw_bin/python":
+        print(
+            "cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.",
+            file=sys.stderr,
+        )
         sys.exit(1)
 
-    # install pip & wheel
-    call(['python', get_pip_script, *dependency_constraint_flags], env=env, cwd="/tmp")
-    assert (installation_bin_path / 'pip').exists()
-    call(['which', 'pip'], env=env)
-    call(['pip', '--version'], env=env)
-    which_pip = subprocess.check_output(['which', 'pip'], env=env, universal_newlines=True).strip()
-    if which_pip != '/tmp/cibw_bin/pip':
-        print("cibuildwheel: pip available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert pip above it.", file=sys.stderr)
+    # Install pip
+
+    requires_reinstall = not (installation_bin_path / "pip").exists()
+    if requires_reinstall:
+        # maybe pip isn't installed at all. ensurepip resolves that.
+        call(["python", "-m", "ensurepip"], env=env, cwd="/tmp")
+
+    # upgrade pip to the version matching our constraints
+    # if necessary, reinstall it to ensure that it's available on PATH as 'pip'
+    call(
+        [
+            "python",
+            "-m",
+            "pip",
+            "install",
+            "--force-reinstall" if requires_reinstall else "--upgrade",
+            "pip",
+            *dependency_constraint_flags,
+        ],
+        env=env,
+        cwd="/tmp",
+    )
+
+    assert (installation_bin_path / "pip").exists()
+    call(["which", "pip"], env=env)
+    call(["pip", "--version"], env=env)
+    which_pip = subprocess.run(
+        ["which", "pip"], env=env, universal_newlines=True, check=True, stdout=subprocess.PIPE
+    ).stdout.strip()
+    if which_pip != "/tmp/cibw_bin/pip":
+        print(
+            "cibuildwheel: pip available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert pip above it.",
+            file=sys.stderr,
+        )
         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.
-    env.setdefault('MACOSX_DEPLOYMENT_TARGET', '10.9')
+    # PyPy defaults to 10.7, causing inconsistencies if it's left unset.
+    env.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.9")
 
-    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')
+    config_is_arm64 = python_configuration.identifier.endswith("arm64")
+    config_is_universal2 = python_configuration.identifier.endswith("universal2")
 
-    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
-            # compatible back to 10.9.
-            env.setdefault('_PYTHON_HOST_PLATFORM', 'macosx-10.9-x86_64')
-            env.setdefault('ARCHFLAGS', '-arch x86_64')
-        elif python_configuration.identifier.endswith('arm64'):
+    if python_configuration.version not in {"3.6", "3.7"}:
+        if config_is_arm64:
             # macOS 11 is the first OS with arm64 support, so the wheels
             # have that as a minimum.
-            env.setdefault('_PYTHON_HOST_PLATFORM', 'macosx-11.0-arm64')
-            env.setdefault('ARCHFLAGS', '-arch arm64')
-        elif python_configuration.identifier.endswith('universal2'):
-            if get_macos_version() < (10, 16):
-                # we can do universal2 builds on macos 10.15, but we need to
-                # set ARCHFLAGS otherwise CPython sets it to `-arch x86_64`
-                env.setdefault('ARCHFLAGS', '-arch arm64 -arch x86_64')
+            env.setdefault("_PYTHON_HOST_PLATFORM", "macosx-11.0-arm64")
+            env.setdefault("ARCHFLAGS", "-arch arm64")
+        elif config_is_universal2:
+            env.setdefault("_PYTHON_HOST_PLATFORM", "macosx-10.9-universal2")
+            env.setdefault("ARCHFLAGS", "-arch arm64 -arch x86_64")
+        elif python_configuration.identifier.endswith("x86_64"):
+            # even on the macos11.0 Python installer, on the x86_64 side it's
+            # compatible back to 10.9.
+            env.setdefault("_PYTHON_HOST_PLATFORM", "macosx-10.9-x86_64")
+            env.setdefault("ARCHFLAGS", "-arch x86_64")
 
-    if python_configuration.identifier.endswith('arm64') or python_configuration.identifier.endswith('universal2'):
-        if get_macos_version() < (10, 16) and 'SDKROOT' not in env:
-            # xcode 12.2 or higher can build arm64 on macos 10.15 or below, but
-            # needs the correct SDK selected.
-            sdks = get_macos_sdks()
+    building_arm64 = config_is_arm64 or config_is_universal2
+    if building_arm64 and get_macos_version() < (10, 16) and "SDKROOT" not in env:
+        # xcode 12.2 or higher can build arm64 on macos 10.15 or below, but
+        # needs the correct SDK selected.
+        sdks = get_macos_sdks()
 
-            # Different versions of Xcode contain different SDK versions...
-            # we're happy with anything newer than macOS 11.0
-            arm64_compatible_sdks = [s for s in sdks if not s.startswith('macosx10.')]
+        # Different versions of Xcode contain different SDK versions...
+        # we're happy with anything newer than macOS 11.0
+        arm64_compatible_sdks = [s for s in sdks if not s.startswith("macosx10.")]
 
-            if not arm64_compatible_sdks:
-                log.warning(unwrap('''
+        if not arm64_compatible_sdks:
+            log.warning(
+                unwrap(
+                    """
                     SDK for building arm64-compatible wheels not found. You need Xcode 12.2 or later
                     to build universal2 or arm64 wheels.
-                '''))
-            else:
-                env.setdefault('SDKROOT', arm64_compatible_sdks[0])
+                    """
+                )
+            )
+        else:
+            env.setdefault("SDKROOT", arm64_compatible_sdks[0])
 
-    log.step('Installing build tools...')
-    call(['pip', 'install', '--upgrade', 'setuptools', 'wheel', 'delocate', *dependency_constraint_flags], env=env)
+    log.step("Installing build tools...")
+    call(
+        [
+            "pip",
+            "install",
+            "--upgrade",
+            "setuptools",
+            "wheel",
+            "delocate",
+            *dependency_constraint_flags,
+        ],
+        env=env,
+    )
 
     return env
 
 
 def build(options: BuildOptions) -> None:
-    temp_dir = Path(tempfile.mkdtemp(prefix='cibuildwheel'))
-    built_wheel_dir = temp_dir / 'built_wheel'
-    repaired_wheel_dir = temp_dir / 'repaired_wheel'
+    temp_dir = Path(tempfile.mkdtemp(prefix="cibuildwheel"))
+    built_wheel_dir = temp_dir / "built_wheel"
+    repaired_wheel_dir = temp_dir / "repaired_wheel"
 
     try:
         if options.before_all:
-            log.step('Running before_all...')
+            log.step("Running before_all...")
             env = options.environment.as_dictionary(prev_environment=os.environ)
-            before_all_prepared = prepare_command(options.before_all, project='.', package=options.package_dir)
+            env.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.9")
+            before_all_prepared = prepare_command(
+                options.before_all, project=".", package=options.package_dir
+            )
             call([before_all_prepared], shell=True, env=env)
 
-        python_configurations = get_python_configurations(options.build_selector, options.architectures)
+        python_configurations = get_python_configurations(
+            options.build_selector, options.architectures
+        )
 
         for config in python_configurations:
             log.build_start(config.identifier)
 
+            config_is_arm64 = config.identifier.endswith("arm64")
+            config_is_universal2 = config.identifier.endswith("universal2")
+
             dependency_constraint_flags: Sequence[PathOrStr] = []
             if options.dependency_constraints:
                 dependency_constraint_flags = [
-                    '-c', options.dependency_constraints.get_for_python_version(config.version)
+                    "-c",
+                    options.dependency_constraints.get_for_python_version(config.version),
                 ]
 
             env = setup_python(config, dependency_constraint_flags, options.environment)
 
             if options.before_build:
-                log.step('Running before_build...')
-                before_build_prepared = prepare_command(options.before_build, project='.', package=options.package_dir)
+                log.step("Running before_build...")
+                before_build_prepared = prepare_command(
+                    options.before_build, project=".", package=options.package_dir
+                )
                 call(before_build_prepared, env=env, shell=True)
 
-            log.step('Building wheel...')
+            log.step("Building wheel...")
             if built_wheel_dir.exists():
                 shutil.rmtree(built_wheel_dir)
             built_wheel_dir.mkdir(parents=True)
 
             # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org
-            # see https://github.com/joerick/cibuildwheel/pull/369
-            call([
-                'pip', 'wheel',
-                options.package_dir.resolve(),
-                '-w', built_wheel_dir,
-                '--no-deps',
-                *get_build_verbosity_extra_flags(options.build_verbosity)
-            ], env=env)
+            # see https://github.com/pypa/cibuildwheel/pull/369
+            call(
+                [
+                    "pip",
+                    "wheel",
+                    options.package_dir.resolve(),
+                    "--wheel-dir",
+                    built_wheel_dir,
+                    "--no-deps",
+                    *get_build_verbosity_extra_flags(options.build_verbosity),
+                ],
+                env=env,
+            )
 
-            built_wheel = next(built_wheel_dir.glob('*.whl'))
+            built_wheel = next(built_wheel_dir.glob("*.whl"))
 
             if repaired_wheel_dir.exists():
                 shutil.rmtree(repaired_wheel_dir)
             repaired_wheel_dir.mkdir(parents=True)
 
-            if built_wheel.name.endswith('none-any.whl'):
+            if built_wheel.name.endswith("none-any.whl"):
                 raise NonPlatformWheelError()
 
             if options.repair_command:
-                log.step('Repairing wheel...')
+                log.step("Repairing wheel...")
 
-                if config.identifier.endswith('universal2'):
-                    delocate_archs = 'x86_64,arm64'
-                elif config.identifier.endswith('arm64'):
-                    delocate_archs = 'arm64'
+                if config_is_universal2:
+                    delocate_archs = "x86_64,arm64"
+                elif config_is_arm64:
+                    delocate_archs = "arm64"
                 else:
-                    delocate_archs = 'x86_64'
+                    delocate_archs = "x86_64"
 
                 repair_command_prepared = prepare_command(
                     options.repair_command,
@@ -353,105 +414,137 @@ def build(options: BuildOptions) -> None:
             else:
                 shutil.move(str(built_wheel), repaired_wheel_dir)
 
-            repaired_wheel = next(repaired_wheel_dir.glob('*.whl'))
+            repaired_wheel = next(repaired_wheel_dir.glob("*.whl"))
 
             log.step_end()
 
             if options.test_command and options.test_selector(config.identifier):
                 machine_arch = platform.machine()
-                testing_archs: List[Literal['x86_64', 'arm64']] = []
+                testing_archs: List[Literal["x86_64", "arm64"]] = []
 
-                if config.identifier.endswith('_arm64'):
-                    testing_archs = ['arm64']
-                elif config.identifier.endswith('_universal2'):
-                    testing_archs = ['x86_64', 'arm64']
+                if config_is_arm64:
+                    testing_archs = ["arm64"]
+                elif config_is_universal2:
+                    testing_archs = ["x86_64", "arm64"]
                 else:
-                    testing_archs = ['x86_64']
+                    testing_archs = ["x86_64"]
 
                 for testing_arch in testing_archs:
-                    if config.identifier.endswith('_universal2'):
-                        arch_specific_identifier = f'{config.identifier}:{testing_arch}'
+                    if config_is_universal2:
+                        arch_specific_identifier = f"{config.identifier}:{testing_arch}"
                         if not options.test_selector(arch_specific_identifier):
                             continue
 
-                    if machine_arch == 'x86_64' and testing_arch == 'arm64':
-                        if config.identifier.endswith('_arm64'):
-                            log.warning(unwrap('''
-                                While arm64 wheels can be built on x86_64, they cannot be tested. The
-                                ability to test the arm64 wheels will be added in a future release of
-                                cibuildwheel, once Apple Silicon CI runners are widely available. To
-                                silence this warning, set `CIBW_TEST_SKIP: *-macosx_arm64`.
-                            '''))
-                        elif config.identifier.endswith('_universal2'):
-                            log.warning(unwrap('''
-                                While universal2 wheels can be built on x86_64, the arm64 part of them
-                                cannot currently be tested. The ability to test the arm64 part of a
-                                universal2 wheel will be added in a future release of cibuildwheel, once
-                                Apple Silicon CI runners are widely available. To silence this warning,
-                                set `CIBW_TEST_SKIP: *-macosx_universal2:arm64`.
-                            '''))
+                    if machine_arch == "x86_64" and testing_arch == "arm64":
+                        if config_is_arm64:
+                            log.warning(
+                                unwrap(
+                                    """
+                                    While arm64 wheels can be built on x86_64, they cannot be
+                                    tested. The ability to test the arm64 wheels will be added in a
+                                    future release of cibuildwheel, once Apple Silicon CI runners
+                                    are widely available. To silence this warning, set
+                                    `CIBW_TEST_SKIP: *-macosx_arm64`.
+                                    """
+                                )
+                            )
+                        elif config_is_universal2:
+                            log.warning(
+                                unwrap(
+                                    """
+                                    While universal2 wheels can be built on x86_64, the arm64 part
+                                    of them cannot currently be tested. The ability to test the
+                                    arm64 part of a universal2 wheel will be added in a future
+                                    release of cibuildwheel, once Apple Silicon CI runners are
+                                    widely available. To silence this warning, set
+                                    `CIBW_TEST_SKIP: *-macosx_universal2:arm64`.
+                                    """
+                                )
+                            )
                         else:
-                            raise RuntimeError('unreachable')
+                            raise RuntimeError("unreachable")
 
                         # skip this test
                         continue
 
-                    log.step('Testing wheel...' if testing_arch == machine_arch else f'Testing wheel on {testing_arch}...')
+                    log.step(
+                        "Testing wheel..."
+                        if testing_arch == machine_arch
+                        else f"Testing wheel on {testing_arch}..."
+                    )
 
                     # set up a virtual environment to install and test from, to make sure
                     # there are no dependencies that were pulled in at build time.
-                    call(['pip', 'install', 'virtualenv', *dependency_constraint_flags], env=env)
+                    call(["pip", "install", "virtualenv", *dependency_constraint_flags], env=env)
                     venv_dir = Path(tempfile.mkdtemp())
 
                     arch_prefix = []
                     if testing_arch != machine_arch:
-                        if machine_arch == 'arm64' and testing_arch == 'x86_64':
+                        if machine_arch == "arm64" and testing_arch == "x86_64":
                             # rosetta2 will provide the emulation with just the arch prefix.
-                            arch_prefix = ['arch', '-x86_64']
+                            arch_prefix = ["arch", "-x86_64"]
                         else:
-                            raise RuntimeError("don't know how to emulate {testing_arch} on {machine_arch}")
+                            raise RuntimeError(
+                                "don't know how to emulate {testing_arch} on {machine_arch}"
+                            )
 
                     # define a custom 'call' function that adds the arch prefix each time
-                    def call_with_arch(args: Sequence[PathOrStr], **kwargs: Any) -> int:
+                    def call_with_arch(args: Sequence[PathOrStr], **kwargs: Any) -> None:
                         if isinstance(args, str):
-                            args = ' '.join(arch_prefix) + ' ' + args
+                            args = " ".join(arch_prefix) + " " + args
                         else:
                             args = [*arch_prefix, *args]
-                        return call(args, **kwargs)
+                        call(args, **kwargs)
 
                     # Use --no-download to ensure determinism by using seed libraries
                     # built into virtualenv
-                    call_with_arch(['python', '-m', 'virtualenv', '--no-download', venv_dir], env=env)
+                    call_with_arch(
+                        ["python", "-m", "virtualenv", "--no-download", venv_dir], env=env
+                    )
 
                     virtualenv_env = env.copy()
-                    virtualenv_env['PATH'] = os.pathsep.join([
-                        str(venv_dir / 'bin'),
-                        virtualenv_env['PATH'],
-                    ])
+                    virtualenv_env["PATH"] = os.pathsep.join(
+                        [
+                            str(venv_dir / "bin"),
+                            virtualenv_env["PATH"],
+                        ]
+                    )
 
                     # check that we are using the Python from the virtual environment
-                    call_with_arch(['which', 'python'], env=virtualenv_env)
+                    call_with_arch(["which", "python"], env=virtualenv_env)
 
                     if options.before_test:
-                        before_test_prepared = prepare_command(options.before_test, project='.', package=options.package_dir)
+                        before_test_prepared = prepare_command(
+                            options.before_test, project=".", package=options.package_dir
+                        )
                         call_with_arch(before_test_prepared, env=virtualenv_env, shell=True)
 
                     # install the wheel
-                    call_with_arch(['pip', 'install', str(repaired_wheel) + options.test_extras], env=virtualenv_env)
+                    call_with_arch(
+                        ["pip", "install", f"{repaired_wheel}{options.test_extras}"],
+                        env=virtualenv_env,
+                    )
 
                     # test the wheel
                     if options.test_requires:
-                        call_with_arch(['pip', 'install'] + options.test_requires, env=virtualenv_env)
+                        call_with_arch(
+                            ["pip", "install"] + options.test_requires, env=virtualenv_env
+                        )
 
                     # run the tests from $HOME, with an absolute path in the command
                     # (this ensures that Python runs the tests against the installed wheel
                     # and not the repo code)
                     test_command_prepared = prepare_command(
                         options.test_command,
-                        project=Path('.').resolve(),
-                        package=options.package_dir.resolve()
+                        project=Path(".").resolve(),
+                        package=options.package_dir.resolve(),
+                    )
+                    call_with_arch(
+                        test_command_prepared,
+                        cwd=os.environ["HOME"],
+                        env=virtualenv_env,
+                        shell=True,
                     )
-                    call_with_arch(test_command_prepared, cwd=os.environ['HOME'], env=virtualenv_env, shell=True)
 
                     # clean up
                     shutil.rmtree(venv_dir)
@@ -460,5 +553,7 @@ def build(options: BuildOptions) -> None:
             shutil.move(str(repaired_wheel), options.output_dir)
             log.build_end()
     except subprocess.CalledProcessError as error:
-        log.step_end_with_error(f'Command {error.cmd} failed with code {error.returncode}. {error.stdout}')
+        log.step_end_with_error(
+            f"Command {error.cmd} failed with code {error.returncode}. {error.stdout}"
+        )
         sys.exit(1)

cibuildwheel/projectfiles.py

@@ -35,9 +35,8 @@ class Analyzer(ast.NodeVisitor):
         if node.arg == "python_requires":
             # Must not be nested in an if or other structure
             # This will be Module -> Expr -> Call -> keyword
-            if (
-                not hasattr(node.parent.parent.parent, "parent")  # type: ignore
-                and isinstance(node.value, Constant)
+            if not hasattr(node.parent.parent.parent, "parent") and isinstance(  # type: ignore
+                node.value, Constant
             ):
                 self.requires_python = get_constant(node.value)
 
@@ -57,21 +56,21 @@ def get_requires_python_str(package_dir: Path) -> Optional[str]:
 
     # Read in from pyproject.toml:project.requires-python
     try:
-        info = toml.load(package_dir / 'pyproject.toml')
-        return str(info['project']['requires-python'])
+        info = toml.load(package_dir / "pyproject.toml")
+        return str(info["project"]["requires-python"])
     except (FileNotFoundError, KeyError, IndexError, TypeError):
         pass
 
     # Read in from setup.cfg:options.python_requires
     try:
         config = ConfigParser()
-        config.read(package_dir / 'setup.cfg')
-        return str(config['options']['python_requires'])
+        config.read(package_dir / "setup.cfg")
+        return str(config["options"]["python_requires"])
     except (FileNotFoundError, KeyError, IndexError, TypeError):
         pass
 
     try:
-        with open(package_dir / 'setup.py') as f:
+        with open(package_dir / "setup.py") as f:
             return setup_py_python_requires(f.read())
     except FileNotFoundError:
         pass

cibuildwheel/resources/build-platforms.toml

@@ -1,69 +1,62 @@
 [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 = "cp310-manylinux_x86_64", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { 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 = "cp310-manylinux_i686", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { 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 = "cp310-manylinux_aarch64", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { 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 = "cp310-manylinux_ppc64le", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { 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" },
   { identifier = "cp39-manylinux_s390x", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp310-manylinux_s390x", version = "3.10", path_str = "/opt/python/cp310-cp310" },
+  { identifier = "pp37-manylinux_aarch64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
+  { identifier = "pp37-manylinux_i686", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
 ]
 
 [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" },
+  { identifier = "cp38-macosx_x86_64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" },
+  { identifier = "cp38-macosx_arm64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" },
+  { identifier = "cp38-macosx_universal2", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" },
+  { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.5/python-3.9.5-macos11.pkg" },
+  { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.5/python-3.9.5-macos11.pkg" },
+  { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.5/python-3.9.5-macos11.pkg" },
+  { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0b1-macos11.pkg" },
+  { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0b1-macos11.pkg" },
+  { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0b1-macos11.pkg" },
+  { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5-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" },
   { identifier = "cp37-win_amd64", version = "3.7.9", arch = "64" },
-  { identifier = "cp38-win32", version = "3.8.7", arch = "32" },
-  { 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" },
+  { identifier = "cp38-win32", version = "3.8.10", arch = "32" },
+  { identifier = "cp38-win_amd64", version = "3.8.10", arch = "64" },
+  { identifier = "cp39-win32", version = "3.9.5", arch = "32" },
+  { identifier = "cp39-win_amd64", version = "3.9.5", arch = "64" },
+  { identifier = "cp310-win32", version = "3.10.0-b1", arch = "32" },
+  { identifier = "cp310-win_amd64", version = "3.10.0-b1", arch = "64" },
+  { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5-win64.zip" },
 ]

cibuildwheel/resources/constraints-python27.txt

@@ -1,55 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    bin/update_dependencies.py
-#
-appdirs==1.4.4
-    # via virtualenv
-configparser==4.0.2
-    # via importlib-metadata
-contextlib2==0.6.0.post1
-    # via
-    #   importlib-metadata
-    #   importlib-resources
-delocate==0.8.2
-    # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.1
-    # via virtualenv
-filelock==3.0.12
-    # via virtualenv
-importlib-metadata==2.1.1
-    # via virtualenv
-importlib-resources==3.3.1
-    # via virtualenv
-pathlib2==2.3.5
-    # via
-    #   importlib-metadata
-    #   importlib-resources
-    #   virtualenv
-scandir==1.10.0
-    # via pathlib2
-singledispatch==3.4.0.3
-    # via importlib-resources
-six==1.15.0
-    # via
-    #   pathlib2
-    #   virtualenv
-typing==3.7.4.3
-    # via importlib-resources
-virtualenv==20.4.2
-    # via -r cibuildwheel/resources/constraints.in
-wheel==0.36.2
-    # via
-    #   -r cibuildwheel/resources/constraints.in
-    #   delocate
-zipp==1.2.0
-    # via
-    #   importlib-metadata
-    #   importlib-resources
-
-# The following packages are considered to be unsafe in a requirements file:
-pip==20.3.4
-    # via -r cibuildwheel/resources/constraints.in
-setuptools==44.1.1
-    # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python35.txt

@@ -1,36 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    bin/update_dependencies.py
-#
-appdirs==1.4.4
-    # via virtualenv
-delocate==0.8.2
-    # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.1
-    # via virtualenv
-filelock==3.0.12
-    # via virtualenv
-importlib-metadata==2.1.1
-    # via virtualenv
-importlib-resources==3.2.1
-    # via virtualenv
-six==1.15.0
-    # via virtualenv
-virtualenv==20.4.2
-    # via -r cibuildwheel/resources/constraints.in
-wheel==0.36.2
-    # via
-    #   -r cibuildwheel/resources/constraints.in
-    #   delocate
-zipp==1.2.0
-    # via
-    #   importlib-metadata
-    #   importlib-resources
-
-# The following packages are considered to be unsafe in a requirements file:
-pip==20.3.4
-    # via -r cibuildwheel/resources/constraints.in
-setuptools==50.3.2
-    # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python36.txt

@@ -12,27 +12,27 @@ distlib==0.3.1
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
-importlib-metadata==3.4.0
+importlib-metadata==4.0.1
     # via virtualenv
-importlib-resources==5.1.0
+importlib-resources==5.1.3
     # via virtualenv
-six==1.15.0
+six==1.16.0
     # via virtualenv
-typing-extensions==3.7.4.3
+typing-extensions==3.10.0.0
     # via importlib-metadata
-virtualenv==20.4.2
+virtualenv==20.4.6
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.36.2
     # via
     #   -r cibuildwheel/resources/constraints.in
     #   delocate
-zipp==3.4.0
+zipp==3.4.1
     # via
     #   importlib-metadata
     #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.0.1
+pip==21.1.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==53.0.0
+setuptools==56.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python37.txt

@@ -12,23 +12,23 @@ distlib==0.3.1
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
-importlib-metadata==3.4.0
+importlib-metadata==4.0.1
     # via virtualenv
-six==1.15.0
+six==1.16.0
     # via virtualenv
-typing-extensions==3.7.4.3
+typing-extensions==3.10.0.0
     # via importlib-metadata
-virtualenv==20.4.2
+virtualenv==20.4.6
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.36.2
     # via
     #   -r cibuildwheel/resources/constraints.in
     #   delocate
-zipp==3.4.0
+zipp==3.4.1
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.0.1
+pip==21.1.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==53.0.0
+setuptools==56.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python38.txt

@@ -12,9 +12,9 @@ distlib==0.3.1
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
-six==1.15.0
+six==1.16.0
     # via virtualenv
-virtualenv==20.4.2
+virtualenv==20.4.6
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.36.2
     # via
@@ -22,7 +22,7 @@ wheel==0.36.2
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.0.1
+pip==21.1.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==53.0.0
+setuptools==56.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python39.txt

@@ -12,9 +12,9 @@ distlib==0.3.1
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
-six==1.15.0
+six==1.16.0
     # via virtualenv
-virtualenv==20.4.2
+virtualenv==20.4.6
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.36.2
     # via
@@ -22,7 +22,7 @@ wheel==0.36.2
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.0.1
+pip==21.1.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==53.0.0
+setuptools==56.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints.txt

@@ -12,9 +12,9 @@ distlib==0.3.1
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
-six==1.15.0
+six==1.16.0
     # via virtualenv
-virtualenv==20.4.2
+virtualenv==20.4.6
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.36.2
     # via
@@ -22,7 +22,7 @@ wheel==0.36.2
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.0.1
+pip==21.1.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==53.0.0
+setuptools==56.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/install_certifi.py

@@ -13,20 +13,24 @@ import stat
 import subprocess
 import sys
 
-STAT_0o775 = (stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR
-              | stat.S_IRGRP | stat.S_IWGRP | stat.S_IXGRP
-              | stat.S_IROTH | stat.S_IXOTH)
-
-if sys.version_info[0] == 2:
-    FileNotFoundError = OSError
+STAT_0o775 = (
+    stat.S_IRUSR
+    | stat.S_IWUSR
+    | stat.S_IXUSR
+    | stat.S_IRGRP
+    | stat.S_IWGRP
+    | stat.S_IXGRP
+    | stat.S_IROTH
+    | stat.S_IXOTH
+)
 
 
 def main():
-    openssl_dir, openssl_cafile = os.path.split(
-        ssl.get_default_verify_paths().openssl_cafile)
+    openssl_dir, openssl_cafile = os.path.split(ssl.get_default_verify_paths().openssl_cafile)
     print(" -- pip install --upgrade certifi")
-    subprocess.check_call([sys.executable,
-                           "-E", "-s", "-m", "pip", "install", "--upgrade", "certifi"])
+    subprocess.check_call(
+        [sys.executable, "-E", "-s", "-m", "pip", "install", "--upgrade", "certifi"]
+    )
 
     import certifi
 
@@ -47,5 +51,5 @@ def main():
     print(" -- update complete")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

cibuildwheel/resources/pinned_docker_images.cfg

@@ -1,22 +1,38 @@
 [x86_64]
-manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-01-24-153e846
-manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-01-24-4117e7c
-manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-01-24-91ce2b8
+manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-05-24-df68af6
+manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-05-24-84874a2
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-05-24-84874a2
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-05-24-84874a2
 
 [i686]
-manylinux1 = quay.io/pypa/manylinux1_i686:2021-01-24-153e846
-manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-01-24-4117e7c
-manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-01-24-91ce2b8
+manylinux1 = quay.io/pypa/manylinux1_i686:2021-05-24-df68af6
+manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-05-24-84874a2
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-05-24-84874a2
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-05-24-84874a2
 
 [pypy_x86_64]
-manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2020-12-11-f1e0e80
+manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-05-24-84874a2
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-05-24-84874a2
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-05-24-84874a2
+
+[pypy_i686]
+manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-05-24-84874a2
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-05-24-84874a2
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-05-24-84874a2
 
 [aarch64]
-manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-01-24-91ce2b8
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-05-24-84874a2
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-05-24-84874a2
 
 [ppc64le]
-manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-01-24-91ce2b8
+manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-05-24-84874a2
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2021-05-24-84874a2
 
 [s390x]
-manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-01-24-91ce2b8
+manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-05-24-84874a2
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2021-05-24-84874a2
+
+[pypy_aarch64]
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-05-24-84874a2
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-05-24-84874a2
 

cibuildwheel/resources/pypy_venv.patch

@@ -1,36 +0,0 @@
-diff --git a/lib-python/3/sysconfig.py b/lib-python/3/sysconfig.py
-index 0d08cde66b4150e1772c13fdc6fe34d079c2b10d..30c77d165a2505d98bc7660ff0cc3b728f56c682 100644
---- a/lib-python/3/sysconfig.py
-+++ b/lib-python/3/sysconfig.py
-@@ -618,9 +618,6 @@ def get_config_vars(*args):
-             import _osx_support
-             _osx_support.customize_config_vars(_CONFIG_VARS)
-
--        _CONFIG_VARS['INCLUDEPY'] = os.path.join(_CONFIG_VARS['prefix'],
--                                                 'include')
--
-     if args:
-         vals = []
-         for name in args:
-diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py
-index f1cca41a4b7553819bb1a2a63af1c1a9b8591ce9..a34216e8e12b82abd72fabdd7793b3e8bb19bbcf 100644
---- a/lib_pypy/_sysconfigdata.py
-+++ b/lib_pypy/_sysconfigdata.py
-@@ -5,6 +5,7 @@ from distutils.spawn import find_executable
-
- so_ext = _imp.extension_suffixes()[0]
-
-+mybase = os.path.dirname(os.path.dirname(__file__))
-
- build_time_vars = {
-     # SOABI is PEP 3149 compliant, but CPython3 has so_ext.split('.')[1]
-@@ -25,7 +26,8 @@ build_time_vars = {
-     'AR': "ar",
-     'ARFLAGS': "rc",
-     'EXE': "",
--    'LIBDIR': os.path.join(sys.prefix, 'bin'),
-+    'LIBDIR': os.path.join(mybase, 'lib'),
-+    'INCLUDEPY': os.path.join(mybase, 'include'),
- }
-
- if find_executable("gcc"):

cibuildwheel/resources/pypy_venv_27.patch

@@ -1,27 +0,0 @@
---- a/lib-python/2.7/sysconfig.py
-+++ b/lib-python/2.7/sysconfig.py
-@@ -553,9 +553,6 @@ def get_config_vars(*args):
-             if type_ == imp.C_EXTENSION:
-                 _CONFIG_VARS['SOABI'] = suffix.split('.')[1]
-                 break
--        _CONFIG_VARS['INCLUDEPY'] = os.path.join(_CONFIG_VARS['prefix'],
--                                                 'include')
--
-     if args:
-         vals = []
-         for name in args:
---- a/lib_pypy/_sysconfigdata.py
-+++ b/lib_pypy/_sysconfigdata.py
-@@ -1,5 +1,11 @@
--import imp
-+import imp, os
-+
-+mybase = os.path.dirname(os.path.dirname(__file__))
-
- build_time_vars = {
-     "SO": [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0]
- }
-+
-+build_time_vars['LIBDIR'] = os.path.join(mybase, 'lib')
-+build_time_vars['INCLUDEPY'] = os.path.join(mybase, 'include')
-+

cibuildwheel/typing.py

@@ -9,7 +9,18 @@ else:
     from typing import Final, Literal, TypedDict
 
 
-__all__ = ("Final", "Literal", "TypedDict", "Set", "Union", "PopenBytes", "PathOrStr", "PlatformName", "PLATFORMS", "assert_never")
+__all__ = (
+    "Final",
+    "Literal",
+    "TypedDict",
+    "Set",
+    "Union",
+    "PopenBytes",
+    "PathOrStr",
+    "PlatformName",
+    "PLATFORMS",
+    "assert_never",
+)
 
 
 if TYPE_CHECKING:
@@ -25,4 +36,4 @@ PLATFORMS: Final[Set[PlatformName]] = {"linux", "macos", "windows"}
 
 
 def assert_never(value: NoReturn) -> NoReturn:
-    assert False, f'Unhandled value: {value} ({type(value).__name__})'  # noqa: B011
+    assert False, f"Unhandled value: {value} ({type(value).__name__})"  # noqa: B011

cibuildwheel/util.py

@@ -22,35 +22,34 @@ from .architecture import Architecture
 from .environment import ParsedEnvironment
 from .typing import PathOrStr, PlatformName
 
-resources_dir = Path(__file__).parent / 'resources'
+resources_dir = Path(__file__).parent / "resources"
 
-get_pip_script = resources_dir / 'get-pip.py'
 install_certifi_script = resources_dir / "install_certifi.py"
 
 
 def prepare_command(command: str, **kwargs: PathOrStr) -> str:
-    '''
+    """
     Preprocesses a command by expanding variables like {python}.
 
     For example, used in the test_command option to specify the path to the
     project's root.
-    '''
-    return command.format(python='python', pip='pip', **kwargs)
+    """
+    return command.format(python="python", pip="pip", **kwargs)
 
 
 def get_build_verbosity_extra_flags(level: int) -> List[str]:
     if level > 0:
-        return ['-' + level * 'v']
+        return ["-" + level * "v"]
     elif level < 0:
-        return ['-' + -level * 'q']
+        return ["-" + -level * "q"]
     else:
         return []
 
 
 def read_python_configs(config: PlatformName) -> List[Dict[str, str]]:
-    input_file = resources_dir / 'build-platforms.toml'
+    input_file = resources_dir / "build-platforms.toml"
     loaded_file = toml.load(input_file)
-    results: List[Dict[str, str]] = list(loaded_file[config]['python_configurations'])
+    results: List[Dict[str, str]] = list(loaded_file[config]["python_configurations"])
     return results
 
 
@@ -59,36 +58,66 @@ class IdentifierSelector:
     This class holds a set of build/skip patterns. You call an instance with a
     build identifier, and it returns True if that identifier should be
     included. Only call this on valid identifiers, ones that have at least 2
-    numeric digits before the first dash.
+    numeric digits before the first dash. If a pre-release version X.Y is present,
+    you can filter it with prerelease="XY".
     """
 
-    def __init__(self, *, build_config: str, skip_config: str, requires_python: Optional[SpecifierSet] = None):
+    # a pattern that skips prerelease versions, when include_prereleases is False.
+    PRERELEASE_SKIP = "cp310-*"
+
+    def __init__(
+        self,
+        *,
+        build_config: str,
+        skip_config: str,
+        requires_python: Optional[SpecifierSet] = None,
+        prerelease_pythons: bool = False,
+    ):
         self.build_patterns = build_config.split()
         self.skip_patterns = skip_config.split()
         self.requires_python = requires_python
+        self.prerelease_pythons = prerelease_pythons
 
     def __call__(self, build_id: str) -> bool:
         # Filter build selectors by python_requires if set
         if self.requires_python is not None:
-            py_ver_str = build_id.split('-')[0]
+            py_ver_str = build_id.split("-")[0]
             major = int(py_ver_str[2])
             minor = int(py_ver_str[3:])
             version = Version(f"{major}.{minor}.99")
             if not self.requires_python.contains(version):
                 return False
 
-        build_patterns = itertools.chain.from_iterable(bracex.expand(p) for p in self.build_patterns)
-        skip_patterns = itertools.chain.from_iterable(bracex.expand(p) for p in self.skip_patterns)
+        build_patterns = itertools.chain.from_iterable(
+            bracex.expand(p) for p in self.build_patterns
+        )
+
+        unexpanded_skip_patterns = self.skip_patterns.copy()
+
+        if not self.prerelease_pythons:
+            # filter out the prerelease pythons, alongside the user-defined
+            # skip patterns
+            unexpanded_skip_patterns += BuildSelector.PRERELEASE_SKIP.split()
+
+        skip_patterns = itertools.chain.from_iterable(
+            bracex.expand(p) for p in unexpanded_skip_patterns
+        )
 
         build: bool = any(fnmatch.fnmatch(build_id, pat) for pat in build_patterns)
         skip: bool = any(fnmatch.fnmatch(build_id, pat) for pat in skip_patterns)
         return build and not skip
 
     def __repr__(self) -> str:
-        if not self.skip_patterns:
-            return f'{self.__class__.__name__}({" ".join(self.build_patterns)!r})'
-        else:
-            return f'{self.__class__.__name__}({" ".join(self.build_patterns)!r} - {" ".join(self.skip_patterns)!r})'
+        result = f'{self.__class__.__name__}(build_config={" ".join(self.build_patterns)!r}'
+
+        if self.skip_patterns:
+            result += f', skip_config={" ".join(self.skip_patterns)!r}'
+        if self.prerelease_pythons:
+            result += ", prerelease_pythons=True"
+
+        result += ")"
+
+        return result
 
 
 class BuildSelector(IdentifierSelector):
@@ -120,14 +149,14 @@ class Unbuffered:
 
 
 def download(url: str, dest: Path) -> None:
-    print(f'+ Download {url} to {dest}')
+    print(f"+ Download {url} to {dest}")
     dest_dir = dest.parent
     if not dest_dir.exists():
         dest_dir.mkdir(parents=True)
 
     # we've had issues when relying on the host OS' CA certificates on Windows,
     # so we use certifi (this sounds odd but requests also does this by default)
-    cafile = os.environ.get('SSL_CERT_FILE', certifi.where())
+    cafile = os.environ.get("SSL_CERT_FILE", certifi.where())
     context = ssl.create_default_context(cafile=cafile)
     repeat_num = 3
     for i in range(repeat_num):
@@ -152,17 +181,15 @@ class DependencyConstraints:
         self.base_file_path = base_file_path.resolve()
 
     @staticmethod
-    def with_defaults() -> 'DependencyConstraints':
-        return DependencyConstraints(
-            base_file_path=resources_dir / 'constraints.txt'
-        )
+    def with_defaults() -> "DependencyConstraints":
+        return DependencyConstraints(base_file_path=resources_dir / "constraints.txt")
 
     def get_for_python_version(self, version: str) -> Path:
-        version_parts = version.split('.')
+        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
-        specific_stem = self.base_file_path.stem + f'-python{version_parts[0]}{version_parts[1]}'
+        # ./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)
         if specific_file_path.exists():
@@ -171,7 +198,7 @@ class DependencyConstraints:
             return self.base_file_path
 
     def __repr__(self) -> str:
-        return f'{self.__class__.__name__}{self.base_file_path!r})'
+        return f"{self.__class__.__name__}{self.base_file_path!r})"
 
 
 class BuildOptions(NamedTuple):
@@ -195,7 +222,8 @@ class BuildOptions(NamedTuple):
 
 class NonPlatformWheelError(Exception):
     def __init__(self) -> None:
-        message = textwrap.dedent('''
+        message = textwrap.dedent(
+            """
             cibuildwheel: Build failed because a pure Python wheel was generated.
 
             If you intend to build a pure-Python wheel, you don't need cibuildwheel - use
@@ -203,66 +231,65 @@ class NonPlatformWheelError(Exception):
 
             If you expected a platform wheel, check your project configuration, or run
             cibuildwheel with CIBW_BUILD_VERBOSITY=1 to view build logs.
-        ''')
+            """
+        )
 
         super().__init__(message)
 
 
 def strtobool(val: str) -> bool:
-    if val.lower() in ('y', 'yes', 't', 'true', 'on', '1'):
-        return True
-    return False
+    return val.lower() in {"y", "yes", "t", "true", "on", "1"}
 
 
 class CIProvider(Enum):
-    travis_ci = 'travis'
-    appveyor = 'appveyor'
-    circle_ci = 'circle_ci'
-    azure_pipelines = 'azure_pipelines'
-    github_actions = 'github_actions'
-    gitlab = 'gitlab'
-    other = 'other'
+    travis_ci = "travis"
+    appveyor = "appveyor"
+    circle_ci = "circle_ci"
+    azure_pipelines = "azure_pipelines"
+    github_actions = "github_actions"
+    gitlab = "gitlab"
+    other = "other"
 
 
 def detect_ci_provider() -> Optional[CIProvider]:
-    if 'TRAVIS' in os.environ:
+    if "TRAVIS" in os.environ:
         return CIProvider.travis_ci
-    elif 'APPVEYOR' in os.environ:
+    elif "APPVEYOR" in os.environ:
         return CIProvider.appveyor
-    elif 'CIRCLECI' in os.environ:
+    elif "CIRCLECI" in os.environ:
         return CIProvider.circle_ci
-    elif 'AZURE_HTTP_USER_AGENT' in os.environ:
+    elif "AZURE_HTTP_USER_AGENT" in os.environ:
         return CIProvider.azure_pipelines
-    elif 'GITHUB_ACTIONS' in os.environ:
+    elif "GITHUB_ACTIONS" in os.environ:
         return CIProvider.github_actions
-    elif 'GITLAB_CI' in os.environ:
+    elif "GITLAB_CI" in os.environ:
         return CIProvider.gitlab
-    elif strtobool(os.environ.get('CI', 'false')):
+    elif strtobool(os.environ.get("CI", "false")):
         return CIProvider.other
     else:
         return None
 
 
 def unwrap(text: str) -> str:
-    '''
+    """
     Unwraps multi-line text to a single line
-    '''
+    """
     # remove initial line indent
     text = textwrap.dedent(text)
     # remove leading/trailing whitespace
     text = text.strip()
     # remove consecutive whitespace
-    return re.sub(r'\s+', ' ', text)
+    return re.sub(r"\s+", " ", text)
 
 
 @contextlib.contextmanager
 def print_new_wheels(msg: str, output_dir: Path) -> Iterator[None]:
-    '''
+    """
     Prints the new items in a directory upon exiting. The message to display
     can include {n} for number of wheels, {s} for total number of seconds,
     and/or {m} for total number of minutes. Does not print anything if this
     exits via exception.
-    '''
+    """
 
     start_time = time.time()
     existing_contents = set(output_dir.iterdir())

cibuildwheel/windows.py

@@ -7,8 +7,6 @@ from pathlib import Path
 from typing import Dict, List, NamedTuple, Optional, Sequence, Set
 from zipfile import ZipFile
 
-import toml
-
 from .architecture import Architecture
 from .environment import ParsedEnvironment
 from .logger import log
@@ -19,33 +17,38 @@ from .util import (
     NonPlatformWheelError,
     download,
     get_build_verbosity_extra_flags,
-    get_pip_script,
     prepare_command,
     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:
-    print('+ ' + ' '.join(str(a) for a in args))
+def call(
+    args: Sequence[PathOrStr], env: Optional[Dict[str, str]] = None, cwd: Optional[str] = None
+) -> None:
+    print("+ " + " ".join(str(a) for a in args))
     # we use shell=True here, even though we don't need a shell due to a bug
     # https://bugs.python.org/issue8557
-    subprocess.check_call([str(a) for a in args], env=env, cwd=cwd, shell=True)
+    subprocess.run([str(a) for a in args], env=env, cwd=cwd, shell=True, check=True)
 
 
 def shell(command: str, env: Optional[Dict[str, str]] = None, cwd: Optional[str] = None) -> None:
-    print(f'+ {command}')
-    subprocess.check_call(command, env=env, cwd=cwd, shell=True)
+    print(f"+ {command}")
+    subprocess.run(command, env=env, cwd=cwd, shell=True, check=True)
 
 
 def get_nuget_args(version: str, arch: str) -> List[str]:
-    python_name = 'python' if version[0] == '3' else 'python2'
-    if arch == '32':
-        python_name = python_name + 'x86'
-    return [python_name, '-Version', version, '-OutputDirectory', 'C:\\cibw\\python']
+    python_name = "python"
+    if arch == "32":
+        python_name += "x86"
+    return [
+        python_name,
+        "-Version",
+        version,
+        "-FallbackSource",
+        "https://api.nuget.org/v3/index.json",
+        "-OutputDirectory",
+        "C:\\cibw\\python",
+    ]
 
 
 class PythonConfiguration(NamedTuple):
@@ -56,28 +59,23 @@ class PythonConfiguration(NamedTuple):
 
 
 def get_python_configurations(
-        build_selector: BuildSelector,
-        architectures: Set[Architecture],
+    build_selector: BuildSelector,
+    architectures: Set[Architecture],
 ) -> List[PythonConfiguration]:
 
-    full_python_configs = read_python_configs('windows')
+    full_python_configs = read_python_configs("windows")
 
     python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
 
     map_arch = {
-        '32': Architecture.x86,
-        '64': Architecture.AMD64,
+        "32": Architecture.x86,
+        "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
+        c
+        for c in python_configurations
         if build_selector(c.identifier) and map_arch[c.arch] in architectures
     ]
 
@@ -91,135 +89,156 @@ def extract_zip(zip_src: Path, dest: Path) -> None:
 
 def install_cpython(version: str, arch: str, nuget: Path) -> Path:
     nuget_args = get_nuget_args(version, arch)
-    installation_path = Path(nuget_args[-1]) / (nuget_args[0] + '.' + version) / 'tools'
-    call([nuget, 'install', *nuget_args])
+    installation_path = Path(nuget_args[-1]) / (nuget_args[0] + "." + version) / "tools"
+    call([nuget, "install", *nuget_args])
     return installation_path
 
 
 def install_pypy(version: str, arch: str, url: str) -> Path:
-    assert arch == '32'
+    assert arch == "64" and "win64" in url
     # Inside the PyPy zip file is a directory with the same name
-    zip_filename = url.rsplit('/', 1)[-1]
+    zip_filename = url.rsplit("/", 1)[-1]
     extension = ".zip"
     assert zip_filename.endswith(extension)
-    installation_path = Path('C:\\cibw') / zip_filename[:-len(extension)]
+    installation_path = Path("C:\\cibw") / zip_filename[: -len(extension)]
     if not installation_path.exists():
-        pypy_zip = Path('C:\\cibw') / zip_filename
+        pypy_zip = Path("C:\\cibw") / zip_filename
         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
 
 
-def setup_python(python_configuration: PythonConfiguration, dependency_constraint_flags: Sequence[PathOrStr], environment: ParsedEnvironment) -> Dict[str, str]:
-    nuget = Path('C:\\cibw\\nuget.exe')
+def setup_python(
+    python_configuration: PythonConfiguration,
+    dependency_constraint_flags: Sequence[PathOrStr],
+    environment: ParsedEnvironment,
+) -> Dict[str, str]:
+    nuget = Path("C:\\cibw\\nuget.exe")
     if not nuget.exists():
-        log.step('Downloading nuget...')
-        download('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', nuget)
+        log.step("Downloading nuget...")
+        download("https://dist.nuget.org/win-x86-commandline/latest/nuget.exe", nuget)
 
     implementation_id = python_configuration.identifier.split("-")[0]
-    log.step(f'Installing Python {implementation_id}...')
+    log.step(f"Installing Python {implementation_id}...")
 
-    if implementation_id.startswith('cp'):
-        installation_path = install_cpython(python_configuration.version, python_configuration.arch, nuget)
-    elif implementation_id.startswith('pp'):
+    if implementation_id.startswith("cp"):
+        installation_path = install_cpython(
+            python_configuration.version, python_configuration.arch, nuget
+        )
+    elif implementation_id.startswith("pp"):
         assert python_configuration.url is not None
-        installation_path = install_pypy(python_configuration.version, python_configuration.arch, python_configuration.url)
+        installation_path = install_pypy(
+            python_configuration.version, python_configuration.arch, python_configuration.url
+        )
     else:
         raise ValueError("Unknown Python implementation")
 
-    assert (installation_path / 'python.exe').exists()
+    assert (installation_path / "python.exe").exists()
 
-    log.step('Setting up build environment...')
+    log.step("Setting up build environment...")
 
     # set up PATH and environment variables for run_with_env
     env = os.environ.copy()
-    env['PYTHON_VERSION'] = python_configuration.version
-    env['PYTHON_ARCH'] = python_configuration.arch
-    env['PATH'] = os.pathsep.join([
-        str(installation_path),
-        str(installation_path / 'Scripts'),
-        env['PATH']
-    ])
-    env['PIP_DISABLE_PIP_VERSION_CHECK'] = '1'
+    env["PYTHON_VERSION"] = python_configuration.version
+    env["PYTHON_ARCH"] = python_configuration.arch
+    env["PATH"] = os.pathsep.join(
+        [str(installation_path), str(installation_path / "Scripts"), env["PATH"]]
+    )
+    env["PIP_DISABLE_PIP_VERSION_CHECK"] = "1"
 
     # update env with results from CIBW_ENVIRONMENT
     env = environment.as_dictionary(prev_environment=env)
 
     # for the logs - check we're running the right version of python
-    call(['where', 'python'], env=env)
-    call(['python', '--version'], env=env)
-    call(['python', '-c', '"import struct; print(struct.calcsize(\'P\') * 8)"'], env=env)
-    where_python = subprocess.check_output(['where', 'python'], env=env, universal_newlines=True).splitlines()[0].strip()
-    if where_python != str(installation_path / 'python.exe'):
-        print("cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", file=sys.stderr)
+    call(["where", "python"], env=env)
+    call(["python", "--version"], env=env)
+    call(["python", "-c", "\"import struct; print(struct.calcsize('P') * 8)\""], env=env)
+    where_python = (
+        subprocess.run(
+            ["where", "python"],
+            env=env,
+            universal_newlines=True,
+            check=True,
+            stdout=subprocess.PIPE,
+        )
+        .stdout.splitlines()[0]
+        .strip()
+    )
+    if where_python != str(installation_path / "python.exe"):
+        print(
+            "cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.",
+            file=sys.stderr,
+        )
         sys.exit(1)
 
-    # make sure pip is installed
-    if not (installation_path / 'Scripts' / 'pip.exe').exists():
-        call(['python', get_pip_script, *dependency_constraint_flags], env=env, cwd="C:\\cibw")
-    assert (installation_path / 'Scripts' / 'pip.exe').exists()
-    where_pip = subprocess.check_output(['where', 'pip'], env=env, universal_newlines=True).splitlines()[0].strip()
-    if where_pip.strip() != str(installation_path / 'Scripts' / 'pip.exe'):
-        print("cibuildwheel: pip available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert pip above it.", file=sys.stderr)
+    log.step("Installing build tools...")
+
+    # Install pip
+
+    requires_reinstall = not (installation_path / "Scripts" / "pip.exe").exists()
+    if requires_reinstall:
+        # maybe pip isn't installed at all. ensurepip resolves that.
+        call(["python", "-m", "ensurepip"], env=env, cwd="C:\\cibw")
+
+    # upgrade pip to the version matching our constraints
+    # if necessary, reinstall it to ensure that it's available on PATH as 'pip.exe'
+    call(
+        [
+            "python",
+            "-m",
+            "pip",
+            "install",
+            "--force-reinstall" if requires_reinstall else "--upgrade",
+            "pip",
+            *dependency_constraint_flags,
+        ],
+        env=env,
+        cwd="C:\\cibw",
+    )
+
+    assert (installation_path / "Scripts" / "pip.exe").exists()
+    where_pip = (
+        subprocess.run(
+            ["where", "pip"], env=env, universal_newlines=True, check=True, stdout=subprocess.PIPE
+        )
+        .stdout.splitlines()[0]
+        .strip()
+    )
+    if where_pip.strip() != str(installation_path / "Scripts" / "pip.exe"):
+        print(
+            "cibuildwheel: pip available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert pip above it.",
+            file=sys.stderr,
+        )
         sys.exit(1)
 
-    log.step('Installing build tools...')
-
-    call(['python', '-m', 'pip', 'install', '--upgrade', 'pip', *dependency_constraint_flags], env=env)
-    call(['pip', '--version'], env=env)
-    call(['pip', 'install', '--upgrade', 'setuptools', 'wheel', *dependency_constraint_flags], env=env)
+    call(["pip", "--version"], env=env)
+    call(
+        ["pip", "install", "--upgrade", "setuptools", "wheel", *dependency_constraint_flags],
+        env=env,
+    )
 
     return env
 
 
-def pep_518_cp35_workaround(package_dir: Path, env: Dict[str, str]) -> None:
-    """
-    Python 3.5 PEP 518 hack (see https://github.com/pypa/pip/issues/8392#issuecomment-639563494)
-    Basically, nuget's Python is an embedded Python distribution, which is not supported by pip.
-    Before version 3.6, there was no way to disable the "embedded" behavior, including the ignoring
-    of environment variables, including the ones pip uses to setup PEP 518 builds.
-
-    The fix here is as suggested in that issue; we manually setup the PEP 518 requirements. Since we
-    are in a fresh environment (except for pinned cibuildweel dependencies), the build is already
-    mostly "isolated".
-    """
-
-    pyproject_path = package_dir / 'pyproject.toml'
-
-    if pyproject_path.exists():
-        data = toml.load(pyproject_path)
-        requirements = (
-            data['build-system'].get('requires', [])
-            if 'build-system' in data
-            else []
-        )
-
-        if requirements:
-            log.step('Performing PEP518 workaround...')
-            with tempfile.TemporaryDirectory() as d:
-                reqfile = Path(d) / "requirements.txt"
-                with reqfile.open('w') as f:
-                    for r in requirements:
-                        print(r, file=f)
-                call(['pip', 'install', '-r', reqfile], env=env)
-
-
 def build(options: BuildOptions) -> None:
-    temp_dir = Path(tempfile.mkdtemp(prefix='cibuildwheel'))
-    built_wheel_dir = temp_dir / 'built_wheel'
-    repaired_wheel_dir = temp_dir / 'repaired_wheel'
+    temp_dir = Path(tempfile.mkdtemp(prefix="cibuildwheel"))
+    built_wheel_dir = temp_dir / "built_wheel"
+    repaired_wheel_dir = temp_dir / "repaired_wheel"
 
     try:
         if options.before_all:
-            log.step('Running before_all...')
+            log.step("Running before_all...")
             env = options.environment.as_dictionary(prev_environment=os.environ)
-            before_all_prepared = prepare_command(options.before_all, project='.', package=options.package_dir)
+            before_all_prepared = prepare_command(
+                options.before_all, project=".", package=options.package_dir
+            )
             shell(before_all_prepared, env=env)
 
-        python_configurations = get_python_configurations(options.build_selector, options.architectures)
+        python_configurations = get_python_configurations(
+            options.build_selector, options.architectures
+        )
 
         for config in python_configurations:
             log.build_start(config.identifier)
@@ -227,7 +246,8 @@ def build(options: BuildOptions) -> None:
             dependency_constraint_flags: Sequence[PathOrStr] = []
             if options.dependency_constraints:
                 dependency_constraint_flags = [
-                    '-c', options.dependency_constraints.get_for_python_version(config.version)
+                    "-c",
+                    options.dependency_constraints.get_for_python_version(config.version),
                 ]
 
             # install Python
@@ -235,92 +255,101 @@ def build(options: BuildOptions) -> None:
 
             # run the before_build command
             if options.before_build:
-                log.step('Running before_build...')
-                before_build_prepared = prepare_command(options.before_build, project='.', package=options.package_dir)
+                log.step("Running before_build...")
+                before_build_prepared = prepare_command(
+                    options.before_build, project=".", package=options.package_dir
+                )
                 shell(before_build_prepared, env=env)
 
-            # activate the PEP 518 patch if on Windows Python 3.5
-            # (will only have an effect if PEP 517 builds are used):
-            if config.version.startswith('3.5'):
-                pep_518_cp35_workaround(options.package_dir, env)
-
-            log.step('Building wheel...')
+            log.step("Building wheel...")
             if built_wheel_dir.exists():
                 shutil.rmtree(built_wheel_dir)
             built_wheel_dir.mkdir(parents=True)
             # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org
-            # see https://github.com/joerick/cibuildwheel/pull/369
-            call([
-                'pip', 'wheel',
-                options.package_dir.resolve(),
-                '-w', built_wheel_dir,
-                '--no-deps',
-                *get_build_verbosity_extra_flags(options.build_verbosity)
-            ], env=env)
+            # see https://github.com/pypa/cibuildwheel/pull/369
+            call(
+                [
+                    "pip",
+                    "wheel",
+                    options.package_dir.resolve(),
+                    "-w",
+                    built_wheel_dir,
+                    "--no-deps",
+                    *get_build_verbosity_extra_flags(options.build_verbosity),
+                ],
+                env=env,
+            )
 
-            built_wheel = next(built_wheel_dir.glob('*.whl'))
+            built_wheel = next(built_wheel_dir.glob("*.whl"))
 
             # repair the wheel
             if repaired_wheel_dir.exists():
                 shutil.rmtree(repaired_wheel_dir)
             repaired_wheel_dir.mkdir(parents=True)
 
-            if built_wheel.name.endswith('none-any.whl'):
+            if built_wheel.name.endswith("none-any.whl"):
                 raise NonPlatformWheelError()
 
             if options.repair_command:
-                log.step('Repairing wheel...')
-                repair_command_prepared = prepare_command(options.repair_command, wheel=built_wheel, dest_dir=repaired_wheel_dir)
+                log.step("Repairing wheel...")
+                repair_command_prepared = prepare_command(
+                    options.repair_command, wheel=built_wheel, dest_dir=repaired_wheel_dir
+                )
                 shell(repair_command_prepared, env=env)
             else:
                 shutil.move(str(built_wheel), repaired_wheel_dir)
 
-            repaired_wheel = next(repaired_wheel_dir.glob('*.whl'))
+            repaired_wheel = next(repaired_wheel_dir.glob("*.whl"))
 
             if options.test_command and options.test_selector(config.identifier):
-                log.step('Testing wheel...')
+                log.step("Testing wheel...")
                 # set up a virtual environment to install and test from, to make sure
                 # there are no dependencies that were pulled in at build time.
-                call(['pip', 'install', 'virtualenv', *dependency_constraint_flags], env=env)
+                call(["pip", "install", "virtualenv", *dependency_constraint_flags], env=env)
                 venv_dir = Path(tempfile.mkdtemp())
 
                 # Use --no-download to ensure determinism by using seed libraries
                 # built into virtualenv
-                call(['python', '-m', 'virtualenv', '--no-download', venv_dir], env=env)
+                call(["python", "-m", "virtualenv", "--no-download", venv_dir], env=env)
 
                 virtualenv_env = env.copy()
-                virtualenv_env['PATH'] = os.pathsep.join([
-                    str(venv_dir / 'Scripts'),
-                    virtualenv_env['PATH'],
-                ])
+                virtualenv_env["PATH"] = os.pathsep.join(
+                    [
+                        str(venv_dir / "Scripts"),
+                        virtualenv_env["PATH"],
+                    ]
+                )
 
                 # check that we are using the Python from the virtual environment
-                call(['which', 'python'], env=virtualenv_env)
+                call(["where", "python"], env=virtualenv_env)
 
                 if options.before_test:
                     before_test_prepared = prepare_command(
                         options.before_test,
-                        project='.',
-                        package=options.package_dir
+                        project=".",
+                        package=options.package_dir,
                     )
                     shell(before_test_prepared, env=virtualenv_env)
 
                 # install the wheel
-                call(['pip', 'install', str(repaired_wheel) + options.test_extras], env=virtualenv_env)
+                call(
+                    ["pip", "install", str(repaired_wheel) + options.test_extras],
+                    env=virtualenv_env,
+                )
 
                 # test the wheel
                 if options.test_requires:
-                    call(['pip', 'install'] + options.test_requires, env=virtualenv_env)
+                    call(["pip", "install"] + options.test_requires, env=virtualenv_env)
 
                 # run the tests from c:\, with an absolute path in the command
                 # (this ensures that Python runs the tests against the installed wheel
                 # and not the repo code)
                 test_command_prepared = prepare_command(
                     options.test_command,
-                    project=Path('.').resolve(),
-                    package=options.package_dir.resolve()
+                    project=Path(".").resolve(),
+                    package=options.package_dir.resolve(),
                 )
-                shell(test_command_prepared, cwd='c:\\', env=virtualenv_env)
+                shell(test_command_prepared, cwd="c:\\", env=virtualenv_env)
 
                 # clean up
                 shutil.rmtree(venv_dir)
@@ -329,5 +358,7 @@ def build(options: BuildOptions) -> None:
             shutil.move(str(repaired_wheel), options.output_dir)
             log.build_end()
     except subprocess.CalledProcessError as error:
-        log.step_end_with_error(f'Command {error.cmd} failed with code {error.returncode}. {error.stdout}')
+        log.step_end_with_error(
+            f"Command {error.cmd} failed with code {error.returncode}. {error.stdout}"
+        )
         sys.exit(1)

docs/contributing.md

@@ -2,12 +2,14 @@
 title: Contributing
 ---
 
-Wheel-building can be pretty complex. I expect users to find many edge-cases - please help the rest of the community out by documenting these, adding features to support them, and reporting bugs.
+Wheel-building can be pretty complex. We expect users to find edge-cases - please help the rest of the community out by documenting these, adding features to support them, and reporting bugs.
 
-I plan to be pretty liberal in accepting pull requests, as long as they align with the design goals below.
+If you have an idea for a modification or feature, it's probably best to raise an issue first and discuss it with the maintainer team. Once we have rough consensus on a design, begin work in a PR.
 
 `cibuildwheel` is indie open source. We're not paid to work on this.
 
+Everyone contributing to the cibuildwheel project is expected to follow the [PSF Code of Conduct](https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md).
+
 Design Goals
 ------------
 
@@ -27,16 +29,37 @@ cibuildwheel doesn't really do anything itself - it's always deferring to other
 
 We're not responsible for errors in those tools, for fixing errors/crashes there. But cibuildwheel's job is providing users with an 'integrated' user experience across those tools. We provide an abstraction. The user says 'build me some wheels', not 'open the docker container, build a wheel with pip, fix up the symbols with auditwheel' etc.  However, errors have a habit of breaking abstractions. And this is where users get confused, because the mechanism of cibuildwheel is laid bare, and they must understand a little bit how it works to debug.
 
-So, if we can, I'd like to improve the experience on errors as well. In [this](https://github.com/joerick/cibuildwheel/issues/139) case, it takes a bit of knowledge to understand that the linux builds are happening in a totally different OS via docker, that the linked symbols won't match, that auditwheel will fail because of this. A problem with how the tools fit together, instead of the tools themselves.
+So, if we can, I'd like to improve the experience on errors as well. In [this](https://github.com/pypa/cibuildwheel/issues/139) case, it takes a bit of knowledge to understand that the Linux builds are happening in a different OS via Docker, that the linked symbols won't match, that auditwheel will fail because of this. A problem with how the tools fit together, instead of the tools themselves.
 
 Maintainer notes
 ----------------
 
-## Local testing
+### Nox support
+
+Most developer tasks have a nox interface. This allows you to very simply run tasks without worrying about setting up a development environment (as shown below). This is a slower than setting up a development environment and reusing it, but has the (important) benefit of being highly reproducible; an earlier run does not affect a current run, or anything else on your machine.
+
+Install [nox](https://nox.thea.codes); homebrew is recommend on macOS, otherwise, pipx is a great choice - in fact, you can use `pipx run nox` and avoid installing completely.
+
+You can see a list of sessions by typing `nox -l`; here are a few common ones:
+
+```console
+nox -s lint          # Run the linters (default)
+nox -s tests         # Run the tests   (default)
+nox -s docs -- serve # Build and serve the documentation
+nox -s build         # Make SDist and wheel
+```
+
+More advanced users can run the update scripts. `update_pins` should work directly, but `update_constraints` needs all versions of Python installed. If you don't want to do that locally, a fast way to run it to use docker to run nox:
+
+```console
+docker run --rm -itv $PWD:/src -w /src quay.io/pypa/manylinux_2_24_x86_64:latest pipx run nox -s update_constraints
+```
+
+### Local testing
 
 You should run:
 
-```python
+```console
 python3 -m venv venv
 . venv/bin/activate
 pip install -e .[dev]
@@ -44,10 +67,9 @@ pip install -e .[dev]
 
 To prepare a development environment.
 
-## Testing minimal configs
+### Testing sample configs
 
-
-cibuildwheel's _minimal_ example configs can be tested on a simple project on cibuildwheel's existing CI. These should be run whenever the minimal configs change.
+cibuildwheel's  example configs can be tested on a simple project on cibuildwheel's existing CI. These should be run whenever the minimal configs change.
 
 To test minimal configs, make sure you have a clean git repo, then run the script:
 
@@ -57,17 +79,21 @@ bin/run_example_ci_configs.py
 
 The script will create an isolated 'orphan' commit containing all the minimal config CI files, and a simple C extension project, and push that to a branch on the `origin` repo. The project's CI is already set up to run on branch push, so will begin testing.
 
+You can test any other configs using `bin/run_example_ci_configs.py CONFIG_PATH`, e.g.
+
+```bash
+bin/run_example_ci_configs.py examples/github-with-qemu.yml
+```
+
 The script then outputs a Markdown table that can be copy/pasted into a PR to monitor and record the test.
 
-## Preparing environments
+### Preparing environments
 
 This has been moved to using docker, so you only need the following instructions if you add `--no-docker` to avoid using docker.
 
 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
 # Optionally add 3.8 and make it the local version;
@@ -77,9 +103,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
 ```
@@ -92,16 +115,9 @@ And, you need to install the requirements into each environment:
 for f in env*/bin/pip; do $f install pip-tools; done
 ```
 
+### Making a release
 
-## Making a release
-
-Before making a release, ensure pinned dependencies are up-to-date. Run the script:
-
-```bash
-bin/make_dependency_update_pr.py
-```
-
-If updates are needed, this will push a PR with those updates for the CI to test. Once green, merge this PR.
+Before making a release, ensure pinned dependencies are up-to-date. Autoupdates are run weekly, with a PR being raised with any changes as required, so just make sure the latest one is merged before continuing.
 
 Then, increment the project version number using:
 
@@ -119,3 +135,5 @@ python setup.py sdist bdist_wheel
 twine upload dist/*
 git push && git push --tags
 ```
+
+Then head to https://github.com/pypa/cibuildwheel/releases and create a GitHub release from the new tag, pasting in the changelog entry.

docs/cpp_standards.md

@@ -5,10 +5,6 @@ title: Modern C++ standards
 Building Python wheels with modern C++ standards (C++11 and later) requires a few tricks.
 
 
-## Python 2.7 and C++17
-
-The Python 2.7 header files use the `register` keyword, which is [reserved and unused from C+17 onwards](https://en.cppreference.com/w/cpp/keyword/register). Compiling a wheel for Python 2.7 with the C++17 standard is still possible to allow usage of `register` using proper flag `-Wno-register` for gcc/clang and `/wd5033` for MSVC.
-
 ## manylinux1 and C++14
 The default `manylinux1` image (based on CentOS 5) contains a version of GCC and libstdc++ that only supports C++11 and earlier standards. There are however ways to compile wheels with the C++14 standard (and later): https://github.com/pypa/manylinux/issues/118
 
@@ -27,43 +23,3 @@ To get C++17 support, Xcode 9.3+ is needed, requiring at least macOS 10.13 on th
 However, if only C++17 compiler and standard template library (STL) features are used (not needing a C++17 runtime) it might be possible to set `MACOSX_DEPLOYMENT_TARGET` to a lower value, such as `"10.9"`. To find out if this is the case, try compiling and running with a lower `MACOSX_DEPLOYMENT_TARGET`: if C++17 features are used that require a more recent deployment target, building the wheel should fail.
 
 For more details see https://en.cppreference.com/w/cpp/compiler_support, https://en.wikipedia.org/wiki/Xcode, and https://xcodereleases.com/: Xcode 10 needs macOS 10.13 and Xcode 11 needs macOS 10.14.
-
-## Windows and Python 2.7
-
-Visual C++ for Python 2.7 does not support modern C++ standards (i.e., C++11 and later). When building on Appveyor, you will need to either use the "Visual Studio 2017" or "Visual Studio 2019" image, but Python 2.7 is not supported on these images - skip it by setting `CIBW_SKIP=cp27-win*`.
-
-There is an optional workaround for this, though: the pybind11 project argues and shows that it is [possible to compile Python 2.7 extension with a newer compiler](https://pybind11.readthedocs.io/en/stable/faq.html#working-with-ancient-visual-studio-2008-builds-on-windows) and has an example project showing how to do this: https://github.com/pybind/python_example. The main catch is that a user might need to install [a newer "Microsoft Visual C++ Redistributable"](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads), since the newer C++ standard library's binaries are not included by default with the Python 2.7 installation.
-
-Forcing `distutils` or `setuptools` to use a more recent version of MSVC that supports modern C++ can be done in the following way:
-
-1. Set the environment variables `DISTUTILS_USE_SDK=1` and `MSSdk=1`. These two environment variables will tell `distutils`/`setuptools` to not search and set up a build environment that uses Visual C++ for Python 2.7 (aka. MSVC 9).
-2. Set up the build Visual Studio build environment you want to use, making sure that e.g. `PATH` contains `cl`, `link`, etc.
-    - Usually, this can be done through `vcvarsall.bat x86` or `vcvarsall.bat x64`. The exact location of this file depends on the installation, but the default path for VS 2019 Community (e.g. used in AppVeyor's `Visual Studio 2019` image) is `C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat`. **Note**: `vcvarsall.bat` changes the environment variables, so this cannot be run in a subprocess/subshell and consequently running `vsvarsall.bat` in `CIBW_BEFORE_BUILD` does not have any effect.
-    - In Azure Pipelines, [a `VSBuild` task is available](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/build/visual-studio-build)
-    - In GitHub Actions, the default shell is powershell, so you'll need to use `shell: cmd` to source a `.bat` file, and the directory is `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"`. Or you can use an action, such as the [`ilammy/msvc-dev-cmd@v1`](https://github.com/ilammy/msvc-dev-cmd) action to setup the environment (see example below).
-3. Next, call `cibuildwheel`. Unfortunately, MSVC has separate toolchains for compiling 32-bit and 64-bit, so you will need to run `cibuildwheel` twice: once with `CIBW_BUILD=*-win32` after setting up the `x86` build environment, and once with `CIBW_BUILD=*-win_amd64` in a `x64` environment (see previous step).
-
-
-**GitHub Action example with ilammy/msvc-dev-cmd**:
-
-```yaml
-  - uses: ilammy/msvc-dev-cmd@v1
-
-  - name: Build 64-bit wheel
-    run: python -m cibuildwheel --output-dir wheelhouse
-    env:
-      CIBW_BUILD: cp27-win_amd64
-      DISTUTILS_USE_SDK: 1
-      MSSdk: 1
-
-  - uses: ilammy/msvc-dev-cmd@v1
-    with:
-      arch: x86
-
-  - name: Build 32-bit wheel
-    run: python -m cibuildwheel --output-dir wheelhouse
-    env:
-      CIBW_BUILD: cp27-win32
-      DISTUTILS_USE_SDK: 1
-      MSSdk: 1
-```

docs/data/projects.yml

@@ -2,6 +2,7 @@
 # name: required, printed name
 # gh: GitHub repo (eventually a url: could be added for non-github projects)
 # stars: GitHub repo (optional, if different from package, such as for Twisted)
+# pypi: The pypi name, if different from the GitHub package name
 # os: Operating system list, [windows, apple, linux] (optional)
 # ci: [appveyor, github, azurepipelines, circleci, gitlab, travisci] (optional)
 # notes: (text, optional)
@@ -29,6 +30,7 @@
 
 - name: Parselmouth
   gh: YannickJadoul/Parselmouth
+  pypi: praat-parselmouth
   notes: A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels.
   ci: [github]
   os: [windows, apple, linux]
@@ -82,6 +84,7 @@
 
 - name: PyAV
   gh: PyAV-Org/PyAV
+  pypi: av
   ci: [github]
   os: [windows, apple, linux]
   notes: Pythonic bindings for FFmpeg's libraries.
@@ -109,6 +112,7 @@
 
 - name: etebase-py
   gh: etesync/etebase-py
+  pypi: etebase
   notes: Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed.
   ci: [travisci]
   os: [linux]
@@ -175,6 +179,7 @@
 
 - name: jq.py
   gh: mwilliamson/jq.py
+  pypi: jq
   ci: [travisci]
   os: [apple, linux]
 
@@ -226,6 +231,7 @@
 
 - name: Dependency Injector
   gh: ets-labs/python-dependency-injector
+  pypi: dependency-injector
   ci: [travisci]
   os: [windows, apple, linux]
   notes: Dependency injection framework for Python, uses Windows TravisCI
@@ -237,11 +243,13 @@
 
 - name: PyTables
   gh: PyTables/PyTables
+  pypi: tables
   ci: [github]
   os: [windows, apple, linux]
 
 - name: dd-trace-py
   gh: DataDog/dd-trace-py
+  pypi: ddtrace
   ci: [github]
   os: [windows, apple, linux]
   notes: Uses custom alternate arch emulation on GitHub
@@ -270,6 +278,7 @@
 - name: MyPy
   gh: mypyc/mypy_mypyc-wheels
   stars: python/mypy
+  pypi: mypy
   ci: [github]
   os: [apple, linux, windows]
   notes: MyPyC, the compiled component of MyPy.
@@ -277,6 +286,7 @@
 - name: Imagecodecs (fork)
   gh: czaki/imagecodecs_build
   stars: cgohlke/imagecodecs
+  pypi: imagecodecs
   ci: [azurepipelines]
   ci_config: azure-pipelines.yaml
   os: [apple, linux]
@@ -287,3 +297,69 @@
   ci: [github]
   os: [apple, linux, windows]
   notes: Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example.
+
+- name: time-machine
+  gh: adamchainz/time-machine
+  ci: [github]
+  os: [apple, linux, windows]
+  notes: Time mocking library using only the CPython C API.
+
+- name: polaroid
+  gh: daggy1234/polaroid
+  ci: [github]
+  os: [apple, linux, windows]
+  notes: Full range of wheels for setuptools rust, with auto release and PyPI deploy.
+
+- name: python-snappy
+  gh: andrix/python-snappy
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: sourmash
+  gh: dib-lab/sourmash
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: markupsafe
+  gh: pallets/markupsafe
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: SiPM
+  gh: EdoPro98/SimSiPM
+  ci: [github]
+  os: [apple, linux]
+  notes: High performance library for SiPM detectors simulation using C++17, OpenMP and AVX2 intrinsics.
+
+- name: CorrectionLib
+  gh: cms-nanoAOD/correctionlib
+  ci: [github]
+  os: [apple, linux]
+  notes: Structured JSON powered correction library for HEP, designed for the CMS experiment at CERN.
+
+- name: GSD
+  gh: glotzerlab/gsd
+  ci: [github]
+  os: [apple, linux, windows]
+  notes: Cython and NumPy project with 64-bit wheels.
+
+- name: PyGLM
+  gh: Zuzu-Typ/PyGLM
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: iDynTree
+  gh: robotology/idyntree
+  ci: [github]
+  os: [linux]
+  notes: Uses manylinux_2_24
+
+- name: H3-py
+  gh: uber/h3-py
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: DeepForest
+  gh: LAMDA-NJU/Deep-Forest
+  ci: [github]
+  os: [apple, linux, windows]

docs/deliver-to-pypi.md

@@ -33,4 +33,4 @@ Obviously, manual steps are for chumps, so we can automate this a little by usin
 
 If you don't need much control over the release of a package, you can set up cibuildwheel to deliver the wheels straight to PyPI. This doesn't require anycloud storage to work - you just need to bump the version and tag it.
 
-[`examples/travis-ci-deploy.yml`](https://github.com/joerick/cibuildwheel/blob/master/examples/travis-ci-deploy.yml) and [`examples/github-deploy.yml`](https://github.com/joerick/cibuildwheel/blob/master/examples/github-deploy.yml) are example configurations that automatically upload wheels to PyPI. Also check out [this example repo](https://github.com/joerick/cibuildwheel-autopypi-example) for more detailed instructions on how to set this up.
+[`examples/travis-ci-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/travis-ci-deploy.yml) and [`examples/github-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml) are example configurations that automatically upload wheels to PyPI. Also check out [this example repo](https://github.com/pypa/cibuildwheel-autopypi-example) for more detailed instructions on how to set this up.

docs/extra.css

@@ -3,13 +3,14 @@
 
 p {
     margin-bottom: 12px;
+    line-height: 26px;
 }
 
 code {
     font-size: 85%;
     background-color: rgba(27,31,35,.05);
     border-radius: 3px;
-    padding: .2em .4em;
+    padding: .15em .4em;
     color: inherit;
     border: none;
     margin: 0 1px;
@@ -39,6 +40,14 @@ h1, h2, h3, h4, h5, h6 {
     white-space: normal;
 }
 
+.rst-content .admonition {
+  line-height: inherit;
+}
+
+.admonition code {
+  border: none;
+}
+
 /*
     Code block filename style
 
@@ -89,3 +98,59 @@ h1, h2, h3, h4, h5, h6 {
 
 /* import font awesome 4 for icons */
 @import url(https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css);
+
+
+/* Tabs */
+
+/* Style the tab */
+.tabs {
+  margin-bottom: 1em;
+  -webkit-font-smoothing: antialiased;
+}
+
+.tabs-header {
+  background-color: white;
+  display: flex;
+  justify-content: flex-start;
+  border-bottom: 2px solid #ccc;
+}
+
+/* Style the buttons that are used to open the tab content */
+.tabs-header button {
+  background-color: transparent;
+  border: none;
+  outline: none;
+  cursor: pointer;
+  color: inherit;
+  font: inherit;
+  font-size: 0.9em;
+  font-weight: 600;
+  padding: 8px 16px;
+  border-bottom: 2px solid transparent;
+
+  /* put the border on top of the parent border */
+  margin-bottom: -2px;
+}
+
+.tabs-header button:focus-visible {
+  /* preserve an outline for accesibility purposes */
+  outline: 1px solid currentColor;
+}
+
+/* Change background color of buttons on hover */
+.tabs-header button:hover {
+  background-color: rgba(0, 0, 0, 0.02);
+}
+
+/* Create an active/current tablink class */
+.tabs-header button.active {
+  color: #4086bd;
+  border-bottom-color: currentColor;
+}
+
+/* Style the tab content */
+.tabs-content {
+  background-color: #f1f6fa;
+  padding: 1px 1em;
+  padding-top: 0.8em;
+}

docs/extra.js

@@ -1,4 +1,49 @@
-
+// add classes for code-block-filename styling
 $('.rst-content pre')
     .prev('blockquote')
     .addClass('code-block-filename');
+
+var tabConversionIterations = 0
+
+// convert tab admonition to tabs
+while (true) {
+  const firstTab = $('.rst-content .admonition.tab').first()
+  if (firstTab.length == 0) break;
+
+  const otherTabs = firstTab.nextUntil(':not(.admonition.tab)');
+  const allTabs = $($.merge($.merge([], firstTab), otherTabs));
+
+  const tabContainer = $('<div>').addClass('tabs');
+  const headerContainer = $('<div>').addClass('tabs-header');
+  const contentContainer = $('<div>').addClass('tabs-content');
+
+  tabContainer.insertBefore(firstTab);
+  tabContainer.append(headerContainer, contentContainer)
+
+  const selectTab = function (index) {
+    headerContainer.children().removeClass('active')
+    headerContainer.children().eq(index).addClass('active')
+    contentContainer.children().hide()
+    contentContainer.children().eq(index).show()
+  }
+
+  allTabs.each(function (tabI, el) {
+    const $el = $(el)
+    const titleElement = $el.children('.admonition-title')
+    const title = titleElement.text()
+    const button = $('<button>').text(title)
+    button.click(function () {
+      selectTab(tabI)
+    })
+    headerContainer.append(button)
+
+    titleElement.remove()
+    $el.removeClass('admonition')
+    contentContainer.append($el)
+  })
+
+  selectTab(0)
+
+  // this will catch infinite loops which can occur when editing the above
+  if (tabConversionIterations++ > 1000) throw 'too many iterations'
+}

docs/faq.md

@@ -12,13 +12,17 @@ If your wheel didn't compile, check the list below for some debugging tips.
 
 - Windows: missing C feature. The Windows C compiler doesn't support C language features invented after 1990, so you'll have to backport your C code to C90. For me, this mostly involved putting my variable declarations at the top of the function like an animal.
 
-- MacOS: calling cibuildwheel from a python3 script and getting a `ModuleNotFoundError`? Due to a (fixed) [bug](https://bugs.python.org/issue22490) in CPython, you'll need to [unset the `__PYVENV_LAUNCHER__` variable](https://github.com/joerick/cibuildwheel/issues/133#issuecomment-478288597) before activating a venv.
+- MacOS: calling cibuildwheel from a python3 script and getting a `ModuleNotFoundError`? Due to a (fixed) [bug](https://bugs.python.org/issue22490) in CPython, you'll need to [unset the `__PYVENV_LAUNCHER__` variable](https://github.com/pypa/cibuildwheel/issues/133#issuecomment-478288597) before activating a venv.
+
+### Building Python 2.7 / PyPy2 wheels
+
+See the [cibuildwheel verison 1 docs](https://cibuildwheel.readthedocs.io/en/1.x/) for information about building Python 2.7 or PyPy2 wheels. There are lots of tricks and workaround there that are no longer required for Python 3 in cibuildwheel 2.
 
 ### Linux builds on Docker
 
 Linux wheels are built in the [`manylinux` docker images](https://github.com/pypa/manylinux) to provide binary compatible wheels on Linux, according to [PEP 571](https://www.python.org/dev/peps/pep-0571/). Because of this, when building with `cibuildwheel` on Linux, a few things should be taken into account:
 
-- Programs and libraries cannot be installed on the Travis CI Ubuntu host with `apt-get`, but can be installed inside of the Docker image using `yum` or manually. The same goes for environment variables that are potentially needed to customize the wheel building. `cibuildwheel` supports this by providing the `CIBW_ENVIRONMENT` and `CIBW_BEFORE_BUILD` options to setup the build environment inside the running Docker image. See [the options docs](options.md#build-environment) for details on these options.
+- Programs and libraries are not installed on the Travis CI Ubuntu host, but rather should be installed inside of the Docker image (using `yum` for `manylinux2010` or `manylinux2014`, and `apt-get` for `manylinux_2_24`) or manually. The same goes for environment variables that are potentially needed to customize the wheel building. `cibuildwheel` supports this by providing the `CIBW_ENVIRONMENT` and `CIBW_BEFORE_BUILD` options to setup the build environment inside the running Docker image. See [the options docs](options.md#build-environment) for details on these options.
 
 - The project directory is mounted in the running Docker instance as `/project`, the output directory for the wheels as `/output`. In general, this is handled transparently by `cibuildwheel`. For a more finegrained level of control however, the root of the host file system is mounted as `/host`, allowing for example to access shared files, caches, etc. on the host file system.  Note that this is not available on CircleCI due to their Docker policies.
 
@@ -105,6 +109,7 @@ Actions. Once QEMU is set up and registered, you just need to set the
 Linux), and the other architectures are emulated automatically.
 
 > .github/workflows/build.yml
+
 ```yaml
 {% include "../examples/github-with-qemu.yml" %}
 ```
@@ -130,10 +135,12 @@ Hopefully, this is a temporary situation. Once we have widely available Apple Si
 Here's an example GitHub Actions workflow with a job that builds for Apple Silicon:
 
 > .github/workflows/build_macos.yml
+
 ```yml
 {% include "../examples/github-apple-silicon.yml" %}
 ```
 
+
 ### Building packages with optional C extensions
 
 `cibuildwheel` defines the environment variable `CIBUILDWHEEL` to the value `1` allowing projects for which the C extension is optional to make it mandatory when building wheels.
@@ -174,9 +181,9 @@ python3 -m twine upload wheelhouse/*.whl
 
 ### 'ImportError: DLL load failed: The specific module could not be found' error on Windows
 
-Visual Studio and MSVC link the compiled binary wheels to the Microsoft Visual C++ Runtime. Normally, these are included with Python, but when compiling with a newer version of Visual Studio, it is possible users will run into problems on systems that do not have these runtime libraries installed. The solution is to ask users to download the corresponding Visual C++ Redistributable from the [Microsoft website](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) and install it. Since a Python installation normally includes these VC++ Redistributable files for [the version of the MSVC compiler used to compile Python](https://wiki.python.org/moin/WindowsCompilers), this is typically only a problem when compiling a Python 2.7 C extension with a newer compiler, e.g. to support a modern C++ standard (see [the section on modern C++ standards for Python 2.7](cpp_standards.md#windows-and-python-27) for more details).
+Visual Studio and MSVC link the compiled binary wheels to the Microsoft Visual C++ Runtime. Normally, these are included with Python, but when compiling with a newer version of Visual Studio, it is possible users will run into problems on systems that do not have these runtime libraries installed. The solution is to ask users to download the corresponding Visual C++ Redistributable from the [Microsoft website](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) and install it. Since a Python installation normally includes these VC++ Redistributable files for [the version of the MSVC compiler used to compile Python](https://wiki.python.org/moin/WindowsCompilers), this is typically only a problem when compiling a Python C extension with a newer compiler.
 
-Additionally, Visual Studio 2019 started linking to an even newer DLL, `VCRUNTIME140_1.dll`, besides the `VCRUNTIME140.dll` that is included with recent Python versions (starting from Python 3.5; see [here](https://wiki.python.org/moin/WindowsCompilers) for more details on the corresponding Visual Studio & MSVC versions used to compile the different Python versions). To avoid this extra dependency on `VCRUNTIME140_1.dll`, the [`/d2FH4-` flag](https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64/) can be added to the MSVC invocations (check out [this issue](https://github.com/joerick/cibuildwheel/issues/423) for details and references).
+Additionally, Visual Studio 2019 started linking to an even newer DLL, `VCRUNTIME140_1.dll`, besides the `VCRUNTIME140.dll` that is included with recent Python versions (starting from Python 3.5; see [here](https://wiki.python.org/moin/WindowsCompilers) for more details on the corresponding Visual Studio & MSVC versions used to compile the different Python versions). To avoid this extra dependency on `VCRUNTIME140_1.dll`, the [`/d2FH4-` flag](https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64/) can be added to the MSVC invocations (check out [this issue](https://github.com/pypa/cibuildwheel/issues/423) for details and references).
 
 To add the `/d2FH4-` flag to a standard `setup.py` using `setuptools`, the `extra_compile_args` option can be used:
 
@@ -203,7 +210,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead
 If you use GitHub Actions for builds, you can use cibuildwheel as an action:
 
 ```yaml
-uses: joerick/cibuildwheel@v1.9.0
+uses: pypa/cibuildwheel@v2.0.0a1
 ```
 
 This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal.
@@ -229,7 +236,7 @@ The second option, and the only one that supports other CI systems, is using a `
 
 ```bash
 # requirements-cibw.txt
-cibuildwheel==1.9.0
+cibuildwheel==2.0.0a1
 ```
 
 Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `dependabot.yml` file could look like this:

docs/options.md

@@ -4,50 +4,78 @@
 
 ## Setting options
 
-cibuildwheel is configured using environment variables, that can be set using
+cibuildwheel is configured using environment variables that can be set using
 your CI config.
 
 For example, to configure cibuildwheel to run tests, add the following YAML to
 your CI config file:
 
-> .travis.yml ([docs](https://docs.travis-ci.com/user/environment-variables/))
-```yaml
-env:
-  global:
-    - CIBW_TEST_REQUIRES=pytest
-    - CIBW_TEST_COMMAND="pytest {project}/tests"
-```
 
-> appveyor.yml ([docs](https://www.appveyor.com/docs/build-configuration/#environment-variables))
-```yaml
-environment:
-  global:
-    CIBW_TEST_REQUIRES: pytest
-    CIBW_TEST_COMMAND: "pytest {project}\\tests"
-```
+!!! tab "GitHub Actions"
 
-> .circleci/config.yml ([docs](https://circleci.com/docs/2.0/configuration-reference/#environment))
-```yaml
-jobs:
-  job_name:
-    environment:
+    > .github/workflows/*.yml ([docs](https://help.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables)) (can be global, in job, or in step)
+
+    ```yaml
+    env:
       CIBW_TEST_REQUIRES: pytest
       CIBW_TEST_COMMAND: "pytest {project}/tests"
-```
+    ```
 
-> azure-pipelines.yml ([docs](https://docs.microsoft.com/en-us/azure/devops/pipelines/process/variables))
-```yaml
-variables:
-  CIBW_TEST_REQUIRES: pytest
-  CIBW_TEST_COMMAND: "pytest {project}/tests"
-```
+!!! tab "Azure Pipelines"
+
+    > azure-pipelines.yml ([docs](https://docs.microsoft.com/en-us/azure/devops/pipelines/process/variables))
+
+    ```yaml
+    variables:
+      CIBW_TEST_REQUIRES: pytest
+      CIBW_TEST_COMMAND: "pytest {project}/tests"
+    ```
+
+!!! tab "Travis CI"
+
+    > .travis.yml ([docs](https://docs.travis-ci.com/user/environment-variables/))
+
+    ```yaml
+    env:
+      global:
+        - CIBW_TEST_REQUIRES=pytest
+        - CIBW_TEST_COMMAND="pytest {project}/tests"
+    ```
+
+!!! tab "AppVeyor"
+
+    > appveyor.yml ([docs](https://www.appveyor.com/docs/build-configuration/#environment-variables))
+
+    ```yaml
+    environment:
+      global:
+        CIBW_TEST_REQUIRES: pytest
+        CIBW_TEST_COMMAND: "pytest {project}\\tests"
+    ```
+
+!!! tab "CircleCI"
+
+    > .circleci/config.yml ([docs](https://circleci.com/docs/2.0/configuration-reference/#environment))
+
+    ```yaml
+    jobs:
+      job_name:
+        environment:
+          CIBW_TEST_REQUIRES: pytest
+          CIBW_TEST_COMMAND: "pytest {project}/tests"
+    ```
+
+!!! tab "Gitlab CI"
+
+    > .gitlab-ci.yml ([docs](https://docs.gitlab.com/ee/ci/variables/README.html#create-a-custom-variable-in-gitlab-ciyml))
+
+    ```yaml
+    linux:
+      variables:
+        CIBW_TEST_REQUIRES: pytest
+        CIBW_TEST_COMMAND: "pytest {project}/tests"
+    ```
 
-> .github/workflows/*.yml ([docs](https://help.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables)) (can be global, in job, or in step)
-```yaml
-env:
-  CIBW_TEST_REQUIRES: pytest
-  CIBW_TEST_COMMAND: "pytest {project}/tests"
-```
 
 
 ## Build selection
@@ -62,75 +90,80 @@ Default: `auto`
 
 `auto` will auto-detect platform using environment variables, such as `TRAVIS_OS_NAME`/`APPVEYOR`/`CIRCLECI`.
 
-For `linux` you need Docker running, on macOS or Linux. For `macos`, you need a Mac machine, and note that this script is going to automatically install MacPython on your system, so don't run on your development machine. For `windows`, you need to run in Windows, and `cibuildwheel` will install required versions of Python to `C:\cibw\python` using NuGet.
+- For `linux`, you need Docker running, on macOS or Linux.
+- For `macos`, you need a Mac machine. Note that cibuildwheel is going to install MacPython on your system, so you probably don't want to run this on your development machine.
+- For `windows`, you need to run in Windows. cibuildwheel will install required versions of Python to `C:\cibw\python` using NuGet.
 
 This option can also be set using the [command-line option](#command-line) `--platform`.
 
+!!! tip
+    If you have Docker installed, you can locally debug your cibuildwheel Linux config, instead of pushing to CI to test every change. For example:
+
+    ```bash
+    export CIBW_BUILD='cp37-*'
+    export CIBW_TEST_COMMAND='pytest {package}/tests'
+    cibuildwheel --platform linux .
+    ```
+
 
 ### `CIBW_BUILD`, `CIBW_SKIP` {: #build-skip}
 
 > Choose the Python versions to build
 
-Space-separated list of builds to build and skip. Each build has an identifier like `cp27-manylinux_x86_64` or `cp35-macosx_x86_64` - you can list specific ones to build and `cibuildwheel` will only build those, and/or list ones to skip and `cibuildwheel` won't try to build them.
+Space-separated list of builds to build and skip. Each build has an identifier like `cp38-manylinux_x86_64` or `cp37-macosx_x86_64` - you can list specific ones to build and cibuildwheel will only build those, and/or list ones to skip and cibuildwheel won't try to build them.
 
 When both options are specified, both conditions are applied and only builds with a tag that matches `CIBW_BUILD` and does not match `CIBW_SKIP` will be built.
 
-When setting the options, you can use shell-style globbing syntax, as per [`fnmatch`](https://docs.python.org/3/library/fnmatch.html) with the addition of curly bracket syntax `{option1,option2}`, provided by [`bracex`](https://pypi.org/project/bracex/). All the build identifiers supported by cibuildwheel are shown below:
+When setting the options, you can use shell-style globbing syntax, as per [fnmatch](https://docs.python.org/3/library/fnmatch.html) with the addition of curly bracket syntax `{option1,option2}`, provided by [bracex](https://pypi.org/project/bracex/). All the build identifiers supported by cibuildwheel are shown below:
 
 <div class="build-id-table-marker"></div>
 
-|                 | macOS 64bit         | Manylinux x86 64bit    | Manylinux x86 32bit  | Windows 64bit   | Windows 32bit  | Manylinux Armv8 64bit  | Manylinux PPC64LE      | Manylinux s390x      |
-|-----------------|---------------------|------------------------|----------------------|-----------------|----------------|------------------------|------------------------|----------------------|
-| 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     | cp35-manylinux_aarch64 | cp35-manylinux_ppc64le | cp35-manylinux_s390x |
-| 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 |
-| 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.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     |                        |                        |                      |
+|              | macOS                                                               | Windows                       | Manylinux Intel                               | Manylinux Other                                                            |
+|--------------|---------------------------------------------------------------------|-------------------------------|-----------------------------------------------|----------------------------------------------------------------------------|
+| Python 3.6   | cp36-macosx_x86_64                                                  | cp36-win_amd64<br/>cp36-win32 | cp36-manylinux_x86_64<br/>cp36-manylinux_i686 | cp36-manylinux_aarch64<br/>cp36-manylinux_ppc64le<br/>cp36-manylinux_s390x |
+| Python 3.7   | cp37-macosx_x86_64                                                  | cp37-win_amd64<br/>cp37-win32 | cp37-manylinux_x86_64<br/>cp37-manylinux_i686 | cp37-manylinux_aarch64<br/>cp37-manylinux_ppc64le<br/>cp37-manylinux_s390x |
+| Python 3.8   | cp38-macosx_x86_64                                                  | cp38-win_amd64<br/>cp38-win32 | cp38-manylinux_x86_64<br/>cp38-manylinux_i686 | cp38-manylinux_aarch64<br/>cp38-manylinux_ppc64le<br/>cp38-manylinux_s390x |
+| Python 3.9   | cp39-macosx_x86_64<br/>cp39-macosx_universal2<br/>cp39-macosx_arm64 | cp39-win_amd64<br/>cp39-win32 | cp39-manylinux_x86_64<br/>cp39-manylinux_i686 | cp39-manylinux_aarch64<br/>cp39-manylinux_ppc64le<br/>cp39-manylinux_s390x |
+| PyPy3.7 v7.3 | pp37-macosx_x86_64                                                  |                pp37-win_amd64 | pp37-manylinux_x86_64                         |                                                                            |
 
 
-The list of supported and currently selected build identifiers can also be retrieved by passing the `--print-build-identifiers` flag to `cibuildwheel`.
+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/3.7, respectively macOS 10.7 and 10.13 or higher is required.
+For CPython, the minimally supported macOS version is 10.9; for PyPy 3.7, macOS 10.13 or higher is required.
+
+See the [cibuildwheel 1 documentation](https://cibuildwheel.readthedocs.io/en/1.x/) for past end of life versions of Python, and PyPy2.7.
 
 #### Examples
 
 ```yaml
-# Only build on Python 3.6
+# Only build on CPython 3.6
 CIBW_BUILD: cp36-*
 
-# Skip building on Python 2.7 on the Mac
-CIBW_SKIP: cp27-macosx_x86_64
+# Skip building on CPython 3.6 on the Mac
+CIBW_SKIP: cp36-macosx_x86_64
 
-# Skip building on Python 3.8 on the Mac
+# Skip building on CPython 3.8 on the Mac
 CIBW_SKIP: cp38-macosx_x86_64
 
-# Skip building on Python 2.7 on all platforms
-CIBW_SKIP: cp27-*
+# Skip building on CPython 3.6 on all platforms
+CIBW_SKIP: cp36-*
 
-# Skip Python 2.7 on Windows
-CIBW_SKIP: cp27-win*
+# Skip CPython 3.6 on Windows
+CIBW_SKIP: cp36-win*
 
-# Skip Python 2.7 on 32-bit Windows
-CIBW_SKIP: cp27-win32
+# Skip CPython 3.6 on 32-bit Windows
+CIBW_SKIP: cp36-win32
 
-# Skip Python 2.7 and Python 3.5
-CIBW_SKIP: cp27-* cp35-*
+# Skip CPython 3.6 and CPython 3.7
+CIBW_SKIP: cp36-* cp37-*
 
 # Skip Python 3.6 on Linux
 CIBW_SKIP: cp36-manylinux*
 
-# Only build on Python 3 (ready for 3.10 when it comes) and skip 32-bit builds
-CIBW_BUILD: {cp,pp}3*-*
+# Skip 32-bit builds
 CIBW_SKIP: "*-win32 *-manylinux_i686"
 
-# Only build PyPy and CPython 3
-CIBW_BUILD: pp* cp3*-*
-
 # Disable building PyPy wheels on all platforms
 CIBW_SKIP: pp*
 ```
@@ -248,8 +281,8 @@ the package is compatible with all versions of Python that it can build.
 
     Currently, setuptools has not yet added support for reading this value from
     pyproject.toml yet, and so does not copy it to Requires-Python in the wheel
-    metadata. This mechanism is used by `pip` to scan through older versions of
-    your package until it finds a release compatible with the curernt version
+    metadata. This mechanism is used by pip to scan through older versions of
+    your package until it finds a release compatible with the current version
     of Python compatible when installing, so it is an important value to set if
     you plan to drop support for a version of Python in the future.
 
@@ -266,6 +299,32 @@ the package is compatible with all versions of Python that it can build.
 CIBW_PROJECT_REQUIRES_PYTHON: ">=3.6"
 ```
 
+###  `CIBW_PRERELEASE_PYTHONS` {: #prerelease-pythons}
+> Enable building with pre-release versions of Python
+
+During the beta period, when new versions of Python are being tested,
+cibuildwheel will often gain early support for beta releases. If you would
+like to test wheel building with these versions, you can enable this flag.
+
+!!! caution
+    This option is provided for testing purposes only. It is not
+    recommended to distribute wheels built when `CIBW_PRERELEASE_PYTHONS` is
+    set, such as uploading to PyPI.  Please _do not_ upload these wheels to
+    PyPI, as they are not guaranteed to work with the final Python release.
+    Once Python is ABI stable and enters the release candidate phase, that
+    version of Python will become available without this flag.
+
+Default: Off (0) if Python is available in beta phase. No effect otherwise.
+
+This option can also be set using the [command-line option](#command-line) `--prerelease-pythons`.
+
+#### Examples
+
+```yaml
+# Include latest Python beta
+CIBW_PRERELEASE_PYTHONS: True
+```
+
 ## Build customization
 
 ### `CIBW_ENVIRONMENT` {: #environment}
@@ -301,7 +360,7 @@ CIBW_ENVIRONMENT: "BUILD_TIME=$(date) SAMPLE_TEXT=\"sample text\""
 ```
 
 !!! note
-    `cibuildwheel` always defines the environment variable `CIBUILDWHEEL=1`. This can be useful for [building wheels with optional extensions](faq.md#building-packages-with-optional-c-extensions).
+    cibuildwheel always defines the environment variable `CIBUILDWHEEL=1`. This can be useful for [building wheels with optional extensions](faq.md#building-packages-with-optional-c-extensions).
 
 ### `CIBW_BEFORE_ALL` {: #before-all}
 > Execute a shell command on the build system before any wheels are built.
@@ -310,7 +369,7 @@ Shell command to prepare a common part of the project (e.g. build or install lib
 
 This option is very useful for the Linux build, where builds take place in isolated Docker containers managed by cibuildwheel. This command will run inside the container before the wheel builds start. Note, if you're building both x86_64 and i686 wheels (the default), your build uses two different Docker images. In that case, this command will execute twice - once per build container.
 
-The placeholder `{package}` can be used here; it will be replaced by the path to the package being built by `cibuildwheel`.
+The placeholder `{package}` can be used here; it will be replaced by the path to the package being built by cibuildwheel.
 
 On Windows and macOS, the version of Python available inside `CIBW_BEFORE_ALL` is whatever is available on the host machine. On Linux, a modern Python version is available on PATH.
 
@@ -326,6 +385,11 @@ CIBW_BEFORE_ALL: make -C third_party_lib
 CIBW_BEFORE_ALL_LINUX: yum install -y libffi-dev
 ```
 
+Note that manylinux2_24 builds occur inside a Debian9 docker, where
+manylinux2010 and manylinux2014 builds occur inside a CentOS one. So for
+`manylinux2_24` the `CIBW_BEFORE_ALL_LINUX` command must use `apt-get -y`
+instead.
+
 ### `CIBW_BEFORE_BUILD` {: #before-build}
 > Execute a shell command preparing each wheel's build
 
@@ -333,7 +397,7 @@ A shell command to run before building the wheel. This option allows you to run
 
 If dependencies are required to build your wheel (for example if you include a header from a Python module), instead of using this command, we recommend adding requirements to a pyproject.toml file. This is reproducible, and users who do not get your wheels (such as Alpine or ClearLinux users) will still benefit.
 
-The active Python binary can be accessed using `python`, and pip with `pip`; `cibuildwheel` makes sure the right version of Python and pip will be executed. The placeholder `{package}` can be used here; it will be replaced by the path to the package being built by `cibuildwheel`.
+The active Python binary can be accessed using `python`, and pip with `pip`; cibuildwheel makes sure the right version of Python and pip will be executed. The placeholder `{package}` can be used here; it will be replaced by the path to the package being built by cibuildwheel.
 
 The command is run in a shell, so you can write things like `cmd1 && cmd2`.
 
@@ -393,7 +457,7 @@ Default:
 A shell command to repair a built wheel by copying external library dependencies into the wheel tree and relinking them.
 The command is run on each built wheel (except for pure Python ones) before testing it.
 
-The following placeholders must be used inside the command and will be replaced by `cibuildwheel`:
+The following placeholders must be used inside the command and will be replaced by cibuildwheel:
 
 - `{wheel}` for the absolute path to the built wheel
 - `{dest_dir}` for the absolute path of the directory where to create the repaired wheel
@@ -404,30 +468,54 @@ The command is run in a shell, so you can run multiple commands like `cmd1 && cm
 Platform-specific variants also available:<br/>
 `CIBW_REPAIR_WHEEL_COMMAND_MACOS` | `CIBW_REPAIR_WHEEL_COMMAND_WINDOWS` | `CIBW_REPAIR_WHEEL_COMMAND_LINUX`
 
+!!! tip
+    cibuildwheel doesn't yet ship a default repair command for Windows.
+
+    **If that's an issue for you, check out [delvewheel]** - a new package that aims to do the same as auditwheel or delocate for Windows.
+
+    Because delvewheel is still relatively early-stage, cibuildwheel does not yet run it by default. However, we'd recommend giving it a try! See the examples below for usage.
+
+    [Delvewheel]: https://github.com/adang1345/delvewheel
+
 #### Examples
 
 ```yaml
+# use delvewheel on windows (only works on Python 3.6+)
+CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel"
+CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel}"
+
 # don't repair macOS wheels
 CIBW_REPAIR_WHEEL_COMMAND_MACOS: ""
 
 # pass the `--lib-sdir .` flag to auditwheel on Linux
 CIBW_REPAIR_WHEEL_COMMAND_LINUX: "auditwheel repair --lib-sdir . -w {dest_dir} {wheel}"
+
 ```
 
 
-### `CIBW_MANYLINUX_X86_64_IMAGE`, `CIBW_MANYLINUX_I686_IMAGE`, `CIBW_MANYLINUX_PYPY_X86_64_IMAGE`, `CIBW_MANYLINUX_AARCH64_IMAGE`, `CIBW_MANYLINUX_PPC64LE_IMAGE`, `CIBW_MANYLINUX_S390X_IMAGE` {: #manylinux-image}
-> Specify alternative manylinux docker images
+### CIBW_MANYLINUX_*_IMAGE {: #manylinux-image}
+> Specify alternative manylinux Docker images
 
-An alternative Docker image to be used for building [`manylinux`](https://github.com/pypa/manylinux) wheels. `cibuildwheel` will then pull these instead of the default images, [`quay.io/pypa/manylinux2010_x86_64`](https://quay.io/pypa/manylinux2010_x86_64), [`quay.io/pypa/manylinux2010_i686`](https://quay.io/pypa/manylinux2010_i686), [`pypywheels/manylinux2010-pypy_x86_64`](https://hub.docker.com/r/pypywheels/manylinux2010-pypy_x86_64), [`quay.io/pypa/manylinux2014_aarch64`](https://quay.io/pypa/manylinux2014_aarch64), [`quay.io/pypa/manylinux2014_ppc64le`](https://quay.io/pypa/manylinux2014_ppc64le), and [`quay.io/pypa/manylinux2014_s390x`](https://quay.io/pypa/manylinux2010_s390x).
+The available options are:
 
-The value of this option can either be set to `manylinux1`, `manylinux2010` or `manylinux2014` to use a pinned version of the [official `manylinux` images](https://github.com/pypa/manylinux) and [PyPy `manylinux` images](https://github.com/pypy/manylinux). Alternatively, set these options to any other valid Docker image name. Note that for PyPy, only the official `manylinux2010` image is currently available. For architectures other
-than x86 (x86\_64 and i686) manylinux2014 must be used because this is the first version of the manylinux specification that supports additional architectures.
+- `CIBW_MANYLINUX_X86_64_IMAGE`
+- `CIBW_MANYLINUX_I686_IMAGE`
+- `CIBW_MANYLINUX_PYPY_X86_64_IMAGE`
+- `CIBW_MANYLINUX_AARCH64_IMAGE`
+- `CIBW_MANYLINUX_PPC64LE_IMAGE`
+- `CIBW_MANYLINUX_S390X_IMAGE`
+- `CIBW_MANYLINUX_PYPY_AARCH64_IMAGE`
+- `CIBW_MANYLINUX_PYPY_I686_IMAGE`
 
-Beware to specify a valid Docker image that can be used in the same way as the official, default Docker images: all necessary Python and pip versions need to be present in `/opt/python/`, and the `auditwheel` tool needs to be present for `cibuildwheel` to work. Apart from that, the architecture and relevant shared system libraries need to be manylinux1-, manylinux2010- or manylinux2014-compatible in order to produce valid `manylinux1`/`manylinux2010`/`manylinux2014` wheels (see [pypa/manylinux on GitHub](https://github.com/pypa/manylinux), [PEP 513](https://www.python.org/dev/peps/pep-0513/), [PEP 571](https://www.python.org/dev/peps/pep-0571/) and [PEP 599](https://www.python.org/dev/peps/pep-0599/) for more details).
+Set an alternative Docker image to be used for building [manylinux](https://github.com/pypa/manylinux) wheels. cibuildwheel will then pull these instead of the default images, [`quay.io/pypa/manylinux2010_x86_64`](https://quay.io/pypa/manylinux2010_x86_64), [`quay.io/pypa/manylinux2010_i686`](https://quay.io/pypa/manylinux2010_i686), [`quay.io/pypa/manylinux2010_x86_64`](https://quay.io/pypa/manylinux2010_x86_64), [`quay.io/pypa/manylinux2014_aarch64`](https://quay.io/pypa/manylinux2014_aarch64), [`quay.io/pypa/manylinux2014_ppc64le`](https://quay.io/pypa/manylinux2014_ppc64le), and [`quay.io/pypa/manylinux2014_s390x`](https://quay.io/pypa/manylinux2010_s390x).
 
-Note that `auditwheel` detects the version of the `manylinux` standard in the Docker image through the `AUDITWHEEL_PLAT` environment variable, as `cibuildwheel` has no way of detecting the correct `--plat` command line argument to pass to `auditwheel` for a custom image. If a Docker image does not correctly set this `AUDITWHEEL_PLAT` environment variable, the `CIBW_ENVIRONMENT` option can be used to do so (e.g., `CIBW_ENVIRONMENT='AUDITWHEEL_PLAT="manylinux2010_$(uname -m)"'`).
+The value of this option can either be set to `manylinux1`, `manylinux2010`, `manylinux2014` or `manylinux_2_24` to use a pinned version of the [official manylinux images](https://github.com/pypa/manylinux). Alternatively, set these options to any other valid Docker image name. For PyPy, the `manylinux1` image is not available. For architectures other
+than x86 (x86\_64 and i686) `manylinux2014` or `manylinux_2_24` must be used, because the first version of the manylinux specification that supports additional architectures is `manylinux2014`.
 
-Note that `manylinux2014` doesn't support builds with Python 2.7 - when building with `manylinux2014`, skip Python 2.7 using `CIBW_SKIP` (see example below).
+
+If setting a custom Docker image, you'll need to make sure it can be used in the same way as the official, default Docker images: all necessary Python and pip versions need to be present in `/opt/python/`, and the auditwheel tool needs to be present for cibuildwheel to work. Apart from that, the architecture and relevant shared system libraries need to be compatible to the relevant standard to produce valid manylinux1/manylinux2010/manylinux2014/manylinux_2_24 wheels (see [pypa/manylinux on GitHub](https://github.com/pypa/manylinux), [PEP 513](https://www.python.org/dev/peps/pep-0513/), [PEP 571](https://www.python.org/dev/peps/pep-0571/), [PEP 599](https://www.python.org/dev/peps/pep-0599/) and [PEP 600](https://www.python.org/dev/peps/pep-0600/) for more details).
+
+Auditwheel detects the version of the manylinux standard in the Docker image through the `AUDITWHEEL_PLAT` environment variable, as cibuildwheel has no way of detecting the correct `--plat` command line argument to pass to auditwheel for a custom image. If a Docker image does not correctly set this `AUDITWHEEL_PLAT` environment variable, the `CIBW_ENVIRONMENT` option can be used to do so (e.g., `CIBW_ENVIRONMENT='AUDITWHEEL_PLAT="manylinux2010_$(uname -m)"'`).
 
 #### Examples
 
@@ -441,12 +529,15 @@ CIBW_SKIP: pp*
 # build using the manylinux2014 image
 CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
 CIBW_MANYLINUX_I686_IMAGE: manylinux2014
-CIBW_SKIP: cp27-manylinux*
+CIBW_MANYLINUX_PYPY_X86_64_IMAGE: manylinux2014
+CIBW_MANYLINUX_PYPY_I686_IMAGE: manylinux2014
 
 # build using the latest manylinux2010 release, instead of the cibuildwheel
 # pinned version
 CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2010_x86_64:latest
 CIBW_MANYLINUX_I686_IMAGE: quay.io/pypa/manylinux2010_i686:latest
+CIBW_MANYLINUX_PYPY_X86_64_IMAGE: quay.io/pypa/manylinux2010_x86_64:latest
+CIBW_MANYLINUX_PYPY_I686_IMAGE: quay.io/pypa/manylinux2010_i686:latest
 
 # build using a different image from the docker registry
 CIBW_MANYLINUX_X86_64_IMAGE: dockcross/manylinux-x64
@@ -478,7 +569,7 @@ here and it will be used instead.
     If you need different dependencies for each python version, provide them
     in the same folder with a `-pythonXY` suffix. e.g. if your
     `CIBW_DEPENDENCY_VERSIONS=./constraints.txt`, cibuildwheel will use
-    `./constraints-python27.txt` on Python 2.7, or fallback to
+    `./constraints-python37.txt` on Python 3.7, or fallback to
     `./constraints.txt` if that's not found.
 
 Platform-specific variants also available:<br/>
@@ -511,8 +602,8 @@ CIBW_DEPENDENCY_VERSIONS: ./constraints.txt
 
 Shell command to run tests after the build. The wheel will be installed
 automatically and available for import from the tests. To ensure the wheel is
-imported by your tests (instead of your source copy), tests are run from a
-different directory. Use the placeholders `{project}` and `{package}` when
+imported by your tests (instead of your source copy), **tests are not run from
+your project directory**. Use the placeholders `{project}` and `{package}` when
 specifying paths in your project. If this variable is not set, your wheel will
 not be installed after building.
 
@@ -543,10 +634,10 @@ CIBW_TEST_COMMAND: "echo Wheel installed"
 ### `CIBW_BEFORE_TEST` {: #before-test}
 > Execute a shell command before testing each wheel
 
-A shell command to run in **each** test virtual environment, before your wheel is installed and tested. This is useful if you need to install a non pip package, change values of environment variables
-or perform multi step pip installation (e.g. installing `scikit-build` or `cython` before install test package)
+A shell command to run in **each** test virtual environment, before your wheel is installed and tested. This is useful if you need to install a non-pip package, invoke pip with different environment variables,
+or perform a multi-step pip installation (e.g. installing scikit-build or Cython before installing test package).
 
-The active Python binary can be accessed using `python`, and pip with `pip`; `cibuildwheel` makes sure the right version of Python and pip will be executed. The placeholder `{package}` can be used here; it will be replaced by the path to the package being built by `cibuildwheel`.
+The active Python binary can be accessed using `python`, and pip with `pip`; cibuildwheel makes sure the right version of Python and pip will be executed. The placeholder `{package}` can be used here; it will be replaced by the path to the package being built by cibuildwheel.
 
 The command is run in a shell, so you can write things like `cmd1 && cmd2`.
 
@@ -611,7 +702,7 @@ CIBW_TEST_EXTRAS: test,qt
 ### `CIBW_TEST_SKIP` {: #test-skip}
 > Skip running tests on some builds
 
-This will skip testing on any identifiers that match the given skip patterns (see [`CIBW_SKIP`](#build-skip)). This can be used to mask out tests for wheels that have missing dependencies upstream that are slow or hard to build, or to mask up slow tests on emulated architectures.
+This will skip testing on any identifiers that match the given skip patterns (see [`CIBW_SKIP`](#build-skip)). This can be used to mask out tests for wheels that have missing dependencies upstream that are slow or hard to build, or to skip slow tests on emulated architectures.
 
 With macOS `universal2` wheels, you can also skip the the individual archs inside the wheel using an `:arch` suffix. For example, `cp39-macosx_universal2:x86_64` or `cp39-macosx_universal2:arm64`.
 
@@ -650,6 +741,7 @@ CIBW_BUILD_VERBOSITY: 1
 usage: cibuildwheel [-h] [--platform {auto,linux,macos,windows}]
                     [--archs ARCHS] [--output-dir OUTPUT_DIR]
                     [--print-build-identifiers] [--allow-empty]
+                    [--prerelease-pythons]
                     [package_dir]
 
 Build wheels for all the platforms.
@@ -676,8 +768,8 @@ optional arguments:
                         natively supported on this machine. Set this option to
                         build an architecture via emulation, for example,
                         using binfmt_misc and QEMU. Default: auto. Choices:
-                        auto, native, all, x86_64, i686, aarch64, ppc64le,
-                        s390x, x86, AMD64
+                        auto, auto64, auto32, native, all, x86_64, i686,
+                        aarch64, ppc64le, s390x, universal2, arm64, x86, AMD64
   --output-dir OUTPUT_DIR
                         Destination folder for the wheels.
   --print-build-identifiers
@@ -685,17 +777,19 @@ optional arguments:
                         invocation and exit.
   --allow-empty         Do not report an error code if the build does not
                         match any wheels.
+  --prerelease-pythons  Enable pre-release Python versions if available.
 ```
 
 <style>
   .options-toc {
     display: grid;
-    grid-auto-columns: fit-content(20%) 1fr;
+    grid-template-columns: fit-content(20%) 1fr;
     grid-gap: 16px 32px;
     gap: 16px 32px;
     font-size: 90%;
     margin-bottom: 28px;
     margin-top: 28px;
+    overflow-x: auto;
   }
   .options-toc .header {
     grid-column: 1 / 3;
@@ -721,7 +815,7 @@ optional arguments:
 
     $('.rst-content h3')
       .filter(function (i, el) {
-        return !!$(el).text().match(/(^([A-Z0-9, _]| and )+)¶$/);
+        return !!$(el).text().match(/(^([A-Z0-9, _*]| and )+)¶$/);
       })
       .each(function (i, el) {
         var optionName = $(el).text().replace('¶', '');

docs/setup.md

@@ -4,82 +4,130 @@ title: 'Setup'
 
 # GitHub Actions [linux/mac/windows] {: #github-actions}
 
-To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/workflows/build.yml` file in your repo.
+To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/workflows/build_wheels.yml` file in your repo.
+
+!!! tab "Action"
+    For GitHub Actions, `cibuildwheel` provides an action you can use. This is
+    concise and enables easier auto updating via GitHub's Dependabot; see
+    [Automatic updates](faq.md#automatic-updates).
+
+    > .github/workflows/build_wheels.yml
+
+    ```yaml
+    {% include "../examples/github-minimal.yml" %}
+    ```
+
+
+    You can use `env:` with the action just like you would with `run:`; you can
+    also use `with:` to set the command line options: `package-dir: .` and
+    `output-dir: wheelhouse` (those values are the defaults).
+
+!!! tab "pipx"
+    The GitHub Actions runners have pipx installed, so you can easily build in
+    just one line. This is internally how the action works; the main benefit of
+    the action form is easy updates via GitHub's Dependabot.
+
+    > .github/workflows/build_wheels.yml
+
+    ```yaml
+    name: Build
+
+    on: [push, pull_request]
+
+    jobs:
+      build_wheels:
+        name: Build wheels on ${{ matrix.os }}
+        runs-on: ${{ matrix.os }}
+        strategy:
+          matrix:
+            os: [ubuntu-20.04, windows-2019, macos-10.15]
+
+        steps:
+          - uses: actions/checkout@v2
+
+          - name: Build wheels
+            run: pipx run cibuildwheel==2.0.0a1
+
+          - uses: actions/upload-artifact@v2
+            with:
+              path: ./wheelhouse/*.whl
+    ```
+
+!!! tab "Generic"
+    This is the most generic form using setup-python and pip; it looks the most
+    like the other CI examples. If you want to avoid having setup that takes
+    advantage of GitHub Actions features or pipx being preinstalled, this might
+    appeal to you.
+
+    > .github/workflows/build_wheels.yml
+
+    ```yaml
+    name: Build
+
+    on: [push, pull_request]
+
+    jobs:
+      build_wheels:
+        name: Build wheels on ${{ matrix.os }}
+        runs-on: ${{ matrix.os }}
+        strategy:
+          matrix:
+            os: [ubuntu-20.04, windows-2019, macos-10.15]
+
+        steps:
+          - uses: actions/checkout@v2
+
+          # Used to host cibuildwheel
+          - uses: actions/setup-python@v2
+
+          - name: Install cibuildwheel
+            run: python -m pip install cibuildwheel==2.0.0a1
+
+          - name: Build wheels
+            run: python -m cibuildwheel --output-dir wheelhouse
+
+          - uses: actions/upload-artifact@v2
+            with:
+              path: ./wheelhouse/*.whl
+    ```
 
-> build.yml
-```yaml
-{% include "../examples/github-minimal.yml" %}
-```
 
 Commit this file, and push to GitHub - either to your default branch, or to a PR branch. The build should start automatically.
 
 For more info on this file, check out the [docs](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions).
 
-[`examples/github-deploy.yml`](https://github.com/joerick/cibuildwheel/blob/master/examples/github-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI.
+[`examples/github-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI.
 
-You can also use cibuildwheel directly as an action with `uses: joerick/cibuildwheel@v1.9.0`; this combines the download and run steps into a single action, and command line arguments are available via `with:`. This makes it easy to manage cibuildwheel updates via normal actions update mechanisms like dependabot, see [Automatic updates](faq.md#automatic-updates).
 
 # Azure Pipelines [linux/mac/windows] {: #azure-pipelines}
 
 To build Linux, Mac, and Windows wheels on Azure Pipelines, create a `azure-pipelines.yml` file in your repo.
 
 > azure-pipelines.yml
+
 ```yaml
 {% include "../examples/azure-pipelines-minimal.yml" %}
 ```
 
-!!! note
-    To support Python 3.5 on Windows, make sure to specify the use of `{vmImage: 'vs2017-win2016'}` on Windows, to ensure the required toolchain is available.
-
 Commit this file, enable building of your repo on Azure Pipelines, and push.
 
 Wheels will be stored for you and available through the Pipelines interface. For more info on this file, check out the [docs](https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema).
 
-# Travis CI [linux/mac/windows] {: #travis-ci}
+# Travis CI [linux/windows] {: #travis-ci}
 
-To build Linux, Mac, and Windows wheels on Travis CI, create a `.travis.yml` file in your repo.
+To build Linux and Windows wheels on Travis CI, create a `.travis.yml` file in your repo.
 
 > .travis.yml
+
 ```yaml
 {% include "../examples/travis-ci-minimal.yml" %}
 ```
 
-Note that building Windows Python 2.7 wheels on Travis is unsupported unless using a newer compiler [via a workaround](cpp_standards.md).
-
 Commit this file, enable building of your repo on Travis CI, and push.
 
 Then setup a deployment method by following the [Travis CI deployment docs](https://docs.travis-ci.com/user/deployment/), or see [Delivering to PyPI](deliver-to-pypi.md). For more info on `.travis.yml`, check out the [docs](https://docs.travis-ci.com/).
 
-[`examples/travis-ci-deploy.yml`](https://github.com/joerick/cibuildwheel/blob/master/examples/travis-ci-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI.
-
-# CircleCI [linux/mac] {: #circleci}
-
-To build Linux and Mac wheels on CircleCI, create a `.circleci/config.yml` file in your repo,
-
-> .circleci/config.yml
-```yaml
-{% include "../examples/circleci-minimal.yml" %}
-```
-
-Commit this file, enable building of your repo on CircleCI, and push.
-
-!!! note
-    CircleCI doesn't enable free macOS containers for open source by default, but you can ask for access. See [here](https://circleci.com/docs/2.0/oss/#overview) for more information.
-
-CircleCI will store the built wheels for you - you can access them from the project console. Check out the CircleCI [docs](https://circleci.com/docs/2.0/configuration-reference/#section=configuration) for more info on this config file.
-
-# Gitlab CI [linux] {: #gitlab-ci}
-
-To build Linux wheels on Gitlab CI, create a `.gitlab-ci.yml` file in your repo,
-
-> .gitlab-ci.yml
-```yaml
-{% include "../examples/gitlab-minimal.yml" %}
-```
-
-Commit this file, and push to Gitlab. The pipeline should start automatically.
-
-Gitlab will store the built wheels for you - you can access them from the Pipelines view. Check out the Gitlab [docs](https://docs.gitlab.com/ee/ci/yaml/) for more info on this config file.
+[`examples/travis-ci-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/travis-ci-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI.
 
 # AppVeyor [linux/mac/windows] {: #appveyor}
 
@@ -97,6 +145,37 @@ AppVeyor will store the built wheels for you - you can access them from the proj
 
 For more info on this config file, check out the [docs](https://www.appveyor.com/docs/).
 
+# CircleCI [linux/mac] {: #circleci}
+
+To build Linux and Mac wheels on CircleCI, create a `.circleci/config.yml` file in your repo,
+
+> .circleci/config.yml
+
+```yaml
+{% include "../examples/circleci-minimal.yml" %}
+```
+
+Commit this file, enable building of your repo on CircleCI, and push.
+
+!!! note
+    CircleCI doesn't enable free macOS containers for open source by default, but you can ask for access. See [here](https://circleci.com/docs/2.0/oss/#overview) for more information.
+
+CircleCI will store the built wheels for you - you can access them from the project console. Check out the CircleCI [docs](https://circleci.com/docs/2.0/configuration-reference/#section=configuration) for more info on this config file.
+
+# Gitlab CI [linux] {: #gitlab-ci}
+
+To build Linux wheels on Gitlab CI, create a `.gitlab-ci.yml` file in your repo,
+
+> .gitlab-ci.yml
+
+```yaml
+{% include "../examples/gitlab-minimal.yml" %}
+```
+
+Commit this file, and push to Gitlab. The pipeline should start automatically.
+
+Gitlab will store the built wheels for you - you can access them from the Pipelines view. Check out the Gitlab [docs](https://docs.gitlab.com/ee/ci/yaml/) for more info on this config file.
+
 > ⚠️ Got an error? Check the [FAQ](faq.md).
 
 <script>

examples/appveyor-minimal.yml

@@ -12,7 +12,7 @@ stack: python 3.7
 init:
 - cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH%
 
-install: python -m pip install cibuildwheel==1.9.0
+install: python -m pip install cibuildwheel==2.0.0a1
 
 build_script: python -m cibuildwheel --output-dir wheelhouse
 

examples/azure-pipelines-minimal.yml

@@ -6,7 +6,7 @@ jobs:
     - bash: |
         set -o errexit
         python3 -m pip install --upgrade pip
-        pip3 install cibuildwheel==1.9.0
+        pip3 install cibuildwheel==2.0.0a1
       displayName: Install dependencies
     - bash: cibuildwheel --output-dir wheelhouse .
       displayName: Build wheels
@@ -20,7 +20,7 @@ jobs:
     - bash: |
         set -o errexit
         python3 -m pip install --upgrade pip
-        python3 -m pip install cibuildwheel==1.9.0
+        python3 -m pip install cibuildwheel==2.0.0a1
       displayName: Install dependencies
     - bash: cibuildwheel --output-dir wheelhouse .
       displayName: Build wheels
@@ -31,12 +31,10 @@ jobs:
   pool: {vmImage: 'vs2017-win2016'}
   steps:
     - task: UsePythonVersion@0
-    - script: choco install vcpython27 -f -y
-      displayName: Install Visual C++ for Python 2.7
     - bash: |
         set -o errexit
         python -m pip install --upgrade pip
-        pip install cibuildwheel==1.9.0
+        pip install cibuildwheel==2.0.0a1
       displayName: Install dependencies
     - bash: cibuildwheel --output-dir wheelhouse .
       displayName: Build wheels

examples/circleci-minimal.yml

@@ -11,7 +11,7 @@ jobs:
       - run:
           name: Build the Linux wheels.
           command: |
-            pip3 install --user cibuildwheel==1.9.0
+            pip3 install --user cibuildwheel==2.0.0a1
             cibuildwheel --output-dir wheelhouse
       - store_artifacts:
           path: wheelhouse/
@@ -25,7 +25,7 @@ jobs:
       - run:
           name: Build the OS X wheels.
           command: |
-            pip3 install cibuildwheel==1.9.0
+            pip3 install cibuildwheel==2.0.0a1
             cibuildwheel --output-dir wheelhouse
       - store_artifacts:
           path: wheelhouse/

examples/github-apple-silicon.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Build wheels
-        uses: joerick/cibuildwheel@v1.9.0
+        uses: pypa/cibuildwheel@v2.0.0a1
         env:
           CIBW_ARCHS_MACOS: x86_64 universal2
 

examples/github-deploy.yml

@@ -26,12 +26,8 @@ jobs:
         with:
           python-version: '3.8'
 
-      - name: Install Visual C++ for Python 2.7
-        if: runner.os == 'Windows'
-        run: choco install vcpython27 -f -y
-
       - name: Build wheels
-        uses: joerick/cibuildwheel@v1.9.0
+        uses: pypa/cibuildwheel@v2.0.0a1
 
       - uses: actions/upload-artifact@v2
         with:
@@ -68,7 +64,7 @@ jobs:
           name: artifact
           path: dist
 
-      - uses: pypa/gh-action-pypi-publish@master
+      - uses: pypa/gh-action-pypi-publish@v1.4.2
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}

examples/github-minimal.yml

@@ -13,12 +13,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Install Visual C++ for Python 2.7
-        if: runner.os == 'Windows'
-        run: choco install vcpython27 -f -y
-
       - name: Build wheels
-        uses: joerick/cibuildwheel@v1.9.0
+        uses: pypa/cibuildwheel@v2.0.0a1
         # to supply options, put them in 'env', like:
         # env:
         #   CIBW_SOME_OPTION: value

examples/github-with-qemu.yml

@@ -18,10 +18,6 @@ jobs:
         with:
           python-version: '3.7'
 
-      - name: Install Visual C++ for Python 2.7
-        if: runner.os == 'Windows'
-        run: choco install vcpython27 -f -y
-
       - name: Set up QEMU
         if: runner.os == 'Linux'
         uses: docker/setup-qemu-action@v1
@@ -29,7 +25,7 @@ jobs:
           platforms: all
 
       - name: Build wheels
-        uses: joerick/cibuildwheel@v1.9.0
+        uses: pypa/cibuildwheel@v2.0.0a1
         env:
           # configure cibuildwheel to build native archs ('auto'), and some
           # emulated ones

examples/gitlab-minimal.yml

@@ -12,7 +12,7 @@ linux:
     DOCKER_TLS_CERTDIR: ""
   script:
     - curl -sSL https://get.docker.com/ | sh
-    - python -m pip install cibuildwheel
+    - python -m pip install cibuildwheel==2.0.0a1
     - cibuildwheel --output-dir wheelhouse
   artifacts:
     paths:

examples/travis-ci-deploy.yml

@@ -1,26 +1,25 @@
 # As written, this configuration will build your wheels on every
 # commit, but will only push to PyPI on tagged commits.
 
+os: linux
+dist: focal
 language: python
 
 jobs:
   include:
     # perform a linux build
     - services: docker
-    # and a mac build
-    - os: osx
-      language: shell
     # and a windows build
     - os: windows
       language: shell
       before_install:
-        - choco install python --version 3.8.6
+        - choco upgrade python -y --version 3.8.6
         - export PATH="/c/Python38:/c/Python38/Scripts:$PATH"
         # make sure it's on PATH as 'python3'
         - ln -s /c/Python38/python.exe /c/Python38/python3.exe
 
 install:
-  - python3 -m pip install cibuildwheel==1.9.0
+  - python3 -m pip install cibuildwheel==2.0.0a1
 
 script:
   # build the wheels, put them into './wheelhouse'

examples/travis-ci-minimal.yml

@@ -1,3 +1,5 @@
+os: linux
+dist: focal
 language: python
 
 jobs:
@@ -13,20 +15,17 @@ jobs:
     # perform a linux S390X build
     - services: docker
       arch: s390x
-    # and a mac build
-    - os: osx
-      language: shell
     # and a windows build
     - os: windows
       language: shell
       before_install:
-        - choco install python --version 3.8.6
+        - choco upgrade python -y --version 3.8.6
         - export PATH="/c/Python38:/c/Python38/Scripts:$PATH"
         # make sure it's on PATH as 'python3'
         - ln -s /c/Python38/python.exe /c/Python38/python3.exe
 
 install:
-  - python3 -m pip install cibuildwheel==1.9.0
+  - python3 -m pip install cibuildwheel==2.0.0a1
 
 script:
   # build the wheels, put them into './wheelhouse'

examples/travis-ci-test-and-deploy.yml

@@ -1,10 +1,12 @@
 # In this configuration, the package is tested against multiple versions of python
 # on Linux and on one version of Python on Windows. If and only if all tests pass
 # will the wheels be built and deployed. Further, deployment is only initiated if
-# the current branch is "master", the current commit is tagged, and the current
+# the current branch is "main", the current commit is tagged, and the current
 # repo is yours (e.g. it won't run on a Pull Request). For convenience, a source
 # distribution is also created.
 
+os: linux
+dist: focal
 language: python
 python:
   - 3.6
@@ -14,7 +16,7 @@ python:
 before_install:
   - |
     if [[ "$TRAVIS_OS_NAME" = windows ]]; then
-        choco install python --version 3.8.6
+        choco upgrade python -y --version 3.8.6
         export PATH="/c/Python38:/c/Python38/Scripts:$PATH"
         # make sure it's on PATH as 'python3'
         ln -s /c/Python38/python.exe /c/Python38/python3.exe
@@ -32,9 +34,9 @@ stages:
   # Only execute deployment stage on tagged commits, and from your repository
   # (e.g. not PRs). Replace with your repo name.
   - name: deploy
-    if: tag IS PRESENT AND repo = joerick/cibuildwheel
+    if: tag IS PRESENT AND repo = pypa/cibuildwheel
     # To only build tags that look like vX.Y.Z:
-    #   if: tag =~ ^v\d+\.\d+\.\d+$ AND repo = joerick/cibuildwheel
+    #   if: tag =~ ^v\d+\.\d+\.\d+$ AND repo = pypa/cibuildwheel
 
 jobs:
   include:
@@ -55,17 +57,7 @@ jobs:
     - stage: deploy
       name: Build and deploy Linux wheels
       services: docker
-      install: python3 -m pip install cibuildwheel==1.9.0
-      script: python3 -m cibuildwheel --output-dir wheelhouse
-      after_success: |
-        python3 -m pip install twine
-        python3 -m twine upload --skip-existing wheelhouse/*.whl
-    # Deploy on mac
-    - stage: deploy
-      name: Build and deploy macOS wheels
-      os: osx
-      language: shell
-      install: python3 -m pip install cibuildwheel==1.9.0
+      install: python3 -m pip install cibuildwheel==2.0.0a1
       script: python3 -m cibuildwheel --output-dir wheelhouse
       after_success: |
         python3 -m pip install twine
@@ -75,7 +67,7 @@ jobs:
       name: Build and deploy Windows wheels
       os: windows
       language: shell
-      install: python3 -m pip install cibuildwheel==1.9.0
+      install: python3 -m pip install cibuildwheel==2.0.0a1
       script: python3 -m cibuildwheel --output-dir wheelhouse
       after_success: |
         python3 -m pip install twine

mkdocs.yml

@@ -5,7 +5,8 @@ theme:
   highlightjs: true
   hljs_languages:
       - yaml
-repo_url: https://github.com/joerick/cibuildwheel
+repo_url: https://github.com/pypa/cibuildwheel
+edit_uri: edit/main/docs/
 
 extra_css:
   - extra.css
@@ -25,13 +26,18 @@ nav:
   - changelog.md
 
 markdown_extensions:
-  - fenced_code
+  - md_in_html
   - toc:
       permalink: True
   - attr_list
   - admonition
   - pymdownx.magiclink:
       repo_url_shortener: True
+  - pymdownx.highlight:
+      # use highlightjs - it's built-in to the theme
+      use_pygments: False
+  - pymdownx.superfences
 
 plugins:
   - include-markdown
+  - search

noxfile.py

@@ -0,0 +1,96 @@
+import shutil
+import sys
+from pathlib import Path
+
+import nox
+
+nox.options.sessions = ["lint", "tests"]
+
+PYTHON_ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]
+
+DIR = Path(__file__).parent.resolve()
+
+
+@nox.session
+def tests(session):
+    """
+    Run the unit and regular tests.
+    """
+    unit_test_args = ["--run-docker"] if sys.platform.startswith("linux") else []
+    session.install("-e", ".[test]")
+    if session.posargs:
+        session.run("pytest", *session.posargs)
+    else:
+        session.run("pytest", "unit_test", *unit_test_args)
+        session.run("pytest", "test", "-x", "--durations", "0", "--timeout=2400", "test")
+
+
+@nox.session
+def lint(session):
+    """
+    Run the linter.
+    """
+    session.install("pre-commit")
+    session.run("pre-commit", "run", "--all-files")
+
+
+@nox.session(python=PYTHON_ALL_VERSIONS)
+def update_constraints(session):
+    """
+    Update the dependencies inplace.
+    """
+    session.install("requests", "pip-tools")
+    session.run("python", "bin/update_dependencies.py")
+
+
+@nox.session
+def update_pins(session):
+    """
+    Update the python and docker pins version inplace.
+    """
+    session.install("-e", ".[dev]")
+    session.run("python", "bin/update_pythons.py", "--force")
+    session.run("python", "bin/update_docker.py")
+
+
+@nox.session
+def update_proj(session):
+    """
+    Update the README inplace.
+    """
+    session.install("-e", ".[dev]")
+    session.run("./bin/projects.py", "docs/data/projects.yml", "--readme=README.md")
+
+
+@nox.session
+def docs(session):
+    """
+    Build the docs.
+    """
+    session.install("-e", ".[docs]")
+
+    if session.posargs:
+        if "serve" in session.posargs:
+            session.run("mkdocs", "serve")
+        else:
+            print("Unrecognized args, use 'serve'")
+    else:
+        session.run("mkdocs", "build")
+
+
+@nox.session
+def build(session):
+    """
+    Build an SDist and wheel.
+    """
+
+    build_p = DIR.joinpath("build")
+    if build_p.exists():
+        shutil.rmtree(build_p)
+
+    dist_p = DIR.joinpath("dist")
+    if dist_p.exists():
+        shutil.rmtree(dist_p)
+
+    session.install("build")
+    session.run("python", "-m", "build")

pyproject.toml

@@ -7,5 +7,5 @@ requires = [
 build-backend = "setuptools.build_meta"
 
 [tool.black]
-line-length = 120
-target-version = ['py36']
+line-length = 100
+target-version = ['py36', 'py37', 'py38', 'py39']

setup.cfg

@@ -1,39 +1,48 @@
 [metadata]
-
 name = cibuildwheel
-version = 1.9.0
+version = 2.0.0a1
 description = Build Python wheels on CI with minimal configuration.
 long_description = file: README.md
 long_description_content_type = text/markdown
+url = https://github.com/pypa/cibuildwheel
 author = Joe Rickerby
 author_email = joerick@mac.com
-url = https://github.com/joerick/cibuildwheel
 license = BSD
+license_file = LICENSE
 classifiers =
+    Development Status :: 5 - Production/Stable
     Intended Audience :: Developers
+    License :: OSI Approved :: BSD License
     Natural Language :: English
     Programming Language :: Python :: 3
-    Development Status :: 5 - Production/Stable
-    License :: OSI Approved :: BSD License
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Programming Language :: Python :: Implementation :: CPython
     Topic :: Software Development :: Build Tools
-project_urls =
-    Changelog=https://github.com/joerick/cibuildwheel#changelog
-    Documentation=https://cibuildwheel.readthedocs.io/
 keywords = ci,wheel,packaging,pypi,travis,appveyor,macos,linux,windows
+project_urls =
+    Changelog=https://github.com/pypa/cibuildwheel#changelog
+    Documentation=https://cibuildwheel.readthedocs.io/
 
 [options]
 packages = find:
-zip_safe = False
-include_package_data = True
-python_requires = >=3.6
 install_requires =
     bashlex!=0.13
-    toml
-    certifi
     bracex
+    certifi
     packaging
-    typing_extensions; python_version < '3.8'
+    toml
+    typing_extensions;python_version < '3.8'
+python_requires = >=3.6
+include_package_data = True
+zip_safe = False
+
+[options.entry_points]
+console_scripts =
+    cibuildwheel = cibuildwheel.__main__:main
 
 [options.package_data]
 cibuildwheel = resources/*
@@ -42,28 +51,26 @@ cibuildwheel = resources/*
 include =
     cibuildwheel
 
-[options.entry_points]
-console_scripts =
-    cibuildwheel = cibuildwheel.__main__:main
-
-
 [flake8]
-ignore = E501,W503,E741,E226,B950
+ignore = E501,W503,E741,E226,B950,E203
 select = C,E,F,W,B,B9
 application-import-names = cibuildwheel
 exclude =
-  cibuildwheel/resources/,
-  dist/,
-  build/,
-  .git/,
-  env/,
-  env2/,
-  env??/,
-  .venv/,
-  site/
+    cibuildwheel/resources/,
+    dist/,
+    build/,
+    .git/,
+    env/,
+    env2/,
+    env??/,
+    .venv/,
+    site/
 
 [tool:pytest]
-junit_family=xunit2
+junit_family = xunit2
+testpaths =
+    test
+    unit_test
 
 [mypy]
 python_version = 3.7
@@ -110,5 +117,5 @@ ignore_missing_imports = True
 ignore_missing_imports = True
 
 [tool:isort]
-profile=black
-multi_line_output=3
+profile = black
+multi_line_output = 3

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 extras = {
     "docs": [
-        "mkdocs-include-markdown-plugin==2.1.1",
+        "mkdocs-include-markdown-plugin==2.8.0",
         "mkdocs==1.0.4",
         "pymdown-extensions",
     ],

test/test_0_basic.py

@@ -1,4 +1,3 @@
-import platform
 import textwrap
 
 import pytest
@@ -8,37 +7,39 @@ from cibuildwheel.logger import Logger
 from . import test_projects, utils
 
 basic_project = test_projects.new_c_project(
-    setup_py_add=textwrap.dedent('''
+    setup_py_add=textwrap.dedent(
+        """
         import os
 
         if os.environ.get("CIBUILDWHEEL", "0") != "1":
             raise Exception("CIBUILDWHEEL environment variable is not set to 1")
-    ''')
+        """
+    )
 )
 
 
 def test(tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     basic_project.generate(project_dir)
 
     # build the wheels
     actual_wheels = utils.cibuildwheel_run(project_dir)
 
     # check that the expected wheels are produced
-    expected_wheels = utils.expected_wheels('spam', '0.1.0')
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
     assert set(actual_wheels) == set(expected_wheels)
 
 
-@pytest.mark.skip(reason='to keep test output clean')
+@pytest.mark.skip(reason="to keep test output clean")
 def test_sample_build(tmp_path, capfd):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     basic_project.generate(project_dir)
 
     # build the wheels, and let the output passthrough to the caller, so
     # we can see how it looks
     with capfd.disabled():
         logger = Logger()
-        logger.step('test_sample_build')
+        logger.step("test_sample_build")
         try:
             utils.cibuildwheel_run(project_dir)
         finally:
@@ -46,18 +47,13 @@ def test_sample_build(tmp_path, capfd):
 
 
 def test_build_identifiers(tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     basic_project.generate(project_dir)
 
     # check that the number of expected wheels matches the number of build
     # identifiers
-    # after adding CIBW_MANYLINUX_IMAGE to support manylinux2010, there
-    # can be multiple wheels for each wheel, though, so we need to limit
-    # the expected wheels
-    if platform.machine() in ['x86_64', 'i686']:
-        expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
-                           if '-manylinux' not in w or '-manylinux1' in w]
-    else:
-        expected_wheels = utils.expected_wheels('spam', '0.1.0')
-    build_identifiers = utils.cibuildwheel_get_build_identifiers(project_dir)
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
+    build_identifiers = utils.cibuildwheel_get_build_identifiers(
+        project_dir, prerelease_pythons=True
+    )
     assert len(expected_wheels) == len(build_identifiers)

test/test_before_all.py

@@ -6,7 +6,8 @@ import pytest
 from . import test_projects, utils
 
 project_with_before_build_asserts = test_projects.new_c_project(
-    setup_py_add=textwrap.dedent(r'''
+    setup_py_add=textwrap.dedent(
+        r"""
         # assert that the Python version as written to text_info.txt in the CIBW_BEFORE_ALL step
         # is the same one as is currently running.
         with open("text_info.txt") as f:
@@ -14,52 +15,62 @@ project_with_before_build_asserts = test_projects.new_c_project(
 
         print("## stored text: " + stored_text)
         assert stored_text == "sample text 123"
-    ''')
+        """
+    )
 )
 
 
 def test(tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     project_with_before_build_asserts.generate(project_dir)
 
-    with (project_dir / 'text_info.txt').open(mode='w') as ff:
+    with (project_dir / "text_info.txt").open(mode="w") as ff:
         print("dummy text", file=ff)
 
     # build the wheels
     before_all_command = '''python -c "import os;open('{project}/text_info.txt', 'w').write('sample text '+os.environ.get('TEST_VAL', ''))"'''
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        # write python version information to a temporary file, this is
-        # checked in setup.py
-        'CIBW_BEFORE_ALL': before_all_command,
-        'CIBW_BEFORE_ALL_LINUX': before_all_command + ''' && python -c "import sys; assert sys.version_info >= (3, 6)"''',
-        'CIBW_ENVIRONMENT': "TEST_VAL='123'"
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            # write python version information to a temporary file, this is
+            # checked in setup.py
+            "CIBW_BEFORE_ALL": before_all_command,
+            "CIBW_BEFORE_ALL_LINUX": f'{before_all_command} && python -c "import sys; assert sys.version_info >= (3, 6)"',
+            "CIBW_ENVIRONMENT": "TEST_VAL='123'",
+        },
+    )
 
     # also check that we got the right wheels
-    (project_dir / 'text_info.txt').unlink()
-    expected_wheels = utils.expected_wheels('spam', '0.1.0')
+    (project_dir / "text_info.txt").unlink()
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
     assert set(actual_wheels) == set(expected_wheels)
 
 
 def test_failing_command(tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     test_projects.new_c_project().generate(project_dir)
 
     with pytest.raises(subprocess.CalledProcessError):
-        utils.cibuildwheel_run(project_dir, add_env={
-            'CIBW_BEFORE_ALL': 'false',
-            'CIBW_BEFORE_ALL_WINDOWS': 'exit /b 1',
-        })
+        utils.cibuildwheel_run(
+            project_dir,
+            add_env={
+                "CIBW_BEFORE_ALL": "false",
+                "CIBW_BEFORE_ALL_WINDOWS": "exit /b 1",
+            },
+        )
 
 
 def test_cwd(tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     test_projects.new_c_project().generate(project_dir)
 
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        'CIBW_BEFORE_ALL': f'''python -c "import os; assert os.getcwd() == {str(project_dir)!r}"''',
-        'CIBW_BEFORE_ALL_LINUX': '''python -c "import os; assert os.getcwd() == '/project'"''',
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            "CIBW_BEFORE_ALL": f'''python -c "import os; assert os.getcwd() == {str(project_dir)!r}"''',
+            "CIBW_BEFORE_ALL_LINUX": '''python -c "import os; assert os.getcwd() == '/project'"''',
+        },
+    )
 
-    expected_wheels = utils.expected_wheels('spam', '0.1.0')
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
     assert set(actual_wheels) == set(expected_wheels)

test/test_before_build.py

@@ -6,8 +6,9 @@ import pytest
 from . import test_projects, utils
 
 project_with_before_build_asserts = test_projects.new_c_project(
-    setup_py_add=textwrap.dedent(r'''
-        import sys, os
+    setup_py_add=textwrap.dedent(
+        r"""
+        import os
 
         # assert that the Python version as written to pythonversion.txt in the CIBW_BEFORE_BUILD step
         # is the same one as is currently running.
@@ -26,49 +27,61 @@ project_with_before_build_asserts = test_projects.new_c_project(
         print('sys.executable', sys.executable)
         # windows/mac are case insensitive
         assert os.path.realpath(stored_executable).lower() == os.path.realpath(sys.executable).lower()
-    ''')
+        """
+    )
 )
 
 
 def test(tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     project_with_before_build_asserts.generate(project_dir)
 
-    before_build = ('''python -c "import sys; open('{output_dir}pythonversion.txt', 'w').write(sys.version)" && '''
-                    '''python -c "import sys; open('{output_dir}pythonexecutable.txt', 'w').write(sys.executable)"''')
+    before_build = (
+        """python -c "import sys; open('{output_dir}pythonversion.txt', 'w').write(sys.version)" && """
+        '''python -c "import sys; open('{output_dir}pythonexecutable.txt', 'w').write(sys.executable)"'''
+    )
 
     # build the wheels
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        # write python version information to a temporary file, this is
-        # checked in setup.py
-        'CIBW_BEFORE_BUILD': before_build.format(output_dir='/tmp/'),
-        'CIBW_BEFORE_BUILD_WINDOWS': before_build.format(output_dir=r'c:\\'),
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            # write python version information to a temporary file, this is
+            # checked in setup.py
+            "CIBW_BEFORE_BUILD": before_build.format(output_dir="/tmp/"),
+            "CIBW_BEFORE_BUILD_WINDOWS": before_build.format(output_dir=r"c:\\"),
+        },
+    )
 
     # also check that we got the right wheels
-    expected_wheels = utils.expected_wheels('spam', '0.1.0')
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
     assert set(actual_wheels) == set(expected_wheels)
 
 
 def test_failing_command(tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     test_projects.new_c_project().generate(project_dir)
 
     with pytest.raises(subprocess.CalledProcessError):
-        utils.cibuildwheel_run(project_dir, add_env={
-            'CIBW_BEFORE_BUILD': 'false',
-            'CIBW_BEFORE_BUILD_WINDOWS': 'exit /b 1',
-        })
+        utils.cibuildwheel_run(
+            project_dir,
+            add_env={
+                "CIBW_BEFORE_BUILD": "false",
+                "CIBW_BEFORE_BUILD_WINDOWS": "exit /b 1",
+            },
+        )
 
 
 def test_cwd(tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     test_projects.new_c_project().generate(project_dir)
 
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        'CIBW_BEFORE_BUILD': f'''python -c "import os; assert os.getcwd() == {str(project_dir)!r}"''',
-        'CIBW_BEFORE_BUILD_LINUX': '''python -c "import os; assert os.getcwd() == '/project'"''',
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            "CIBW_BEFORE_BUILD": f'''python -c "import os; assert os.getcwd() == {str(project_dir)!r}"''',
+            "CIBW_BEFORE_BUILD_LINUX": '''python -c "import os; assert os.getcwd() == '/project'"''',
+        },
+    )
 
-    expected_wheels = utils.expected_wheels('spam', '0.1.0')
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
     assert set(actual_wheels) == set(expected_wheels)

test/test_before_test.py

@@ -1,7 +1,9 @@
 from . import test_projects, utils
 
 before_test_project = test_projects.new_c_project()
-before_test_project.files['test/spam_test.py'] = r'''
+before_test_project.files[
+    "test/spam_test.py"
+] = r"""
 import sys
 import os
 from unittest import TestCase
@@ -30,28 +32,31 @@ class TestBeforeTest(TestCase):
         #  vssadm~1 instead of vssadministrator
 
         assert os.stat(stored_prefix) == os.stat(sys.prefix)
-'''
+"""
 
 
 def test(tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     before_test_project.generate(project_dir)
-    test_project_dir = project_dir / 'dependency'
+    test_project_dir = project_dir / "dependency"
     test_projects.new_c_project().generate(test_project_dir)
 
     # build the wheels
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        # write python version information to a temporary file, this is
-        # checked in setup.py
-        'CIBW_BEFORE_TEST': '''python -c "import sys; open('/tmp/pythonversion.txt', 'w').write(sys.version)" && python -c "import sys; open('/tmp/pythonprefix.txt', 'w').write(sys.prefix)" && python -m pip install {project}/dependency''',
-        'CIBW_BEFORE_TEST_WINDOWS': '''python -c "import sys; open('c:\\pythonversion.txt', 'w').write(sys.version)" && python -c "import sys; open('c:\\pythonprefix.txt', 'w').write(sys.prefix)" && python -m pip install {project}/dependency''',
-        'CIBW_TEST_REQUIRES': 'nose',
-        # the 'false ||' bit is to ensure this command runs in a shell on
-        # mac/linux.
-        'CIBW_TEST_COMMAND': 'false || nosetests {project}/test',
-        'CIBW_TEST_COMMAND_WINDOWS': 'nosetests {project}/test',
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            # write python version information to a temporary file, this is
+            # checked in setup.py
+            "CIBW_BEFORE_TEST": """python -c "import sys; open('/tmp/pythonversion.txt', 'w').write(sys.version)" && python -c "import sys; open('/tmp/pythonprefix.txt', 'w').write(sys.prefix)" && python -m pip install {project}/dependency""",
+            "CIBW_BEFORE_TEST_WINDOWS": """python -c "import sys; open('c:\\pythonversion.txt', 'w').write(sys.version)" && python -c "import sys; open('c:\\pythonprefix.txt', 'w').write(sys.prefix)" && python -m pip install {project}/dependency""",
+            "CIBW_TEST_REQUIRES": "pytest",
+            # the 'false ||' bit is to ensure this command runs in a shell on
+            # mac/linux.
+            "CIBW_TEST_COMMAND": "false || pytest {project}/test",
+            "CIBW_TEST_COMMAND_WINDOWS": "pytest {project}/test",
+        },
+    )
 
     # also check that we got the right wheels
-    expected_wheels = utils.expected_wheels('spam', '0.1.0')
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
     assert set(actual_wheels) == set(expected_wheels)

test/test_build_skip.py

@@ -3,27 +3,33 @@ import textwrap
 from . import test_projects, utils
 
 project_with_skip_asserts = test_projects.new_c_project(
-    setup_py_add=textwrap.dedent(r'''
-        # explode if run on Python 2.7 or Python 3.7 (these should be skipped)
-        if sys.version_info[0:2] == (2, 7):
-            raise Exception("Python 2.7 should not be built")
+    setup_py_add=textwrap.dedent(
+        r"""
+        # explode if run on PyPyor Python 3.7 (these should be skipped)
+        if sys.implementation.name != "cpython":
+            raise Exception("Only CPython shall be built")
         if sys.version_info[0:2] == (3, 7):
-            raise Exception("Python 3.7 should be skipped")
-    ''')
+            raise Exception("CPython 3.7 should be skipped")
+        """
+    )
 )
 
 
 def test(tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     project_with_skip_asserts.generate(project_dir)
 
     # build the wheels
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        'CIBW_BUILD': 'cp3?-*',
-        'CIBW_SKIP': 'cp37-*',
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            "CIBW_BUILD": "cp3*-*",
+            "CIBW_SKIP": "cp37-*",
+        },
+    )
 
-    # check that we got the right wheels. There should be no 2.7 or 3.7.
-    expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
-                       if ('-cp3' in w) and ('-cp37' not in w)]
+    # check that we got the right wheels. There should be no PyPy or 3.7.
+    expected_wheels = [
+        w for w in utils.expected_wheels("spam", "0.1.0") if ("-cp3" in w) and ("-cp37" not in w)
+    ]
     assert set(actual_wheels) == set(expected_wheels)

test/test_cpp_standards.py

@@ -8,7 +8,7 @@ from .test_projects import TestProject
 
 cpp_test_project = TestProject()
 
-cpp_test_project.files['setup.py'] = jinja2.Template(r'''
+setup_py_template = r"""
 from setuptools import Extension, setup
 
 setup(
@@ -16,9 +16,9 @@ setup(
     ext_modules=[Extension('spam', sources=['spam.cpp'], language="c++", extra_compile_args={{ extra_compile_args }})],
     version="0.1.0",
 )
-''')
+"""
 
-cpp_test_project.files['spam.cpp'] = jinja2.Template(r'''
+spam_cpp_template = r"""
 #include <Python.h>
 
 {{ spam_cpp_top_level_add }}
@@ -36,174 +36,96 @@ spam_system(PyObject *self, PyObject *args)
 }
 
 /* Module initialization */
-
-#if PY_MAJOR_VERSION >= 3
-    #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
-    #define MOD_DEF(m, name, doc, methods, module_state_size) \
-        static struct PyModuleDef moduledef = { \
-            PyModuleDef_HEAD_INIT, name, doc, module_state_size, methods, }; \
-        m = PyModule_Create(&moduledef);
-    #define MOD_RETURN(m) return m;
-#else
-    #define MOD_INIT(name) PyMODINIT_FUNC init##name(void)
-    #define MOD_DEF(m, name, doc, methods, module_state_size) \
-        m = Py_InitModule3(name, methods, doc);
-    #define MOD_RETURN(m) return;
-#endif
-
 static PyMethodDef module_methods[] = {
     {"system", (PyCFunction)spam_system, METH_VARARGS,
      "Execute a shell command."},
     {NULL}  /* Sentinel */
 };
 
-MOD_INIT(spam)
+PyMODINIT_FUNC PyInit_spam(void)
 {
-    PyObject* m;
-
-    MOD_DEF(m,
-            "spam",
-            "Example module",
-            module_methods,
-            -1)
-
-    MOD_RETURN(m)
+    static struct PyModuleDef moduledef = {
+        PyModuleDef_HEAD_INIT, "spam", "Example module", -1, module_methods,
+    };
+    return PyModule_Create(&moduledef);
 }
-''')
+"""
 
+cpp_test_project.files["setup.py"] = jinja2.Template(setup_py_template)
+cpp_test_project.files["spam.cpp"] = jinja2.Template(spam_cpp_template)
 
 cpp11_project = cpp_test_project.copy()
-cpp11_project.template_context['extra_compile_args'] = (
-    ['/std:c++11'] if utils.platform == 'windows' else ['-std=c++11']
+cpp11_project.template_context["extra_compile_args"] = (
+    ["/std:c++11"] if utils.platform == "windows" else ["-std=c++11"]
 )
-cpp11_project.template_context['spam_cpp_top_level_add'] = '#include <array>'
+cpp11_project.template_context["spam_cpp_top_level_add"] = "#include <array>"
 
 
 def test_cpp11(tmp_path):
     # This test checks that the C++11 standard is supported
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
 
     cpp11_project.generate(project_dir)
 
-    # VC++ for Python 2.7 does not support modern standards
-    add_env = {'CIBW_SKIP': 'cp27-win* pp27-win32'}
-
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
-    expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
-                       if 'cp27-cp27m-win' not in w and 'pp27-pypy_73-win32' not in w]
+    actual_wheels = utils.cibuildwheel_run(project_dir)
+    expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0")]
 
     assert set(actual_wheels) == set(expected_wheels)
 
 
 cpp14_project = cpp_test_project.copy()
-cpp14_project.template_context['extra_compile_args'] = (
-    ['/std:c++14'] if utils.platform == 'windows' else ['-std=c++14']
+cpp14_project.template_context["extra_compile_args"] = (
+    ["/std:c++14"] if utils.platform == "windows" else ["-std=c++14"]
 )
-cpp14_project.template_context['spam_cpp_top_level_add'] = "int a = 100'000;"
+cpp14_project.template_context["spam_cpp_top_level_add"] = "int a = 100'000;"
 
 
 def test_cpp14(tmp_path):
     # This test checks that the C++14 standard is supported
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
 
     cpp14_project.generate(project_dir)
 
-    # VC++ for Python 2.7 does not support modern standards
-    # The manylinux1 docker image does not have a compiler which supports C++11
-    add_env = {'CIBW_SKIP': 'cp27-win* pp27-win32'}
-
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
-    expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
-                       if 'cp27-cp27m-win' not in w
-                       and 'pp27-pypy_73-win32' not in w]
+    actual_wheels = utils.cibuildwheel_run(project_dir)
+    expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0")]
 
     assert set(actual_wheels) == set(expected_wheels)
 
 
 cpp17_project = cpp_test_project.copy()
 
-# Python and PyPy 2.7 headers use the `register` keyword, which is forbidden in
-# the C++17 standard, so we need the -Wno-register or /wd5033 options
-cpp17_project.template_context['extra_compile_args'] = (
-    ['/std:c++17', '/wd5033'] if utils.platform == 'windows' else ['-std=c++17', '-Wno-register']
-)
-cpp17_project.template_context['spam_cpp_top_level_add'] = r'''
+cpp17_project.template_context["extra_compile_args"] = [
+    "/std:c++17" if utils.platform == "windows" else "-std=c++17"
+]
+cpp17_project.template_context[
+    "spam_cpp_top_level_add"
+] = r"""
 #include <utility>
 auto a = std::pair(5.0, false);
-'''
+"""
 
 
 def test_cpp17(tmp_path):
     # This test checks that the C++17 standard is supported
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
 
     cpp17_project.generate(project_dir)
 
-    if os.environ.get('APPVEYOR_BUILD_WORKER_IMAGE', '') == 'Visual Studio 2015':
-        pytest.skip('Visual Studio 2015 does not support C++17')
+    if os.environ.get("APPVEYOR_BUILD_WORKER_IMAGE", "") == "Visual Studio 2015":
+        pytest.skip("Visual Studio 2015 does not support C++17")
 
     # Pypy's distutils sets the default compiler to 'msvc9compiler', which
     # is too old to support cpp17.
-    add_env = {'CIBW_SKIP': 'cp27-win* pp??-*'}
+    add_env = {"CIBW_SKIP": "pp??-*"}
 
-    if utils.platform == 'macos':
-        add_env['MACOSX_DEPLOYMENT_TARGET'] = '10.13'
+    if utils.platform == "macos":
+        add_env["MACOSX_DEPLOYMENT_TARGET"] = "10.13"
 
     actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
-    expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0', macosx_deployment_target='10.13')
-                       if 'cp27-cp27m-win' not in w
-                       and '-pp' not in w]
-
-    assert set(actual_wheels) == set(expected_wheels)
-
-
-def test_cpp17_py27_modern_msvc_workaround(tmp_path):
-    # This test checks the workaround for building Python 2.7 wheel with MSVC 14
-
-    if utils.platform != 'windows':
-        pytest.skip('the test is only relevant to the Windows build')
-
-    if os.environ.get('APPVEYOR_BUILD_WORKER_IMAGE', '') == 'Visual Studio 2015':
-        pytest.skip('Visual Studio 2015 does not support C++17')
-
-    project_dir = tmp_path / 'project'
-    cpp17_project.generate(project_dir)
-
-    # VC++ for Python 2.7 (i.e., MSVC 9) does not support modern standards
-    # This is a workaround which forces distutils/setupstools to a newer version
-    # Wheels compiled need a more modern C++ redistributable installed, which is not
-    # included with Python: see documentation for more info
-    # DISTUTILS_USE_SDK and MSSdk=1 tell distutils/setuptools that we are adding
-    # MSVC's compiler, tools, and libraries to PATH ourselves
-    add_env = {'DISTUTILS_USE_SDK': '1', 'MSSdk': '1'}
-
-    # Use existing setuptools code to run Visual Studio's vcvarsall.bat and get the
-    # necessary environment variables, since running vcvarsall.bat in a subprocess
-    # does not keep the relevant environment variables
-    # There are different environment variables for 32-bit/64-bit targets, so we
-    # need to run cibuildwheel twice, once for 32-bit with `vcvarsall.bat x86, and
-    # once for 64-bit with `vcvarsall.bat x64`
-    # In a normal CI setup, just run vcvarsall.bat before running cibuildwheel and set
-    # DISTUTILS_USE_SDK and MSSdk
-    import setuptools
-
-    def add_vcvars(prev_env, platform):
-        vcvarsall_env = setuptools.msvc.msvc14_get_vc_env(platform)
-        env = prev_env.copy()
-        for vcvar in ['path', 'include', 'lib']:
-            env[vcvar] = vcvarsall_env[vcvar]
-        return env
-
-    add_env_x86 = add_vcvars(add_env, 'x86')
-    add_env_x86['CIBW_BUILD'] = '?p27-win32'
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env_x86)
-
-    add_env_x64 = add_vcvars(add_env, 'x64')
-    add_env_x64['CIBW_BUILD'] = 'cp27-win_amd64'
-    actual_wheels += utils.cibuildwheel_run(project_dir, add_env=add_env_x64)
-
-    expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0', exclude_27=False)
-                       if 'cp27-cp27m-win' in w
-                       or 'pp27-pypy_73-win32' in w]
+    expected_wheels = [
+        w
+        for w in utils.expected_wheels("spam", "0.1.0", macosx_deployment_target="10.13")
+        if "-pp" not in w
+    ]
 
     assert set(actual_wheels) == set(expected_wheels)

test/test_dependency_versions.py

@@ -8,7 +8,8 @@ import cibuildwheel.util
 from . import test_projects, utils
 
 project_with_expected_version_checks = test_projects.new_c_project(
-    setup_py_add=textwrap.dedent(r'''
+    setup_py_add=textwrap.dedent(
+        r"""
         import subprocess
         import os
 
@@ -30,146 +31,128 @@ project_with_expected_version_checks = test_projects.new_c_project(
             assert '{}=={}'.format(package_name, expected_version) in versions, (
                 'error: {} version should equal {}'.format(package_name, expected_version)
             )
-    ''')
+        """
+    )
 )
 
 
-VERSION_REGEX = r'([\w-]+)==([^\s]+)'
+VERSION_REGEX = r"([\w-]+)==([^\s]+)"
 
 
 def get_versions_from_constraint_file(constraint_file):
-    constraint_file_text = constraint_file.read_text(encoding='utf8')
+    constraint_file_text = constraint_file.read_text(encoding="utf8")
 
-    versions = {}
-    for package, version in re.findall(VERSION_REGEX, constraint_file_text):
-        versions[package] = version
-
-    return versions
+    return {
+        package: version for package, version in re.findall(VERSION_REGEX, constraint_file_text)
+    }
 
 
-@pytest.mark.parametrize('python_version', ['2.7', '3.5', '3.6', '3.8'])
+@pytest.mark.parametrize("python_version", ["3.6", "3.8", "3.9"])
 def test_pinned_versions(tmp_path, python_version):
-    if utils.platform == 'linux':
-        pytest.skip('linux doesn\'t pin individual tool versions, it pins manylinux images instead')
+    if utils.platform == "linux":
+        pytest.skip("linux doesn't pin individual tool versions, it pins manylinux images instead")
 
-    if utils.IS_WINDOWS_RUNNING_ON_TRAVIS and python_version == '2.7':
-        pytest.skip('Windows + Travis CI requires a workaround')
-
-    is_running_on_macos_11_or_later = (
-        utils.platform == 'macos' and utils.get_macos_version() >= (10, 16)
-    )
-
-    if is_running_on_macos_11_or_later and python_version == '3.5':
-        pytest.skip('CPython 3.5 doesn\'t work on macOS Big Sur+')
-
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     project_with_expected_version_checks.generate(project_dir)
 
     build_environment = {}
 
-    if python_version == '2.7':
-        constraint_filename = 'constraints-python27.txt'
-        build_pattern = '[cp]p27-*'
-    elif python_version == '3.5':
-        constraint_filename = 'constraints-python35.txt'
-        build_pattern = '[cp]p35-*'
-    elif python_version == '3.6':
-        constraint_filename = 'constraints-python36.txt'
-        build_pattern = '[cp]p36-*'
-    elif python_version == '3.7':
-        constraint_filename = 'constraints-python37.txt'
-        build_pattern = '[cp]p37-*'
+    if python_version == "3.6":
+        constraint_filename = "constraints-python36.txt"
+        build_pattern = "[cp]p36-*"
+    elif python_version == "3.7":
+        constraint_filename = "constraints-python37.txt"
+        build_pattern = "[cp]p37-*"
+    elif python_version == "3.8":
+        constraint_filename = "constraints-python38.txt"
+        build_pattern = "[cp]p38-*"
     else:
-        constraint_filename = 'constraints.txt'
-        build_pattern = '[cp]p38-*'
+        constraint_filename = "constraints.txt"
+        build_pattern = "[cp]p39-*"
 
     constraint_file = cibuildwheel.util.resources_dir / constraint_filename
     constraint_versions = get_versions_from_constraint_file(constraint_file)
 
-    for package in ['pip', 'setuptools', 'wheel', 'virtualenv']:
-        env_name = f'EXPECTED_{package.upper()}_VERSION'
+    for package in ["pip", "setuptools", "wheel", "virtualenv"]:
+        env_name = f"EXPECTED_{package.upper()}_VERSION"
         build_environment[env_name] = constraint_versions[package]
 
-    cibw_environment_option = ' '.join(
-        [f'{k}={v}' for k, v in build_environment.items()]
-    )
+    cibw_environment_option = " ".join(f"{k}={v}" for k, v in build_environment.items())
 
     # build and test the wheels
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        'CIBW_BUILD': build_pattern,
-        'CIBW_ENVIRONMENT': cibw_environment_option,
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            "CIBW_BUILD": build_pattern,
+            "CIBW_ENVIRONMENT": cibw_environment_option,
+        },
+    )
 
     # also check that we got the right wheels
-    if python_version == '2.7':
-        expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
-                           if '-cp27' in w or '-pp27' in w]
-    elif python_version == '3.5':
-        expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
-                           if '-cp35' in w or '-pp35' in w]
-    elif python_version == '3.6':
-        expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
-                           if '-cp36' in w or '-pp36' in w]
-    elif python_version == '3.8':
-        expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
-                           if '-cp38' in w or '-pp38' in w]
+    if python_version == "3.6":
+        expected_wheels = [
+            w for w in utils.expected_wheels("spam", "0.1.0") if "-cp36" in w or "-pp36" in w
+        ]
+    elif python_version == "3.8":
+        expected_wheels = [
+            w for w in utils.expected_wheels("spam", "0.1.0") if "-cp38" in w or "-pp38" in w
+        ]
+    elif python_version == "3.9":
+        expected_wheels = [
+            w for w in utils.expected_wheels("spam", "0.1.0") if "-cp39" in w or "-pp39" in w
+        ]
     else:
-        raise ValueError('unhandled python version')
+        raise ValueError("unhandled python version")
 
     assert set(actual_wheels) == set(expected_wheels)
 
 
-@pytest.mark.parametrize('python_version', ['2.7', '3.x'])
-def test_dependency_constraints_file(tmp_path, python_version):
-    if utils.platform == 'linux':
-        pytest.skip('linux doesn\'t pin individual tool versions, it pins manylinux images instead')
+def test_dependency_constraints_file(tmp_path):
+    if utils.platform == "linux":
+        pytest.skip("linux doesn't pin individual tool versions, it pins manylinux images instead")
 
-    if utils.IS_WINDOWS_RUNNING_ON_TRAVIS and python_version == '2.7':
-        pytest.skip('Windows + Travis CI requires a workaround')
-
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     project_with_expected_version_checks.generate(project_dir)
 
     tool_versions = {
-        'pip': '20.0.2',
-        'setuptools': '44.0.0' if python_version == '2.7' else '46.0.0',
-        'wheel': '0.34.2',
-        'virtualenv': '20.0.10',
+        "pip": "20.0.2",
+        "setuptools": "53.0.0",
+        "wheel": "0.34.2",
+        "virtualenv": "20.0.10",
     }
 
-    constraints_file = tmp_path / 'constraints.txt'
-    constraints_file.write_text(textwrap.dedent(
-        '''
+    constraints_file = tmp_path / "constraints.txt"
+    constraints_file.write_text(
+        textwrap.dedent(
+            """
             pip=={pip}
             setuptools=={setuptools}
             wheel=={wheel}
             virtualenv=={virtualenv}
-        '''.format(**tool_versions)
-    ))
+            """.format(
+                **tool_versions
+            )
+        )
+    )
 
     build_environment = {}
 
     for package_name, version in tool_versions.items():
-        env_name = f'EXPECTED_{package_name.upper()}_VERSION'
+        env_name = f"EXPECTED_{package_name.upper()}_VERSION"
         build_environment[env_name] = version
 
-    cibw_environment_option = ' '.join(
-        [f'{k}={v}' for k, v in build_environment.items()]
-    )
+    cibw_environment_option = " ".join(f"{k}={v}" for k, v in build_environment.items())
 
     # build and test the wheels
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        'CIBW_BUILD': '[cp]p27-*' if python_version == '2.7' else '[cp]p3?-*',
-        'CIBW_ENVIRONMENT': cibw_environment_option,
-        'CIBW_DEPENDENCY_VERSIONS': str(constraints_file),
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            "CIBW_ENVIRONMENT": cibw_environment_option,
+            "CIBW_DEPENDENCY_VERSIONS": str(constraints_file),
+        },
+    )
 
     # also check that we got the right wheels
-    if python_version == '2.7':
-        expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
-                           if '-cp27' in w or '-pp27' in w]
-    else:
-        expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
-                           if '-cp27' not in w and '-pp27' not in w]
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
 
     assert set(actual_wheels) == set(expected_wheels)

test/test_docker_images.py

@@ -6,8 +6,9 @@ import pytest
 from . import test_projects, utils
 
 dockcross_only_project = test_projects.new_c_project(
-    setup_py_add=textwrap.dedent(r'''
-        import os, sys
+    setup_py_add=textwrap.dedent(
+        r"""
+        import os
 
         # check that we're running in the correct docker image as specified in the
         # environment options CIBW_MANYLINUX1_*_IMAGE
@@ -15,26 +16,39 @@ dockcross_only_project = test_projects.new_c_project(
             raise Exception(
                 "/dockcross directory not found. Is this test running in the correct docker image?"
             )
-    ''')
+        """
+    )
 )
 
 
 def test(tmp_path):
-    if utils.platform != 'linux':
-        pytest.skip('the test is only relevant to the linux build')
-    if platform.machine() not in ['x86_64', 'i686']:
-        pytest.skip('this test is currently only possible on x86_64/i686 due to availability of alternative images')
+    if utils.platform != "linux":
+        pytest.skip("the test is only relevant to the linux build")
+    if platform.machine() not in ["x86_64", "i686"]:
+        pytest.skip(
+            "this test is currently only possible on x86_64/i686 due to availability of alternative images"
+        )
 
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     dockcross_only_project.generate(project_dir)
 
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        'CIBW_MANYLINUX_X86_64_IMAGE': 'dockcross/manylinux2010-x64',
-        'CIBW_MANYLINUX_I686_IMAGE': 'dockcross/manylinux2010-x86',
-        'CIBW_SKIP': 'pp* cp39-*',
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            "CIBW_MANYLINUX_X86_64_IMAGE": "dockcross/manylinux2010-x64",
+            "CIBW_MANYLINUX_I686_IMAGE": "dockcross/manylinux2010-x86",
+            "CIBW_BUILD": "cp3{6,7,8,9}-*",
+        },
+    )
 
     # also check that we got the right wheels built
-    expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
-                       if '-pp' not in w and '-cp39-' not in w]
+    # there's no auditwheel 4+ on dockcross image
+    # remove manylinux1 wheels from the list of actual_wheels
+    # and restrict expected_wheels to manylinux2010 wheels
+    actual_wheels = [w for w in actual_wheels if "-manylinux1" not in w]
+    expected_wheels = [
+        w
+        for w in utils.expected_wheels("spam", "0.1.0", manylinux_versions=["manylinux2010"])
+        if "-cp36-" in w or "-cp37-" in w or "-cp38-" in w or "-cp39-" in w
+    ]
     assert set(actual_wheels) == set(expected_wheels)

test/test_emulation.py

@@ -6,48 +6,56 @@ from . import test_projects, utils
 
 project_with_a_test = test_projects.new_c_project()
 
-project_with_a_test.files['test/spam_test.py'] = r'''
+project_with_a_test.files[
+    "test/spam_test.py"
+] = r"""
 import spam
 
 def test_spam():
     assert spam.system('python -c "exit(0)"') == 0
     assert spam.system('python -c "exit(1)"') != 0
-'''
+"""
 
 
 @pytest.mark.emulation
 def test(tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     project_with_a_test.generate(project_dir)
 
     # build and test the wheels
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        'CIBW_TEST_REQUIRES': 'pytest',
-        'CIBW_TEST_COMMAND': 'pytest {project}/test',
-        'CIBW_ARCHS': 'aarch64 ppc64le s390x',
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            "CIBW_TEST_REQUIRES": "pytest",
+            "CIBW_TEST_COMMAND": "pytest {project}/test",
+            "CIBW_ARCHS": "aarch64 ppc64le s390x",
+        },
+    )
 
     # also check that we got the right wheels
     expected_wheels = (
-        utils.expected_wheels('spam', '0.1.0', machine_arch='aarch64')
-        + utils.expected_wheels('spam', '0.1.0', machine_arch='ppc64le')
-        + utils.expected_wheels('spam', '0.1.0', machine_arch='s390x')
+        utils.expected_wheels("spam", "0.1.0", machine_arch="aarch64")
+        + utils.expected_wheels("spam", "0.1.0", machine_arch="ppc64le")
+        + utils.expected_wheels("spam", "0.1.0", machine_arch="s390x")
     )
     assert set(actual_wheels) == set(expected_wheels)
 
 
 def test_setting_arch_on_other_platforms(tmp_path, capfd):
-    if utils.platform == 'linux':
-        pytest.skip('this test checks the behaviour on platforms other than linux')
+    if utils.platform == "linux":
+        pytest.skip("this test checks the behaviour on platforms other than linux")
 
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     project_with_a_test.generate(project_dir)
 
     # build and test the wheels
     with pytest.raises(subprocess.CalledProcessError):
-        utils.cibuildwheel_run(project_dir, add_env={
-            'CIBW_ARCHS': 'aarch64',
-        })
+        utils.cibuildwheel_run(
+            project_dir,
+            add_env={
+                "CIBW_ARCHS": "aarch64",
+            },
+        )
 
     captured = capfd.readouterr()
     assert "Invalid archs option" in captured.err

test/test_environment.py

@@ -7,7 +7,8 @@ import pytest
 from . import test_projects, utils
 
 project_with_environment_asserts = test_projects.new_c_project(
-    setup_py_add=textwrap.dedent(r'''
+    setup_py_add=textwrap.dedent(
+        r"""
         import os
 
         # explode if environment isn't correct, as set in CIBW_ENVIRONMENT
@@ -26,30 +27,34 @@ project_with_environment_asserts = test_projects.new_c_project(
             raise Exception('PATH should contain "/opt/cibw_test_path". It was "%s"' % PATH)
         if "$PATH" in PATH:
             raise Exception('$PATH should be expanded in PATH. It was "%s"' % PATH)
-    ''')
+        """
+    )
 )
 
 
 def test(tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     project_with_environment_asserts.generate(project_dir)
 
     # write some information into the CIBW_ENVIRONMENT, for expansion and
     # insertion into the environment by cibuildwheel. This is checked
     # in setup.py
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        'CIBW_ENVIRONMENT': '''CIBW_TEST_VAR="a b c" CIBW_TEST_VAR_2=1 CIBW_TEST_VAR_3="$(echo 'test string 3')" PATH=$PATH:/opt/cibw_test_path''',
-        'CIBW_ENVIRONMENT_WINDOWS': '''CIBW_TEST_VAR="a b c" CIBW_TEST_VAR_2=1 CIBW_TEST_VAR_3="$(echo 'test string 3')" PATH="$PATH;/opt/cibw_test_path"''',
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            "CIBW_ENVIRONMENT": """CIBW_TEST_VAR="a b c" CIBW_TEST_VAR_2=1 CIBW_TEST_VAR_3="$(echo 'test string 3')" PATH=$PATH:/opt/cibw_test_path""",
+            "CIBW_ENVIRONMENT_WINDOWS": '''CIBW_TEST_VAR="a b c" CIBW_TEST_VAR_2=1 CIBW_TEST_VAR_3="$(echo 'test string 3')" PATH="$PATH;/opt/cibw_test_path"''',
+        },
+    )
 
     # also check that we got the right wheels built
-    expected_wheels = utils.expected_wheels('spam', '0.1.0')
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
     assert set(actual_wheels) == set(expected_wheels)
 
 
 def test_overridden_path(tmp_path, capfd):
-    project_dir = tmp_path / 'project'
-    output_dir = tmp_path / 'output'
+    project_dir = tmp_path / "project"
+    output_dir = tmp_path / "output"
 
     project = test_projects.new_c_project()
     project.generate(project_dir)
@@ -57,20 +62,28 @@ def test_overridden_path(tmp_path, capfd):
 
     # mess up PATH, somehow
     with pytest.raises(subprocess.CalledProcessError):
-        if utils.platform == 'linux':
-            utils.cibuildwheel_run(project_dir, output_dir=output_dir, add_env={
-                'CIBW_BEFORE_ALL': 'mkdir new_path && touch new_path/python && chmod +x new_path/python',
-                'CIBW_ENVIRONMENT': '''PATH="$(pwd)/new_path:$PATH"''',
-            })
+        if utils.platform == "linux":
+            utils.cibuildwheel_run(
+                project_dir,
+                output_dir=output_dir,
+                add_env={
+                    "CIBW_BEFORE_ALL": "mkdir new_path && touch new_path/python && chmod +x new_path/python",
+                    "CIBW_ENVIRONMENT": '''PATH="$(pwd)/new_path:$PATH"''',
+                },
+            )
         else:
-            new_path = tmp_path / 'another_bin'
+            new_path = tmp_path / "another_bin"
             new_path.mkdir()
-            (new_path / 'python').touch(mode=0o777)
+            (new_path / "python").touch(mode=0o777)
 
-            utils.cibuildwheel_run(project_dir, output_dir=output_dir, add_env={
-                'NEW_PATH': str(new_path),
-                'CIBW_ENVIRONMENT': f'''PATH="$NEW_PATH{os.pathsep}$PATH"''',
-            })
+            utils.cibuildwheel_run(
+                project_dir,
+                output_dir=output_dir,
+                add_env={
+                    "NEW_PATH": str(new_path),
+                    "CIBW_ENVIRONMENT": f'''PATH="$NEW_PATH{os.pathsep}$PATH"''',
+                },
+            )
 
     assert len(os.listdir(output_dir)) == 0
     captured = capfd.readouterr()

test/test_macos_archs.py

@@ -8,112 +8,128 @@ from . import test_projects, utils
 
 basic_project = test_projects.new_c_project()
 
-ALL_MACOS_WHEELS = (
-    utils.expected_wheels('spam', '0.1.0', machine_arch='x86_64')
-    + utils.expected_wheels('spam', '0.1.0', machine_arch='arm64')
-)
+ALL_MACOS_WHEELS = {
+    *utils.expected_wheels("spam", "0.1.0", machine_arch="x86_64"),
+    *utils.expected_wheels("spam", "0.1.0", machine_arch="arm64"),
+}
 
 
 def get_xcode_version() -> Tuple[int, int]:
-    output = subprocess.check_output(
-        ['xcodebuild', '-version'],
+    output = subprocess.run(
+        ["xcodebuild", "-version"],
         universal_newlines=True,
-    )
+        check=True,
+        stdout=subprocess.PIPE,
+    ).stdout
     lines = output.splitlines()
     _, version_str = lines[0].split()
 
-    version_parts = version_str.split('.')
+    version_parts = version_str.split(".")
     return (int(version_parts[0]), int(version_parts[1]))
 
 
 def test_cross_compiled_build(tmp_path):
-    if utils.platform != 'macos':
-        pytest.skip('this test is only relevant to macos')
+    if utils.platform != "macos":
+        pytest.skip("this test is only relevant to macos")
     if get_xcode_version() < (12, 2):
-        pytest.skip('this test only works with Xcode 12.2 or greater')
+        pytest.skip("this test only works with Xcode 12.2 or greater")
 
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     basic_project.generate(project_dir)
 
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        'CIBW_BUILD': 'cp39-*',
-        'CIBW_ARCHS': 'x86_64, universal2, arm64',
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            "CIBW_BUILD": "cp39-*",
+            "CIBW_ARCHS": "x86_64, universal2, arm64",
+        },
+    )
 
-    expected_wheels = [w for w in ALL_MACOS_WHEELS if 'cp39' in w]
+    expected_wheels = [w for w in ALL_MACOS_WHEELS if "cp39" in w]
     assert set(actual_wheels) == set(expected_wheels)
 
 
-@pytest.mark.parametrize('build_universal2', [False, True])
+@pytest.mark.parametrize("build_universal2", [False, True])
 def test_cross_compiled_test(tmp_path, capfd, build_universal2):
-    if utils.platform != 'macos':
-        pytest.skip('this test is only relevant to macos')
+    if utils.platform != "macos":
+        pytest.skip("this test is only relevant to macos")
     if get_xcode_version() < (12, 2):
-        pytest.skip('this test only works with Xcode 12.2 or greater')
+        pytest.skip("this test only works with Xcode 12.2 or greater")
 
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     basic_project.generate(project_dir)
 
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        'CIBW_BUILD': 'cp39-*',
-        'CIBW_TEST_COMMAND': '''python -c "import platform; print('running tests on ' + platform.machine())"''',
-        'CIBW_ARCHS': 'universal2' if build_universal2 else 'x86_64 arm64',
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            "CIBW_BUILD": "cp39-*",
+            "CIBW_TEST_COMMAND": '''python -c "import platform; print('running tests on ' + platform.machine())"''',
+            "CIBW_ARCHS": "universal2" if build_universal2 else "x86_64 arm64",
+        },
+    )
 
     captured = capfd.readouterr()
 
-    if platform.machine() == 'x86_64':
+    if platform.machine() == "x86_64":
         # ensure that tests were run on only x86_64
-        assert 'running tests on x86_64' in captured.out
-        assert 'running tests on arm64' not in captured.out
+        assert "running tests on x86_64" in captured.out
+        assert "running tests on arm64" not in captured.out
         if build_universal2:
-            assert 'While universal2 wheels can be built on x86_64, the arm64 part of them cannot currently be tested' in captured.err
+            assert (
+                "While universal2 wheels can be built on x86_64, the arm64 part of them cannot currently be tested"
+                in captured.err
+            )
         else:
-            assert 'While arm64 wheels can be built on x86_64, they cannot be tested' in captured.err
-    elif platform.machine() == 'arm64':
+            assert (
+                "While arm64 wheels can be built on x86_64, they cannot be tested" in captured.err
+            )
+    elif platform.machine() == "arm64":
         # ensure that tests were run on both x86_64 and arm64
-        assert 'running tests on x86_64' in captured.out
-        assert 'running tests on arm64' in captured.out
+        assert "running tests on x86_64" in captured.out
+        assert "running tests on arm64" in captured.out
 
     if build_universal2:
-        expected_wheels = [w for w in ALL_MACOS_WHEELS if 'cp39' in w and 'universal2' in w]
+        expected_wheels = [w for w in ALL_MACOS_WHEELS if "cp39" in w and "universal2" in w]
     else:
-        expected_wheels = [w for w in ALL_MACOS_WHEELS if 'cp39' in w and 'universal2' not in w]
+        expected_wheels = [w for w in ALL_MACOS_WHEELS if "cp39" in w and "universal2" not in w]
 
     assert set(actual_wheels) == set(expected_wheels)
 
 
-@pytest.mark.parametrize('skip_arm64_test', [False, True])
+@pytest.mark.parametrize("skip_arm64_test", [False, True])
 def test_universal2_testing(tmp_path, capfd, skip_arm64_test):
-    if utils.platform != 'macos':
-        pytest.skip('this test is only relevant to macos')
+    if utils.platform != "macos":
+        pytest.skip("this test is only relevant to macos")
     if get_xcode_version() < (12, 2):
-        pytest.skip('this test only works with Xcode 12.2 or greater')
-    if platform.machine() != 'x86_64':
-        pytest.skip('this test only works on x86_64')
+        pytest.skip("this test only works with Xcode 12.2 or greater")
+    if platform.machine() != "x86_64":
+        pytest.skip("this test only works on x86_64")
 
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     basic_project.generate(project_dir)
 
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        'CIBW_BUILD': 'cp39-*',
-        'CIBW_TEST_COMMAND': '''python -c "import platform; print('running tests on ' + platform.machine())"''',
-        'CIBW_ARCHS': 'universal2',
-        'CIBW_TEST_SKIP': '*_universal2:arm64' if skip_arm64_test else '',
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            "CIBW_BUILD": "cp39-*",
+            "CIBW_TEST_COMMAND": '''python -c "import platform; print('running tests on ' + platform.machine())"''',
+            "CIBW_ARCHS": "universal2",
+            "CIBW_TEST_SKIP": "*_universal2:arm64" if skip_arm64_test else "",
+        },
+    )
 
     captured = capfd.readouterr()
 
-    if platform.machine() == 'x86_64':
-        assert 'running tests on x86_64' in captured.out
-        assert 'running tests on arm64' not in captured.out
+    if platform.machine() == "x86_64":
+        assert "running tests on x86_64" in captured.out
+        assert "running tests on arm64" not in captured.out
 
-        warning_message = 'While universal2 wheels can be built on x86_64, the arm64 part of them cannot currently be tested'
+        warning_message = "While universal2 wheels can be built on x86_64, the arm64 part of them cannot currently be tested"
         if skip_arm64_test:
             assert warning_message not in captured.err
         else:
             assert warning_message in captured.err
 
-    expected_wheels = [w for w in ALL_MACOS_WHEELS if 'cp39' in w and 'universal2' in w]
+    expected_wheels = [w for w in ALL_MACOS_WHEELS if "cp39" in w and "universal2" in w]
 
     assert set(actual_wheels) == set(expected_wheels)

test/test_manylinuxXXXX_only.py

@@ -7,8 +7,12 @@ from . import test_projects, utils
 
 # TODO: specify these at runtime according to manylinux_image
 project_with_manylinux_symbols = test_projects.new_c_project(
-    spam_c_top_level_add=textwrap.dedent(r'''
+    spam_c_top_level_add=textwrap.dedent(
+        r"""
         #include <malloc.h>
+        #include <stdlib.h>
+        #include <stdint.h>
+        #include <math.h>
 
         #if !defined(__GLIBC_PREREQ)
         #error "Must run on a glibc linux environment"
@@ -17,54 +21,67 @@ project_with_manylinux_symbols = test_projects.new_c_project(
         #if !__GLIBC_PREREQ(2, 5)  /* manylinux1 is glibc 2.5 */
         #error "Must run on a glibc >= 2.5 linux environment"
         #endif
-    '''),
-    spam_c_function_add=textwrap.dedent(r'''
-        #if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 17)  /* manylinux2014 is glibc 2.17 */
-            // secure_getenv is only available in manylinux2014, ensuring
-            // that only a manylinux2014 wheel is produced
-            secure_getenv("NON_EXISTING_ENV_VARIABLE");
+        """
+    ),
+    spam_c_function_add=textwrap.dedent(
+        r"""
+        #if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 24)
+            // nextupf is only available in manylinux_2_24+
+            sts = (int)nextupf(0.0F);
+        #elif defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 17)  /* manylinux2014 is glibc 2.17 */
+            // secure_getenv is only available in manylinux2014+
+            sts = (int)(intptr_t)secure_getenv("NON_EXISTING_ENV_VARIABLE");
         #elif defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)  /* manylinux2010 is glibc 2.12 */
             // malloc_info is only available on manylinux2010+
-            malloc_info(0, stdout);
+            sts = malloc_info(0, stdout);
         #endif
-    '''),
+        """
+    ),
 )
 
 
-@pytest.mark.parametrize('manylinux_image', ['manylinux1', 'manylinux2010', 'manylinux2014'])
+@pytest.mark.parametrize(
+    "manylinux_image", ["manylinux1", "manylinux2010", "manylinux2014", "manylinux_2_24"]
+)
 def test(manylinux_image, tmp_path):
-    if utils.platform != 'linux':
-        pytest.skip('the docker test is only relevant to the linux build')
-    elif platform.machine() not in ['x86_64', 'i686']:
-        if manylinux_image in ['manylinux1', 'manylinux2010']:
+    if utils.platform != "linux":
+        pytest.skip("the docker test is only relevant to the linux build")
+    elif platform.machine() not in ["x86_64", "i686"]:
+        if manylinux_image in ["manylinux1", "manylinux2010"]:
             pytest.skip("manylinux1 and 2010 doesn't exist for non-x86 architectures")
 
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     project_with_manylinux_symbols.generate(project_dir)
 
     # build the wheels
     # CFLAGS environment variable is necessary to fail on 'malloc_info' (on manylinux1) during compilation/linking,
     # rather than when dynamically loading the Python
     add_env = {
-        'CIBW_ENVIRONMENT': 'CFLAGS="$CFLAGS -Werror=implicit-function-declaration"',
-        'CIBW_MANYLINUX_X86_64_IMAGE': manylinux_image,
-        'CIBW_MANYLINUX_I686_IMAGE': manylinux_image,
-        'CIBW_MANYLINUX_PYPY_X86_64_IMAGE': manylinux_image,
-        'CIBW_MANYLINUX_AARCH64_IMAGE': manylinux_image,
-        'CIBW_MANYLINUX_PPC64LE_IMAGE': manylinux_image,
-        'CIBW_MANYLINUX_S390X_IMAGE': manylinux_image,
+        "CIBW_ENVIRONMENT": 'CFLAGS="$CFLAGS -O0 -Werror=implicit-function-declaration"',
+        "CIBW_MANYLINUX_X86_64_IMAGE": manylinux_image,
+        "CIBW_MANYLINUX_I686_IMAGE": manylinux_image,
+        "CIBW_MANYLINUX_PYPY_X86_64_IMAGE": manylinux_image,
+        "CIBW_MANYLINUX_AARCH64_IMAGE": manylinux_image,
+        "CIBW_MANYLINUX_PPC64LE_IMAGE": manylinux_image,
+        "CIBW_MANYLINUX_S390X_IMAGE": manylinux_image,
+        "CIBW_MANYLINUX_PYPY_AARCH64_IMAGE": manylinux_image,
+        "CIBW_MANYLINUX_PYPY_I686_IMAGE": manylinux_image,
     }
-    if manylinux_image == 'manylinux1':
-        # We don't have a manylinux1 image for PyPy
-        add_env['CIBW_SKIP'] = 'pp*'
-    elif manylinux_image == 'manylinux2014':
-        # We don't have a manylinux2014 image for PyPy (yet?)
-        add_env['CIBW_SKIP'] = 'cp27* pp*'  # Python 2.7 not available on manylinux2014
+    if manylinux_image in {"manylinux1"}:
+        # We don't have a manylinux1 image for PyPy & CPython 3.10 and above
+        add_env["CIBW_SKIP"] = "pp* cp31*"
+
     actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
 
-    expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0', manylinux_versions=[manylinux_image])]
-    if manylinux_image == 'manylinux2014':
-        expected_wheels = [w for w in expected_wheels if '-cp27' not in w]
-    if manylinux_image in ['manylinux1', 'manylinux2014']:
-        expected_wheels = [w for w in expected_wheels if '-pp' not in w]
+    platform_tag_map = {
+        "manylinux1": ["manylinux_2_5", "manylinux1"],
+        "manylinux2010": ["manylinux_2_12", "manylinux2010"],
+        "manylinux2014": ["manylinux_2_17", "manylinux2014"],
+    }
+    expected_wheels = utils.expected_wheels(
+        "spam", "0.1.0", manylinux_versions=platform_tag_map.get(manylinux_image, [manylinux_image])
+    )
+    if manylinux_image in {"manylinux1"}:
+        # remove PyPy & CPython 3.10 and above
+        expected_wheels = [w for w in expected_wheels if "-pp" not in w and "-cp31" not in w]
     assert set(actual_wheels) == set(expected_wheels)

test/test_pep518.py

@@ -7,12 +7,8 @@ basic_project = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(
         """
         # Will fail if PEP 518 does work
-        import sys
         import requests
-        if sys.version_info < (3, 6, 0):
-            assert requests.__version__ == "2.22.0", "Requests found but wrong version ({0})".format(requests.__version__)
-        else:
-            assert requests.__version__ == "2.23.0", "Requests found but wrong version ({0})".format(requests.__version__)
+        assert requests.__version__ == "2.23.0", "Requests found but wrong version ({0})".format(requests.__version__)
 
         # Just making sure environment is still set
         import os
@@ -30,8 +26,7 @@ requires = [
     "setuptools >= 42",
     "setuptools_scm[toml]>=4.1.2",
     "wheel",
-    "requests==2.22.0; python_version<'3.6'",
-    "requests==2.23.0; python_version>='3.6'"
+    "requests==2.23.0"
 ]
 
 build-backend = "setuptools.build_meta"
@@ -51,7 +46,7 @@ def test_pep518(tmp_path):
     assert set(actual_wheels) == set(expected_wheels)
 
     # These checks ensure an extra file is not created when using custom
-    # workaround; see https://github.com/joerick/cibuildwheel/issues/421
+    # workaround; see https://github.com/pypa/cibuildwheel/issues/421
     assert not (project_dir / "42").exists()
     assert not (project_dir / "4.1.2").exists()
 

test/test_projects/__main__.py

@@ -8,38 +8,42 @@ from pathlib import Path
 
 def main():
     parser = ArgumentParser(
-        prog="python -m test.test_projects",
-        description='Generate a test project to check it out'
+        prog="python -m test.test_projects", description="Generate a test project to check it out"
+    )
+    parser.add_argument(
+        "--open",
+        action="store_true",
+        help="Open the generated project in a file explorer",
+    )
+    parser.add_argument(
+        "PROJECT",
+        help="Python path to a project object. E.g. test.test_0_basic.basic_project",
+    )
+    parser.add_argument(
+        "OUTPUT",
+        nargs="?",
+        help="Path to output dir. If no dir is passed, a tempdir will be generated.",
     )
-    parser.add_argument('--open', action='store_true', help='''
-        Open the generated project in a file explorer
-    ''')
-    parser.add_argument('PROJECT', help='''
-        Python path to a project object. E.g. test.test_0_basic.basic_project
-    ''')
-    parser.add_argument('OUTPUT', nargs='?', help='''
-        Path to output dir. If no dir is passed, a tempdir will be generated.
-    ''')
     options = parser.parse_args()
 
-    module, _, name = options.PROJECT.rpartition('.')
+    module, _, name = options.PROJECT.rpartition(".")
 
     project = getattr(importlib.import_module(module), name)
 
     project_dir = Path(options.OUTPUT or tempfile.mkdtemp())
     project.generate(project_dir)
 
-    print('Project generated at', project_dir)
+    print("Project generated at", project_dir)
     print()
 
     if options.open:
-        if sys.platform == 'darwin':
-            subprocess.check_call(['open', '--', project_dir])
-        elif sys.platform == 'linux2':
-            subprocess.check_call(['xdg-open', '--', project_dir])
-        elif sys.platform == 'win32':
-            subprocess.check_call(['explorer', project_dir])
+        if sys.platform == "darwin":
+            subprocess.run(["open", "--", project_dir], check=True)
+        elif sys.platform == "linux2":
+            subprocess.run(["xdg-open", "--", project_dir], check=True)
+        elif sys.platform == "win32":
+            subprocess.run(["explorer", project_dir], check=True)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()

test/test_projects/base.py

@@ -8,12 +8,13 @@ TemplateContext = Dict[str, Any]
 
 
 class TestProject:
-    '''
+    """
     An object that represents a project that can be built by cibuildwheel.
     Can be manipulated in tests by changing `files` and `template_context`.
 
     Write out to the filesystem using `generate`.
-    '''
+    """
+
     __test__ = False  # Have pytest ignore this class on `from .test_projects import TestProject`
 
     files: FilesDict
@@ -28,7 +29,7 @@ class TestProject:
             file_path = path / filename
             file_path.parent.mkdir(parents=True, exist_ok=True)
 
-            with file_path.open('w', encoding='utf8') as f:
+            with file_path.open("w", encoding="utf8") as f:
                 if isinstance(content, jinja2.Template):
                     content = content.render(self.template_context)
 

test/test_projects/c.py

@@ -2,7 +2,7 @@ import jinja2
 
 from .base import TestProject
 
-SPAM_C_TEMPLATE = r'''
+SPAM_C_TEMPLATE = r"""
 #include <Python.h>
 
 {{ spam_c_top_level_add }}
@@ -24,77 +24,76 @@ spam_system(PyObject *self, PyObject *args)
 }
 
 /* Module initialization */
-
-#if PY_MAJOR_VERSION >= 3
-    #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
-    #define MOD_DEF(m, name, doc, methods, module_state_size) \
-        static struct PyModuleDef moduledef = { \
-            PyModuleDef_HEAD_INIT, name, doc, module_state_size, methods, }; \
-        m = PyModule_Create(&moduledef);
-    #define MOD_RETURN(m) return m;
-#else
-    #define MOD_INIT(name) PyMODINIT_FUNC init##name(void)
-    #define MOD_DEF(m, name, doc, methods, module_state_size) \
-        m = Py_InitModule3(name, methods, doc);
-    #define MOD_RETURN(m) return;
-#endif
-
 static PyMethodDef module_methods[] = {
     {"system", (PyCFunction)spam_system, METH_VARARGS,
      "Execute a shell command."},
     {NULL}  /* Sentinel */
 };
 
-MOD_INIT(spam)
+PyMODINIT_FUNC PyInit_spam(void)
 {
-    PyObject* m;
-
-    MOD_DEF(m,
-            "spam",
-            "Example module",
-            module_methods,
-            -1)
-
-    MOD_RETURN(m)
+    static struct PyModuleDef moduledef = {
+        PyModuleDef_HEAD_INIT, "spam", "Example module", -1, module_methods,
+    };
+    return PyModule_Create(&moduledef);
 }
-'''
+"""
 
-SETUP_PY_TEMPLATE = r'''
+SETUP_PY_TEMPLATE = r"""
+import sys
 from setuptools import setup, Extension
 
 {{ setup_py_add }}
 
+libraries = []
+if sys.platform.startswith('linux'):
+    libraries.extend(['m', 'c'])
+
 setup(
-    ext_modules=[Extension('spam', sources=['spam.c'])],
+    ext_modules=[Extension(
+        'spam',
+        sources=['spam.c'],
+        libraries=libraries,
+    )],
     {{ setup_py_setup_args_add | indent(4) }}
 )
-'''
+"""
 
-SETUP_CFG_TEMPLATE = r'''
+SETUP_CFG_TEMPLATE = r"""
 [metadata]
 name = spam
 version = 0.1.0
 
 {{ setup_cfg_add }}
-'''
+"""
 
 
-def new_c_project(*, spam_c_top_level_add='', spam_c_function_add='', setup_py_add='',
-                  setup_py_setup_args_add='', setup_cfg_add=''):
+def new_c_project(
+    *,
+    spam_c_top_level_add="",
+    spam_c_function_add="",
+    setup_py_add="",
+    setup_py_setup_args_add="",
+    setup_cfg_add="",
+):
     project = TestProject()
 
-    project.files.update({
-        'spam.c': jinja2.Template(SPAM_C_TEMPLATE),
-        'setup.py': jinja2.Template(SETUP_PY_TEMPLATE),
-        'setup.cfg': jinja2.Template(SETUP_CFG_TEMPLATE),
-    })
+    project.files.update(
+        {
+            "spam.c": jinja2.Template(SPAM_C_TEMPLATE),
+            "setup.py": jinja2.Template(SETUP_PY_TEMPLATE),
+            "setup.cfg": jinja2.Template(SETUP_CFG_TEMPLATE),
+        }
+    )
 
-    project.template_context.update({
-        'spam_c_top_level_add': spam_c_top_level_add,
-        'spam_c_function_add': spam_c_function_add,
-        'setup_py_add': setup_py_add,
-        'setup_py_setup_args_add': setup_py_setup_args_add,
-        'setup_cfg_add': setup_cfg_add,
-    })
+    project.template_context.update(
+        {
+            "spam_c_top_level_add": spam_c_top_level_add,
+            "spam_c_function_add": spam_c_function_add,
+            "setup_py_add": setup_py_add,
+            "setup_py_setup_args_add": setup_py_setup_args_add,
+            "setup_cfg_add": setup_cfg_add,
+        }
+    )
 
     return project

test/test_pure_wheel.py

@@ -6,7 +6,9 @@ import pytest
 from . import utils
 
 pure_python_project = test_projects.TestProject()
-pure_python_project.files['setup.py'] = '''
+pure_python_project.files[
+    "setup.py"
+] = """
 from setuptools import Extension, setup
 
 setup(
@@ -14,25 +16,27 @@ setup(
     py_modules=['spam'],
     version="0.1.0",
 )
-'''
+"""
 
-pure_python_project.files['spam.py'] = '''
+pure_python_project.files[
+    "spam.py"
+] = """
 def a_function():
     pass
-'''
+"""
 
 
 def test(tmp_path, capfd):
     # this test checks that if a pure wheel is generated, the build should
     # fail.
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     pure_python_project.generate(project_dir)
 
     with pytest.raises(subprocess.CalledProcessError):
         actual_wheels = utils.cibuildwheel_run(project_dir)
-        print('produced wheels:', actual_wheels)
+        print("produced wheels:", actual_wheels)
 
     captured = capfd.readouterr()
-    print('out', captured.out)
-    print('err', captured.err)
+    print("out", captured.out)
+    print("err", captured.err)
     assert "Build failed because a pure Python wheel was generated" in captured.err

test/test_ssl.py

@@ -3,30 +3,28 @@ import textwrap
 from . import test_projects, utils
 
 project_with_ssl_tests = test_projects.new_c_project(
-    setup_py_add=textwrap.dedent(r'''
+    setup_py_add=textwrap.dedent(
+        r"""
         import ssl
-        import sys
 
-        if sys.version_info[0] == 2:
-            from urllib2 import urlopen
-        else:
-            from urllib.request import urlopen
+        from urllib.request import urlopen
 
         context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2)
         data = urlopen("https://www.nist.gov", context=context)
-        data = urlopen("https://raw.githubusercontent.com/joerick/cibuildwheel/master/CI.md", context=context)
-        data = urlopen("https://raw.githubusercontent.com/joerick/cibuildwheel/master/CI.md")
-    ''')
+        data = urlopen("https://raw.githubusercontent.com/pypa/cibuildwheel/main/CI.md", context=context)
+        data = urlopen("https://raw.githubusercontent.com/pypa/cibuildwheel/main/CI.md")
+        """
+    )
 )
 
 
 def test(tmp_path):
     # this test checks that SSL is working in the build environment using
     # some checks in setup.py.
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     project_with_ssl_tests.generate(project_dir)
 
     actual_wheels = utils.cibuildwheel_run(project_dir)
 
-    expected_wheels = utils.expected_wheels('spam', '0.1.0')
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
     assert set(actual_wheels) == set(expected_wheels)

test/test_subdir_package.py

@@ -8,11 +8,13 @@ from .test_projects.c import SPAM_C_TEMPLATE
 
 subdir_package_project = TestProject()
 
-subdir_package_project.files['src/spam/spam.c'] = jinja2.Template(SPAM_C_TEMPLATE)
-subdir_package_project.template_context['spam_c_top_level_add'] = ''
-subdir_package_project.template_context['spam_c_function_add'] = ''
+subdir_package_project.files["src/spam/spam.c"] = jinja2.Template(SPAM_C_TEMPLATE)
+subdir_package_project.template_context["spam_c_top_level_add"] = ""
+subdir_package_project.template_context["spam_c_function_add"] = ""
 
-subdir_package_project.files['src/spam/setup.py'] = r'''
+subdir_package_project.files[
+    "src/spam/setup.py"
+] = r"""
 from setuptools import Extension, setup
 
 setup(
@@ -20,33 +22,40 @@ setup(
     ext_modules=[Extension('spam', sources=['spam.c'])],
     version="0.1.0",
 )
-'''
+"""
 
-subdir_package_project.files['src/spam/test/run_tests.py'] = r'''
+subdir_package_project.files[
+    "src/spam/test/run_tests.py"
+] = r"""
 print('run_tests.py executed!')
-'''
+"""
 
-subdir_package_project.files['bin/before_build.py'] = r'''
+subdir_package_project.files[
+    "bin/before_build.py"
+] = r"""
 print('before_build.py executed!')
-'''
+"""
 
 
 def test(capfd, tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     subdir_package_project.generate(project_dir)
 
-    package_dir = Path('src', 'spam')
+    package_dir = Path("src", "spam")
     # build the wheels
-    actual_wheels = utils.cibuildwheel_run(project_dir, package_dir=package_dir, add_env={
-        'CIBW_BEFORE_BUILD': 'python {project}/bin/before_build.py',
-        'CIBW_TEST_COMMAND': 'python {package}/test/run_tests.py',
-        # this shouldn't depend on the version of python, so build only CPython 3.6
-        'CIBW_BUILD': 'cp36-*',
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        package_dir=package_dir,
+        add_env={
+            "CIBW_BEFORE_BUILD": "python {project}/bin/before_build.py",
+            "CIBW_TEST_COMMAND": "python {package}/test/run_tests.py",
+            # this shouldn't depend on the version of python, so build only CPython 3.6
+            "CIBW_BUILD": "cp36-*",
+        },
+    )
 
     # check that the expected wheels are produced
-    expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
-                       if 'cp36' in w]
+    expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp36" in w]
     assert set(actual_wheels) == set(expected_wheels)
 
     captured = capfd.readouterr()

test/test_testing.py

@@ -7,13 +7,17 @@ import pytest
 from . import test_projects, utils
 
 project_with_a_test = test_projects.new_c_project(
-    setup_cfg_add=textwrap.dedent(r'''
+    setup_cfg_add=textwrap.dedent(
+        r"""
         [options.extras_require]
-        test = nose
-    ''')
+        test = pytest
+        """
+    )
 )
 
-project_with_a_test.files['test/spam_test.py'] = r'''
+project_with_a_test.files[
+    "test/spam_test.py"
+] = r'''
 import os
 import platform
 import sys
@@ -48,8 +52,7 @@ class TestSpam(TestCase):
         # sys.prefix is different from sys.base_prefix when running a virtualenv
         # See https://docs.python.org/3/library/venv.html, which virtualenv seems
         # to honor in recent releases
-        # Python 2 doesn't have sys.base_prefix by default
-        if not hasattr(sys, 'base_prefix') or sys.prefix == sys.base_prefix:
+        if sys.prefix == sys.base_prefix:
             self.fail("Not running in a virtualenv")
 
         self.assertTrue(path_contains(sys.prefix, sys.executable))
@@ -63,73 +66,81 @@ class TestSpam(TestCase):
         bits = struct.calcsize("P") * 8
         if bits == 32:
             self.assertEqual(platform.machine(), "i686")
-
-    def test_time_to_remove_the_pypy_venv_patch(self):
-        if sys.platform == "darwin":
-            assert not hasattr(sys, "pypy_version_info") or sys.pypy_version_info < (7,3,4)
 '''
 
 
 def test(tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     project_with_a_test.generate(project_dir)
 
     # build and test the wheels
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        'CIBW_TEST_REQUIRES': 'nose',
-        # the 'false ||' bit is to ensure this command runs in a shell on
-        # mac/linux.
-        'CIBW_TEST_COMMAND': 'false || nosetests {project}/test',
-        'CIBW_TEST_COMMAND_WINDOWS': 'COLOR 00 || nosetests {project}/test',
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            "CIBW_TEST_REQUIRES": "pytest",
+            # the 'false ||' bit is to ensure this command runs in a shell on
+            # mac/linux.
+            "CIBW_TEST_COMMAND": "false || pytest {project}/test",
+            "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest {project}/test",
+        },
+    )
 
     # also check that we got the right wheels
-    expected_wheels = utils.expected_wheels('spam', '0.1.0')
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
     assert set(actual_wheels) == set(expected_wheels)
 
 
 def test_extras_require(tmp_path):
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     project_with_a_test.generate(project_dir)
 
     # build and test the wheels
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        'CIBW_TEST_EXTRAS': 'test',
-        # the 'false ||' bit is to ensure this command runs in a shell on
-        # mac/linux.
-        'CIBW_TEST_COMMAND': 'false || nosetests {project}/test',
-        'CIBW_TEST_COMMAND_WINDOWS': 'COLOR 00 || nosetests {project}/test',
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            "CIBW_TEST_EXTRAS": "test",
+            # the 'false ||' bit is to ensure this command runs in a shell on
+            # mac/linux.
+            "CIBW_TEST_COMMAND": "false || pytest {project}/test",
+            "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest {project}/test",
+        },
+    )
 
     # also check that we got the right wheels
-    expected_wheels = utils.expected_wheels('spam', '0.1.0')
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
     assert set(actual_wheels) == set(expected_wheels)
 
 
 project_with_a_failing_test = test_projects.new_c_project()
-project_with_a_failing_test.files['test/spam_test.py'] = r'''
+project_with_a_failing_test.files[
+    "test/spam_test.py"
+] = r"""
 from unittest import TestCase
 
 class TestSpam(TestCase):
     def test_something(self):
         self.fail('this test is supposed to fail')
-'''
+"""
 
 
 def test_failing_test(tmp_path):
     """Ensure a failing test causes cibuildwheel to error out and exit"""
-    project_dir = tmp_path / 'project'
-    output_dir = tmp_path / 'output'
+    project_dir = tmp_path / "project"
+    output_dir = tmp_path / "output"
     project_with_a_failing_test.generate(project_dir)
 
     with pytest.raises(subprocess.CalledProcessError):
-        utils.cibuildwheel_run(project_dir, output_dir=output_dir, add_env={
-            'CIBW_TEST_REQUIRES': 'nose',
-            'CIBW_TEST_COMMAND': 'nosetests {project}/test',
-            # manylinux1 has a version of bash that's been shown to have
-            # problems with this, so let's check that.
-            'CIBW_MANYLINUX_I686_IMAGE': 'manylinux1',
-            'CIBW_MANYLINUX_X86_64_IMAGE': 'manylinux1',
-        })
+        utils.cibuildwheel_run(
+            project_dir,
+            output_dir=output_dir,
+            add_env={
+                "CIBW_TEST_REQUIRES": "nose",
+                "CIBW_TEST_COMMAND": "nosetests {project}/test",
+                # manylinux1 has a version of bash that's been shown to have
+                # problems with this, so let's check that.
+                "CIBW_MANYLINUX_I686_IMAGE": "manylinux1",
+                "CIBW_MANYLINUX_X86_64_IMAGE": "manylinux1",
+            },
+        )
 
     assert len(os.listdir(output_dir)) == 0

test/test_troubleshooting.py

@@ -7,24 +7,26 @@ from .test_projects import TestProject
 
 so_file_project = TestProject()
 
-so_file_project.files['libnothing.so'] = ''
+so_file_project.files["libnothing.so"] = ""
 
-so_file_project.files['setup.py'] = '''
+so_file_project.files[
+    "setup.py"
+] = """
 raise Exception('this build will fail')
-'''
+"""
 
 
 def test_failed_project_with_so_files(tmp_path, capfd):
-    if utils.platform != 'linux':
-        pytest.skip('this test is only relevant to the linux build')
+    if utils.platform != "linux":
+        pytest.skip("this test is only relevant to the linux build")
 
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     so_file_project.generate(project_dir)
 
     with pytest.raises(subprocess.CalledProcessError):
         utils.cibuildwheel_run(project_dir)
 
     captured = capfd.readouterr()
-    print('out', captured.out)
-    print('err', captured.err)
+    print("out", captured.out)
+    print("err", captured.err)
     assert "NOTE: Shared object (.so) files found in this project." in captured.err

test/test_unicode.py

@@ -5,26 +5,28 @@ import pytest
 from . import test_projects, utils
 
 project_with_unicode = test_projects.new_c_project(
-    spam_c_function_add=textwrap.dedent(r'''
+    spam_c_function_add=textwrap.dedent(
+        r"""
         {
             Py_XDECREF(PyUnicode_FromStringAndSize("foo", 4));
         }
-    '''),
+        """
+    ),
 )
 
 
 def test(tmp_path):
-    if utils.platform != 'linux':
-        pytest.skip('the docker test is only relevant to the linux build')
+    if utils.platform != "linux":
+        pytest.skip("the docker test is only relevant to the linux build")
 
-    project_dir = tmp_path / 'project'
+    project_dir = tmp_path / "project"
     project_with_unicode.generate(project_dir)
 
     # build the wheels
-    actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
-        'CIBW_TEST_COMMAND': 'python -c "import spam"'
-    })
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir, add_env={"CIBW_TEST_COMMAND": 'python -c "import spam"'}
+    )
 
     # check that the expected wheels are produced
-    expected_wheels = utils.expected_wheels('spam', '0.1.0')
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
     assert set(actual_wheels) == set(expected_wheels)

test/utils.py

@@ -1,47 +1,51 @@
-'''
+"""
 Utility functions used by the cibuildwheel tests.
 
 This file is added to the PYTHONPATH in the test runner at bin/run_test.py.
-'''
+"""
 
 import os
 import platform as pm
-import shutil
 import subprocess
 import sys
-from contextlib import contextmanager
-from tempfile import mkdtemp
+from tempfile import TemporaryDirectory
 
-IS_WINDOWS_RUNNING_ON_TRAVIS = os.environ.get('TRAVIS_OS_NAME') == 'windows'
+platform: str
+
+if "CIBW_PLATFORM" in os.environ:
+    platform = os.environ["CIBW_PLATFORM"]
+elif sys.platform.startswith("linux"):
+    platform = "linux"
+elif sys.platform.startswith("darwin"):
+    platform = "macos"
+elif sys.platform in ["win32", "cygwin"]:
+    platform = "windows"
+else:
+    raise Exception("Unsupported platform")
 
 
-# Python 2 does not have a tempfile.TemporaryDirectory context manager
-@contextmanager
-def TemporaryDirectoryIfNone(path):
-    _path = path or mkdtemp()
-    try:
-        yield _path
-    finally:
-        if path is None:
-            shutil.rmtree(_path)
-
-
-def cibuildwheel_get_build_identifiers(project_path, env=None):
-    '''
+def cibuildwheel_get_build_identifiers(project_path, env=None, *, prerelease_pythons=False):
+    """
     Returns the list of build identifiers that cibuildwheel will try to build
     for the current platform.
-    '''
-    cmd_output = subprocess.check_output(
-        [sys.executable, '-m', 'cibuildwheel', '--print-build-identifiers', str(project_path)],
+    """
+    cmd = [sys.executable, "-m", "cibuildwheel", "--print-build-identifiers", str(project_path)]
+    if prerelease_pythons:
+        cmd.append("--prerelease-pythons")
+
+    cmd_output = subprocess.run(
+        cmd,
         universal_newlines=True,
         env=env,
-    )
+        check=True,
+        stdout=subprocess.PIPE,
+    ).stdout
 
-    return cmd_output.strip().split('\n')
+    return cmd_output.strip().split("\n")
 
 
-def cibuildwheel_run(project_path, package_dir='.', env=None, add_env=None, output_dir=None):
-    '''
+def cibuildwheel_run(project_path, package_dir=".", env=None, add_env=None, output_dir=None):
+    """
     Runs cibuildwheel as a subprocess, building the project at project_path.
 
     Uses the current Python interpreter.
@@ -54,44 +58,57 @@ def cibuildwheel_run(project_path, package_dir='.', env=None, add_env=None, outp
     :param output_dir: directory where wheels are saved. If None, a temporary
     directory will be used for the duration of the command.
     :return: list of built wheels (file names).
-    '''
+    """
     if env is None:
         env = os.environ.copy()
         # If present in the host environment, remove the MACOSX_DEPLOYMENT_TARGET for consistency
-        env.pop('MACOSX_DEPLOYMENT_TARGET', None)
+        env.pop("MACOSX_DEPLOYMENT_TARGET", None)
 
     if add_env is not None:
         env.update(add_env)
 
-    with TemporaryDirectoryIfNone(output_dir) as _output_dir:
-        subprocess.check_call(
-            [sys.executable, '-m', 'cibuildwheel', '--output-dir', str(_output_dir), str(package_dir)],
+    with TemporaryDirectory() as tmp_output_dir:
+        subprocess.run(
+            [
+                sys.executable,
+                "-m",
+                "cibuildwheel",
+                "--prerelease-pythons",
+                "--output-dir",
+                str(output_dir or tmp_output_dir),
+                str(package_dir),
+            ],
             env=env,
             cwd=project_path,
+            check=True,
         )
-        wheels = os.listdir(_output_dir)
+        wheels = os.listdir(output_dir or tmp_output_dir)
     return wheels
 
 
 def _get_arm64_macosx_deployment_target(macosx_deployment_target: str) -> str:
-    '''
+    """
     The first version of macOS that supports arm is 11.0. So the wheel tag
     cannot contain an earlier deployment target, even if
     MACOSX_DEPLOYMENT_TARGET sets it.
-    '''
-    version_tuple = tuple(map(int, macosx_deployment_target.split('.')))
+    """
+    version_tuple = tuple(map(int, macosx_deployment_target.split(".")))
     if version_tuple <= (11, 0):
-        return '11.0'
+        return "11.0"
     else:
         return macosx_deployment_target
 
 
-def expected_wheels(package_name, package_version, manylinux_versions=None,
-                    macosx_deployment_target='10.9', machine_arch=None, *,
-                    exclude_27=IS_WINDOWS_RUNNING_ON_TRAVIS):
-    '''
+def expected_wheels(
+    package_name,
+    package_version,
+    manylinux_versions=None,
+    macosx_deployment_target="10.9",
+    machine_arch=None,
+):
+    """
     Returns a list of expected wheels from a run of cibuildwheel.
-    '''
+    """
     # per PEP 425 (https://www.python.org/dev/peps/pep-0425/), wheel files shall have name of the form
     # {distribution}-{version}(-{build tag})?-{python tag}-{abi tag}-{platform tag}.whl
     # {python tag} and {abi tag} are closely related to the python interpreter used to build the wheel
@@ -101,56 +118,55 @@ def expected_wheels(package_name, package_version, manylinux_versions=None,
         machine_arch = pm.machine()
 
     if manylinux_versions is None:
-        if machine_arch == 'x86_64':
-            manylinux_versions = ['manylinux1', 'manylinux2010']
+        if machine_arch == "x86_64":
+            manylinux_versions = ["manylinux_2_5", "manylinux1", "manylinux_2_12", "manylinux2010"]
         else:
-            manylinux_versions = ['manylinux2014']
+            manylinux_versions = ["manylinux_2_17", "manylinux2014"]
 
-    python_abi_tags = ['cp35-cp35m', 'cp36-cp36m', 'cp37-cp37m', 'cp38-cp38', 'cp39-cp39']
+    python_abi_tags = ["cp36-cp36m", "cp37-cp37m", "cp38-cp38", "cp39-cp39", "cp310-cp310"]
 
-    if machine_arch in ['x86_64', 'AMD64', 'x86']:
-        python_abi_tags += ['cp27-cp27m', 'pp27-pypy_73', 'pp36-pypy36_pp73', 'pp37-pypy37_pp73']
+    if machine_arch in ["x86_64", "AMD64", "x86", "aarch64"]:
+        python_abi_tags += ["pp37-pypy37_pp73"]
 
-        if platform == 'linux':
-            python_abi_tags.append('cp27-cp27mu')  # python 2.7 has 2 different ABI on manylinux
-
-    if platform == 'macos' and get_macos_version() >= (10, 16):
+    if platform == "macos" and get_macos_version() >= (10, 16):
         # 10.16 is sometimes reported as the macOS version on macOS 11.
-        # CPython 3.5 doesn't work on macOS 11.
-        python_abi_tags.remove('cp35-cp35m')
         # pypy not supported on macOS 11.
-        python_abi_tags = [t for t in python_abi_tags if not t.startswith('pp')]
+        python_abi_tags = [t for t in python_abi_tags if not t.startswith("pp")]
 
-    if platform == 'macos' and machine_arch == 'arm64':
-        # currently, arm64 macs are only supported by cp39
-        python_abi_tags = ['cp39-cp39']
+    if platform == "macos" and machine_arch == "arm64":
+        # currently, arm64 macs are only supported by cp39 & cp310
+        python_abi_tags = ["cp39-cp39", "cp310-cp310"]
 
     wheels = []
 
     for python_abi_tag in python_abi_tags:
         platform_tags = []
 
-        if platform == 'linux':
+        if platform == "linux":
             architectures = [machine_arch]
 
-            if machine_arch == 'x86_64' and python_abi_tag.startswith('cp'):
-                architectures.append('i686')
+            if machine_arch == "x86_64":
+                architectures.append("i686")
 
             platform_tags = [
-                f'{manylinux_version}_{architecture}'
+                ".".join(
+                    f"{manylinux_version}_{architecture}"
+                    for manylinux_version in manylinux_versions
+                )
                 for architecture in architectures
-                for manylinux_version in manylinux_versions
             ]
 
-        elif platform == 'windows':
-            if python_abi_tag.startswith('cp'):
-                platform_tags = ['win32', 'win_amd64']
+        elif platform == "windows":
+            if python_abi_tag.startswith("cp"):
+                platform_tags = ["win32", "win_amd64"]
             else:
-                platform_tags = ['win32']
+                platform_tags = ["win_amd64"]
 
-        elif platform == 'macos':
-            if python_abi_tag == 'cp39-cp39' and machine_arch == 'arm64':
-                arm64_macosx_deployment_target = _get_arm64_macosx_deployment_target(macosx_deployment_target)
+        elif platform == "macos":
+            if python_abi_tag == "cp39-cp39" and machine_arch == "arm64":
+                arm64_macosx_deployment_target = _get_arm64_macosx_deployment_target(
+                    macosx_deployment_target
+                )
                 platform_tags = [
                     f'macosx_{macosx_deployment_target.replace(".", "_")}_universal2',
                     f'macosx_{arm64_macosx_deployment_target.replace(".", "_")}_arm64',
@@ -161,40 +177,21 @@ def expected_wheels(package_name, package_version, manylinux_versions=None,
                 ]
 
         else:
-            raise Exception('unsupported platform')
+            raise Exception("unsupported platform")
 
         for platform_tag in platform_tags:
-            wheels.append(f'{package_name}-{package_version}-{python_abi_tag}-{platform_tag}.whl')
-
-    # Travis on Windows does not support using the default Python 2.7 compiler,
-    # so we support skipping here.
-    if exclude_27:
-        wheels = [w for w in wheels if '-cp27-' not in w and '-pp2' not in w]
+            wheels.append(f"{package_name}-{package_version}-{python_abi_tag}-{platform_tag}.whl")
 
     return wheels
 
 
 def get_macos_version():
-    '''
+    """
     Returns the macOS major/minor version, as a tuple, e.g. (10, 15) or (11, 0)
 
     These tuples can be used in comparisons, e.g.
         (10, 14) <= (11, 0) == True
         (11, 2) <= (11, 0) != True
-    '''
+    """
     version_str, _, _ = pm.mac_ver()
     return tuple(map(int, version_str.split(".")[:2]))
-
-
-platform = None
-
-if 'CIBW_PLATFORM' in os.environ:
-    platform = os.environ['CIBW_PLATFORM']
-elif sys.platform.startswith('linux'):
-    platform = 'linux'
-elif sys.platform.startswith('darwin'):
-    platform = 'macos'
-elif sys.platform in ['win32', 'cygwin']:
-    platform = 'windows'
-else:
-    raise Exception('Unsupported platform')

unit_test/build_selector_test.py

@@ -4,103 +4,130 @@ from cibuildwheel.util import BuildSelector
 
 
 def test_build():
-    build_selector = BuildSelector(build_config="cp3?-* *-manylinux1*", skip_config="")
+    build_selector = BuildSelector(build_config="cp3*-* *-manylinux*", skip_config="")
 
-    assert build_selector('cp27-manylinux1_x86_64')
-    assert build_selector('cp36-manylinux1_x86_64')
-    assert build_selector('cp37-manylinux1_x86_64')
-    assert build_selector('cp27-manylinux1_i686')
-    assert build_selector('cp36-manylinux1_i686')
-    assert build_selector('cp37-manylinux1_i686')
-    assert not build_selector('cp27-macosx_10_6_intel')
-    assert build_selector('cp36-macosx_10_6_intel')
-    assert build_selector('cp37-macosx_10_6_intel')
-    assert not build_selector('cp27-win32')
-    assert build_selector('cp36-win32')
-    assert build_selector('cp37-win32')
-    assert not build_selector('cp27-win_amd64')
-    assert build_selector('cp36-win_amd64')
-    assert build_selector('cp37-win_amd64')
+    assert build_selector("cp36-manylinux_x86_64")
+    assert build_selector("cp37-manylinux_x86_64")
+    assert not build_selector("cp310-manylinux_x86_64")
+    assert build_selector("pp36-manylinux_x86_64")
+    assert build_selector("pp37-manylinux_x86_64")
+    assert build_selector("cp36-manylinux_i686")
+    assert build_selector("cp37-manylinux_i686")
+    assert build_selector("cp36-macosx_intel")
+    assert build_selector("cp37-macosx_intel")
+    assert build_selector("cp39-macosx_intel")
+    assert build_selector("cp39-macosx_universal2")
+    assert build_selector("cp39-macosx_arm64")
+    assert not build_selector("pp36-macosx_intel")
+    assert not build_selector("pp37-macosx_intel")
+    assert build_selector("cp36-win32")
+    assert build_selector("cp37-win32")
+    assert not build_selector("pp36-win32")
+    assert not build_selector("pp37-win32")
+    assert build_selector("cp36-win_amd64")
+    assert build_selector("cp37-win_amd64")
+    assert not build_selector("cp310-win_amd64")
+    assert not build_selector("pp36-win_amd64")
+    assert not build_selector("pp37-win_amd64")
+
+
+def test_build_filter_pre():
+    build_selector = BuildSelector(
+        build_config="cp3*-* *-manylinux*",
+        skip_config="",
+        prerelease_pythons=True,
+    )
+
+    assert build_selector("cp37-manylinux_x86_64")
+    assert build_selector("cp310-manylinux_x86_64")
+    assert build_selector("cp37-win_amd64")
+    assert build_selector("cp310-win_amd64")
 
 
 def test_skip():
-    build_selector = BuildSelector(build_config="*", skip_config="cp27-* cp3?-manylinux1_i686 cp36-win* *-win32")
+    build_selector = BuildSelector(
+        build_config="*", skip_config="pp36-* cp3?-manylinux_i686 cp36-win* *-win32"
+    )
 
-    assert not build_selector('cp27-manylinux1_x86_64')
-    assert build_selector('cp36-manylinux1_x86_64')
-    assert build_selector('cp37-manylinux1_x86_64')
-    assert not build_selector('cp27-manylinux1_i686')
-    assert not build_selector('cp36-manylinux1_i686')
-    assert not build_selector('cp37-manylinux1_i686')
-    assert not build_selector('cp27-macosx_10_6_intel')
-    assert build_selector('cp36-macosx_10_6_intel')
-    assert build_selector('cp37-macosx_10_6_intel')
-    assert not build_selector('cp27-win32')
-    assert not build_selector('cp36-win32')
-    assert not build_selector('cp37-win32')
-    assert not build_selector('cp27-win_amd64')
-    assert not build_selector('cp36-win_amd64')
-    assert build_selector('cp37-win_amd64')
+    assert not build_selector("pp36-manylinux_x86_64")
+    assert build_selector("pp37-manylinux_x86_64")
+    assert build_selector("cp36-manylinux_x86_64")
+    assert build_selector("cp37-manylinux_x86_64")
+    assert not build_selector("cp36-manylinux_i686")
+    assert not build_selector("cp37-manylinux_i686")
+    assert not build_selector("pp36-macosx_10_6_intel")
+    assert build_selector("pp37-macosx_10_6_intel")
+    assert build_selector("cp36-macosx_10_6_intel")
+    assert build_selector("cp37-macosx_10_6_intel")
+    assert not build_selector("cp36-win32")
+    assert not build_selector("cp37-win32")
+    assert not build_selector("cp36-win_amd64")
+    assert build_selector("cp37-win_amd64")
 
 
 def test_build_and_skip():
-    build_selector = BuildSelector(build_config="cp36-* cp37-macosx* *-manylinux1*", skip_config="cp27-* cp37-manylinux1_i686")
+    build_selector = BuildSelector(
+        build_config="cp36-* cp37-macosx* *-manylinux*", skip_config="pp37-* cp37-manylinux_i686"
+    )
 
-    assert not build_selector('cp27-manylinux1_x86_64')
-    assert build_selector('cp36-manylinux1_x86_64')
-    assert build_selector('cp37-manylinux1_x86_64')
-    assert not build_selector('cp27-manylinux1_i686')
-    assert build_selector('cp36-manylinux1_i686')
-    assert not build_selector('cp37-manylinux1_i686')
-    assert not build_selector('cp27-macosx_10_6_intel')
-    assert build_selector('cp36-macosx_10_6_intel')
-    assert build_selector('cp37-macosx_10_6_intel')
-    assert not build_selector('cp27-win32')
-    assert build_selector('cp36-win32')
-    assert not build_selector('cp37-win32')
-    assert not build_selector('cp27-win_amd64')
-    assert build_selector('cp36-win_amd64')
-    assert not build_selector('cp37-win_amd64')
+    assert not build_selector("pp37-manylinux_x86_64")
+    assert build_selector("cp36-manylinux_x86_64")
+    assert build_selector("cp37-manylinux_x86_64")
+    assert not build_selector("pp37-manylinux_i686")
+    assert build_selector("cp36-manylinux_i686")
+    assert not build_selector("cp37-manylinux_i686")
+    assert not build_selector("pp37-macosx_10_6_intel")
+    assert build_selector("cp36-macosx_10_6_intel")
+    assert build_selector("cp37-macosx_10_6_intel")
+    assert not build_selector("pp37-win32")
+    assert build_selector("cp36-win32")
+    assert not build_selector("cp37-win32")
+    assert not build_selector("pp37-win_amd64")
+    assert build_selector("cp36-win_amd64")
+    assert not build_selector("cp37-win_amd64")
 
 
 def test_build_braces():
     build_selector = BuildSelector(build_config="cp{36,37}*", skip_config="")
 
-    assert not build_selector('cp27-manylinux1_x86_64')
-    assert build_selector('cp36-manylinux1_x86_64')
-    assert build_selector('cp37-manylinux1_x86_64')
-    assert not build_selector('cp38-manylinux1_x86_64')
-    assert not build_selector('cp39-manylinux1_x86_64')
+    assert build_selector("cp36-manylinux_x86_64")
+    assert build_selector("cp37-manylinux_x86_64")
+    assert not build_selector("cp38-manylinux_x86_64")
+    assert not build_selector("cp39-manylinux_x86_64")
 
 
 def test_build_limited_python():
-    build_selector = BuildSelector(build_config="*", skip_config="", requires_python=SpecifierSet(">=3.6"))
+    build_selector = BuildSelector(
+        build_config="*", skip_config="", requires_python=SpecifierSet(">=3.7")
+    )
 
-    assert not build_selector('cp27-manylinux1_x86_64')
-    assert build_selector('cp36-manylinux1_x86_64')
-    assert build_selector('cp37-manylinux1_x86_64')
-    assert not build_selector('cp27-manylinux1_i686')
-    assert build_selector('cp36-manylinux1_i686')
-    assert build_selector('cp37-manylinux1_i686')
-    assert not build_selector('cp27-win32')
-    assert build_selector('cp36-win32')
-    assert build_selector('cp37-win32')
-    assert not build_selector('pp27-win32')
-    assert build_selector('pp36-win32')
-    assert build_selector('pp37-win32')
+    assert not build_selector("cp36-manylinux_x86_64")
+    assert build_selector("cp37-manylinux_x86_64")
+    assert build_selector("cp38-manylinux_x86_64")
+    assert not build_selector("cp36-manylinux_i686")
+    assert build_selector("cp37-manylinux_i686")
+    assert build_selector("cp38-manylinux_i686")
+    assert not build_selector("cp36-win32")
+    assert build_selector("cp37-win32")
+    assert build_selector("cp38-win32")
+    assert build_selector("pp37-win_amd64")
 
 
 def test_build_limited_python_partial():
-    build_selector = BuildSelector(build_config="*", skip_config="", requires_python=SpecifierSet(">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"))
+    build_selector = BuildSelector(
+        build_config="*", skip_config="", requires_python=SpecifierSet(">=3.6, !=3.7.*")
+    )
 
-    assert build_selector('cp27-manylinux1_x86_64')
-    assert not build_selector('cp35-manylinux1_x86_64')
-    assert build_selector('cp36-manylinux1_x86_64')
+    assert build_selector("cp36-manylinux_x86_64")
+    assert not build_selector("cp37-manylinux_x86_64")
+    assert build_selector("cp38-manylinux_x86_64")
+    assert build_selector("cp39-manylinux_x86_64")
 
 
 def test_build_limited_python_patch():
-    build_selector = BuildSelector(build_config="*", skip_config="", requires_python=SpecifierSet(">=2.7.9"))
+    build_selector = BuildSelector(
+        build_config="*", skip_config="", requires_python=SpecifierSet(">=3.6.8")
+    )
 
-    assert build_selector('cp27-manylinux1_x86_64')
-    assert build_selector('cp36-manylinux1_x86_64')
-    assert build_selector('cp37-manylinux1_x86_64')
+    assert build_selector("cp36-manylinux_x86_64")
+    assert build_selector("cp37-manylinux_x86_64")

unit_test/conftest.py

@@ -2,9 +2,7 @@ import pytest
 
 
 def pytest_addoption(parser):
-    parser.addoption(
-        "--run-docker", action="store_true", default=False, help="run docker tests"
-    )
+    parser.addoption("--run-docker", action="store_true", default=False, help="run docker tests")
 
 
 def pytest_configure(config):

unit_test/dependency_constraints_test.py

@@ -7,11 +7,15 @@ def test_defaults():
     dependency_constraints = DependencyConstraints.with_defaults()
 
     project_root = Path(__file__).parents[1]
-    resources_dir = project_root / 'cibuildwheel' / 'resources'
+    resources_dir = project_root / "cibuildwheel" / "resources"
 
-    assert dependency_constraints.base_file_path.samefile(resources_dir / 'constraints.txt')
-    assert dependency_constraints.get_for_python_version('3.99').samefile(resources_dir / 'constraints.txt')
-    assert dependency_constraints.get_for_python_version('3.9').samefile(resources_dir / 'constraints-python39.txt')
-    assert dependency_constraints.get_for_python_version('3.6').samefile(resources_dir / 'constraints-python36.txt')
-    assert dependency_constraints.get_for_python_version('3.5').samefile(resources_dir / 'constraints-python35.txt')
-    assert dependency_constraints.get_for_python_version('2.7').samefile(resources_dir / 'constraints-python27.txt')
+    assert dependency_constraints.base_file_path.samefile(resources_dir / "constraints.txt")
+    assert dependency_constraints.get_for_python_version("3.99").samefile(
+        resources_dir / "constraints.txt"
+    )
+    assert dependency_constraints.get_for_python_version("3.9").samefile(
+        resources_dir / "constraints-python39.txt"
+    )
+    assert dependency_constraints.get_for_python_version("3.6").samefile(
+        resources_dir / "constraints-python36.txt"
+    )