'Bump version: v1.11.0'

* Try some things to debug Travis failures

* Perhaps there is a config file

* Update .travis.yml

* Update .travis.yml

* Add -FallbackSource to nuget invocation

* Update windows.py

* Tidy things up

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
   osx-python3.6:
     macos:
-      xcode: "9.4.1"
+      xcode: 9.4.1
     environment:
       PYTHON: python3
     steps:

.circleci/prepare.sh

@@ -4,6 +4,6 @@ set -o xtrace
 $PYTHON --version
 $PYTHON -m pip --version
 $PYTHON -m virtualenv -p $PYTHON venv
-venv/bin/python -m pip install -r requirements-dev.txt
+venv/bin/python -m pip install -e ".[dev]"
 venv/bin/python -m pip freeze
 venv/bin/python --version

.github/workflows/test.yml

@@ -1,10 +1,14 @@
 name: Test
 
 on:
-  push: {}
+  push:
+    branches:
+      - master
   pull_request:
     paths-ignore:
       - 'docs/**'
+  workflow_dispatch:
+    # allow manual runs on branches without a PR
 
 jobs:
   pre-commit:
@@ -16,14 +20,12 @@ jobs:
     - uses: pre-commit/action@v2.0.0
 
   test:
-    # skip branch builds on joerick/cibuildwheel, but always build `master` and pull requests
-    if: github.repository != 'joerick/cibuildwheel' || github.ref == 'refs/heads/master' || github.event_name == 'pull_request'
-
     name: Test cibuildwheel on ${{ matrix.os }}
+    needs: pre-commit
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
         python_version: ['3.7']
     timeout-minutes: 180
     steps:
@@ -35,11 +37,51 @@ jobs:
 
     - name: Install dependencies
       run: |
-        python -m pip install -r requirements-dev.txt
-    - name: Install Visual C++ for Python 2.7
-      if: runner.os == 'Windows'
+        python -m pip install -e ".[dev]"
+
+    - 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 ')
       run: |
-        choco install vcpython27 -f -y
+        python bin/sample_build.py
+
+    - name: Get some sample wheels
+      run: |
+        python -m test.test_projects test.test_0_basic.basic_project sample_proj
+        cibuildwheel --output-dir wheelhouse sample_proj
+      env:
+        CIBW_ARCHS_MACOS: x86_64 universal2 arm64
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: sample_wheels
+        path: wheelhouse
+
     - name: Test cibuildwheel
       run: |
         python ./bin/run_tests.py
+
+  test-emulated:
+    name: Test emulated cibuildwheel using qemu
+    needs: pre-commit
+    runs-on: ubuntu-latest
+    timeout-minutes: 180
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+    - name: Install dependencies
+      run: |
+        python -m pip install -r requirements-dev.txt
+
+    - name: Set up QEMU
+      id: qemu
+      uses: docker/setup-qemu-action@v1
+      with:
+        platforms: all
+
+    - name: Run the emulation tests
+      run: |
+        pytest --run-emulation test/test_emulation.py

.github/workflows/update-dependencies.yml

@@ -0,0 +1,36 @@
+name: Update dependencies
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 6 * * 1'  # "At 06:00 on Monday."
+
+jobs:
+  update-dependencies:
+    name: Update dependencies
+    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]"
+    - name: "Run update: dependencies"
+      run: python ./bin/update_dependencies.py
+    - name: "Run update: python configs"
+      run: python ./bin/update_pythons.py --force
+    - name: Create Pull Request
+      if: github.ref == 'refs/heads/master' && github.repository == 'joerick/cibuildwheel'
+      uses: peter-evans/create-pull-request@v3
+      with:
+        commit-message: Update dependencies
+        title: '[Bot] Update dependencies'
+        body: |
+          Update the versions of our dependencies.
+
+          PR generated by "Update dependencies" [workflow](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}).
+        branch: update-dependencies-pr
+        delete-branch: true

.gitignore

@@ -105,3 +105,12 @@ env3?/
 
 # MyPy cache
 .mypy_cache/
+
+# Output cache for setup.py checker
+all_known_setup.yaml
+
+# mkdocs
+site/
+
+# Virtual environments
+venv*

.gitlab-ci.yml

@@ -11,5 +11,5 @@ linux:
     DOCKER_TLS_CERTDIR: ""
   script:
     - curl -sSL https://get.docker.com/ | sh
-    - python -m pip install -r requirements-dev.txt
+    - python -m pip install -e ".[dev]"
     - python ./bin/run_tests.py

.pre-commit-config.yaml

@@ -1,25 +1,72 @@
 repos:
-- repo: https://gitlab.com/pycqa/flake8
-  rev: 3.8.3
+
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v3.4.0
+  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/PyCQA/isort
+  rev: 5.8.0
+  hooks:
+  - id: isort
+
+- repo: https://github.com/psf/black
+  rev: 21.4b1
+  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.812
+  hooks:
+  - id: mypy
+    exclude: ^(bin/|cibuildwheel/resources/).*py$
+    additional_dependencies: [packaging]
+    args: ["--python-version=3.6", "--ignore-missing-imports", "--scripts-are-modules"]
+  - id: mypy
+    name: mypy 3.7+ on bin/
+    files: ^bin/.*py$
+    additional_dependencies: [packaging]
+    args: ["--python-version=3.7", "--ignore-missing-imports", "--scripts-are-modules"]
+
+- repo: https://github.com/asottile/pyupgrade
+  rev: v2.13.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/flake8
+  rev: 3.9.1
   hooks:
   - id: flake8
     exclude: cibuildwheel/resources/
     additional_dependencies: [flake8-bugbear]
 
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.2.0
+- repo: local
   hooks:
-  - id: check-case-conflict
-  - id: check-merge-conflict
-  - id: check-yaml
-  - id: end-of-file-fixer
-    exclude: cibuildwheel/resources/pinned_docker_images.cfg
-  - id: mixed-line-ending
-  - id: trailing-whitespace
-
-- repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.782
-  hooks:
-  - id: mypy
-    files: cibuildwheel/|test/
-    pass_filenames: false
+  - id: disallow-caps
+    name: Disallow improper capitalization
+    language: pygrep
+    entry: PyBind|Numpy|Cmake|Github
+    types:
+    - markdown

.readthedocs.yml

@@ -6,6 +6,9 @@ mkdocs:
   configuration: mkdocs.yml
 
 python:
-  version: 3.7
+  version: 3.8
   install:
-    - requirements: requirements-dev.txt
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs

.travis.yml

@@ -28,15 +28,17 @@ jobs:
 
     - name: macOS | x86_64 | Python 3.x
       os: osx
-      env: PYTHON=python3
+      env:
+        - PYTHON=python3
+        - PYTEST_ADDOPTS='-k "unit_test or test_0_basic" --suppress-no-test-exit-code'
 
     - name: Windows | x86_64 | Python 3.6
       os: windows
       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
 
@@ -52,6 +54,6 @@ jobs:
     # must repeat the s390x job above exactly to match
     - *linux_s390x_36
 
-install: $PYTHON -m pip install -r requirements-dev.txt
+install: $PYTHON -m pip install -e ".[dev]" pytest-custom-exit-code
 
 script: $PYTHON ./bin/run_tests.py

README.md

@@ -1,7 +1,14 @@
 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) [![Build Status](https://travis-ci.org/joerick/cibuildwheel.svg?branch=master)](https://travis-ci.org/joerick/cibuildwheel) [![Build status](https://ci.appveyor.com/api/projects/status/wbsgxshp05tt1tif/branch/master?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/master) [![CircleCI](https://circleci.com/gh/joerick/cibuildwheel.svg?style=svg)](https://circleci.com/gh/joerick/cibuildwheel) [![Build 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)
+[![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)
+
 
 [Documentation](https://cibuildwheel.readthedocs.org)
 
@@ -9,95 +16,90 @@ cibuildwheel
 
 Python wheels are great. Building them across **Mac, Linux, Windows**, on **multiple versions of Python**, is not.
 
-`cibuildwheel` is here to help. `cibuildwheel` runs on your CI server - currently it supports Azure Pipelines, Travis CI, AppVeyor, GitHub Actions and CircleCI - and it builds and tests your wheels across all of your platforms.
+`cibuildwheel` is here to help. `cibuildwheel` runs on your CI server - currently it supports GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, and GitLab CI - and it builds and tests your wheels across all of your platforms.
 
 
 What does it do?
 ----------------
 
-|   | macOS x86_64 | 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.0 | ✅ |    | ✅  | ✅ |    |    |    |    |
-| PyPy 3.6 v7.3.0 | ✅ |    | ✅  | ✅ |    |    |    |    |
+|   | macOS Intel | macOS Apple Silicon | Windows 64bit | Windows 32bit | manylinux x86_64 | manylinux i686 | manylinux aarch64 | manylinux ppc64le | manylinux s390x |
+|---|---|---|---|---|---|---|---|---|---|
+| CPython 2.7     | ✅ |   | ✅¹ | ✅¹ | ✅ | ✅ |    |    |   |
+| CPython 3.5     | ✅ |   | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
+| CPython 3.6     | ✅ |   | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
+| CPython 3.7     | ✅ |   | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
+| CPython 3.8     | ✅ |   | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
+| CPython 3.9     | ✅ | ✅ | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
+| PyPy 2.7 v7.3.3 | ✅ |    |    | ✅  | ✅ |    |    |    |   |
+| PyPy 3.6 v7.3.3 | ✅ |    |    | ✅  | ✅ |    |    |    |   |
+| PyPy 3.7 (beta) v7.3.3 | ✅ | |  | ✅  | ✅ |    |    |   |    |
 
-<sup>¹ Not supported on Travis</sup><br>
-<sup>² Only supported on Travis</sup><br>
-<sup>³ Beta support until Travis CI fixes <a href="https://travis-ci.community/t/no-space-left-on-device-for-system-z/5954/11">a bug</a></sup><br>
+<sup>¹ Only using a workaround with a newer compiler; Microsoft removed the 2008 compiler for Python 2.7 in April 2021.</sup><br>
 
-- Builds manylinux, macOS and Windows wheels for CPython and PyPy using Azure Pipelines, Travis CI, AppVeyor, and CircleCI
+- 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 the library test suite against the wheel-installed version of your library
+- Runs your library's tests against the wheel-installed version of your library
 
 Usage
 -----
 
-`cibuildwheel` currently works on **Travis CI**, **Azure Pipelines**, **AppVeyor**, **GitHub Actions**, **CircleCI**, and **Gitlab CI**. Check the table below for supported platforms on each service:
+`cibuildwheel` runs inside a CI service. Supported platforms depend on which service you're using:
 
-|                 | Linux | macOS | Windows |
-|-----------------|-------|-------|---------|
-| Azure Pipelines | ✅    | ✅    | ✅      |
-| Travis CI       | ✅    | ✅    | ✅      |
-| AppVeyor        | ✅    | ✅    | ✅      |
-| GitHub Actions  | ✅    | ✅    | ✅      |
-| CircleCI        | ✅    | ✅    |         |
-| Gitlab CI       | ✅    |       |         |
+|                 | Linux | macOS | Windows | Linux ARM |
+|-----------------|-------|-------|---------|--------------|
+| GitHub Actions  | ✅    | ✅    | ✅      | ✅¹           |
+| Azure Pipelines | ✅    | ✅    | ✅      |              |
+| Travis CI       | ✅    | ✅    | ✅      | ✅           |
+| AppVeyor        | ✅    | ✅    | ✅      |              |
+| CircleCI        | ✅    | ✅    |         |              |
+| Gitlab CI       | ✅    |       |         |              |
 
-`cibuildwheel` is not intended to run on your development machine. Because it uses system Python from Python.org it will try to install packages globally - not what you expect from a build tool! Instead, isolated CI services like those mentioned above are ideal.
+<sup>¹ [Requires emulation](https://cibuildwheel.readthedocs.io/en/stable/faq/#emulation), distributed separately. Other services may also support Linux ARM through emulation or third-party build hosts, but these are not tested in our CI.</sup><br>
+
+`cibuildwheel` is not intended to run on your development machine. Because it uses system Python from Python.org on macOS and Windows, it will try to install packages globally - not what you expect from a build tool! Instead, isolated CI services like those mentioned above are ideal. For Linux builds, it uses manylinux docker images, so those can be done locally for testing in a pinch.
 
 <!--intro-end-->
 
 Example setup
 -------------
 
-To build manylinux, macOS, and Windows wheels on Travis CI and upload them to PyPI whenever you tag a version, you could use this `.travis.yml`:
+To build manylinux, macOS, and Windows wheels on GitHub Actions, you could use this `.github/workflows/wheels.yml`:
 
 ```yaml
-language: python
+name: Build
+
+on: [push, pull_request]
 
 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.0
-        - 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
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, windows-2019, macOS-10.15]
 
-env:
-  global:
-    - TWINE_USERNAME=__token__
-    # Note: TWINE_PASSWORD is set to a PyPI API token in Travis settings
+    steps:
+      - uses: actions/checkout@v2
 
-install:
-  - python3 -m pip install cibuildwheel==1.6.1
+      # Used to host cibuildwheel
+      - uses: actions/setup-python@v2
 
-script:
-  # build the wheels, put them into './wheelhouse'
-  - python3 -m cibuildwheel --output-dir wheelhouse
+      - name: Install cibuildwheel
+        run: python -m pip install cibuildwheel==1.11.0
 
-after_success:
-  # if the release was tagged, upload them to PyPI
-  - |
-    if [[ $TRAVIS_TAG ]]; then
-      python3 -m pip install twine
-      python3 -m twine upload wheelhouse/*.whl
-    fi
+      - name: Build wheels
+        run: python -m cibuildwheel --output-dir wheelhouse
+        # to supply options, put them in 'env', like:
+        # env:
+        #   CIBW_SOME_OPTION: value
+
+      - uses: actions/upload-artifact@v2
+        with:
+          path: ./wheelhouse/*.whl
 ```
 
-For more information, including how to build on GitHub Actions, Appveyor, Azure Pipelines, or CircleCI, check out the [documentation](https://cibuildwheel.readthedocs.org) and the [examples](https://github.com/joerick/cibuildwheel/tree/master/examples).
+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).
 
 Options
 -------
@@ -106,6 +108,8 @@ Options
 |---|--------|-------------|
 | **Build selection** | [`CIBW_PLATFORM`](https://cibuildwheel.readthedocs.io/en/stable/options/#platform)  | Override the auto-detected target platform |
 |   | [`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 |
 | **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 |
@@ -116,37 +120,197 @@ Options
 |   | [`CIBW_BEFORE_TEST`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-test)  | Execute a shell command before testing each wheel |
 |   | [`CIBW_TEST_REQUIRES`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-requires)  | Install Python dependencies before running the tests |
 |   | [`CIBW_TEST_EXTRAS`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-extras)  | Install your wheel for testing using extras_require |
+|   | [`CIBW_TEST_SKIP`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-skip)  | Skip running tests on some builds |
 | **Other** | [`CIBW_BUILD_VERBOSITY`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-verbosity)  | Increase/decrease the output of pip wheel |
 
 
 Working examples
 ----------------
 
+<!--working-examples-start-->
+
 Here are some repos that use cibuildwheel.
 
-- [pyinstrument_cext](https://github.com/joerick/pyinstrument_cext) - A simple C extension, without external dependencies, built on Travis CI/Appveyor.
-- [websockets](https://github.com/aaugustin/websockets)
-- [Parselmouth](https://github.com/YannickJadoul/Parselmouth)
-- [python-admesh](https://github.com/admesh/python-admesh)
-- [pybase64](https://github.com/mayeut/pybase64)
-- [KDEpy](https://github.com/tommyod/KDEpy)
-- [AutoPy](https://github.com/autopilot-rs/autopy)
-- [apriltags2-ethz](https://github.com/safijari/apriltags2_ethz)
-- [TgCrypto](https://github.com/pyrogram/tgcrypto)
-- [Twisted](https://github.com/twisted/twisted)
-- [gmic-py](https://github.com/dtschump/gmic-py)
-- [creme](https://github.com/creme-ml/creme)
-- [PyAV](https://github.com/PyAV-Org/PyAV)
-- [aiortc](https://github.com/aiortc/aiortc)
-- [aioquic](https://github.com/aiortc/aioquic)
-- [pikepdf](https://github.com/pikepdf/pikepdf)
-- [fathon](https://github.com/stfbnc/fathon)
-- [etebase-py](https://github.com/etesync/etebase-py) - Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed, built on Travis CI.
+<!-- START bin/projects.py -->
 
-> Add your repo here! Send a PR.
+<!-- this section is generated by bin/projects.py. Don't edit it directly, instead, edit docs/data/projects.yml -->
+
+| Name                              | CI | OS | Notes |
+|-----------------------------------|----|----|:------|
+| [scikit-learn][]                  | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The machine learning library. A complex but clean config using many of cibuildwheel's features to build a large project with Cython and C++ extensions.  |
+| [Matplotlib][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The venerable Matplotlib, a Python library with C++ portions |
+| [MyPy][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | MyPyC, the compiled component of MyPy. |
+| [psutil][]                        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python |
+| [scikit-image][]                  | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Image processing library. Uses cibuildwheel to build and test a project that uses Cython with platform-native code.  |
+| [twisted-iocpsupport][]           | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. |
+| [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. |
+| [numexpr][]                       | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas, bcolz and more |
+| [coverage.py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python |
+| [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. |
+| [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 |
+| [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 |
+| [google neuroglancer][]           | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data |
+| [pikepdf][]                       | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by qpdf |
+| [AutoPy][]                        | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
+| [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. |
+| [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][] | Compute and compare MinHash signatures for DNA 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. |
+| [Tokenizer][]                     | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support |
+| [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 |
+| [TgCrypto][]                      | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
+| [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 |
+| [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. |
+| [pyinstrument_cext][]             | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies |
+| [polaroid][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. |
+| [xmlstarlet][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. |
+| [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 |
+
+[scikit-learn]: https://github.com/scikit-learn/scikit-learn
+[Matplotlib]: https://github.com/matplotlib/matplotlib
+[MyPy]: https://github.com/mypyc/mypy_mypyc-wheels
+[psutil]: https://github.com/giampaolo/psutil
+[scikit-image]: https://github.com/scikit-image/scikit-image
+[twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport
+[websockets]: https://github.com/aaugustin/websockets
+[pyzmq]: https://github.com/zeromq/pyzmq
+[aiortc]: https://github.com/aiortc/aiortc
+[numexpr]: https://github.com/pydata/numexpr
+[coverage.py]: https://github.com/nedbat/coveragepy
+[h5py]: https://github.com/h5py/h5py
+[River]: https://github.com/online-ml/river
+[PyAV]: https://github.com/PyAV-Org/PyAV
+[Dependency Injector]: https://github.com/ets-labs/python-dependency-injector
+[PyTables]: https://github.com/PyTables/PyTables
+[ruptures]: https://github.com/deepcharles/ruptures
+[aioquic]: https://github.com/aiortc/aioquic
+[google neuroglancer]: https://github.com/google/neuroglancer
+[pikepdf]: https://github.com/pikepdf/pikepdf
+[AutoPy]: https://github.com/autopilot-rs/autopy
+[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
+[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
+[Tokenizer]: https://github.com/OpenNMT/Tokenizer
+[bx-python]: https://github.com/bxlab/bx-python
+[boost-histogram]: https://github.com/scikit-hep/boost-histogram
+[pybase64]: https://github.com/mayeut/pybase64
+[TgCrypto]: https://github.com/pyrogram/tgcrypto
+[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
+[Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build
+[pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext
+[polaroid]: https://github.com/daggy1234/polaroid
+[xmlstarlet]: https://github.com/dimitern/xmlstarlet
+[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example
+
+[appveyor icon]: docs/data/readme_icons/appveyor.svg
+[github icon]: docs/data/readme_icons/github.svg
+[azurepipelines icon]: docs/data/readme_icons/azurepipelines.svg
+[circleci icon]: docs/data/readme_icons/circleci.svg
+[gitlab icon]: docs/data/readme_icons/gitlab.svg
+[travisci icon]: docs/data/readme_icons/travisci.svg
+[windows icon]: docs/data/readme_icons/windows.svg
+[apple icon]: docs/data/readme_icons/apple.svg
+[linux icon]: docs/data/readme_icons/linux.svg
+
+<!-- scikit-learn: 44749, last pushed 0 days ago -->
+<!-- Matplotlib: 13218, last pushed 0 days ago -->
+<!-- MyPy: 10122, last pushed 0 days ago -->
+<!-- psutil: 7128, last pushed 7 days ago -->
+<!-- scikit-image: 4220, last pushed 0 days ago -->
+<!-- twisted-iocpsupport: 4184, last pushed 0 days ago -->
+<!-- websockets: 3217, last pushed 13 days ago -->
+<!-- pyzmq: 2707, last pushed 13 days ago -->
+<!-- aiortc: 2244, last pushed 0 days ago -->
+<!-- numexpr: 1548, last pushed 0 days ago -->
+<!-- coverage.py: 1515, last pushed 1 days ago -->
+<!-- h5py: 1485, last pushed 0 days ago -->
+<!-- River: 1428, last pushed 0 days ago -->
+<!-- PyAV: 1182, last pushed 2 days ago -->
+<!-- Dependency Injector: 1163, last pushed 0 days ago -->
+<!-- PyTables: 1005, last pushed 18 days ago -->
+<!-- ruptures: 637, last pushed 1 days ago -->
+<!-- aioquic: 587, last pushed 15 days ago -->
+<!-- google neuroglancer: 568, last pushed 5 days ago -->
+<!-- pikepdf: 548, last pushed 0 days ago -->
+<!-- AutoPy: 519, last pushed 175 days ago -->
+<!-- Parselmouth: 471, last pushed 0 days ago -->
+<!-- python-rapidjson: 415, last pushed 80 days ago -->
+<!-- Rtree: 388, last pushed 69 days ago -->
+<!-- python-snappy: 386, last pushed 6 days ago -->
+<!-- markupsafe: 365, last pushed 2 days ago -->
+<!-- KDEpy: 242, last pushed 16 days ago -->
+<!-- cyvcf2: 242, last pushed 17 days ago -->
+<!-- pybind11 cmake_example: 239, last pushed 77 days ago -->
+<!-- pybind11 python_example: 235, last pushed 22 days ago -->
+<!-- sourmash: 235, last pushed 0 days ago -->
+<!-- dd-trace-py: 217, last pushed 0 days ago -->
+<!-- iminuit: 172, last pushed 20 days ago -->
+<!-- jq.py: 147, last pushed 7 days ago -->
+<!-- time-machine: 139, last pushed 4 days ago -->
+<!-- matrixprofile: 138, last pushed 36 days ago -->
+<!-- CTranslate2: 133, last pushed 0 days ago -->
+<!-- Tokenizer: 126, last pushed 0 days ago -->
+<!-- bx-python: 97, last pushed 2 days ago -->
+<!-- boost-histogram: 69, last pushed 0 days ago -->
+<!-- pybase64: 56, last pushed 1 days ago -->
+<!-- TgCrypto: 52, last pushed 106 days ago -->
+<!-- etebase-py: 46, last pushed 58 days ago -->
+<!-- pyjet: 27, last pushed 7 days ago -->
+<!-- numpythia: 25, last pushed 7 days ago -->
+<!-- fathon: 22, last pushed 31 days ago -->
+<!-- Imagecodecs (fork): 16, last pushed 4 days ago -->
+<!-- pyinstrument_cext: 10, last pushed 19 days ago -->
+<!-- polaroid: 9, last pushed 0 days ago -->
+<!-- xmlstarlet: 7, last pushed 1 days ago -->
+<!-- pybind11 scikit_build_example: 4, last pushed 40 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`.
 >
 > <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>
 
+<!--working-examples-end-->
+
 Legal note
 ----------
 
@@ -159,6 +323,161 @@ This is similar to static linking, so it might have some licence implications. C
 Changelog
 =========
 
+<!--changelog-start-->
+
+### v1.11.0
+
+- 📚 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_
+
+- 🌟 Added support for Apple Silicon wheels on macOS! You can now
+  cross-compile `universal2` and `arm64` wheels on your existing macOS Intel
+  runners, by setting
+  [CIBW_ARCHS_MACOS](https://cibuildwheel.readthedocs.io/en/stable/options/#archs).
+  Xcode 12.2 or later is required, but you don't need macOS 11.0 - you can
+  still build on macOS 10.15. See
+  [this FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#apple-silicon)
+  for more information. (#484)
+- 🌟 Added auto-detection of your package's Python compatibility, via declared
+   [`requires-python`](https://www.python.org/dev/peps/pep-0621/#requires-python)
+  in your `pyproject.toml`, or
+  [`python_requires`](https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires)
+  in `setup.cfg` or `setup.py`. If your project has these set, cibuildwheel
+  will automatically skip builds on versions of Python that your package
+  doesn't support. Hopefully this makes the first-run experience of
+  cibuildwheel a bit easier. If you need to override this for any reason,
+  look at [`CIBW_PROJECT_REQUIRES_PYTHON`](https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python).
+  (#536)
+- 🌟 cibuildwheel can now be invoked as a native GitHub Action! You can now
+  invoke cibuildwheel in a GHA build step like:
+
+  ```yaml
+  - name: Build wheels
+    uses: joerick/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)
+- ✨ cibuildwheel now prints a list of the wheels built at the end of each
+  run. (#570)
+- 📚 Lots of minor docs improvements.
+
+### 1.8.0
+
+_22 January 2021_
+
+- 🌟 Added support for emulated builds! You can now build manylinux wheels on
+  ARM64`aarch64`, as well as `ppc64le` and 's390x'. To build under emulation,
+  register QEMU via binfmt_misc and set the
+  [`CIBW_ARCHS_LINUX`](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)
+  option to the architectures you want to run. See
+  [this FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#emulation)
+  for more information. (#482)
+- ✨ Added `CIBW_TEST_SKIP` option. This allows you to choose certain builds
+  whose tests you'd like to skip. This might be useful when running a slow
+  test suite under emulation, for example. (#537)
+- ✨ Added `curly-{brace,bracket,paren}` style globbing to `CIBW_BUILD` and
+  `CIBW_SKIP`. This gives more expressivity, letting you do things like
+  `CIBW_BUILD=cp39-manylinux_{aarch64,ppc64le}`. (#527)
+- 🛠 cibuildwheel will now exit with an error if it's called with options that
+  skip all builds on a platform. This feature can be disabled by adding
+  `--allow-empty` on the command line. (#545)
+
+### 1.7.4
+
+_2 January 2021_
+
+- 🐛 Fix the PyPy virtualenv patch to work on macOS 10.14 (#506)
+
+### 1.7.3
+
+_1 January 2021_
+
+- 🛠 Added a patch for Pypy to ensure header files are available for building
+  in a virtualenv. (#502)
+- 🛠 Some preparatory work towards using cibuildwheel as a GitHub Action.
+  Check out
+  [the FAQ](https://cibuildwheel.readthedocs.io/en/stable/faq/#option-1-github-action)
+  for information on how to use it. We'll be fully updating the docs to this
+  approach in a subsequent release (#494)
+
+### 1.7.2
+
+_21 December 2020_
+
+- 🛠 Update dependencies, notably wheel==0.36.2 and pip==20.3.3, and CPython to
+  their latest bugfix releases (#489)
+- 📚 Switch to a GitHub example in the README (#479)
+- 📚 Create Working Examples table, with many projects that use cibuildwheel (#474)
+- 📚 Import Working Examples table and Changelog to docs
+
+### 1.7.1
+
+_3 December 2020_
+
+- 🛠 Update manylinux2010 image to resolve issues with 'yum' repositories
+  (#472)
+
+### 1.7.0
+
+_26 November 2020_
+
+- ✨ New logging format, that uses 'fold groups' in CI services that support
+  it. (#458)
+- 🛠 Update PyPy to 7.3.3 (#460)
+- 🐛 Fix a bug where CIBW_BEFORE_ALL runs with a very old version of Python on
+  Linux. (#464)
+
+### 1.6.4
+
+_31 October 2020_
+
+- 🐛 Fix crash on Appveyor during nuget install due to old system CA
+  certificates. We now use certifi's CA certs to download files. (#455)
+
+### 1.6.3
+
+_12 October 2020_
+
+- 🐛 Fix missing SSL certificates on macOS (#447)
+- 🛠 Update OpenSSL Python 3.5 patch to 1.1.1h on macOS (#449)
+
+### 1.6.2
+
+_9 October 2020_
+
+- ✨ Python 3.9 updated to the final release version - v3.9.0 (#440)
+- 🛠 Pypy updated to v7.3.2, adding alpha support for Python 3.7 (#430)
+
 ### 1.6.1
 
 _20 September 2020_
@@ -179,6 +498,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
@@ -222,7 +542,7 @@ _8 July 2020_
 _25 June 2020_
 
 - 🐛 Fix "OSError: [WinError 17] The system cannot move the file to a different
-  disk drive" on Github Actions (#388, #389)
+  disk drive" on GitHub Actions (#388, #389)
 
 ### 1.5.0
 
@@ -236,7 +556,7 @@ _24 June 2020_
   (#360, #358)
 - ✨ Added workaround to allow Python 3.5 on Windows to pull dependencies from
   pyproject.toml. (#358)
-- 📚 Improved Github Actions examples and docs (#354, #362)
+- 📚 Improved GitHub Actions examples and docs (#354, #362)
 - 🐛 Ensure pip wheel uses the specified package, and doesn't build a wheel
   from PyPI (#369)
 - 🛠 Internal changes: using pathlib.Path, precommit hooks, testing
@@ -276,6 +596,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)
@@ -286,6 +607,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.
@@ -294,7 +616,7 @@ _2 May 2020_
 
 _12 March 2020_
 
-- 🌟 Add support for building on Github Actions! Check out the
+- 🌟 Add support for building on GitHub Actions! Check out the
   [docs](https://cibuildwheel.readthedocs.io/en/stable/setup/#github-actions)
   for information on how to set it up. (#194)
 - ✨ Add the `CIBW_BEFORE_TEST` option, which lets you run a command to
@@ -528,6 +850,8 @@ _31 March 2017_
 
 - 🌟 First public release!
 
+<!--changelog-end-->
+
 Contributing
 ============
 
@@ -539,6 +863,7 @@ Maintainers
 - Joe Rickerby [@joerick](https://github.com/joerick)
 - Yannick Jadoul [@YannickJadoul](https://github.com/YannickJadoul)
 - Matthieu Darbois [@mayeut](https://github.com/mayeut)
+- Henry Schreiner [@henryiii](https://github.com/henryiii)
 
 Credits
 -------
@@ -554,10 +879,12 @@ 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!
+- @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
 
 See also
 ========
 
 If you'd like to keep wheel building separate from the package itself, check out [astrofrog/autowheel](https://github.com/astrofrog/autowheel). It builds packages using cibuildwheel from source distributions on PyPI.
 
-If `cibuildwheel` is too limited for your needs, consider [matthew-brett/multibuild](http://github.com/matthew-brett/multibuild). `multibuild` is a toolbox for building a wheel on various platforms. It can do a lot more than this project - it's used to build SciPy!
+Another very similar tool to consider is [matthew-brett/multibuild](http://github.com/matthew-brett/multibuild). `multibuild` is a shell script toolbox for building a wheel on various platforms. It is used as a basis to build some of the big data science tools, like SciPy.

action.yml

@@ -0,0 +1,28 @@
+name: cibuildwheel
+description: 'Installs and runs cibuildwheel on the current runner'
+inputs:
+  package-dir:
+    description: 'Input directory, defaults to "."'
+    required: false
+    default: .
+  output-dir:
+    description: 'Folder to place the outputs in, defaults to "wheelhouse"'
+    required: false
+    default: wheelhouse
+branding:
+  icon: package
+  color: yellow
+
+runs:
+  using: composite
+  steps:
+
+    # This needs powershell-core because github.action path is a Windows-style
+    # path on Windows.  Powershell-core understands both types of paths.
+    - run: >
+        pipx run
+        --spec ${{ github.action_path }}
+        cibuildwheel
+        ${{ inputs.package-dir }}
+        --output-dir ${{ inputs.output-dir }}
+      shell: pwsh

appveyor.yml

@@ -1,7 +1,4 @@
 environment:
-  # workaround an appveyor bug on macos
-  # see https://github.com/appveyor/ci/issues/3376#issuecomment-611314299
-  APPVEYOR_CONSOLE_DISABLE_PTY: true
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu
       APPVEYOR_JOB_NAME: "python37-x64-ubuntu"
@@ -10,11 +7,6 @@ environment:
     - APPVEYOR_BUILD_WORKER_IMAGE: macos-mojave
       APPVEYOR_JOB_NAME: "python37-x64-macos-mojave"
 
-# while pypy libffi dependency is failing the build, allow failures on macos
-matrix:
-  allow_failures:
-    - APPVEYOR_BUILD_WORKER_IMAGE: macos-mojave
-
 stack: python 3.7
 
 build: off
@@ -24,10 +16,10 @@ init:
 - ps: |
       $BRANCH = if ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH) { $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH } else { $env:APPVEYOR_REPO_BRANCH }
       if (-not ($BRANCH -eq 'master' -or $BRANCH.ToLower().StartsWith('appveyor-'))) {
-        $env:PYTEST_ADDOPTS='-k "unit_test or _basic" --suppress-no-test-exit-code'
+        $env:PYTEST_ADDOPTS='-k "unit_test or test_0_basic" --suppress-no-test-exit-code'
       }
 
-install: python -m pip install -r requirements-dev.txt pytest-custom-exit-code
+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.

azure-pipelines.yml

@@ -6,7 +6,7 @@ jobs:
       inputs:
         versionSpec: '3.8'
     - bash: |
-        python -m pip install -r requirements-dev.txt pytest-azurepipelines
+        python -m pip install -e ".[dev]" pytest-azurepipelines
         python ./bin/run_tests.py
 
 - job: macos_38
@@ -16,7 +16,7 @@ jobs:
       inputs:
         versionSpec: '3.8'
     - bash: |
-        python -m pip install -r requirements-dev.txt pytest-azurepipelines
+        python -m pip install -e ".[dev]" pytest-azurepipelines
         python ./bin/run_tests.py
 
 - job: windows_36
@@ -26,10 +26,8 @@ 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 -r requirements-dev.txt pytest-azurepipelines
+        python -m pip install -e ".[dev]" pytest-azurepipelines
         python ./bin/run_tests.py
 
 - job: windows_38
@@ -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 -r requirements-dev.txt pytest-azurepipelines
+        python -m pip install -e ".[dev]" pytest-azurepipelines
         python ./bin/run_tests.py

bin/bump_version.py

@@ -1,41 +1,76 @@
 #!/usr/bin/env python3
 
-import click
-from pathlib import Path
-import os
-import cibuildwheel
-from packaging.version import Version, InvalidVersion
-import subprocess
+
+from __future__ import annotations
+
 import glob
+import os
+import subprocess
+import sys
+import urllib.parse
+from pathlib import Path
+
+import click
+from packaging.version import InvalidVersion, Version
+
+import cibuildwheel
 
 config = [
     # file path, version find/replace format
-    ('cibuildwheel/__init__.py', "__version__ = '{}'"),
-    ('setup.py', "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"
+
 
 @click.command()
-def bump_version():
+def bump_version() -> None:
+    current_version = cibuildwheel.__version__
+
+    try:
+        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_opts = urllib.parse.urlencode({'q': f'is:pr merged:>{cd_date}T{cd_time}{cd_tz}'})
+        url = f'https://github.com/joerick/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.')
+
     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.')
-        exit(1)
+        sys.exit(1)
 
-    current_version = cibuildwheel.__version__
+    # 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/')
-        exit(1)
+        sys.exit(1)
 
     actions = []
 
@@ -43,8 +78,8 @@ 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')
-            exit(1)
+            print(f"error: Pattern {path_pattern} didn't match any files")
+            sys.exit(1)
 
         find_pattern = version_pattern.format(current_version)
         replace_pattern = version_pattern.format(new_version)
@@ -55,30 +90,28 @@ def bump_version():
             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('error: Didn’t find any occurences of “{}” in “{}”'.format(find_pattern, path_pattern))
-            exit(1)
+            print(f'''error: Didn't find any occurrences of "{find_pattern}" in "{path_pattern}"''')
+            sys.exit(1)
 
     print()
     print("Here's the plan:")
     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('Then commit, and tag as v{}'.format(new_version))
+    print(f'Then commit, and tag as v{new_version}')
 
     answer = input('Proceed? [y/N] ').strip()
 
     if answer != 'y':
         print('Aborted')
-        exit(1)
+        sys.exit(1)
 
     for path, find, replace in actions:
         contents = path.read_text(encoding='utf8')
@@ -87,27 +120,27 @@ def bump_version():
 
     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':
         pass
 
     subprocess.run([
         'git', 'commit',
-        '-a',
-        '-m', f'Bump version: v{new_version}'
+        '--all',
+        f"--message='Bump version: v{new_version}'",
     ], check=True)
 
     subprocess.run([
         'git', 'tag',
-        '-a',
-        '-m', f'v{new_version}',
-        f'v{new_version}'
+        '--annotate',
+        f"--message='v{new_version}'",
+        f'v{new_version}',
     ], check=True)
 
     print('Done.')
 
 
 if __name__ == '__main__':
-    os.chdir(os.path.dirname(__file__))
-    os.chdir('..')
+    os.chdir(Path(__file__).parent.parent.resolve())
     bump_version()

bin/inspect_all_known_projects.py

@@ -0,0 +1,110 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import ast
+from pathlib import Path
+from typing import Iterator
+
+import click
+import yaml
+from ghapi.core import GhApi, HTTP404NotFoundError  # type: ignore
+from rich import print
+
+from cibuildwheel.projectfiles import Analyzer
+
+DIR = Path(__file__).parent.resolve()
+
+
+def parse(contents: str) -> str | None:
+    try:
+        tree = ast.parse(contents)
+        analyzer = Analyzer()
+        analyzer.visit(tree)
+        return analyzer.requires_python or ""
+    except Exception:
+        return None
+
+
+def check_repo(name: str, contents: str) -> str:
+    s = f"  {name}: "
+    if name == "setup.py":
+        if "python_requires" not in contents:
+            s += "❌"
+        res = parse(contents)
+        if res is None:
+            s += "⚠️ "
+        elif res:
+            s += "✅ " + res
+        elif "python_requires" in contents:
+            s += "☑️"
+
+    elif name == "setup.cfg":
+        s += "✅" if "python_requires" in contents else "❌"
+    else:
+        s += "✅" if "requires-python" in contents else "❌"
+
+    return s
+
+
+class MaybeRemote:
+    def __init__(self, cached_file: Path | str, *, online: bool) -> None:
+        self.online = online
+        if self.online:
+            self.contents: dict[str, dict[str, str | None]] = {
+                "setup.py": {},
+                "setup.cfg": {},
+                "pyproject.toml": {},
+            }
+        else:
+            with open(cached_file) as f:
+                self.contents = yaml.safe_load(f)
+
+    def get(self, repo: str, filename: str) -> str | None:
+        if self.online:
+            try:
+                self.contents[filename][repo] = (
+                    GhApi(*repo.split("/")).get_content(filename).decode()
+                )
+            except HTTP404NotFoundError:
+                self.contents[filename][repo] = None
+            return self.contents[filename][repo]
+        elif repo in self.contents[filename]:
+            return self.contents[filename][repo]
+        else:
+            raise RuntimeError(
+                f"Trying to access {repo}:{filename} and not in cache, rebuild cache"
+            )
+
+    def save(self, filename: Path | str) -> None:
+        with open(filename, "w") as f:
+            yaml.safe_dump(self.contents, f, default_flow_style=False)
+
+    def on_each(self, repos: list[str]) -> Iterator[tuple[str, str, str | None]]:
+        for repo in repos:
+            print(f"[bold]{repo}:")
+            for filename in sorted(self.contents, reverse=True):
+                yield repo, filename, self.get(repo, filename)
+
+
+@click.command()
+@click.option("--online", is_flag=True, help="Remember to set GITHUB_TOKEN")
+def main(online: bool) -> None:
+    with open(DIR / "../docs/data/projects.yml") as f:
+        known = yaml.safe_load(f)
+
+    repos = [x["gh"] for x in known]
+
+    ghinfo = MaybeRemote("all_known_setup.yaml", online=online)
+
+    for _, filename, contents in ghinfo.on_each(repos):
+        if contents is None:
+            print(f"[red]  {filename}: Not found")
+        else:
+            print(check_repo(filename, contents))
+
+    if online:
+        ghinfo.save("all_known_setup.yaml")
+
+
+if __name__ == "__main__":
+    main()

bin/make_dependency_update_pr.py

@@ -1,12 +1,15 @@
 #!/usr/bin/env python3
 
+from __future__ import annotations
+
 import os
+import sys
+import textwrap
 import time
 from pathlib import Path
 from subprocess import run
 
 import click
-import textwrap
 
 
 def shell(cmd, **kwargs):
@@ -26,7 +29,7 @@ def main():
 
     if git_repo_has_changes():
         print('Your git repo has uncommitted changes. Commit or stash before continuing.')
-        exit(1)
+        sys.exit(1)
 
     previous_branch = shell('git rev-parse --abbrev-ref HEAD',
                             check=True,
@@ -48,17 +51,18 @@ def main():
             return
 
         shell('git commit -a -m "Update dependencies"', check=True)
-        run(
-            [
-                'gh', 'pr', 'create',
-                '--repo', 'joerick/cibuildwheel',
-                '--base', 'master',
-                '--title', 'Update dependencies',
-                '--body', textwrap.dedent(f'''
+        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'",
+                f"--body='{body}'",
             ],
             check=True
         )

bin/projects.py

@@ -0,0 +1,204 @@
+#!/usr/bin/env python3
+
+"""
+Convert a yaml project list into a nice table.
+
+Suggested usage:
+
+    ./bin/projects.py docs/data/projects.yml --online --auth $GITHUB_API_TOKEN --readme README.md
+    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, TextIO
+
+import click
+import yaml
+from github import Github, GithubException
+
+ICONS = (
+    "appveyor",
+    "github",
+    "azurepipelines",
+    "circleci",
+    "gitlab",
+    "travisci",
+    "windows",
+    "apple",
+    "linux",
+)
+
+
+class Project:
+    NAME: int = 0
+
+    def __init__(self, config: dict[str, Any], github: Github | None = None):
+        try:
+            self.name: str = config["name"]
+            self.gh: str = config["gh"]
+        except KeyError:
+            print("Invalid config, needs at least gh and name!", config)
+            raise
+
+        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.online = github is not None
+        if github is not None:
+            try:
+                repo = github.get_repo(self.stars_repo)
+            except GithubException:
+                print(f"Broken: {self.stars_repo}")
+                raise
+
+            self.num_stars = repo.stargazers_count
+            self.pushed_at = repo.pushed_at
+            if not self.notes:
+                notes = repo.description
+                if repo.description:
+                    self.notes = notes
+        else:
+            self.num_stars = 0
+            self.pushed_at = datetime.utcnow()
+
+        name_len = len(self.name) + 4
+        self.__class__.NAME = max(self.__class__.NAME, name_len)
+
+    def __lt__(self, other: Project) -> bool:
+        if self.online:
+            return self.num_stars < other.num_stars
+        else:
+            return self.name < other.name
+
+    @classmethod
+    def header(cls) -> str:
+        return textwrap.dedent(f"""\
+                | {'Name':{cls.NAME}} | CI | OS | Notes |
+                |{'':-^{cls.NAME+2  }}|----|----|:------|""")
+
+    @property
+    def namelink(self) -> str:
+        return f"[{self.name}][]"
+
+    @property
+    def starslink(self) -> str:
+        return f"![{self.name} stars][]"
+
+    @property
+    def url(self) -> str:
+        return f"https://github.com/{self.gh}"
+
+    @property
+    def ci_icons(self) -> str:
+        return " ".join(f"![{icon} icon][]" for icon in self.ci)
+
+    @property
+    def os_icons(self) -> str:
+        return " ".join(f"![{icon} icon][]" for icon in self.os)
+
+    def table_row(self) -> str:
+        notes = self.notes.replace('\n', ' ')
+        return f"| {self.namelink: <{self.NAME}} | {self.ci_icons} | {self.os_icons} | {notes} |"
+
+    def links(self) -> str:
+        return f"[{self.name}]: {self.url}"
+
+    def info(self) -> str:
+        days = (datetime.utcnow() - self.pushed_at).days
+        return f"<!-- {self.name}: {self.num_stars}, last pushed {days} days ago -->"
+
+
+def fetch_icon(icon_name: str) -> None:
+    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')
+
+    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:
+        f.write(svgElement.toxml())
+
+
+def path_for_icon(icon_name: str) -> Path:
+    return Path('.') / 'docs' / 'data' / 'readme_icons' / f'{icon_name}.svg'
+
+
+def str_projects(
+    config: list[dict[str, Any]], *, online: bool = True, auth: str | None = None,
+) -> str:
+    io = StringIO()
+    print = functools.partial(builtins.print, file=io)
+
+    if online:
+        for icon in ICONS:
+            fetch_icon(icon)
+
+    github = Github(auth) if online else None
+
+    projects = sorted((Project(item, github) for item in config), reverse=online)
+
+    print(Project.header())
+    for project in projects:
+        print(project.table_row())
+
+    print()
+    for project in projects:
+        print(project.links())
+
+    print()
+    for icon in ICONS:
+        print(f"[{icon} icon]: {path_for_icon(icon).as_posix()}")
+
+    print()
+    for project in projects:
+        print(project.info())
+
+    return io.getvalue()
+
+
+@click.command(help="Try ./bin/projects.py docs/data/projects.yml --readme README.md")
+@click.argument("input", type=click.File("r"))
+@click.option("--online/--no-online", default=True, help="Get info from GitHub")
+@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: str | None, readme: TextIO | None
+) -> None:
+    config = yaml.safe_load(input)
+    output = str_projects(config, online=online, auth=auth)
+
+    if readme is None:
+        print(output)
+    else:
+        text = readme.read()
+        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} -->'
+        new_text = f"{text[:start + len(start_str)]}\n{generated_note}\n\n{output}\n{text[end:]}"
+
+        readme.seek(0)
+        readme.write(new_text)
+        readme.truncate()
+
+
+if __name__ == "__main__":
+    projects()

bin/run_example_ci_configs.py

@@ -1,16 +1,20 @@
 #!/usr/bin/env python3
 
+from __future__ import annotations
+
 import os
-from pathlib import Path
 import shutil
-from subprocess import run
 import sys
 import textwrap
 import time
-import click
 from collections import namedtuple
+from glob import glob
+from pathlib import Path
+from subprocess import run
 from urllib.parse import quote
 
+import click
+
 
 def shell(cmd, **kwargs):
     return run([cmd], shell=True, **kwargs)
@@ -30,52 +34,73 @@ def generate_basic_project(path):
     project.generate(path)
 
 
-CIService = namedtuple('CIService', 'name src_config_path dst_config_path badge_md')
+CIService = namedtuple('CIService', 'name dst_config_path badge_md')
 services = [
     CIService(
         name='appveyor',
-        src_config_path='examples/appveyor-minimal.yml',
         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})',
     ),
     CIService(
         name='azure-pipelines',
-        src_config_path='examples/azure-pipelines-minimal.yml',
         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='circle-ci',
-        src_config_path='examples/circleci-minimal.yml',
+        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})',
     ),
     CIService(
         name='github',
-        src_config_path='examples/github-minimal.yml',
         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)',
     ),
     CIService(
         name='travis-ci',
-        src_config_path='examples/travis-ci-minimal.yml',
         dst_config_path='.travis.yml',
         badge_md='[![Build Status](https://travis-ci.org/joerick/cibuildwheel.svg?branch={branch})](https://travis-ci.org/joerick/cibuildwheel)',
     ),
     CIService(
         name='gitlab',
-        src_config_path='examples/gitlab-minimal.yml',
         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})'
     ),
 ]
 
 
+def ci_service_for_config_file(config_file):
+    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}')
+
+
 @click.command()
-def run_example_ci_configs():
+@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
+    '''
+
+    if len(config_files) == 0:
+        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')
+        configs_by_service[service.name] = config_file
+
     if git_repo_has_changes():
         print('Your git repo has uncommitted changes. Commit or stash before continuing.')
-        exit(1)
+        sys.exit(1)
 
     previous_branch = shell('git rev-parse --abbrev-ref HEAD',
                             check=True,
@@ -91,21 +116,23 @@ def run_example_ci_configs():
         example_project = Path('example_root')
         generate_basic_project(example_project)
 
-        for service in services:
-            src_config_file = Path(service.src_config_path)
+        for config_file in config_files:
+            service = ci_service_for_config_file(config_file)
+            src_config_file = Path(config_file)
             dst_config_file = example_project / service.dst_config_path
 
             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', '-m', textwrap.dedent(f'''
+        message = textwrap.dedent(f'''
             Test example minimal configs
 
-            Testing files: {[s.src_config_path for s in services]}
+            Testing files: {config_files}
             Generated from branch: {previous_branch}
             Time: {timestamp}
-        ''')], 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('---')
@@ -116,9 +143,10 @@ def run_example_ci_configs():
         print('> ')
         print('> | Service | Config | Status |')
         print('> |---|---|---|')
-        for service in services:
+        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} | `{service.src_config_path}` | {badge} |')
+            print(f'> | {service.name} | `{config_file}` | {badge} |')
         print('> ')
         print('> Generated by `bin/run_example_ci_config.py`')
         print()

bin/run_tests.py

@@ -14,7 +14,7 @@ if __name__ == '__main__':
     # run the docker unit tests only on Linux
     if sys.platform.startswith('linux'):
         unit_test_args += ['--run-docker']
-    subprocess.check_call(unit_test_args)
+    subprocess.run(unit_test_args, check=True)
 
     # run the integration tests
-    subprocess.check_call([sys.executable, '-m', 'pytest', '-x', '--durations', '0', 'test'])
+    subprocess.run([sys.executable, '-m', 'pytest', '-x', '--durations', '0', '--timeout=2400', 'test'], check=True)

bin/sample_build.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+
+from __future__ import annotations
+
+import argparse
+import os
+import subprocess
+import sys
+import tempfile
+from pathlib import Path
+
+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')
+
+    options = parser.parse_args()
+
+    project_dir = tempfile.mkdtemp()
+    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)

bin/update_dependencies.py

@@ -1,9 +1,12 @@
 #!/usr/bin/env python3
+from __future__ import annotations
 
 import configparser
 import os
+import shutil
 import subprocess
-from collections import namedtuple
+import sys
+from typing import NamedTuple
 
 import requests
 
@@ -12,48 +15,82 @@ os.chdir('..')
 
 # CUSTOM_COMPILE_COMMAND is a pip-compile option that tells users how to
 # regenerate the constraints files
-os.environ['CUSTOM_COMPILE_COMMAND'] = "bin/update_constraints.py"
-subprocess.check_call([
-    'pip-compile',
-    '--allow-unsafe',
-    '--upgrade',
-    'cibuildwheel/resources/constraints.in',
-])
-for python_version in ['27', '35', '36']:
-    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'
-    ])
+os.environ['CUSTOM_COMPILE_COMMAND'] = "bin/update_dependencies.py"
+
+PYTHON_VERSIONS = ['27', '35', '36', '37', '38', '39']
+
+if '--no-docker' in sys.argv:
+    for python_version in PYTHON_VERSIONS:
+        subprocess.run([
+            f'./env{python_version}/bin/pip-compile',
+            '--allow-unsafe',
+            '--upgrade',
+            'cibuildwheel/resources/constraints.in',
+            '--output-file=cibuildwheel/resources/constraints-python{python_version}.txt',
+        ], check=True)
+else:
+    # latest manylinux2010 image with cpython 2.7 support
+    image_runner = 'quay.io/pypa/manylinux2010_x86_64:2021-02-06-3d322a5'
+    subprocess.run(['docker', 'pull', image_runner], check=True)
+    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.run([
+            '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'
+        ], check=True)
+
+# default constraints.txt
+shutil.copyfile(f'cibuildwheel/resources/constraints-python{PYTHON_VERSIONS[-1]}.txt', 'cibuildwheel/resources/constraints.txt',)
+
+
+class Image(NamedTuple):
+    manylinux_version: str
+    platform: str
+    image_name: str
+    tag: str | None
 
-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('manylinux1', 'x86_64', 'quay.io/pypa/manylinux1_x86_64', None),
+    Image('manylinux1', 'i686', 'quay.io/pypa/manylinux1_i686', None),
 
-    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'),
+    # Images for manylinux2010 are pinned to the latest tag supporting cp27
+    Image('manylinux2010', 'x86_64', 'quay.io/pypa/manylinux2010_x86_64', '2021-02-06-3d322a5'),
+    Image('manylinux2010', 'i686', 'quay.io/pypa/manylinux2010_i686', '2021-02-06-3d322a5'),
 
-    Image('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'),
+    Image('manylinux2010', 'pypy_x86_64', 'pypywheels/manylinux2010-pypy_x86_64', 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),
+
+    # 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),
 ]
 
 config = configparser.ConfigParser()
 
 for image in images:
     # get the tag name whose digest matches 'latest'
-    if image.image_name.startswith('quay.io/'):
+    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'

bin/update_pythons.py

@@ -0,0 +1,308 @@
+#!/usr/bin/env python3
+
+from __future__ import annotations
+
+import copy
+import difflib
+import logging
+from pathlib import Path
+from typing import Union
+
+import click
+import requests
+import rich
+import toml
+from packaging.specifiers import Specifier
+from packaging.version import Version
+from rich.logging import RichHandler
+from rich.syntax import Syntax
+
+from cibuildwheel.extra import InlineArrayDictEncoder
+from cibuildwheel.typing import Final, Literal, TypedDict
+
+log = logging.getLogger("cibw")
+
+# Looking up the dir instead of using utils.resources_dir
+# since we want to write to it.
+DIR: Final[Path] = Path(__file__).parent.parent.resolve()
+RESOURCES_DIR: Final[Path] = DIR / "cibuildwheel/resources"
+
+
+ArchStr = Literal["32", "64"]
+
+
+class ConfigWinCP(TypedDict):
+    identifier: str
+    version: str
+    arch: str
+
+
+class ConfigWinPP(TypedDict):
+    identifier: str
+    version: str
+    arch: str
+    url: str
+
+
+class ConfigMacOS(TypedDict):
+    identifier: str
+    version: str
+    url: str
+
+
+AnyConfig = Union[ConfigWinCP, ConfigWinPP, ConfigMacOS]
+
+
+# The following set of "Versions" classes allow the initial call to the APIs to
+# be cached and reused in the `update_version_*` methods.
+
+
+class WindowsVersions:
+    def __init__(self, arch_str: ArchStr) -> None:
+
+        response = requests.get("https://api.nuget.org/v3/index.json")
+        response.raise_for_status()
+        api_info = response.json()
+
+        for resource in api_info["resources"]:
+            if resource["@type"] == "PackageBaseAddress/3.0.0":
+                endpoint = resource["@id"]
+
+        ARCH_DICT = {"32": "win32", "64": "win_amd64"}
+        PACKAGE_DICT = {"32": "pythonx86", "64": "python"}
+
+        self.arch_str = arch_str
+        self.arch = ARCH_DICT[arch_str]
+        package = PACKAGE_DICT[arch_str]
+
+        response = requests.get(f"{endpoint}{package}/index.json")
+        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)
+
+    def update_version_windows(self, spec: Specifier) -> ConfigWinCP | None:
+        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]
+        identifier = f"cp{version.major}{version.minor}-{self.arch}"
+        return ConfigWinCP(
+            identifier=identifier,
+            version=str(version),
+            arch=self.arch_str,
+        )
+
+
+class PyPyVersions:
+    def __init__(self, arch_str: ArchStr):
+
+        response = requests.get("https://downloads.python.org/pypy/versions.json")
+        response.raise_for_status()
+
+        releases = [r for r in response.json() if r["pypy_version"] != "nightly"]
+        for release in releases:
+            release["pypy_version"] = Version(release["pypy_version"])
+            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
+        ]
+        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")
+
+        releases = [r for r in self.releases if spec.contains(r["python_version"])]
+        releases = sorted(releases, key=lambda r: r["pypy_version"])
+
+        if not releases:
+            raise RuntimeError(f"PyPy Win {self.arch} not found for {spec}! {self.releases}")
+
+        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"]
+
+        return ConfigWinPP(
+            identifier=identifier,
+            version=f"{version.major}.{version.minor}",
+            arch="32",
+            url=url,
+        )
+
+    def update_version_macos(self, spec: Specifier) -> ConfigMacOS:
+        if self.arch != "64":
+            raise RuntimeError("Other archs not supported yet on macOS")
+
+        releases = [r for r in self.releases if spec.contains(r["python_version"])]
+        releases = sorted(releases, key=lambda r: r["pypy_version"])
+
+        if not releases:
+            raise RuntimeError(f"PyPy macOS {self.arch} not found for {spec}!")
+
+        release = releases[-1]
+        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"
+        ]
+
+        return ConfigMacOS(
+            identifier=identifier,
+            version=f"{version.major}.{version.minor}",
+            url=url,
+        )
+
+
+class CPythonVersions:
+    def __init__(self) -> None:
+
+        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] = {}
+        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
+
+    def update_version_macos(self, identifier: str, spec: Specifier) -> ConfigMacOS | None:
+        file_idents = ("macos11.pkg", "macosx10.9.pkg", "macosx10.6.pkg")
+        sorted_versions = sorted(v for v in self.versions_dict if spec.contains(v))
+
+        for version in reversed(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}")
+            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],
+                    )
+
+        return None
+
+
+# This is a universal interface to all the above Versions classes. Given an
+# identifier, it updates a config dict.
+
+
+class AllVersions:
+    def __init__(self) -> None:
+        self.windows_32 = WindowsVersions("32")
+        self.windows_64 = WindowsVersions("64")
+        self.windows_pypy = PyPyVersions("32")
+
+        self.macos_cpython = CPythonVersions()
+        self.macos_pypy = PyPyVersions("64")
+
+    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: AnyConfig | None
+
+        # We need to use ** in update due to MyPy (probably a bug)
+        if "macos" in identifier:
+            if 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:
+                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 config != orig_config:
+            log.info(f"  Updated {orig_config} to {config}")
+
+
+@click.command()
+@click.option("--force", is_flag=True)
+@click.option("--level", default="INFO", type=click.Choice(["INFO", "DEBUG", "TRACE"], case_sensitive=False))
+def update_pythons(force: bool, level: str) -> None:
+
+    logging.basicConfig(
+        level="INFO",
+        format="%(message)s",
+        datefmt="[%X]",
+        handlers=[RichHandler(rich_tracebacks=True, markup=True)],
+    )
+    log.setLevel(level)
+
+    all_versions = AllVersions()
+    toml_file_path = RESOURCES_DIR / "build-platforms.toml"
+
+    original_toml = toml_file_path.read_text()
+    configs = toml.loads(original_toml)
+
+    for config in configs["windows"]["python_configurations"]:
+        all_versions.update_config(config)
+
+    for config in configs["macos"]["python_configurations"]:
+        all_versions.update_config(config)
+
+    result_toml = toml.dumps(configs, encoder=InlineArrayDictEncoder())  # type: ignore
+
+    rich.print()  # spacer
+
+    if original_toml == result_toml:
+        rich.print("[green]Check complete, Python configurations unchanged.")
+        return
+
+    rich.print("Python configurations updated.")
+    rich.print("Changes:")
+    rich.print()
+
+    toml_relpath = toml_file_path.relative_to(DIR).as_posix()
+    diff_lines = difflib.unified_diff(
+        original_toml.splitlines(keepends=True),
+        result_toml.splitlines(keepends=True),
+        fromfile=toml_relpath,
+        tofile=toml_relpath,
+    )
+    rich.print(Syntax("".join(diff_lines), "diff", theme="ansi_light"))
+    rich.print()
+
+    if force:
+        toml_file_path.write_text(result_toml)
+        rich.print("[green]TOML file updated.")
+    else:
+        rich.print("[yellow]File left unchanged. Use --force flag to update.")
+
+
+if __name__ == "__main__":
+    update_pythons()

cibuildwheel/__init__.py

@@ -1 +1 @@
-__version__ = '1.6.1'
+__version__ = '1.11.0'

cibuildwheel/__main__.py

@@ -5,31 +5,35 @@ import textwrap
 import traceback
 from configparser import ConfigParser
 from pathlib import Path
+from typing import Dict, List, Optional, Set, Union, overload
 
-from typing import Any, Dict, List, Optional, overload
+from packaging.specifiers import SpecifierSet
 
 import cibuildwheel
 import cibuildwheel.linux
 import cibuildwheel.macos
+import cibuildwheel.util
 import cibuildwheel.windows
-from cibuildwheel.environment import (
-    EnvironmentParseError,
-    parse_environment,
-)
+from cibuildwheel.architecture import Architecture, allowed_architectures_check
+from cibuildwheel.environment import EnvironmentParseError, parse_environment
+from cibuildwheel.projectfiles import get_requires_python_str
+from cibuildwheel.typing import PLATFORMS, PlatformName, assert_never
 from cibuildwheel.util import (
     BuildOptions,
     BuildSelector,
     DependencyConstraints,
+    TestSelector,
     Unbuffered,
+    detect_ci_provider,
     resources_dir,
 )
 
 
 @overload
-def get_option_from_environment(option_name: str, platform: Optional[str], 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.
 
@@ -47,13 +51,9 @@ def get_option_from_environment(option_name: str, platform: Optional[str] = None
     return os.environ.get(option_name, default)
 
 
-def strtobool(val: str) -> bool:
-    if val.lower() in ('y', 'yes', 't', 'true', 'on', '1'):
-        return True
-    return False
-
-
 def main() -> None:
+    platform: PlatformName
+
     parser = argparse.ArgumentParser(
         description='Build wheels for all the platforms.',
         epilog='''
@@ -72,9 +72,23 @@ def main() -> None:
                             run in Windows, and it will build and test for all versions of
                             Python. Default: auto.
                         ''')
+
+    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('--output-dir',
                         default=os.environ.get('CIBW_OUTPUT_DIR', 'wheelhouse'),
                         help='Destination folder for the wheels.')
+
     parser.add_argument('package_dir',
                         default='.',
                         nargs='?',
@@ -89,6 +103,10 @@ def main() -> None:
                         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.')
+
     args = parser.parse_args()
 
     detect_obsolete_options()
@@ -96,14 +114,15 @@ def main() -> None:
     if args.platform != 'auto':
         platform = args.platform
     else:
-        ci = strtobool(os.environ.get('CI', 'false')) or 'BITRISE_BUILD_NUMBER' in os.environ or 'AZURE_HTTP_USER_AGENT' in os.environ or 'GITHUB_WORKFLOW' in os.environ
-        if not ci:
-            print('cibuildwheel: Unable to detect platform. cibuildwheel should run on your CI server, '
-                  'Travis CI, AppVeyor, Azure Pipelines, GitHub Actions and CircleCI 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)
-            exit(2)
+        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)
+            sys.exit(2)
         if sys.platform.startswith('linux'):
             platform = 'linux'
         elif sys.platform == 'darwin':
@@ -114,7 +133,11 @@ def main() -> None:
             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)
-            exit(2)
+            sys.exit(2)
+
+    if platform not in PLATFORMS:
+        print(f'cibuildwheel: Unsupported platform: {platform}', file=sys.stderr)
+        sys.exit(2)
 
     package_dir = Path(args.package_dir)
     output_dir = Path(args.output_dir)
@@ -122,11 +145,15 @@ def main() -> None:
     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 x86_64 -w {dest_dir} {wheel}'
-    else:
+        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', '')
+    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)
@@ -138,14 +165,26 @@ def main() -> None:
     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_selector = BuildSelector(build_config, skip_config)
+    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)
+        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 = 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)
+    test_selector = TestSelector(skip_config=test_skip)
 
     try:
         environment = parse_environment(environment_config)
     except (EnvironmentParseError, ValueError):
         print(f'cibuildwheel: Malformed environment option "{environment_config}"', file=sys.stderr)
         traceback.print_exc(None, sys.stderr)
-        exit(2)
+        sys.exit(2)
 
     if dependency_versions == 'pinned':
         dependency_constraints: Optional[DependencyConstraints] = DependencyConstraints.with_defaults()
@@ -167,14 +206,19 @@ def main() -> None:
     # This needs to be passed on to the docker container in linux.py
     os.environ['CIBUILDWHEEL'] = '1'
 
-    if not any((package_dir / name).exists()
-               for name in ["setup.py", "setup.cfg", "pyproject.toml"]):
-        print('cibuildwheel: Could not find setup.py, setup.cfg or pyproject.toml at root of package', file=sys.stderr)
-        exit(2)
+    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 = Architecture.parse_config(archs_config_str, platform=platform)
+
+    identifiers = get_build_identifiers(platform, build_selector, archs)
 
     if args.print_build_identifiers:
-        print_build_identifiers(platform, build_selector)
-        exit(0)
+        for identifier in identifiers:
+            print(identifier)
+        sys.exit(0)
 
     manylinux_images: Optional[Dict[str, str]] = None
     if platform == 'linux':
@@ -206,6 +250,7 @@ def main() -> None:
             manylinux_images[build_platform] = image
 
     build_options = BuildOptions(
+        architectures=archs,
         package_dir=package_dir,
         output_dir=output_dir,
         test_command=test_command,
@@ -216,6 +261,7 @@ def main() -> None:
         before_all=before_all,
         build_verbosity=build_verbosity,
         build_selector=build_selector,
+        test_selector=test_selector,
         repair_command=repair_command,
         environment=environment,
         dependency_constraints=dependency_constraints,
@@ -227,18 +273,29 @@ def main() -> None:
 
     print_preamble(platform, build_options)
 
+    try:
+        allowed_architectures_check(platform, build_options.architectures)
+    except ValueError as err:
+        print("cibuildwheel:", *err.args, file=sys.stderr)
+        sys.exit(4)
+
+    if not identifiers:
+        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)
 
-    if platform == 'linux':
-        cibuildwheel.linux.build(build_options)
-    elif platform == 'windows':
-        cibuildwheel.windows.build(build_options)
-    elif platform == 'macos':
-        cibuildwheel.macos.build(build_options)
-    else:
-        print(f'cibuildwheel: Unsupported platform: {platform}', file=sys.stderr)
-        exit(2)
+    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':
+            cibuildwheel.windows.build(build_options)
+        elif platform == 'macos':
+            cibuildwheel.macos.build(build_options)
+        else:
+            assert_never(platform)
 
 
 def detect_obsolete_options() -> None:
@@ -252,7 +309,7 @@ def detect_obsolete_options() -> None:
                 os.environ[alternative] = os.environ[deprecated]
             else:
                 print(f"Option '{alternative}' is not empty. Please unset '{deprecated}'")
-                exit(2)
+                sys.exit(2)
 
     # Check for deprecated identifiers in 'CIBW_BUILD' and 'CIBW_SKIP' options
     for option in ['CIBW_BUILD', 'CIBW_SKIP']:
@@ -288,17 +345,23 @@ def print_preamble(platform: str, build_options: BuildOptions) -> None:
     print('\nHere we go!\n')
 
 
-def print_build_identifiers(platform: str, build_selector: BuildSelector) -> None:
-    python_configurations: List[Any] = []
-    if platform == 'linux':
-        python_configurations = cibuildwheel.linux.get_python_configurations(build_selector)
-    elif platform == 'windows':
-        python_configurations = cibuildwheel.windows.get_python_configurations(build_selector)
-    elif platform == 'macos':
-        python_configurations = cibuildwheel.macos.get_python_configurations(build_selector)
+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]]
 
-    for config in python_configurations:
-        print(config.identifier)
+    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)
+
+    return [config.identifier for config in python_configurations]
 
 
 def detect_warnings(platform: str, build_options: BuildOptions) -> List[str]:
@@ -308,9 +371,13 @@ def detect_warnings(platform: str, build_options: BuildOptions) -> List[str]:
     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
 

cibuildwheel/architecture.py

@@ -0,0 +1,115 @@
+import functools
+import platform as platform_module
+import re
+from enum import Enum
+from typing import Set
+
+from .typing import Literal, PlatformName, assert_never
+
+PRETTY_NAMES = {'linux': 'Linux', 'macos': 'macOS', 'windows': 'Windows'}
+
+
+@functools.total_ordering
+class Architecture(Enum):
+    value: str
+
+    # mac/linux archs
+    x86_64 = 'x86_64'
+
+    # linux archs
+    i686 = 'i686'
+    aarch64 = 'aarch64'
+    ppc64le = 'ppc64le'
+    s390x = 's390x'
+
+    # mac archs
+    universal2 = 'universal2'
+    arm64 = 'arm64'
+
+    # windows archs
+    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]':
+        result = set()
+        for arch_str in re.split(r'[\s,]+', config):
+            if arch_str == 'auto':
+                result |= Architecture.auto_archs(platform=platform)
+            elif arch_str == 'native':
+                result.add(Architecture(platform_module.machine()))
+            elif arch_str == 'all':
+                result |= Architecture.all_archs(platform=platform)
+            elif arch_str == 'auto64':
+                result |= Architecture.bitness_archs(platform=platform, bitness="64")
+            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]':
+        native_architecture = Architecture(platform_module.machine())
+        result = {native_architecture}
+
+        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:
+            result.add(Architecture.x86)
+
+        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':
+            return {Architecture.x86_64, Architecture.arm64, Architecture.universal2}
+        elif platform == 'windows':
+            return {Architecture.x86, Architecture.AMD64}
+        else:
+            assert_never(platform)
+
+    @staticmethod
+    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':
+            return auto_archs - archs_32
+        elif bitness == '32':
+            return auto_archs & archs_32
+        else:
+            assert_never(bitness)
+
+
+def allowed_architectures_check(
+    platform: PlatformName,
+    architectures: Set[Architecture],
+) -> None:
+
+    allowed_architectures = Architecture.all_archs(platform)
+
+    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 not architectures <= allowed_architectures:
+        msg = f'Invalid archs option {architectures}. ' + msg
+        raise ValueError(msg)
+
+    if not architectures:
+        msg = 'Empty archs option set. ' + msg
+        raise ValueError(msg)

cibuildwheel/bashlex_eval.py

@@ -1,14 +1,14 @@
 import subprocess
 from typing import Callable, Dict, List, NamedTuple, Optional, Sequence
 
-import bashlex  # type: ignore
+import bashlex
 
 # a function that takes a command and the environment, and returns the result
 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):
@@ -50,7 +50,7 @@ def evaluate_node(node: bashlex.ast.node, context: NodeExecutionContext) -> str:
 
 
 def evaluate_word_node(node: bashlex.ast.node, context: NodeExecutionContext) -> str:
-    value = node.word
+    value: str = node.word
 
     for part in node.parts:
         part_string = context.input[part.pos[0]:part.pos[1]]
@@ -58,9 +58,8 @@ def evaluate_word_node(node: bashlex.ast.node, context: NodeExecutionContext) ->
 
         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)
@@ -85,9 +84,7 @@ def evaluate_nodes_as_compound_command(nodes: Sequence[bashlex.ast.node], contex
         if node.kind == 'command':
             result += evaluate_command_node(node, context=context)
         elif node.kind == 'operator':
-            if node.op == ';':
-                pass
-            else:
+            if node.op != ';':
                 raise ValueError(f'Unsupported bash operator: "{node.op}"')
         else:
             raise ValueError(f'Unsupported bash node in compound command: "{node.kind}"')
@@ -95,7 +92,7 @@ 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):
+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)
 

cibuildwheel/docker_container.py

@@ -5,9 +5,11 @@ import shlex
 import subprocess
 import sys
 import uuid
-from os import PathLike
 from pathlib import Path, PurePath
-from typing import IO, Dict, List, Optional, Sequence, Union
+from types import TracebackType
+from typing import IO, Dict, List, Optional, Sequence, Type, cast
+
+from .typing import PathOrStr, PopenBytes
 
 
 class DockerContainer:
@@ -23,14 +25,18 @@ class DockerContainer:
     '''
     UTILITY_PYTHON = '/opt/python/cp38-cp38/bin/python'
 
-    process: subprocess.Popen
+    process: PopenBytes
     bash_stdin: IO[bytes]
     bash_stdout: IO[bytes]
 
-    def __init__(self, docker_image: str, simulate_32_bit: bool = False, cwd: Optional[Union[str, PathLike]] = 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.")
+
         self.docker_image = docker_image
         self.simulate_32_bit = simulate_32_bit
         self.cwd = cwd
+        self.name: Optional[str] = None
 
     def __enter__(self) -> 'DockerContainer':
         self.name = f'cibuildwheel-{uuid.uuid4()}'
@@ -39,10 +45,10 @@ class DockerContainer:
         subprocess.run(
             [
                 'docker', 'create',
-                '--env', 'CIBUILDWHEEL',
-                '--name', self.name,
-                '-i',
-                '-v', '/:/host',  # ignored on CircleCI
+                '--env=CIBUILDWHEEL',
+                f'--name={self.name}',
+                '--interactive',
+                '--volume=/:/host',  # ignored on CircleCI
                 *cwd_args,
                 self.docker_image,
                 *shell_args
@@ -68,12 +74,19 @@ class DockerContainer:
 
         return self
 
-    def __exit__(self, exc_type, exc_val, exc_tb):
+    def __exit__(
+            self,
+            exc_type: Optional[Type[BaseException]],
+            exc_val: Optional[BaseException],
+            exc_tb: Optional[TracebackType]) -> None:
+
         self.bash_stdin.close()
         self.process.terminate()
         self.process.wait()
 
-        subprocess.run(['docker', 'rm', '--force', '-v', self.name])
+        assert isinstance(self.name, str)
+
+        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:
@@ -117,8 +130,12 @@ class DockerContainer:
 
         return [PurePath(p) for p in path_strs]
 
-    def call(self, args: Sequence[Union[str, PathLike]], env: Optional[Dict[str, str]] = None,
-             capture_output=False, cwd: Optional[Union[str, PathLike]] = None) -> str:
+    def call(
+            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)}'
@@ -152,13 +169,15 @@ 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
                 )
+                # fmt: on
                 returncode_str = line[footer_offset:footer_offset+4]
                 returncode = int(returncode_str)
                 # add the last line to output, without the footer
@@ -178,11 +197,12 @@ class DockerContainer:
         return output
 
     def get_environment(self) -> Dict[str, str]:
-        return json.loads(self.call([
+        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:
         # used as an EnvironmentExecutor to evaluate commands and capture output

cibuildwheel/environment.py

@@ -1,7 +1,7 @@
-import bashlex  # type: ignore
-
 from typing import Dict, List, Mapping, Optional
 
+import bashlex
+
 from . import bashlex_eval
 
 

cibuildwheel/extra.py

@@ -0,0 +1,23 @@
+"""
+These are utilities for the `/bin` scripts, not for the `cibuildwheel` program.
+"""
+
+from typing import Any, Dict
+
+import toml.encoder
+from packaging.version import Version
+
+
+class InlineArrayDictEncoder(toml.encoder.TomlEncoder):  # type: ignore
+    def __init__(self) -> None:
+        super().__init__()
+        self.dump_funcs[Version] = lambda v: f'"{v}"'
+
+    def dump_sections(self, o: Dict[str, Any], sup: str) -> Any:
+        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

@@ -1,35 +1,22 @@
-import platform
 import subprocess
 import sys
 import textwrap
-from os import PathLike
 from pathlib import Path, PurePath
-from typing import List, NamedTuple, Union
+from typing import List, NamedTuple, Set
 
+from .architecture import Architecture
 from .docker_container import DockerContainer
-from .util import (BuildOptions, BuildSelector, NonPlatformWheelError,
-                   get_build_verbosity_extra_flags, prepare_command)
-
-
-def matches_platform(identifier: str) -> bool:
-    pm = platform.machine()
-    if pm == "x86_64":
-        # x86_64 machines can run i686 docker containers
-        if identifier.endswith('x86_64') or identifier.endswith('i686'):
-            return True
-    elif pm == "i686":
-        if identifier.endswith('i686'):
-            return True
-    elif pm == "aarch64":
-        if identifier.endswith('aarch64'):
-            return True
-    elif pm == "ppc64le":
-        if identifier.endswith('ppc64le'):
-            return True
-    elif pm == "s390x":
-        if identifier.endswith('s390x'):
-            return True
-    return False
+from .logger import log
+from .typing import PathOrStr
+from .util import (
+    BuildOptions,
+    BuildSelector,
+    NonPlatformWheelError,
+    get_build_verbosity_extra_flags,
+    prepare_command,
+    read_python_configs,
+    resources_dir,
+)
 
 
 class PythonConfiguration(NamedTuple):
@@ -38,60 +25,41 @@ class PythonConfiguration(NamedTuple):
     path_str: str
 
     @property
-    def path(self):
+    def path(self) -> PurePath:
         return PurePath(self.path_str)
 
 
-def get_python_configurations(build_selector: BuildSelector) -> List[PythonConfiguration]:
-    python_configurations = [
-        PythonConfiguration(version='2.7', identifier='cp27-manylinux_x86_64', path_str='/opt/python/cp27-cp27m'),
-        PythonConfiguration(version='2.7', identifier='cp27-manylinux_x86_64', path_str='/opt/python/cp27-cp27mu'),
-        PythonConfiguration(version='3.5', identifier='cp35-manylinux_x86_64', path_str='/opt/python/cp35-cp35m'),
-        PythonConfiguration(version='3.6', identifier='cp36-manylinux_x86_64', path_str='/opt/python/cp36-cp36m'),
-        PythonConfiguration(version='3.7', identifier='cp37-manylinux_x86_64', path_str='/opt/python/cp37-cp37m'),
-        PythonConfiguration(version='3.8', identifier='cp38-manylinux_x86_64', path_str='/opt/python/cp38-cp38'),
-        PythonConfiguration(version='3.9', identifier='cp39-manylinux_x86_64', path_str='/opt/python/cp39-cp39'),
-        PythonConfiguration(version='2.7', identifier='cp27-manylinux_i686', path_str='/opt/python/cp27-cp27m'),
-        PythonConfiguration(version='2.7', identifier='cp27-manylinux_i686', path_str='/opt/python/cp27-cp27mu'),
-        PythonConfiguration(version='3.5', identifier='cp35-manylinux_i686', path_str='/opt/python/cp35-cp35m'),
-        PythonConfiguration(version='3.6', identifier='cp36-manylinux_i686', path_str='/opt/python/cp36-cp36m'),
-        PythonConfiguration(version='3.7', identifier='cp37-manylinux_i686', path_str='/opt/python/cp37-cp37m'),
-        PythonConfiguration(version='3.8', identifier='cp38-manylinux_i686', path_str='/opt/python/cp38-cp38'),
-        PythonConfiguration(version='3.9', identifier='cp39-manylinux_i686', path_str='/opt/python/cp39-cp39'),
-        PythonConfiguration(version='2.7', identifier='pp27-manylinux_x86_64', path_str='/opt/python/pp27-pypy_73'),
-        PythonConfiguration(version='3.6', identifier='pp36-manylinux_x86_64', path_str='/opt/python/pp36-pypy36_pp73'),
-        PythonConfiguration(version='3.5', identifier='cp35-manylinux_aarch64', path_str='/opt/python/cp35-cp35m'),
-        PythonConfiguration(version='3.6', identifier='cp36-manylinux_aarch64', path_str='/opt/python/cp36-cp36m'),
-        PythonConfiguration(version='3.7', identifier='cp37-manylinux_aarch64', path_str='/opt/python/cp37-cp37m'),
-        PythonConfiguration(version='3.8', identifier='cp38-manylinux_aarch64', path_str='/opt/python/cp38-cp38'),
-        PythonConfiguration(version='3.9', identifier='cp39-manylinux_aarch64', path_str='/opt/python/cp39-cp39'),
-        PythonConfiguration(version='3.5', identifier='cp35-manylinux_ppc64le', path_str='/opt/python/cp35-cp35m'),
-        PythonConfiguration(version='3.6', identifier='cp36-manylinux_ppc64le', path_str='/opt/python/cp36-cp36m'),
-        PythonConfiguration(version='3.7', identifier='cp37-manylinux_ppc64le', path_str='/opt/python/cp37-cp37m'),
-        PythonConfiguration(version='3.8', identifier='cp38-manylinux_ppc64le', path_str='/opt/python/cp38-cp38'),
-        PythonConfiguration(version='3.9', identifier='cp39-manylinux_ppc64le', path_str='/opt/python/cp39-cp39'),
-        PythonConfiguration(version='3.5', identifier='cp35-manylinux_s390x', path_str='/opt/python/cp35-cp35m'),
-        PythonConfiguration(version='3.6', identifier='cp36-manylinux_s390x', path_str='/opt/python/cp36-cp36m'),
-        PythonConfiguration(version='3.7', identifier='cp37-manylinux_s390x', path_str='/opt/python/cp37-cp37m'),
-        PythonConfiguration(version='3.8', identifier='cp38-manylinux_s390x', path_str='/opt/python/cp38-cp38'),
-        PythonConfiguration(version='3.9', identifier='cp39-manylinux_s390x', path_str='/opt/python/cp39-cp39'),
+def get_python_configurations(
+    build_selector: BuildSelector,
+    architectures: Set[Architecture],
+) -> List[PythonConfiguration]:
+
+    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
+        if any(c.identifier.endswith(arch.value) for arch in architectures)
+        and build_selector(c.identifier)
     ]
-    # skip builds as required
-    return [c for c in python_configurations if matches_platform(c.identifier) and build_selector(c.identifier)]
 
 
 def build(options: BuildOptions) -> None:
     try:
-        subprocess.check_call(['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)
-        exit(2)
+        sys.exit(2)
 
     assert options.manylinux_images is not None
-    python_configurations = get_python_configurations(options.build_selector)
+    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']),
@@ -116,19 +84,37 @@ def build(options: BuildOptions) -> None:
             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('Copying project into Docker...')
                 docker.copy_into(Path.cwd(), container_project_path)
 
                 if options.before_all:
+                    log.step('Running before_all...')
+
                     env = docker.get_environment()
-                    env['PATH'] = f'/opt/python/cp38-cp38:{env["PATH"]}'
+                    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)
 
                 for config in platform_configs:
-                    dependency_constraint_flags: List[Union[str, PathLike]] = []
+                    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)
@@ -137,6 +123,8 @@ def build(options: BuildOptions) -> None:
                         docker.copy_into(constraints_file, container_constraints_file)
                         dependency_constraint_flags = ['-c', container_constraints_file]
 
+                    log.step('Setting up build environment...')
+
                     env = docker.get_environment()
 
                     # put this config's python top of the list
@@ -149,17 +137,20 @@ def build(options: BuildOptions) -> None:
                     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)
-                        exit(1)
+                        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)
-                        exit(1)
+                        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('Building wheel...')
+
                     temp_dir = PurePath('/tmp/cibuildwheel')
                     built_wheel_dir = temp_dir / 'built_wheel'
                     docker.call(['rm', '-rf', built_wheel_dir])
@@ -168,7 +159,7 @@ def build(options: BuildOptions) -> None:
                     docker.call([
                         'pip', 'wheel',
                         container_package_dir,
-                        '-w', built_wheel_dir,
+                        '--wheel-dir', built_wheel_dir,
                         '--no-deps',
                         *get_build_verbosity_extra_flags(options.build_verbosity)
                     ], env=env)
@@ -183,6 +174,7 @@ def build(options: BuildOptions) -> None:
                         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)
                     else:
@@ -190,7 +182,9 @@ def build(options: BuildOptions) -> None:
 
                     repaired_wheels = docker.glob(repaired_wheel_dir, '*.whl')
 
-                    if options.test_command:
+                    if options.test_command and options.test_selector(config.identifier):
+                        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)
@@ -229,12 +223,16 @@ def build(options: BuildOptions) -> None:
                     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...')
                 # copy the output back into the host
                 docker.copy_out(container_output_dir, options.output_dir)
+                log.step_end()
         except subprocess.CalledProcessError as error:
-            print(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)
-            exit(1)
+            sys.exit(1)
 
 
 def troubleshoot(package_dir: Path, error: Exception) -> None:
@@ -255,5 +253,5 @@ def troubleshoot(package_dir: Path, error: Exception) -> None:
             '''), file=sys.stderr)
 
             print('  Files detected:')
-            print('\n'.join([f'    {f}' for f in so_files]))
+            print('\n'.join(f'    {f}' for f in so_files))
             print('')

cibuildwheel/logger.py

@@ -0,0 +1,259 @@
+import codecs
+import os
+import re
+import sys
+import time
+from typing import IO, AnyStr, Optional, Union
+
+from cibuildwheel.util import CIProvider, detect_ci_provider
+
+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}'),
+}
+
+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',
+}
+
+
+class Logger:
+    fold_mode: str
+    colors_enabled: bool
+    unicode_enabled: bool
+    active_build_identifier: Optional[str] = None
+    build_start_time: Optional[float] = None
+    step_start_time: Optional[float] = None
+    active_fold_group_name: Optional[str] = None
+
+    def __init__(self) -> None:
+        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')
+
+        self.unicode_enabled = file_supports_unicode(sys.stdout)
+
+        ci_provider = detect_ci_provider()
+
+        if ci_provider == CIProvider.azure_pipelines:
+            self.fold_mode = 'azure'
+            self.colors_enabled = True
+
+        elif ci_provider == CIProvider.github_actions:
+            self.fold_mode = 'github'
+            self.colors_enabled = True
+
+        elif ci_provider == CIProvider.travis_ci:
+            self.fold_mode = 'travis'
+            self.colors_enabled = True
+
+        elif ci_provider == CIProvider.appveyor:
+            self.fold_mode = 'disabled'
+            self.colors_enabled = True
+
+        else:
+            self.fold_mode = 'disabled'
+            self.colors_enabled = file_supports_color(sys.stdout)
+
+    def build_start(self, identifier: str) -> None:
+        self.step_end()
+        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()
+
+        self.build_start_time = time.time()
+        self.active_build_identifier = identifier
+
+    def build_end(self) -> None:
+        assert self.build_start_time is not None
+        assert self.active_build_identifier is not None
+        self.step_end()
+
+        c = self.colors
+        s = self.symbols
+        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')
+        self.build_start_time = None
+        self.active_build_identifier = None
+
+    def step(self, step_description: str) -> None:
+        self.step_end()
+        self.step_start_time = time.time()
+        self._start_fold_group(step_description)
+
+    def step_end(self, success: bool = True) -> None:
+        if self.step_start_time is not None:
+            self._end_fold_group()
+            c = self.colors
+            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))
+            else:
+                print(f'{c.red}{s.error} {c.end}{duration:.2f}s'.rjust(78))
+
+            self.step_start_time = None
+
+    def step_end_with_error(self, error: Union[BaseException, str]) -> None:
+        self.step_end(success=False)
+        self.error(error)
+
+    def warning(self, message: str) -> None:
+        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)
+
+    def error(self, error: Union[BaseException, str]) -> None:
+        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)
+
+    def _start_fold_group(self, name: str) -> None:
+        self._end_fold_group()
+        self.active_fold_group_name = name
+        fold_start_pattern = FOLD_PATTERNS.get(self.fold_mode, DEFAULT_FOLD_PATTERN)[0]
+        identifier = self._fold_group_identifier(name)
+
+        print(fold_start_pattern.format(name=self.active_fold_group_name, identifier=identifier))
+        print()
+        sys.stdout.flush()
+
+    def _end_fold_group(self) -> None:
+        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))
+            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)
+        # remove non-alphanum
+        identifier = re.sub(r'[^A-Za-z\d_]+', '', identifier)
+        # trim underscores
+        identifier = identifier.strip('_')
+        # lowercase, shorten
+        return identifier.lower()[:20]
+
+    @property
+    def colors(self) -> "Colors":
+        if self.colors_enabled:
+            return Colors(enabled=True)
+        else:
+            return Colors(enabled=False)
+
+    @property
+    def symbols(self) -> "Symbols":
+        if self.unicode_enabled:
+            return Symbols(unicode=True)
+        else:
+            return Symbols(unicode=False)
+
+
+def build_description_from_identifier(identifier: str) -> str:
+    python_identifier, _, platform_identifier = identifier.partition('-')
+
+    build_description = ''
+
+    python_interpreter = python_identifier[0:2]
+    python_version = python_identifier[2:4]
+
+    if python_interpreter == 'cp':
+        build_description += 'CPython'
+    elif python_interpreter == 'pp':
+        build_description += 'PyPy'
+    else:
+        raise Exception('unknown python')
+
+    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
+
+    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.bg_grey = '\033[48;5;235m' if enabled else ''
+
+        self.bold = '\033[1m' if enabled else ''
+        self.faint = '\033[2m' 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'
+
+
+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)
+
+    is_a_tty = file_is_a_tty(file_obj)
+
+    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()
+
+
+def file_supports_unicode(file_obj: IO[AnyStr]) -> bool:
+    encoding = getattr(file_obj, 'encoding', None)
+    if not encoding:
+        return False
+
+    codec_info = codecs.lookup(encoding)
+
+    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

@@ -1,27 +1,66 @@
 import os
+import platform
+import re
 import shlex
 import shutil
 import subprocess
 import sys
 import tempfile
-from os import PathLike
 from pathlib import Path
-from typing import Dict, List, NamedTuple, Optional, Sequence, Union
+from typing import Any, Dict, List, NamedTuple, Optional, Sequence, Set, Tuple, cast
 
+from .architecture import Architecture
 from .environment import ParsedEnvironment
-from .util import (BuildOptions, BuildSelector, NonPlatformWheelError, download,
-                   get_build_verbosity_extra_flags, get_pip_script,
-                   prepare_command)
+from .logger import log
+from .typing import Literal, PathOrStr
+from .util import (
+    BuildOptions,
+    BuildSelector,
+    NonPlatformWheelError,
+    download,
+    get_build_verbosity_extra_flags,
+    get_pip_script,
+    install_certifi_script,
+    prepare_command,
+    read_python_configs,
+    resources_dir,
+    unwrap,
+)
 
 
-def call(args: Union[str, Sequence[Union[str, PathLike]]], 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}')
     else:
         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.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)]
 
 
 class PythonConfiguration(NamedTuple):
@@ -30,22 +69,43 @@ class PythonConfiguration(NamedTuple):
     url: str
 
 
-def get_python_configurations(build_selector: BuildSelector) -> List[PythonConfiguration]:
-    python_configurations = [
-        # CPython
-        PythonConfiguration(version='2.7', identifier='cp27-macosx_x86_64', url='https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg'),
-        PythonConfiguration(version='3.5', identifier='cp35-macosx_x86_64', url='https://www.python.org/ftp/python/3.5.4/python-3.5.4-macosx10.6.pkg'),
-        PythonConfiguration(version='3.6', identifier='cp36-macosx_x86_64', url='https://www.python.org/ftp/python/3.6.8/python-3.6.8-macosx10.9.pkg'),
-        PythonConfiguration(version='3.7', identifier='cp37-macosx_x86_64', url='https://www.python.org/ftp/python/3.7.8/python-3.7.8-macosx10.9.pkg'),
-        PythonConfiguration(version='3.8', identifier='cp38-macosx_x86_64', url='https://www.python.org/ftp/python/3.8.4/python-3.8.4-macosx10.9.pkg'),
-        PythonConfiguration(version='3.9', identifier='cp39-macosx_x86_64', url='https://www.python.org/ftp/python/3.9.0/python-3.9.0rc1-macosx10.9.pkg'),
-        # PyPy
-        PythonConfiguration(version='2.7', identifier='pp27-macosx_x86_64', url='https://downloads.python.org/pypy/pypy2.7-v7.3.1-osx64.tar.bz2'),
-        PythonConfiguration(version='3.6', identifier='pp36-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.6-v7.3.1-osx64.tar.bz2'),
-    ]
+def get_python_configurations(build_selector: BuildSelector,
+                              architectures: Set[Architecture]) -> List[PythonConfiguration]:
 
-    # skip builds as required
-    return [c for c in python_configurations if build_selector(c.identifier)]
+    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)]
+
+    # skip builds as required by BUILD/SKIP
+    python_configurations = [c for c in python_configurations if build_selector(c.identifier)]
+
+    # 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):
+            # 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')]
+
+    return python_configurations
 
 
 SYMLINKS_DIR = Path('/tmp/cibw_bin')
@@ -67,10 +127,13 @@ def make_symlinks(installation_bin_path: Path, python_executable: str, pip_execu
 
 
 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')
+
     if python_package_identifier not in installed_system_packages:
         # download the pkg
         download(url, Path('/tmp/Python.pkg'))
@@ -78,12 +141,12 @@ def install_cpython(version: str, url: str) -> Path:
         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.0.2u/patch-macos-python-{version}-openssl-v1.0.2u.tar.gz'
+            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'])
 
-    installation_bin_path = Path(f'/Library/Frameworks/Python.framework/Versions/{version}/bin')
-    python_executable = 'python3' if version[0] == '3' else 'python'
+        call(["sudo", str(installation_bin_path/python_executable), str(install_certifi_script)])
+
     pip_executable = 'pip3' if version[0] == '3' else 'pip'
     make_symlinks(installation_bin_path, python_executable, pip_executable)
 
@@ -100,6 +163,10 @@ def install_pypy(version: str, url: str) -> Path:
         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])
 
     installation_bin_path = installation_path / 'bin'
     python_executable = 'pypy3' if version[0] == '3' else 'pypy'
@@ -110,15 +177,20 @@ def install_pypy(version: str, url: str) -> Path:
 
 
 def setup_python(python_configuration: PythonConfiguration,
-                 dependency_constraint_flags: Sequence[Union[str, PathLike]],
+                 dependency_constraint_flags: Sequence[PathOrStr],
                  environment: ParsedEnvironment) -> Dict[str, str]:
-    if python_configuration.identifier.startswith('cp'):
+    implementation_id = python_configuration.identifier.split("-")[0]
+    log.step(f'Installing Python {implementation_id}...')
+
+    if implementation_id.startswith('cp'):
         installation_bin_path = install_cpython(python_configuration.version, python_configuration.url)
-    elif python_configuration.identifier.startswith('pp'):
+    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...')
+
     env = os.environ.copy()
     env['PATH'] = os.pathsep.join([
         str(SYMLINKS_DIR),
@@ -135,30 +207,35 @@ def setup_python(python_configuration: PythonConfiguration,
     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'
+
     # 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()
+    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)
-        exit(1)
+        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()
+    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)
-        exit(1)
-    call(['pip', 'install', '--upgrade', 'setuptools', 'wheel', 'delocate', *dependency_constraint_flags], env=env)
+        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')
 
+    config_is_arm64 = python_configuration.identifier.endswith('arm64')
+    config_is_universal2 = python_configuration.identifier.endswith('universal2')
+
     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
@@ -166,6 +243,44 @@ def setup_python(python_configuration: PythonConfiguration,
         # https://github.com/python/cpython/blob/a5ed2fe0eedefa1649aa93ee74a0bafc8e628a10/Lib/_osx_support.py#L260
         env.setdefault('ARCHFLAGS', '-arch x86_64')
 
+    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 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 config_is_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')
+
+    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.')]
+
+        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])
+
+    log.step('Installing build tools...')
+    call(['pip', 'install', '--upgrade', 'setuptools', 'wheel', 'delocate', *dependency_constraint_flags], env=env)
+
     return env
 
 
@@ -174,102 +289,185 @@ def build(options: BuildOptions) -> None:
     built_wheel_dir = temp_dir / 'built_wheel'
     repaired_wheel_dir = temp_dir / 'repaired_wheel'
 
-    if options.before_all:
-        env = options.environment.as_dictionary(prev_environment=os.environ)
-        before_all_prepared = prepare_command(options.before_all, project='.', package=options.package_dir)
-        call([before_all_prepared], shell=True, env=env)
+    try:
+        if options.before_all:
+            log.step('Running before_all...')
+            env = options.environment.as_dictionary(prev_environment=os.environ)
+            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)
+        python_configurations = get_python_configurations(options.build_selector, options.architectures)
 
-    for config in python_configurations:
-        dependency_constraint_flags: Sequence[Union[str, PathLike]] = []
-        if options.dependency_constraints:
-            dependency_constraint_flags = [
-                '-c', options.dependency_constraints.get_for_python_version(config.version)
-            ]
+        for config in python_configurations:
+            log.build_start(config.identifier)
 
-        env = setup_python(config, dependency_constraint_flags, options.environment)
+            config_is_arm64 = config.identifier.endswith('arm64')
+            config_is_universal2 = config.identifier.endswith('universal2')
 
-        # run the before_build command
-        if options.before_build:
-            before_build_prepared = prepare_command(options.before_build, project='.', package=options.package_dir)
-            call(before_build_prepared, env=env, shell=True)
+            dependency_constraint_flags: Sequence[PathOrStr] = []
+            if options.dependency_constraints:
+                dependency_constraint_flags = [
+                    '-c', options.dependency_constraints.get_for_python_version(config.version)
+                ]
 
-        # build the wheel
-        if built_wheel_dir.exists():
-            shutil.rmtree(built_wheel_dir)
-        built_wheel_dir.mkdir(parents=True)
+            env = setup_python(config, dependency_constraint_flags, options.environment)
 
-        # 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)
+            if options.before_build:
+                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)
 
-        built_wheel = next(built_wheel_dir.glob('*.whl'))
+            log.step('Building wheel...')
+            if built_wheel_dir.exists():
+                shutil.rmtree(built_wheel_dir)
+            built_wheel_dir.mkdir(parents=True)
 
-        # repair the wheel
-        if repaired_wheel_dir.exists():
-            shutil.rmtree(repaired_wheel_dir)
-        repaired_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(),
+                '--wheel-dir', built_wheel_dir,
+                '--no-deps',
+                *get_build_verbosity_extra_flags(options.build_verbosity)
+            ], env=env)
 
-        if built_wheel.name.endswith('none-any.whl'):
-            raise NonPlatformWheelError()
+            built_wheel = next(built_wheel_dir.glob('*.whl'))
 
-        if options.repair_command:
-            repair_command_prepared = prepare_command(options.repair_command, wheel=built_wheel, dest_dir=repaired_wheel_dir)
-            call(repair_command_prepared, env=env, shell=True)
-        else:
-            shutil.move(str(built_wheel), repaired_wheel_dir)
+            if repaired_wheel_dir.exists():
+                shutil.rmtree(repaired_wheel_dir)
+            repaired_wheel_dir.mkdir(parents=True)
 
-        repaired_wheel = next(repaired_wheel_dir.glob('*.whl'))
+            if built_wheel.name.endswith('none-any.whl'):
+                raise NonPlatformWheelError()
 
-        if options.test_command:
-            # 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)
-            venv_dir = Path(tempfile.mkdtemp())
+            if options.repair_command:
+                log.step('Repairing wheel...')
 
-            # Use --no-download to ensure determinism by using seed libraries
-            # built into virtualenv
-            call(['python', '-m', 'virtualenv', '--no-download', venv_dir], env=env)
+                if config_is_universal2:
+                    delocate_archs = 'x86_64,arm64'
+                elif config_is_arm64:
+                    delocate_archs = 'arm64'
+                else:
+                    delocate_archs = 'x86_64'
 
-            virtualenv_env = env.copy()
-            virtualenv_env['PATH'] = os.pathsep.join([
-                str(venv_dir / 'bin'),
-                virtualenv_env['PATH'],
-            ])
+                repair_command_prepared = prepare_command(
+                    options.repair_command,
+                    wheel=built_wheel,
+                    dest_dir=repaired_wheel_dir,
+                    delocate_archs=delocate_archs,
+                )
+                call(repair_command_prepared, env=env, shell=True)
+            else:
+                shutil.move(str(built_wheel), repaired_wheel_dir)
 
-            # check that we are using the Python from the virtual environment
-            call(['which', 'python'], env=virtualenv_env)
+            repaired_wheel = next(repaired_wheel_dir.glob('*.whl'))
 
-            if options.before_test:
-                before_test_prepared = prepare_command(options.before_test, project='.', package=options.package_dir)
-                call(before_test_prepared, env=virtualenv_env, shell=True)
+            log.step_end()
 
-            # install the wheel
-            call(['pip', 'install', str(repaired_wheel) + options.test_extras], env=virtualenv_env)
+            if options.test_command and options.test_selector(config.identifier):
+                machine_arch = platform.machine()
+                testing_archs: List[Literal['x86_64', 'arm64']] = []
 
-            # test the wheel
-            if options.test_requires:
-                call(['pip', 'install'] + options.test_requires, env=virtualenv_env)
+                if config_is_arm64:
+                    testing_archs = ['arm64']
+                elif config_is_universal2:
+                    testing_archs = ['x86_64', 'arm64']
+                else:
+                    testing_archs = ['x86_64']
 
-            # 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()
-            )
-            call(test_command_prepared, cwd=os.environ['HOME'], env=virtualenv_env, shell=True)
+                for testing_arch in testing_archs:
+                    if config_is_universal2:
+                        arch_specific_identifier = f'{config.identifier}:{testing_arch}'
+                        if not options.test_selector(arch_specific_identifier):
+                            continue
 
-            # clean up
-            shutil.rmtree(venv_dir)
+                    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')
 
-        # we're all done here; move it to output (overwrite existing)
-        shutil.move(str(repaired_wheel), options.output_dir)
+                        # skip this test
+                        continue
+
+                    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)
+                    venv_dir = Path(tempfile.mkdtemp())
+
+                    arch_prefix = []
+                    if testing_arch != machine_arch:
+                        if machine_arch == 'arm64' and testing_arch == 'x86_64':
+                            # rosetta2 will provide the emulation with just the arch prefix.
+                            arch_prefix = ['arch', '-x86_64']
+                        else:
+                            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) -> None:
+                        if isinstance(args, str):
+                            args = ' '.join(arch_prefix) + ' ' + args
+                        else:
+                            args = [*arch_prefix, *args]
+                        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)
+
+                    virtualenv_env = env.copy()
+                    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)
+
+                    if options.before_test:
+                        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', 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)
+
+                    # 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()
+                    )
+                    call_with_arch(test_command_prepared, cwd=os.environ['HOME'], env=virtualenv_env, shell=True)
+
+                    # clean up
+                    shutil.rmtree(venv_dir)
+
+            # we're all done here; move it to output (overwrite existing)
+            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}')
+        sys.exit(1)

cibuildwheel/projectfiles.py

@@ -0,0 +1,79 @@
+import ast
+import sys
+from configparser import ConfigParser
+from pathlib import Path
+from typing import Any, Optional
+
+import toml
+
+if sys.version_info < (3, 8):
+    Constant = ast.Str
+
+    def get_constant(x: ast.Str) -> str:
+        return x.s
+
+
+else:
+    Constant = ast.Constant
+
+    def get_constant(x: ast.Constant) -> Any:
+        return x.value
+
+
+class Analyzer(ast.NodeVisitor):
+    def __init__(self) -> None:
+        self.requires_python: Optional[str] = None
+
+    def visit(self, content: ast.AST) -> None:
+        for node in ast.walk(content):
+            for child in ast.iter_child_nodes(node):
+                child.parent = node  # type: ignore
+        super().visit(content)
+
+    def visit_keyword(self, node: ast.keyword) -> None:
+        self.generic_visit(node)
+        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)
+            ):
+                self.requires_python = get_constant(node.value)
+
+
+def setup_py_python_requires(content: str) -> Optional[str]:
+    try:
+        tree = ast.parse(content)
+        analyzer = Analyzer()
+        analyzer.visit(tree)
+        return analyzer.requires_python or None
+    except Exception:
+        return None
+
+
+def get_requires_python_str(package_dir: Path) -> Optional[str]:
+    "Return the python requires string from the most canonical source available, or None"
+
+    # Read in from pyproject.toml:project.requires-python
+    try:
+        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'])
+    except (FileNotFoundError, KeyError, IndexError, TypeError):
+        pass
+
+    try:
+        with open(package_dir / 'setup.py') as f:
+            return setup_py_python_requires(f.read())
+    except FileNotFoundError:
+        pass
+
+    return None

cibuildwheel/resources/build-platforms.toml

@@ -0,0 +1,69 @@
+[linux]
+python_configurations = [
+  { identifier = "cp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/cp27-cp27m" },
+  { identifier = "cp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/cp27-cp27mu" },
+  { identifier = "cp35-manylinux_x86_64", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
+  { identifier = "cp36-manylinux_x86_64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-manylinux_x86_64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-manylinux_x86_64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-manylinux_x86_64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp27-manylinux_i686", version = "2.7", path_str = "/opt/python/cp27-cp27m" },
+  { identifier = "cp27-manylinux_i686", version = "2.7", path_str = "/opt/python/cp27-cp27mu" },
+  { identifier = "cp35-manylinux_i686", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
+  { identifier = "cp36-manylinux_i686", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-manylinux_i686", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-manylinux_i686", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-manylinux_i686", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "pp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/pp27-pypy_73" },
+  { identifier = "pp36-manylinux_x86_64", version = "3.6", path_str = "/opt/python/pp36-pypy36_pp73" },
+  { identifier = "pp37-manylinux_x86_64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
+  { identifier = "cp35-manylinux_aarch64", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
+  { 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 = "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 = "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" },
+]
+
+[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.9/python-3.8.9-macosx10.9.pkg" },
+  { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.4/python-3.9.4-macos11.pkg" },
+  { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.4/python-3.9.4-macos11.pkg" },
+  { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.4/python-3.9.4-macos11.pkg" },
+  { identifier = "pp27-macosx_x86_64", version = "2.7", url = "https://downloads.python.org/pypy/pypy2.7-v7.3.3-osx64.tar.bz2" },
+  { identifier = "pp36-macosx_x86_64", version = "3.6", url = "https://downloads.python.org/pypy/pypy3.6-v7.3.3-osx64.tar.bz2" },
+  { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.3-osx64.tar.bz2" },
+]
+
+[windows]
+python_configurations = [
+  { identifier = "cp27-win32", version = "2.7.18", arch = "32" },
+  { identifier = "cp27-win_amd64", version = "2.7.18", arch = "64" },
+  { identifier = "cp35-win32", version = "3.5.4", arch = "32" },
+  { identifier = "cp35-win_amd64", version = "3.5.4", arch = "64" },
+  { identifier = "cp36-win32", version = "3.6.8", arch = "32" },
+  { 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.9", arch = "32" },
+  { identifier = "cp38-win_amd64", version = "3.8.9", arch = "64" },
+  { identifier = "cp39-win32", version = "3.9.4", arch = "32" },
+  { identifier = "cp39-win_amd64", version = "3.9.4", 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" },
+]

cibuildwheel/resources/constraints-python27.txt

@@ -2,25 +2,54 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    bin/update_constraints.py
+#    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==1.7.0  # via virtualenv
-importlib-resources==3.0.0  # 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.0.31       # via -r cibuildwheel/resources/constraints.in
-wheel==0.35.1             # via -r cibuildwheel/resources/constraints.in, delocate
-zipp==1.2.0               # via importlib-metadata, importlib-resources
+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.6.1
+    # via importlib-resources
+six==1.15.0
+    # via
+    #   pathlib2
+    #   virtualenv
+typing==3.7.4.3
+    # via importlib-resources
+virtualenv==20.4.3
+    # 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.2.2               # via -r cibuildwheel/resources/constraints.in
-setuptools==44.1.1        # via -r cibuildwheel/resources/constraints.in
+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

@@ -2,19 +2,35 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    bin/update_constraints.py
+#    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==1.7.0  # via virtualenv
-importlib-resources==3.0.0  # via virtualenv
-six==1.15.0               # via virtualenv
-virtualenv==20.0.31       # via -r cibuildwheel/resources/constraints.in
-wheel==0.35.1             # via -r cibuildwheel/resources/constraints.in, delocate
-zipp==1.2.0               # via importlib-metadata, importlib-resources
+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.3
+    # 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.2.2               # via -r cibuildwheel/resources/constraints.in
-setuptools==50.3.0        # via -r cibuildwheel/resources/constraints.in
+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

@@ -2,19 +2,37 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    bin/update_constraints.py
+#    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==1.7.0  # via virtualenv
-importlib-resources==3.0.0  # via virtualenv
-six==1.15.0               # via virtualenv
-virtualenv==20.0.31       # via -r cibuildwheel/resources/constraints.in
-wheel==0.35.1             # via -r cibuildwheel/resources/constraints.in, delocate
-zipp==3.1.0               # via importlib-metadata, importlib-resources
+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==3.10.0
+    # via virtualenv
+importlib-resources==5.1.2
+    # via virtualenv
+six==1.15.0
+    # via virtualenv
+typing-extensions==3.7.4.3
+    # via importlib-metadata
+virtualenv==20.4.3
+    # via -r cibuildwheel/resources/constraints.in
+wheel==0.36.2
+    # via
+    #   -r cibuildwheel/resources/constraints.in
+    #   delocate
+zipp==3.4.1
+    # via
+    #   importlib-metadata
+    #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==20.2.2               # via -r cibuildwheel/resources/constraints.in
-setuptools==50.3.0        # via -r cibuildwheel/resources/constraints.in
+pip==21.0.1
+    # via -r cibuildwheel/resources/constraints.in
+setuptools==54.2.0
+    # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python37.txt

@@ -0,0 +1,34 @@
+#
+# 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==3.10.0
+    # via virtualenv
+six==1.15.0
+    # via virtualenv
+typing-extensions==3.7.4.3
+    # via importlib-metadata
+virtualenv==20.4.3
+    # via -r cibuildwheel/resources/constraints.in
+wheel==0.36.2
+    # via
+    #   -r cibuildwheel/resources/constraints.in
+    #   delocate
+zipp==3.4.1
+    # via importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==21.0.1
+    # via -r cibuildwheel/resources/constraints.in
+setuptools==54.2.0
+    # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python38.txt

@@ -0,0 +1,28 @@
+#
+# 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
+six==1.15.0
+    # via virtualenv
+virtualenv==20.4.3
+    # via -r cibuildwheel/resources/constraints.in
+wheel==0.36.2
+    # via
+    #   -r cibuildwheel/resources/constraints.in
+    #   delocate
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==21.0.1
+    # via -r cibuildwheel/resources/constraints.in
+setuptools==54.2.0
+    # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python39.txt

@@ -0,0 +1,28 @@
+#
+# 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
+six==1.15.0
+    # via virtualenv
+virtualenv==20.4.3
+    # via -r cibuildwheel/resources/constraints.in
+wheel==0.36.2
+    # via
+    #   -r cibuildwheel/resources/constraints.in
+    #   delocate
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==21.0.1
+    # via -r cibuildwheel/resources/constraints.in
+setuptools==54.2.0
+    # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints.txt

@@ -2,18 +2,27 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    bin/update_constraints.py
+#    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==1.7.0  # via virtualenv
-six==1.15.0               # via virtualenv
-virtualenv==20.0.31       # via -r cibuildwheel/resources/constraints.in
-wheel==0.35.1             # via -r cibuildwheel/resources/constraints.in, delocate
-zipp==3.1.0               # via importlib-metadata
+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
+six==1.15.0
+    # via virtualenv
+virtualenv==20.4.3
+    # via -r cibuildwheel/resources/constraints.in
+wheel==0.36.2
+    # via
+    #   -r cibuildwheel/resources/constraints.in
+    #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==20.2.2               # via -r cibuildwheel/resources/constraints.in
-setuptools==50.3.0        # via -r cibuildwheel/resources/constraints.in
+pip==21.0.1
+    # via -r cibuildwheel/resources/constraints.in
+setuptools==54.2.0
+    # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/get-pip.py

@@ -23,8 +23,8 @@
 import os.path
 import pkgutil
 import shutil
-import sys
 import struct
+import sys
 import tempfile
 
 # Useful for very coarse version differentiation.

cibuildwheel/resources/install_certifi.py

@@ -0,0 +1,51 @@
+# Based on: https://github.com/python/cpython/blob/master/Mac/BuildScript/resources/install_certificates.command
+
+# install_certifi.py
+#
+# sample script to install or update a set of default Root Certificates
+# for the ssl module.  Uses the certificates provided by the certifi package:
+#       https://pypi.org/project/certifi/
+
+import os
+import os.path
+import ssl
+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
+
+
+def main():
+    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"])
+
+    import certifi
+
+    # change working directory to the default SSL directory
+    os.chdir(openssl_dir)
+    relpath_to_certifi_cafile = os.path.relpath(certifi.where())
+
+    print(" -- removing any existing file or link")
+    try:
+        os.remove(openssl_cafile)
+    except FileNotFoundError:
+        pass
+    print(" -- creating symlink to certifi certificate bundle")
+    os.symlink(relpath_to_certifi_cafile, openssl_cafile)
+
+    print(" -- setting permissions")
+    os.chmod(openssl_cafile, STAT_0o775)
+    print(" -- update complete")
+
+
+if __name__ == '__main__':
+    main()

cibuildwheel/resources/pinned_docker_images.cfg

@@ -1,22 +1,27 @@
 [x86_64]
-manylinux1 = quay.io/pypa/manylinux1_x86_64:2020-09-20-9444d5c
-manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2020-09-20-6131e60
-manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2020-09-20-fb9af88
+manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-04-05-14df3a6
+manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-02-06-3d322a5
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-04-05-b4fd19d
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-04-05-b4fd19d
 
 [i686]
-manylinux1 = quay.io/pypa/manylinux1_i686:2020-09-20-9444d5c
-manylinux2010 = quay.io/pypa/manylinux2010_i686:2020-09-20-6131e60
-manylinux2014 = quay.io/pypa/manylinux2014_i686:2020-09-20-fb9af88
+manylinux1 = quay.io/pypa/manylinux1_i686:2021-04-05-14df3a6
+manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-02-06-3d322a5
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-04-05-b4fd19d
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-04-05-b4fd19d
 
 [pypy_x86_64]
-manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2020-07-02-fd8c128
+manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2020-12-11-f1e0e80
 
 [aarch64]
-manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2020-09-20-fb9af88
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-04-05-b4fd19d
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-04-05-b4fd19d
 
 [ppc64le]
-manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2020-09-20-fb9af88
+manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-04-05-b4fd19d
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2021-04-05-b4fd19d
 
 [s390x]
-manylinux2014 = quay.io/pypa/manylinux2014_s390x:2020-09-20-fb9af88
+manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-04-05-b4fd19d
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2021-04-05-b4fd19d
 

cibuildwheel/resources/pypy_venv.patch

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1,27 @@
+--- 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

@@ -0,0 +1,28 @@
+import os
+import subprocess
+import sys
+from typing import TYPE_CHECKING, NoReturn, Set, Union
+
+if sys.version_info < (3, 8):
+    from typing_extensions import Final, Literal, TypedDict
+else:
+    from typing import Final, Literal, TypedDict
+
+
+__all__ = ("Final", "Literal", "TypedDict", "Set", "Union", "PopenBytes", "PathOrStr", "PlatformName", "PLATFORMS", "assert_never")
+
+
+if TYPE_CHECKING:
+    PopenBytes = subprocess.Popen[bytes]
+    PathOrStr = Union[str, os.PathLike[str]]
+else:
+    PopenBytes = subprocess.Popen
+    PathOrStr = Union[str, "os.PathLike[str]"]
+
+
+PlatformName = Literal["linux", "macos", "windows"]
+PLATFORMS: Final[Set[PlatformName]] = {"linux", "macos", "windows"}
+
+
+def assert_never(value: NoReturn) -> NoReturn:
+    assert False, f'Unhandled value: {value} ({type(value).__name__})'  # noqa: B011

cibuildwheel/util.py

@@ -1,16 +1,34 @@
+import contextlib
+import fnmatch
+import itertools
 import os
+import re
+import ssl
 import textwrap
+import time
 import urllib.request
-from fnmatch import fnmatch
+from enum import Enum
 from pathlib import Path
 from time import sleep
+from typing import Dict, Iterator, List, NamedTuple, Optional, Set
 
-from typing import Dict, List, NamedTuple, Optional, Union
+import bracex
+import certifi
+import toml
+from packaging.specifiers import SpecifierSet
+from packaging.version import Version
 
+from .architecture import Architecture
 from .environment import ParsedEnvironment
+from .typing import PathOrStr, PlatformName
+
+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: Union[str, os.PathLike]) -> str:
+def prepare_command(command: str, **kwargs: PathOrStr) -> str:
     '''
     Preprocesses a command by expanding variables like {python}.
 
@@ -29,18 +47,59 @@ def get_build_verbosity_extra_flags(level: int) -> List[str]:
         return []
 
 
-class BuildSelector:
-    def __init__(self, build_config: str, skip_config: str):
+def read_python_configs(config: PlatformName) -> List[Dict[str, str]]:
+    input_file = resources_dir / 'build-platforms.toml'
+    loaded_file = toml.load(input_file)
+    results: List[Dict[str, str]] = list(loaded_file[config]['python_configurations'])
+    return results
+
+
+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.
+    """
+
+    def __init__(self, *, build_config: str, skip_config: str, requires_python: Optional[SpecifierSet] = None):
         self.build_patterns = build_config.split()
         self.skip_patterns = skip_config.split()
+        self.requires_python = requires_python
 
     def __call__(self, build_id: str) -> bool:
-        def match_any(patterns: List[str]) -> bool:
-            return any(fnmatch(build_id, pattern) for pattern in patterns)
-        return match_any(self.build_patterns) and not match_any(self.skip_patterns)
+        # Filter build selectors by python_requires if set
+        if self.requires_python is not None:
+            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: 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:
-        return f'BuildSelector({" ".join(self.build_patterns)!r} - {" ".join(self.skip_patterns)!r})'
+        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})'
+
+
+class BuildSelector(IdentifierSelector):
+    pass
+
+
+# Note that requires-python is not needed for TestSelector, as you can't test
+# what you can't build.
+class TestSelector(IdentifierSelector):
+    def __init__(self, *, skip_config: str):
+        super().__init__(build_config="*", skip_config=skip_config)
 
 
 # Taken from https://stackoverflow.com/a/107717
@@ -66,10 +125,14 @@ def download(url: str, dest: Path) -> None:
     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())
+    context = ssl.create_default_context(cafile=cafile)
     repeat_num = 3
     for i in range(repeat_num):
         try:
-            response = urllib.request.urlopen(url)
+            response = urllib.request.urlopen(url, context=context)
         except Exception:
             if i == repeat_num - 1:
                 raise
@@ -107,11 +170,15 @@ class DependencyConstraints:
         else:
             return self.base_file_path
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}{self.base_file_path!r})'
+
 
 class BuildOptions(NamedTuple):
     package_dir: Path
     output_dir: Path
     build_selector: BuildSelector
+    architectures: Set[Architecture]
     environment: ParsedEnvironment
     before_all: str
     before_build: Optional[str]
@@ -119,16 +186,13 @@ class BuildOptions(NamedTuple):
     manylinux_images: Optional[Dict[str, str]]
     dependency_constraints: Optional[DependencyConstraints]
     test_command: Optional[str]
+    test_selector: TestSelector
     before_test: Optional[str]
     test_requires: List[str]
     test_extras: str
     build_verbosity: int
 
 
-resources_dir = Path(__file__).resolve().parent / 'resources'
-get_pip_script = resources_dir / 'get-pip.py'
-
-
 class NonPlatformWheelError(Exception):
     def __init__(self) -> None:
         message = textwrap.dedent('''
@@ -142,3 +206,68 @@ class NonPlatformWheelError(Exception):
         ''')
 
         super().__init__(message)
+
+
+def strtobool(val: str) -> bool:
+    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'
+
+
+def detect_ci_provider() -> Optional[CIProvider]:
+    if 'TRAVIS' in os.environ:
+        return CIProvider.travis_ci
+    elif 'APPVEYOR' in os.environ:
+        return CIProvider.appveyor
+    elif 'CIRCLECI' in os.environ:
+        return CIProvider.circle_ci
+    elif 'AZURE_HTTP_USER_AGENT' in os.environ:
+        return CIProvider.azure_pipelines
+    elif 'GITHUB_ACTIONS' in os.environ:
+        return CIProvider.github_actions
+    elif 'GITLAB_CI' in os.environ:
+        return CIProvider.gitlab
+    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)
+
+
+@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())
+    yield
+    final_contents = set(output_dir.iterdir())
+    new_contents = final_contents - existing_contents
+    n = len(new_contents)
+    s = time.time() - start_time
+    m = s / 60
+    print(msg.format(n=n, s=s, m=m), *sorted(f"  {f.name}" for f in new_contents), sep="\n")

cibuildwheel/windows.py

@@ -3,75 +3,86 @@ import shutil
 import subprocess
 import sys
 import tempfile
-from os import PathLike
 from pathlib import Path
-from typing import Dict, List, NamedTuple, Optional, Sequence, Union
+from typing import Dict, List, NamedTuple, Optional, Sequence, Set
 from zipfile import ZipFile
+
 import toml
 
+from .architecture import Architecture
 from .environment import ParsedEnvironment
-from .util import (BuildOptions, BuildSelector, NonPlatformWheelError, download,
-                   get_build_verbosity_extra_flags, get_pip_script,
-                   prepare_command)
+from .logger import log
+from .typing import PathOrStr
+from .util import (
+    BuildOptions,
+    BuildSelector,
+    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[Union[str, PathLike]], env: Optional[Dict[str, str]] = None,
+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)
+    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 += 'x86'
+    return [
+        python_name,
+        '-Version', version,
+        '-FallbackSource', 'https://api.nuget.org/v3/index.json',
+        '-OutputDirectory', 'C:\\cibw\\python',
+    ]
 
 
 class PythonConfiguration(NamedTuple):
     version: str
     arch: str
     identifier: str
-    url: Optional[str]
+    url: Optional[str] = None
 
 
-def get_python_configurations(build_selector: BuildSelector) -> List[PythonConfiguration]:
-    python_configurations = [
-        # CPython
-        PythonConfiguration(version='2.7.18', arch='32', identifier='cp27-win32', url=None),
-        PythonConfiguration(version='2.7.18', arch='64', identifier='cp27-win_amd64', url=None),
-        PythonConfiguration(version='3.5.4', arch='32', identifier='cp35-win32', url=None),
-        PythonConfiguration(version='3.5.4', arch='64', identifier='cp35-win_amd64', url=None),
-        PythonConfiguration(version='3.6.8', arch='32', identifier='cp36-win32', url=None),
-        PythonConfiguration(version='3.6.8', arch='64', identifier='cp36-win_amd64', url=None),
-        PythonConfiguration(version='3.7.8', arch='32', identifier='cp37-win32', url=None),
-        PythonConfiguration(version='3.7.8', arch='64', identifier='cp37-win_amd64', url=None),
-        PythonConfiguration(version='3.8.4', arch='32', identifier='cp38-win32', url=None),
-        PythonConfiguration(version='3.8.4', arch='64', identifier='cp38-win_amd64', url=None),
-        PythonConfiguration(version='3.9.0-rc1', arch='32', identifier='cp39-win32', url=None),
-        PythonConfiguration(version='3.9.0-rc1', arch='64', identifier='cp39-win_amd64', url=None),
-        # PyPy
-        PythonConfiguration(version='2.7', arch='32', identifier='pp27-win32', url='https://downloads.python.org/pypy/pypy2.7-v7.3.1-win32.zip'),
-        PythonConfiguration(version='3.6', arch='32', identifier='pp36-win32', url='https://downloads.python.org/pypy/pypy3.6-v7.3.1-win32.zip'),
-    ]
+def get_python_configurations(
+        build_selector: BuildSelector,
+        architectures: Set[Architecture],
+) -> List[PythonConfiguration]:
 
-    if IS_RUNNING_ON_TRAVIS:
-        # cannot install VCForPython27.msi which is needed for compiling C software
-        # try with (and similar): msiexec /i VCForPython27.msi ALLUSERS=1 ACCEPT=YES /passive
+    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,
+    }
+
+    # Only supported with custom compiler, since MS removed the 2008 compiler download
+    custom_compiler = os.environ.get('DISTUTILS_USE_SDK') and os.environ.get('MSSdk')
+    if not custom_compiler:
         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 if build_selector(c.identifier)]
+    python_configurations = [
+        c for c in python_configurations
+        if build_selector(c.identifier) and map_arch[c.arch] in architectures
+    ]
 
     return python_configurations
 
@@ -105,14 +116,18 @@ def install_pypy(version: str, arch: str, url: str) -> Path:
     return installation_path
 
 
-def setup_python(python_configuration: PythonConfiguration, dependency_constraint_flags: Sequence[Union[str, PathLike]], environment: ParsedEnvironment) -> Dict[str, str]:
+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)
 
-    if python_configuration.identifier.startswith('cp'):
+    implementation_id = python_configuration.identifier.split("-")[0]
+    log.step(f'Installing Python {implementation_id}...')
+
+    if implementation_id.startswith('cp'):
         installation_path = install_cpython(python_configuration.version, python_configuration.arch, nuget)
-    elif python_configuration.identifier.startswith('pp'):
+    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)
     else:
@@ -120,6 +135,8 @@ def setup_python(python_configuration: PythonConfiguration, dependency_constrain
 
     assert (installation_path / 'python.exe').exists()
 
+    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
@@ -129,6 +146,8 @@ def setup_python(python_configuration: PythonConfiguration, dependency_constrain
         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)
 
@@ -136,21 +155,22 @@ def setup_python(python_configuration: PythonConfiguration, dependency_constrain
     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()
+    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)
-        exit(1)
+        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()
+    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)
-        exit(1)
+        sys.exit(1)
+
+    log.step('Installing build tools...')
 
-    # prepare the Python environment
     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)
@@ -181,9 +201,10 @@ def pep_518_cp35_workaround(package_dir: Path, env: Dict[str, str]) -> None:
         )
 
         if requirements:
+            log.step('Performing PEP518 workaround...')
             with tempfile.TemporaryDirectory() as d:
                 reqfile = Path(d) / "requirements.txt"
-                with reqfile.open("w") as f:
+                with reqfile.open('w') as f:
                     for r in requirements:
                         print(r, file=f)
                 call(['pip', 'install', '-r', reqfile], env=env)
@@ -194,114 +215,122 @@ def build(options: BuildOptions) -> None:
     built_wheel_dir = temp_dir / 'built_wheel'
     repaired_wheel_dir = temp_dir / 'repaired_wheel'
 
-    # install nuget as best way to provide python
-    nuget = Path('C:\\cibw\\nuget.exe')
-    download('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', nuget)
+    try:
+        if options.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)
+            shell(before_all_prepared, env=env)
 
-    if options.before_all:
-        env = options.environment.as_dictionary(prev_environment=os.environ)
-        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)
-    for config in python_configurations:
-        dependency_constraint_flags: Sequence[Union[str, PathLike]] = []
-        if options.dependency_constraints:
-            dependency_constraint_flags = [
-                '-c', options.dependency_constraints.get_for_python_version(config.version)
-            ]
+        for config in python_configurations:
+            log.build_start(config.identifier)
 
-        # install Python
-        env = setup_python(config, dependency_constraint_flags, options.environment)
+            dependency_constraint_flags: Sequence[PathOrStr] = []
+            if options.dependency_constraints:
+                dependency_constraint_flags = [
+                    '-c', options.dependency_constraints.get_for_python_version(config.version)
+                ]
 
-        # run the before_build command
-        if options.before_build:
-            before_build_prepared = prepare_command(options.before_build, project='.', package=options.package_dir)
-            shell(before_build_prepared, env=env)
+            # install Python
+            env = setup_python(config, dependency_constraint_flags, options.environment)
 
-        # 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)
+            # 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)
+                shell(before_build_prepared, env=env)
 
-        # build the 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)
+            # 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)
 
-        built_wheel = next(built_wheel_dir.glob('*.whl'))
+            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)
 
-        # repair the wheel
-        if repaired_wheel_dir.exists():
-            shutil.rmtree(repaired_wheel_dir)
-        repaired_wheel_dir.mkdir(parents=True)
+            built_wheel = next(built_wheel_dir.glob('*.whl'))
 
-        if built_wheel.name.endswith('none-any.whl'):
-            raise NonPlatformWheelError()
+            # repair the wheel
+            if repaired_wheel_dir.exists():
+                shutil.rmtree(repaired_wheel_dir)
+            repaired_wheel_dir.mkdir(parents=True)
 
-        if options.repair_command:
-            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)
+            if built_wheel.name.endswith('none-any.whl'):
+                raise NonPlatformWheelError()
 
-        repaired_wheel = next(repaired_wheel_dir.glob('*.whl'))
+            if options.repair_command:
+                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)
 
-        if options.test_command:
-            # 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)
-            venv_dir = Path(tempfile.mkdtemp())
+            repaired_wheel = next(repaired_wheel_dir.glob('*.whl'))
 
-            # Use --no-download to ensure determinism by using seed libraries
-            # built into virtualenv
-            call(['python', '-m', 'virtualenv', '--no-download', venv_dir], env=env)
+            if options.test_command and options.test_selector(config.identifier):
+                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)
+                venv_dir = Path(tempfile.mkdtemp())
 
-            virtualenv_env = env.copy()
-            virtualenv_env['PATH'] = os.pathsep.join([
-                str(venv_dir / 'Scripts'),
-                virtualenv_env['PATH'],
-            ])
+                # Use --no-download to ensure determinism by using seed libraries
+                # built into virtualenv
+                call(['python', '-m', 'virtualenv', '--no-download', venv_dir], env=env)
 
-            # check that we are using the Python from the virtual environment
-            call(['which', 'python'], env=virtualenv_env)
+                virtualenv_env = env.copy()
+                virtualenv_env['PATH'] = os.pathsep.join([
+                    str(venv_dir / 'Scripts'),
+                    virtualenv_env['PATH'],
+                ])
 
-            if options.before_test:
-                before_test_prepared = prepare_command(
-                    options.before_test,
-                    project='.',
-                    package=options.package_dir
+                # check that we are using the Python from the virtual environment
+                call(['where', 'python'], env=virtualenv_env)
+
+                if options.before_test:
+                    before_test_prepared = prepare_command(
+                        options.before_test,
+                        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)
+
+                # test the wheel
+                if options.test_requires:
+                    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(),
                 )
-                shell(before_test_prepared, env=virtualenv_env)
+                shell(test_command_prepared, cwd='c:\\', env=virtualenv_env)
 
-            # install the wheel
-            call(['pip', 'install', str(repaired_wheel) + options.test_extras], env=virtualenv_env)
+                # clean up
+                shutil.rmtree(venv_dir)
 
-            # test the wheel
-            if options.test_requires:
-                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()
-            )
-            shell(test_command_prepared, cwd='c:\\', env=virtualenv_env)
-
-            # clean up
-            shutil.rmtree(venv_dir)
-
-        # we're all done here; move it to output (remove if already exists)
-        shutil.move(str(repaired_wheel), options.output_dir)
+            # we're all done here; move it to output (remove if already exists)
+            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}')
+        sys.exit(1)

docs/changelog.md

@@ -0,0 +1,17 @@
+---
+title: Changelog
+---
+
+{%
+   include-markdown "../README.md"
+   start="<!--changelog-start-->"
+   end="<!--changelog-end-->"
+%}
+
+<script>
+  // undo the scrollTop that the theme did on this page, as there are loads
+  // of toc entries and it's disorientating.
+  window.addEventListener('DOMContentLoaded', function() {
+    $('.wy-nav-side').scrollTop(0)
+  })
+</script>

docs/contributing.md

@@ -2,9 +2,9 @@
 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.
 
@@ -27,40 +27,95 @@ 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/joerick/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
 ----------------
 
-## Testing minimal configs
+### Local testing
 
-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.
+You should run:
+
+```python
+python3 -m venv venv
+. venv/bin/activate
+pip install -e .[dev]
+```
+
+To prepare a development environment.
+
+### Testing sample configs
+
+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:
 
-    bin/run_example_ci_configs.py
+```bash
+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.
 
-## Making a release
+### Preparing environments
 
-Before making a release, ensure pinned dependencies are up-to-date. Run the script:
+This has been moved to using docker, so you only need the following instructions if you add `--no-docker` to avoid using docker.
 
-    bin/make_dependency_update_pr.py
+The dependency update script in the next section requires multiple python versions installed. One way to do this is to use `pyenv`:
 
-If updates are needed, this will push a PR with those updates for the CI to test. Once green, merge this PR.
+```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;
+# otherwise assuming 3.8+ already is your current python version
+```
+
+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
+```
+
+<!-- Note for fish users: use zsh/bash for these lines for now, there's not a nice one-line fish replacement -->
+
+And, you need to install the requirements into each environment:
+
+```bash
+for f in env*/bin/pip; do $f install pip-tools; done
+```
+
+### Making a release
+
+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:
 
-    bin/bump_version.py
+```bash
+bin/bump_version.py
+```
 
 You'll be prompted to enter the new version number. Update the changelog when prompted. The script will create a 'bump version' commit and version tag.
 
-Finally, cut the release and upload to PyPI/Github.
+Finally, cut the release and upload to PyPI/GitHub.
 
-    rm -rf dist
-    python setup.py sdist bdist_wheel
-    twine upload dist/*
-    git push && git push --tags
+```bash
+rm -rf dist
+python setup.py sdist bdist_wheel
+twine upload dist/*
+git push && git push --tags
+```
+
+Then head to https://github.com/joerick/cibuildwheel/releases and create a GitHub release from the new tag, pasting in the changelog entry.

docs/cpp_standards.md

@@ -30,9 +30,11 @@ For more details see https://en.cppreference.com/w/cpp/compiler_support, https:/
 
 ## 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*`.
+In previous years, Microsoft distributed a compiler toolchain called 'Visual C++ for Python 2.7', which was a distribution of MSVC 2008 that was created to make it easier to build Python 2.7 extensions on Windows, because it was fully compatible with the toolchain that built Python 2.7.
 
-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.
+This toolchain does not support modern C++ standards (i.e., C++11 and later). And it is hard to find this toolchain these days, since Microsoft removed the download for the required Visual Studio 2008 needed to build a native extension in April, 2021. So, by default, cibuildwheel does not attempt to build Python 2.7 extensions on Windows.
+
+There is an optional workaround, 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:
 

docs/data/projects.yml

@@ -0,0 +1,326 @@
+# Fields:
+# 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)
+
+- name: Matplotlib
+  gh: matplotlib/matplotlib
+  notes: The venerable Matplotlib, a Python library with C++ portions
+  ci: [github]
+  os: [windows, apple, linux]
+
+- name: pyinstrument_cext
+  gh: joerick/pyinstrument_cext
+  ci: [travisci, appveyor]
+  os: [windows, apple, linux]
+  notes: A simple C extension, without external dependencies
+
+- name: websockets
+  gh: aaugustin/websockets
+  ci: [travisci]
+  ci_config: .travis.yml
+  os: [apple, linux]
+  notes: |
+    Library for building WebSocket servers and clients. Mostly written in
+    Python, with a small C 'speedups' extension module.
+
+- 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]
+
+# Seems to be defunct
+# - name: python-admesh
+#   gh: admesh/python-admesh
+
+- name: pybase64
+  gh: mayeut/pybase64
+  ci: [github]
+  os: [windows, apple, linux]
+
+
+- name: KDEpy
+  gh: tommyod/KDEpy
+  ci: [github]
+  os: [windows, apple, linux]
+
+- name: AutoPy
+  gh: autopilot-rs/autopy
+  ci: [travisci]
+  os: [windows, apple, linux]
+  notes: Includes a Windows Travis build.
+
+# Seems to be defunct
+# - name: apriltags2-ethz
+#  gh: safijari/apriltags2_ethz
+
+- name: TgCrypto
+  gh: pyrogram/tgcrypto
+  ci: [travisci]
+  os: [windows, apple, linux]
+  notes: Includes a Windows Travis build.
+
+- name: twisted-iocpsupport
+  gh: twisted/twisted-iocpsupport
+  stars: twisted/twisted
+  notes: A submodule of Twisted that hooks into native C APIs using Cython.
+  ci: [github]
+  os: [windows]
+
+# cibuildwheel moved to backup folder
+# - name: gmic-py
+# gh: myselfhimself/gmic-py
+
+- name: River
+  gh: online-ml/river
+  ci: [github]
+  os: [windows, apple, linux]
+
+- name: PyAV
+  gh: PyAV-Org/PyAV
+  pypi: av
+  ci: [github]
+  os: [windows, apple, linux]
+  notes: Pythonic bindings for FFmpeg's libraries.
+
+- name: aiortc
+  gh: aiortc/aiortc
+  ci: [github]
+  os: [apple, linux]
+  notes: WebRTC and ORTC implementation for Python using asyncio.
+
+- name: aioquic
+  gh: aiortc/aioquic
+  ci: [github]
+  os: [windows, apple, linux]
+
+- name: pikepdf
+  gh: pikepdf/pikepdf
+  ci: [azurepipelines]
+  os: [windows, apple, linux]
+
+- name: fathon
+  gh: stfbnc/fathon
+  ci: [travisci]
+  os: [apple, linux]
+
+- 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]
+
+- name: xmlstarlet
+  gh: dimitern/xmlstarlet
+  notes: Python 3.6+ CFFI bindings with true MSVC build.
+  ci: [github]
+  os: [windows, apple, linux]
+
+- name: bx-python
+  gh: bxlab/bx-python
+  notes: A library that includes Cython extensions.
+  ci: [travisci]
+  os: [apple, linux]
+
+- name: coverage.py
+  gh: nedbat/coveragepy
+  ci: [github]
+  os: [windows, apple, linux]
+  notes: The coverage tool for Python
+
+- name: scikit-learn
+  gh: scikit-learn/scikit-learn
+  ci: [github]
+  os: [windows, apple, linux]
+  ci_config: .github/workflows/wheels.yml
+  notes: |
+    The machine learning library. A complex but clean config using many of
+    cibuildwheel's features to build a large project with Cython and C++
+    extensions.
+
+- name: scikit-image
+  gh: scikit-image/scikit-image
+  ci: [github]
+  os: [windows, apple, linux]
+  ci_config: .github/workflows/cibuildwheel.yml
+  notes: |
+    Image processing library. Uses cibuildwheel to build and test a project
+    that uses Cython with platform-native code.
+
+- name: google neuroglancer
+  gh: google/neuroglancer
+  ci: [github]
+  os: [windows, apple, linux]
+
+- name: h5py
+  gh: h5py/h5py
+  ci: [azurepipelines]
+  os: [windows, apple, linux]
+
+- name: pyzmq
+  gh: zeromq/pyzmq
+  ci: [github]
+  os: [windows, apple, linux]
+  ci_config: .github/workflows/wheels.yml
+  notes: |
+    Python bindings for zeromq, the networking library. Uses Cython and CFFI.
+
+- name: python-rapidjson
+  gh: python-rapidjson/python-rapidjson
+  ci: [travisci, gitlab, appveyor]
+  os: [windows, linux]
+
+- name: jq.py
+  gh: mwilliamson/jq.py
+  pypi: jq
+  ci: [travisci]
+  os: [apple, linux]
+
+- name: pybind11 python_example
+  gh: pybind/python_example
+  ci: [github]
+  os: [windows, apple, linux]
+
+- name: pybind11 cmake_example
+  gh: pybind/cmake_example
+  ci: [github]
+  os: [windows, apple, linux]
+
+- name: pybind11 scikit_build_example
+  gh: pybind/scikit_build_example
+  ci: [github]
+  os: [windows, apple, linux]
+
+- name: iminuit
+  gh: scikit-hep/iminuit
+  ci: [github]
+  os: [windows, apple, linux]
+
+- name: pyjet
+  gh: scikit-hep/pyjet
+  ci: [github]
+  os: [windows, apple, linux]
+
+- name: numpythia
+  gh: scikit-hep/numpythia
+  ci: [github]
+  os: [apple, linux]
+
+- name: boost-histogram
+  gh: scikit-hep/boost-histogram
+  ci: [github, travisci]
+  os: [windows, apple, linux]
+  notes: Supports full range of wheels, including PyPy and alternate archs.
+
+- name: Rtree
+  gh: Toblerity/rtree
+  ci: [github]
+  os: [windows, apple, linux]
+
+- name: psutil
+  gh: giampaolo/psutil
+  ci: [github]
+  os: [windows, apple, linux]
+
+- 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
+
+- name: numexpr
+  gh: pydata/numexpr
+  ci: [github, travisci]
+  os: [windows, apple, linux]
+
+- 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
+
+- name: Tokenizer
+  gh: OpenNMT/Tokenizer
+  ci: [github, travisci]
+  os: [apple, linux]
+
+- name: matrixprofile
+  gh: matrix-profile-foundation/matrixprofile
+  ci: [travisci]
+  os: [windows, apple, linux]
+
+- name: cyvcf2
+  gh: brentp/cyvcf2
+  ci: [github]
+  os: [apple, linux]
+
+- name: CTranslate2
+  gh: OpenNMT/CTranslate2
+  ci: [github]
+  os: [apple, linux]
+  notes: 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.
+
+- 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.
+
+- name: Imagecodecs (fork)
+  gh: czaki/imagecodecs_build
+  stars: cgohlke/imagecodecs
+  pypi: imagecodecs
+  ci: [azurepipelines]
+  ci_config: azure-pipelines.yaml
+  os: [apple, linux]
+  notes: Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS.
+
+- name: ruptures
+  gh: deepcharles/ruptures
+  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]

docs/data/readme_icons/apple.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 24 24" width="16px" fill="#606060"><title>Apple icon</title><path d="M12.152 6.896c-.948 0-2.415-1.078-3.96-1.04-2.04.027-3.91 1.183-4.961 3.014-2.117 3.675-.546 9.103 1.519 12.09 1.013 1.454 2.208 3.09 3.792 3.039 1.52-.065 2.09-.987 3.935-.987 1.831 0 2.35.987 3.96.948 1.637-.026 2.676-1.48 3.676-2.948 1.156-1.688 1.636-3.325 1.662-3.415-.039-.013-3.182-1.221-3.22-4.857-.026-3.04 2.48-4.494 2.597-4.559-1.429-2.09-3.623-2.324-4.39-2.376-2-.156-3.675 1.09-4.61 1.09zM15.53 3.83c.843-1.012 1.4-2.427 1.245-3.83-1.207.052-2.662.805-3.532 1.818-.78.896-1.454 2.338-1.273 3.714 1.338.104 2.715-.688 3.559-1.701"/></svg>

docs/data/readme_icons/appveyor.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 24 24" width="16px" fill="#606060"><title>AppVeyor icon</title><path d="M 12,0 C 18.6,0 24,5.4 24,12 24,18.6 18.6,24 12,24 5.4,24 0,18.6 0,12 0,5.4 5.4,0 12,0 Z m 2.94,14.34 C 16.26,12.66 16.08,10.26 14.4,9 12.78,7.74 10.38,8.04 9,9.72 7.68,11.4 7.86,13.8 9.54,15.06 c 1.68,1.26 4.08,0.96 5.4,-0.72 z m -6.42,7.8 c 0.72,0.3 2.28,0.6 3.06,0.6 l 5.22,-7.56 c 1.68,-2.52 1.26,-5.94 -1.08,-7.8 -2.1,-1.68 -5.04,-1.62 -7.14,0 l -7.26,5.58 c 0.18,1.92 0.72,2.88 0.72,2.94 l 4.14,-4.5 c -0.3,1.98 0.42,4.02 2.1,5.28 1.44,1.14 3.18,1.44 4.86,1.08 z"/></svg>

docs/data/readme_icons/azurepipelines.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 24 24" width="16px" fill="#606060"><title>Azure Pipelines icon</title><path d="M1.8 18H0v6h6v-1.8H1.8zM23 0h-8.93a2 2 0 0 0-1.67.89L9 5.99H1a1 1 0 0 0-1 1v5.5l3.5 3.61 1.2-1.29 1.5 1.5L5 17.53l1.48 1.48 1.22-1.22 1.5 1.51L8 20.5l3.5 3.5H17a1 1 0 0 0 1-1v-8l5.11-3.4A2 2 0 0 0 24 9.92V1a1 1 0 0 0-1-1zm-5 9a3 3 0 1 1 0-6 3 3 0 0 1 0 6z"/></svg>

docs/data/readme_icons/circleci.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 24 24" width="16px" fill="#606060"><title>CircleCI icon</title><path d="M8.963 12c0-1.584 1.284-2.855 2.855-2.855 1.572 0 2.856 1.284 2.856 2.855 0 1.572-1.284 2.856-2.856 2.856-1.57 0-2.855-1.284-2.855-2.856zm2.855-12C6.215 0 1.522 3.84.19 9.025c-.01.036-.01.07-.01.12 0 .313.252.576.575.576H5.59c.23 0 .433-.13.517-.333.997-2.16 3.18-3.672 5.712-3.672 3.466 0 6.286 2.82 6.286 6.287 0 3.47-2.82 6.29-6.29 6.29-2.53 0-4.714-1.5-5.71-3.673-.097-.19-.29-.336-.517-.336H.755c-.312 0-.575.253-.575.576 0 .037.014.072.014.12C1.514 20.16 6.214 24 11.818 24c6.624 0 12-5.375 12-12 0-6.623-5.376-12-12-12z"/></svg>

docs/data/readme_icons/github.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 24 24" width="16px" fill="#606060"><title>GitHub icon</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>

docs/data/readme_icons/gitlab.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 24 24" width="16px" fill="#606060"><title>GitLab icon</title><path d="M4.845.904c-.435 0-.82.28-.955.692C2.639 5.449 1.246 9.728.07 13.335a1.437 1.437 0 00.522 1.607l11.071 8.045c.2.145.472.144.67-.004l11.073-8.04a1.436 1.436 0 00.522-1.61c-1.285-3.942-2.683-8.256-3.817-11.746a1.004 1.004 0 00-.957-.684.987.987 0 00-.949.69l-2.405 7.408H8.203l-2.41-7.408a.987.987 0 00-.942-.69h-.006zm-.006 1.42l2.173 6.678H2.675zm14.326 0l2.168 6.678h-4.341zm-10.593 7.81h6.862c-1.142 3.52-2.288 7.04-3.434 10.559L8.572 10.135zm-5.514.005h4.321l3.086 9.5zm13.567 0h4.325c-2.467 3.17-4.95 6.328-7.411 9.502 1.028-3.167 2.059-6.334 3.086-9.502zM2.1 10.762l6.977 8.947-7.817-5.682a.305.305 0 01-.112-.341zm19.798 0l.952 2.922a.305.305 0 01-.11.341v.002l-7.82 5.68.026-.035z"/></svg>

docs/data/readme_icons/travisci.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 24 24" width="16px" fill="#606060"><title>Travis CI icon</title><path d="M9.32 13.025a.485.485 0 1 1-.97 0c0-.446-.167-.758-.406-.758-.239 0-.405.312-.405.758a.485.485 0 1 1-.97 0c0-1.187.713-1.728 1.375-1.728s1.376.541 1.376 1.728zm6.017.485a.485.485 0 0 0 .485-.485c0-.446.167-.758.405-.758s.405.312.405.758a.485.485 0 1 0 .97 0c0-1.187-.713-1.728-1.375-1.728s-1.375.541-1.375 1.728c0 .268.217.485.485.485zm7.967-4.454l-.191 2.459a.801.801 0 0 1-.367.623.852.852 0 0 1-.46.13 1.07 1.07 0 0 1-.366-.068c-.271-.101-.544-.192-.817-.285a8.978 8.978 0 0 1-.094 1.614c-.04.242-.092.471-.138.707a.485.485 0 0 1-.024.125 19.471 19.471 0 0 1-1.033 3.513l.033-.02.897-.537c.193-.137.599-.122.815.1a.645.645 0 0 1 .173.577.743.743 0 0 1-.053.159c-.061.135-.319.706-.866 1.906-.675 1.483-2.06 1.77-2.121 1.782.001.001-.907.214-1.879.44C15.458 23.419 13.87 24 12.087 24c-1.84 0-3.448-.58-4.787-1.713l-1.924-.45c-.041-.008-1.427-.294-2.103-1.778l-.87-1.914c-.005-.019-.05-.158-.053-.177-.009-.625.621-.914 1.023-.632l.858.512c.006.003.074.043.171.085a20.443 20.443 0 0 1-.982-3.444c-.063-.317-.129-.63-.183-.96a8.937 8.937 0 0 1-.09-1.7c-.357.118-.713.24-1.066.372-.292.109-.593.087-.827-.062a.802.802 0 0 1-.366-.621L.695 9.055c-.036-.475.305-.969.794-1.152l.3-.117c.225-.089.505-.198.837-.318C3.65 3.124 7.566 0 12.041 0c4.516 0 8.438 3.158 9.434 7.549.472.153.843.281 1.036.355.492.183.833.677.793 1.152zm-4.612 8.973c.369-.815.678-1.708.93-2.67l-.997.713a.952.952 0 0 1-.655.166l-4.467-.47a.96.96 0 0 1-.821-.698l-.558-1.923a2.482 2.482 0 0 0-.244 0l-.56 1.93a.955.955 0 0 1-.82.691l-4.471.471a.951.951 0 0 1-.642-.162l-.723-.503c.231.889.506 1.708.824 2.451.609-.028 1.207-.069 1.209-.069.001 0 .434-.039.788-.332l1.061-.885c.148-.165.652-.465 1.33-.271.196.055.495.146.815.243.062.019.12.05.17.092.532.445 1.832.445 2.365.002a.481.481 0 0 1 .168-.091c.337-.103.631-.192.823-.247.68-.193 1.182.108 1.374.314l1.016.843c.353.294.785.332.789.332-.001.001.658.045 1.296.073zm-6.605 5.001a6.42 6.42 0 0 0 1.949-.313c-.932-.209-1.555-1.019-1.588-1.062l-.406-.542-.407.543c-.031.043-.641.842-1.558 1.06.63.196 1.295.314 2.01.314zm6.941-4.016a63.622 63.622 0 0 1-1.701-.089 2.519 2.519 0 0 1-1.339-.554l-1.065-.888c-.055-.051-.187-.152-.442-.083-.176.05-.436.13-.717.216-.878.655-2.567.655-3.443-.003a43.693 43.693 0 0 0-.709-.212c-.258-.076-.386.03-.411.052l-1.097.918a2.523 2.523 0 0 1-1.341.553s-.872.059-1.594.085h-.002l-.106.004a2.41 2.41 0 0 1-1.341-.343l-.018-.01.453.996c.463 1.017 1.389 1.225 1.427 1.232.014.004 2.754.646 3.822.889.781.174 1.447-.696 1.454-.705l.795-1.061c.183-.245.594-.245.776 0l.796 1.061c.007.009.682.881 1.455.705 1.067-.243 3.807-.886 3.807-.886a2.193 2.193 0 0 0 1.442-1.236l.452-.993-.026.015a2.27 2.27 0 0 1-1.327.337zm1.096-7.412a28.286 28.286 0 0 0-15.998-.075 8.025 8.025 0 0 0 .067 1.845c.045.275.1.535.152.8l1.591 1.108 4.461-.476.642-2.243a.488.488 0 0 1 .395-.345 3.855 3.855 0 0 1 1.135.003.482.482 0 0 1 .394.344l.652 2.245 4.462.468 1.864-1.336c.036-.19.079-.374.111-.568a7.89 7.89 0 0 0 .072-1.77zm2.214-2.623c-.005-.034-.073-.133-.165-.167l-.004-.001c-.22-.083-.68-.242-1.256-.423l-.007-.005c-.955-.299-2.771-.823-4.267-.99a.485.485 0 0 1 .108-.964c1.192.134 2.529.466 3.637.787C19.298 3.552 15.913.97 12.041.97c-3.832 0-7.207 2.549-8.318 6.165a20.252 20.252 0 0 1 3.27-.705.484.484 0 1 1 .121.962 19.235 19.235 0 0 0-3.909.899l-.005.004c-.432.149-.785.288-1.056.394l-.315.123c-.094.035-.162.135-.167.175l.177 2.264a29.36 29.36 0 0 1 10.164-1.817c3.442 0 6.881.607 10.157 1.82l.178-2.275zm-8.534-5.986h-3.539a.485.485 0 0 0-.485.485v.811a.485.485 0 1 0 .97 0v-.326h.746v3.308h-.521a.485.485 0 1 0 0 .97h2.061a.485.485 0 1 0 0-.97h-.57V3.963h.853v.326a.485.485 0 1 0 .97 0v-.811a.485.485 0 0 0-.485-.485z"/></svg>

docs/data/readme_icons/windows.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 24 24" width="16px" fill="#606060"><title>Windows icon</title><path d="M0 3.449L9.75 2.1v9.451H0m10.949-9.602L24 0v11.4H10.949M0 12.6h9.75v9.451L0 20.699M10.949 12.6H24V24l-12.9-1.801"/></svg>

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;
@@ -29,7 +30,6 @@ h1, h2, h3, h4, h5, h6 {
     border-bottom: 1px solid  #e1e4e5;
     margin-bottom: 0.8em;
     padding-bottom: 0.2em;
-
 }
 
 .rst-content blockquote {
@@ -40,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
 
@@ -84,5 +92,65 @@ h1, h2, h3, h4, h5, h6 {
     padding-top: 0.9em;
 }
 
+.toctree-l3 {
+  border-left: 10px solid transparent;
+}
+
 /* 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,18 +12,160 @@ 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 [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/joerick/cibuildwheel/issues/133#issuecomment-478288597) before activating a venv.
 
 ### 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.
 
 - Alternative dockers images can be specified with the `CIBW_MANYLINUX_X86_64_IMAGE`, `CIBW_MANYLINUX_I686_IMAGE`, and `CIBW_MANYLINUX_PYPY_X86_64_IMAGE` options to allow for a custom, preconfigured build environment for the Linux builds. See [options](options.md#manylinux-image) for more details.
 
+### Building macOS wheels for Apple Silicon {: #apple-silicon}
+
+`cibuildwheel` supports cross-compiling `universal2` and `arm64` wheels on `x86_64` runners. With the introduction of Apple Silicon, you now have several choices for wheels for Python 3.9+:
+
+#### `x86_64`
+
+The traditional wheel for Apple, loads on Intel machines, and on
+Apple Silicon when running Python under Rosetta 2 emulation.
+
+Due to a change in naming, Pip 20.3+ (or an installer using packaging 20.5+)
+is required to install a binary wheel on macOS Big Sur.
+
+#### `arm64`
+
+The native wheel for macOS on Apple Silicon.
+
+Requires Pip 20.3+ (or packaging 20.5+) to install.
+
+#### `universal2`
+
+This wheel contains both architectures, causing it to be up to twice the
+size (data files do not get doubled, only compiled code). It requires
+Pip 20.3 (Packaging 20.6+) to load on Intel, and Pip 21.0.1 (Packaging 20.9+)
+to load on Apple Silicon.
+
+!!! note
+    The dual-architecture `universal2` has a few benefits, but a key benefit
+    to a universal wheel is that a user can bundle these wheels into an
+    application and ship a single binary.
+
+    However, if you have a large library, then you might prefer to ship
+    the two single-arch wheels instead - `x86_64` and `arm64`. In rare cases,
+    you might want to build all three, but in that case, pip will not download
+    the universal wheels, because it prefers the most specific wheel
+    available.
+
+Generally speaking, because Pip 20.3 is required for the `universal2` wheel,
+most packages should provide both `x86_64` and `universal2` wheels for now.
+Once Pip 20.3+ is common on macOS, then it should be possible to ship only the
+`universal2` wheel.
+
+**Apple Silicon wheels are not built by default**, but can be enabled by adding extra archs to the [`CIBW_ARCHS_MACOS` option](options.md#archs) - e.g. `x86_64 arm64 universal2`. Cross-compilation is provided by the Xcode toolchain.
+
+!!! important
+    When cross-compiling on Intel, it is not possible to test `arm64` and the `arm64` part of a `universal2` wheel.
+
+    `cibuildwheel` will raise a warning to notify you of this - these warnings be be silenced by skipping testing on these platforms: `CIBW_TEST_SKIP: *_arm64 *_universal2:arm64`.
+
+Hopefully, cross-compilation is a temporary situation. Once we have widely
+available Apple Silicon CI runners, we can build and test `arm64` and
+`universal2` wheels natively. That's why `universal2` wheels are not yet built
+by default, and require opt-in by setting `CIBW_ARCHS_MACOS`.
+
+!!! note
+    Your runner needs Xcode Command Line Tools 12.2 or later to build `universal2` or `arm64`.
+
+    So far, only CPython 3.9 supports `universal2` and `arm64` wheels.
+
+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 non-native architectures using emulation  {: #emulation}
+
+cibuildwheel supports building non-native architectures on Linux, via
+emulation through the binfmt_misc kernel feature. The easiest way to use this
+is via the [docker/setup-qemu-action][setup-qemu-action] on GitHub Actions or
+[tonistiigi/binfmt][binfmt].
+
+[setup-qemu-action]: https://github.com/docker/setup-qemu-action
+[binfmt]: https://hub.docker.com/r/tonistiigi/binfmt
+
+Check out the following config for an example of how to set it up on GitHub
+Actions. Once QEMU is set up and registered, you just need to set the
+`CIBW_ARCHS_LINUX` environment variable (or use the `--archs` option on
+Linux), and the other architectures are emulated automatically.
+
+> .github/workflows/build.yml
+
+```yaml
+{% include "../examples/github-with-qemu.yml" %}
+```
+
+### Building Apple Silicon wheels on Intel {: #apple-silicon}
+
+`cibuildwheel` supports cross-compiling `universal2` and `arm64` wheels on `x86_64` runners.
+
+These wheels are not built by default, but can be enabled by setting the [`CIBW_ARCHS_MACOS` option](options.md#archs) to `x86_64 arm64 universal2`. Cross-compilation is provided by the Xcode toolchain.
+
+!!! important
+    When cross-compiling on Intel, it is not possible to test `arm64` and the `arm64` part of a `universal2` wheel.
+
+    `cibuildwheel` will raise a warning to notify you of this - these warnings be be silenced by skipping testing on these platforms: `CIBW_TEST_SKIP: *_arm64 *_universal2:arm64`.
+
+Hopefully, this is a temporary situation. Once we have widely available Apple Silicon CI runners, we can build and test `arm64` and `universal2` wheels more natively. That's why `universal2` wheels are not yet built by default, and require opt-in by setting `CIBW_ARCHS_MACOS`.
+
+!!! note
+    Your runner image needs Xcode Command Line Tools 12.2 or later to build `universal2` and `arm64`.
+
+    So far, only CPython 3.9 supports `universal2` and `arm64` wheels.
+
+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" %}
+```
+
+### Windows and Python 2.7
+
+Building 2.7 extensions on Windows is difficult, because the VS 2008 compiler that was used for the original Python compilation was discontinued in 2018, and has since been removed from Microsoft's downloads. Most people choose to not build Windows 2.7 wheels, or to override the compiler to something more modern.
+
+To override, you need to have a modern compiler toolchain activated, and set `DISTUTILS_USE_SDK=1` and `MSSdk=1`. For example, on GitHub Actions, you would add these steps:
+
+```yaml
+    - name: Prepare compiler environment for Windows
+      if: runner.os == 'Windows'
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: x64
+
+    - name: Set Windows environment variables
+      if: runner.os == 'Windows'
+      shell: bash
+      run: |
+        echo "DISTUTILS_USE_SDK=1" >> $GITHUB_ENV
+        echo "MSSdk=1" >> $GITHUB_ENV
+
+    # invoke cibuildwheel...
+```
+
+cibuildwheel will not try to build 2.7 on Windows unless it detects that the above two variables are set. Note that changing to a more modern compiler will mean your wheel picks up a runtime dependency to a different [Visual C++ Redistributable][]. You also need to be [a bit careful][] in designing your extension; some major binding tools like pybind11 do this for you.
+
+More on setting a custom Windows toolchain in our docs on modern C++ standards [here](cpp_standards.md#windows-and-python-27).
+
+[Visual C++ Redistributable]: https://support.microsoft.com/en-us/topic/the-latest-supported-visual-c-downloads-2647da03-1eea-4433-9aff-95f26a218cc0
+[a bit careful]: https://pybind11.readthedocs.io/en/stable/faq.html#working-with-ancient-visual-studio-2008-builds-on-windows
+
 ### 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.
@@ -81,3 +223,56 @@ To add the `/d2FH4-` flag to a standard `setup.py` using `setuptools`, the `extr
 ```
 
 To investigate the dependencies of a C extension (i.e., the `.pyd` file, a DLL in disguise) on Windows, [Dependency Walker](http://www.dependencywalker.com/) is a great tool.
+
+
+### Automatic updates {: #automatic-updates}
+
+Selecting a moving target (like the latest release) is generally a bad idea in CI. If something breaks, you can't tell whether it was your code or an upstream update that caused the breakage, and in a worse-case scenario, it could occur during a release.
+There are two suggested methods for keeping cibuildwheel up to date that instead involve scheduled pull requests using GitHub's dependabot.
+
+#### Option 1: GitHub Action
+
+If you use GitHub Actions for builds, you can use cibuildwheel as an action:
+
+```yaml
+uses: joerick/cibuildwheel@v1.11.0
+```
+
+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.
+
+Then, your `dependabot.yml` file could look like this:
+
+```yaml
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    ignore:
+      # Optional: Official actions have moving tags like v1;
+      # if you use those, you don't need updates.
+      - dependency-name: "actions/*"
+```
+
+#### Option 2: Requirement files
+
+The second option, and the only one that supports other CI systems, is using a `requirements-*.txt` file. The file should have a distinct name and have only one entry:
+
+```bash
+# requirements-cibw.txt
+cibuildwheel==1.11.0
+```
+
+Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `dependabot.yml` file could look like this:
+
+```yaml
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
+```
+
+This will also try to update other pins in all requirement files, so be sure you want to do that. The only control you have over the files used is via the directory option.

docs/index.md

@@ -3,7 +3,7 @@ title: Home
 ---
 
 {%
-   includemarkdown "../README.md"
+   include-markdown "../README.md"
    start="<!--intro-start-->"
    end="<!--intro-end-->"
 %}

docs/mkdocs_include_markdown_plugin/mkdocs_include_markdown_plugin/plugin.py

@@ -1,84 +0,0 @@
-import cgi
-import re
-from pathlib import Path
-
-import mkdocs
-
-INCLUDE_TAG_REGEX = re.compile(
-    r'''
-        {% # opening tag
-        \s*
-        include # directive name
-        \s+
-        "(?P<filename>[^"]+)" # "filename"
-        \s*
-        %} # closing tag
-    ''',
-    flags=re.VERBOSE,
-)
-
-INCLUDEMARKDOWN_TAG_REGEX = re.compile(
-    r'''
-        {% # opening tag
-        \s*
-        includemarkdown # directive name
-        \s+
-        "(?P<filename>[^"]+)" # "filename"
-        (?:\s+start="(?P<start>[^"]+)")? # optional start expression
-        (?:\s+end="(?P<end>[^"]+)")? # optional end expression
-        \s*
-        %} # closing tag
-    ''',
-    flags=re.VERBOSE,
-)
-
-
-class ImportMarkdownPlugin(mkdocs.plugins.BasePlugin):
-    def on_page_markdown(self, markdown, page, **kwargs):
-        page_src_path = page.file.abs_src_path
-
-        def found_include_tag(match):
-            filename = match.group('filename')
-
-            file_path_abs = Path(page_src_path).parent / filename
-
-            if not file_path_abs.exists():
-                raise ValueError('file not found', filename)
-
-            text_to_include = file_path_abs.read_text(encoding='utf8')
-
-            # Allow good practice of having a final newline in the file
-            if text_to_include.endswith('\n'):
-                text_to_include = text_to_include[:-1]
-
-            return text_to_include
-
-        def found_includemarkdown_tag(match):
-            filename = match.group('filename')
-            start = match.group('start')
-            end = match.group('end')
-
-            file_path_abs = Path(page_src_path).parent / filename
-
-            if not file_path_abs.exists():
-                raise ValueError('file not found', filename)
-
-            text_to_include = file_path_abs.read_text(encoding='utf8')
-
-            if start:
-                _, _, text_to_include = text_to_include.partition(start)
-
-            if end:
-                text_to_include, _, _ = text_to_include.partition(end)
-
-            return (
-                '<!-- BEGIN INCLUDE %s %s %s -->\n' % (
-                    filename, cgi.escape(start or ''), cgi.escape(end or '')
-                )
-                + text_to_include
-                + '\n<!-- END INCLUDE -->'
-            )
-
-        markdown = re.sub(INCLUDE_TAG_REGEX, found_include_tag, markdown)
-        markdown = re.sub(INCLUDEMARKDOWN_TAG_REGEX, found_includemarkdown_tag, markdown)
-        return markdown

docs/mkdocs_include_markdown_plugin/setup.py

@@ -1,15 +0,0 @@
-from setuptools import setup
-
-setup(
-    name='mkdocs_include_markdown_plugin',
-    version='1.0',
-    author='Joe Rickerby',
-    license='Apache 2',
-    packages=['mkdocs_include_markdown_plugin'],
-    entry_points={
-        'mkdocs.plugins': [
-            'importmarkdown = mkdocs_include_markdown_plugin.plugin:ImportMarkdownPlugin',
-        ]
-    },
-    zip_safe=False
-)

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,37 +90,51 @@ 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 `--platform`.
+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 `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.
 
 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)). 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 |
-| PyPy 2.7 v7.3.0 | pp27-macosx_x86_64  | pp27-manylinux_x86_64  |                      |                 | pp27-win32     |                        |                        |                      |
-| PyPy 3.6 v7.3.0 | pp36-macosx_x86_64  | pp36-manylinux_x86_64  |                      |                 | pp36-win32     |                        |                        |                      |
+|              | macOS                                                               | Windows                       | Manylinux Intel                               | Manylinux Other                                                            |
+|--------------|---------------------------------------------------------------------|-------------------------------|-----------------------------------------------|----------------------------------------------------------------------------|
+| Python 2.7   | cp27-macosx_x86_64                                                  | cp27-win_amd64<br/>cp27-win32 | cp27-manylinux_x86_64<br/>cp27-manylinux_i686 |                                                                            |
+| Python 3.5   | cp35-macosx_x86_64                                                  | cp35-win_amd64<br/>cp35-win32 | cp35-manylinux_x86_64<br/>cp35-manylinux_i686 | cp35-manylinux_aarch64<br/>cp35-manylinux_ppc64le<br/>cp35-manylinux_s390x |
+| 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 |
+| PyPy2.7 v7.3 | pp27-macosx_x86_64                                                  |                    pp27-win32 | pp27-manylinux_x86_64                         |                                                                            |
+| PyPy3.6 v7.3 | pp36-macosx_x86_64                                                  |                    pp36-win32 | pp36-manylinux_x86_64                         |                                                                            |
+| PyPy3.7 v7.3 | pp37-macosx_x86_64                                                  |                    pp37-win32 | 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, respectively macOS 10.7 and 10.13 or higher is required.
+For CPython, the minimally supported macOS version is 10.9; for PyPy 2.7 and PyPy 3.6/3.7, respectively macOS 10.7 and 10.13 or higher is required.
 
 #### Examples
 
@@ -121,12 +163,12 @@ CIBW_SKIP: cp27-* cp35-*
 # Skip Python 3.6 on Linux
 CIBW_SKIP: cp36-manylinux*
 
-# Only build on Python 3 and skip 32-bit builds
-CIBW_BUILD: cp3?-*
+# Only build on Python 3 (ready for 3.10 when it comes) and skip 32-bit builds
+CIBW_BUILD: {cp,pp}3*-*
 CIBW_SKIP: "*-win32 *-manylinux_i686"
 
 # Only build PyPy and CPython 3
-CIBW_BUILD: pp* cp3?-*
+CIBW_BUILD: pp* cp3*-*
 
 # Disable building PyPy wheels on all platforms
 CIBW_SKIP: pp*
@@ -152,6 +194,116 @@ CIBW_SKIP: pp*
   }
 </style>
 
+### `CIBW_ARCHS` {: #archs}
+> Change the architectures built on your machine by default.
+
+A space-separated list of architectures to build.
+
+On macOS, this option can be used to cross-compile between `x86_64`,
+`universal2` and `arm64` for Apple Silicon support.
+
+On Linux, this option can be used to build non-native architectures under
+emulation. See [this guide](faq.md#emulation) for more information.
+
+Options:
+
+- Linux: `x86_64` `i686` `aarch64` `ppc64le` `s390x`
+- macOS: `x86_64` `arm64` `universal2`
+- Windows: `AMD64` `x86`
+- `auto`: The default archs for your machine - see the table below.
+    - `auto64`: Just the 64-bit auto archs
+    - `auto32`: Just the 32-bit auto archs
+- `native`: the native arch of the build machine - Matches [`platform.machine()`](https://docs.python.org/3/library/platform.html#platform.machine).
+- `all` : expands to all the architectures supported on this OS. You may want
+  to use [CIBW_BUILD](#build-skip) with this option to target specific
+  architectures via build selectors.
+
+Default: `auto`
+
+| Runner | `native` | `auto` | `auto64` | `auto32` |
+|---|---|---|---|---|
+| Linux / Intel | `x86_64` | `x86_64` `i686` | `x86_64` | `i686` |
+| Windows / Intel | `AMD64` | `AMD64` `x86` | `AMD64` | `x86` |
+| macOS / Intel | `x86_64` | `x86_64` | `x86_64` |  |
+| macOS / Apple Silicon | `arm64` | `arm64` `universal2` | `arm64` `universal2`|  |
+
+If not listed above, `auto` is the same as `native`.
+
+[setup-qemu-action]: https://github.com/docker/setup-qemu-action
+[binfmt]: https://hub.docker.com/r/tonistiigi/binfmt
+
+Platform-specific variants also available:<br/>
+ `CIBW_ARCHS_MACOS` | `CIBW_ARCHS_WINDOWS` | `CIBW_ARCHS_LINUX`
+
+This option can also be set using the [command-line option](#command-line) `--archs`.
+
+#### Examples
+
+```yaml
+# Build `universal2` and `arm64` wheels on an Intel runner.
+# Note that the `arm64` wheel and the `arm64` part of the `universal2`
+# wheel cannot be tested in this configuration.
+CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
+
+# On an Linux Intel runner with qemu installed, build Intel and ARM wheels
+CIBW_ARCHS_LINUX: "auto aarch64"
+```
+
+
+###  `CIBW_PROJECT_REQUIRES_PYTHON` {: #requires-python}
+> Manually set the Python compatibility of your project
+
+By default, cibuildwheel reads your package's Python compatibility from
+`pyproject.toml` following [PEP621](https://www.python.org/dev/peps/pep-0621/)
+or from `setup.cfg`; finally it will try to inspect the AST of `setup.py` for a
+simple keyword assignment in a top level function call. If you need to override
+this behaviour for some reason, you can use this option.
+
+When setting this option, the syntax is the same as `project.requires-python`,
+using 'version specifiers' like `>=3.6`, according to
+[PEP440](https://www.python.org/dev/peps/pep-0440/#version-specifiers).
+
+Default: reads your package's Python compatibility from `pyproject.toml`
+(`project.requires-python`) or `setup.cfg` (`options.python_requires`) or
+`setup.py` `setup(python_requires="...")`. If not found, cibuildwheel assumes
+the package is compatible with all versions of Python that it can build.
+
+
+!!! note
+    Rather than using this option, it's recommended you set
+    `project.requires-python` in `pyproject.toml` instead:
+    Example `pyproject.toml`:
+
+        [project]
+        requires-python = ">=3.6"
+
+        # Aside - in pyproject.toml you should always specify minimal build
+        # system options, like this:
+
+        [build-system]
+        requires = ["setuptools>=42", "wheel"]
+        build-backend = "setuptools.build_meta"
+
+
+    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 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.
+
+    If you don't want to list this value twice, you can also use the setuptools
+    specific location in `setup.cfg` and cibuildwheel will detect it from
+    there. Example `setup.cfg`:
+
+        [options]
+        python_requires = ">=3.6"
+
+#### Examples
+
+```yaml
+CIBW_PROJECT_REQUIRES_PYTHON: ">=3.6"
+```
 
 ## Build customization
 
@@ -188,7 +340,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.
@@ -197,7 +349,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.
 
@@ -213,14 +365,19 @@ 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
 
 A shell command to run before building the wheel. This option allows you to run a command in **each** Python environment before the `pip wheel` command. This is useful if you need to set up some dependency so it's available during the build.
 
-If dependencies are required to build your wheel (for example if you include a header from a Python module), set this to `pip install .`, and the dependencies will be installed automatically by pip. However, this means your package will be built twice - if your package takes a long time to build, you might wish to manually list the dependencies here instead.
+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`.
 
@@ -229,22 +386,44 @@ Platform-specific variants also available:<br/>
 
 #### Examples
 ```yaml
-# install your project and dependencies before building
-CIBW_BEFORE_BUILD: pip install .
-
-# install something required for the build
+# install something required for the build (you might want to use pyproject.toml instead)
 CIBW_BEFORE_BUILD: pip install pybind11
 
 # chain commands using &&
-CIBW_BEFORE_BUILD: yum install -y libffi-dev && pip install .
+CIBW_BEFORE_BUILD_LINUX: yum install -y libffi-dev && make clean
 
 # run a script that's inside your project
 CIBW_BEFORE_BUILD: bash scripts/prepare_for_build.sh
 
 # if cibuildwheel is called with a package_dir argument, it's available as {package}
-CIBW_BEFORE_BUILD: "{package}/bin/prepare_for_build.sh"
+CIBW_BEFORE_BUILD: "{package}/script/prepare_for_build.sh"
 ```
 
+!!! note
+    If you need dependencies installed for the build, we recommend using
+    `pyproject.toml`. This is an example `pyproject.toml` file:
+
+        [build-system]
+        requires = [
+            "setuptools>=42",
+            "wheel",
+            "Cython",
+            "numpy==1.13.3; python_version<'3.5'",
+            "oldest-supported-numpy; python_version>='3.5'",
+        ]
+
+        build-backend = "setuptools.build_meta"
+
+    This [PEP 517][]/[PEP 518][] style build allows you to completely control
+    the build environment in cibuildwheel, [PyPA-build][], and pip, doesn't
+    force downstream users to install anything they don't need, and lets you do
+    more complex pinning (Cython, for example, requires a wheel to be built
+    with an equal or earlier version of NumPy; pinning in this way is the only
+    way to ensure your module works on all available NumPy versions).
+
+    [PyPA-build]: https://pypa-build.readthedocs.io/en/latest/
+    [PEP 517]: https://www.python.org/dev/peps/pep-0517/
+    [PEP 518]: https://www.python.org/dev/peps/pep-0517/
 
 ### `CIBW_REPAIR_WHEEL_COMMAND` {: #repair-wheel-command}
 > Execute a shell command to repair each (non-pure Python) built wheel
@@ -252,46 +431,70 @@ CIBW_BEFORE_BUILD: "{package}/bin/prepare_for_build.sh"
 Default:
 
 - on Linux: `'auditwheel repair -w {dest_dir} {wheel}'`
-- on macOS: `'delocate-listdeps {wheel} && delocate-wheel --require-archs x86_64 -w {dest_dir} {wheel}'`
+- on macOS: `'delocate-listdeps {wheel} && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}'`
 - on Windows: `''`
 
 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.
+- `{dest_dir}` for the absolute path of the directory where to create the repaired wheel
+- `{delocate_archs}` (macOS only) comma-separated list of architectures in the wheel.
 
 The command is run in a shell, so you can run multiple commands like `cmd1 && cmd2`.
 
 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`
 
-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), [`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).
 
-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) and [PyPy manylinux images](https://github.com/pypy/manylinux). Alternatively, set these options to any other valid Docker image name. For PyPy, only the official `manylinux2010` image is currently 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).
+Note that `manylinux2014`/`manylinux_2_24` don't support builds with Python 2.7 - when building with `manylinux2014`/`manylinux_2_24`, 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
 
@@ -373,10 +576,17 @@ CIBW_DEPENDENCY_VERSIONS: ./constraints.txt
 ### `CIBW_TEST_COMMAND` {: #test-command}
 > Execute a shell command to test each built wheel
 
-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 specifying paths in your project.
+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 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.
 
-- `{project}` is an absolute path to the project root - the working directory where cibuildwheel was called.
-- `{package}` is the path to the package being built - the `package_dir` argument supplied to cibuildwheel on the command line.
+- `{project}` is an absolute path to the project root - the working directory
+  where cibuildwheel was called.
+- `{package}` is the path to the package being built - the `package_dir`
+  argument supplied to cibuildwheel on the command line.
 
 The command is run in a shell, so you can write things like `cmd1 && cmd2`.
 
@@ -391,16 +601,19 @@ CIBW_TEST_COMMAND: nosetests {project}/tests
 
 # run the package tests using `pytest`
 CIBW_TEST_COMMAND: pytest {package}/tests
+
+# trigger an install of the package, but run nothing of note
+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`.
 
@@ -462,6 +675,23 @@ Platform-specific variants also available:<br/>
 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 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`.
+
+#### Examples
+
+```yaml
+# Will avoid testing on emulated architectures
+CIBW_TEST_SKIP: "*-manylinux_{aarch64,ppc64le,s390x}"
+
+# Skip trying to test arm64 builds on Intel Macs
+CIBW_TEST_SKIP: "*-macosx_arm64 *-macosx_universal2:arm64"
+```
+
 
 ## Other
 
@@ -481,11 +711,12 @@ CIBW_BUILD_VERBOSITY: 1
 ```
 
 
-## Command line options
+## Command line options {: #command-line}
 
 ```text
 usage: cibuildwheel [-h] [--platform {auto,linux,macos,windows}]
-                    [--output-dir OUTPUT_DIR] [--print-build-identifiers]
+                    [--archs ARCHS] [--output-dir OUTPUT_DIR]
+                    [--print-build-identifiers] [--allow-empty]
                     [package_dir]
 
 Build wheels for all the platforms.
@@ -507,26 +738,32 @@ optional arguments:
                         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.
+  --archs ARCHS         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, native, all, x86_64, i686, aarch64, ppc64le,
+                        s390x, x86, AMD64
   --output-dir OUTPUT_DIR
                         Destination folder for the wheels.
   --print-build-identifiers
                         Print the build identifiers matched by the current
                         invocation and exit.
+  --allow-empty         Do not report an error code if the build does not
+                        match any wheels.
 ```
 
 <style>
-  .toctree-l3 {
-    border-left: 10px solid transparent;
-  }
-
   .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;
@@ -552,7 +789,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,24 +4,107 @@ 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.
 
-> build.yml
-```yaml
-{% include "../examples/github-minimal.yml" %}
-```
+!!! 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).
 
-Commit this file, and push to Github - either to your default branch, or to a PR branch. The build should start automatically.
+    > .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==1.11.0
+
+          - 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==1.11.0
+
+          - name: Build wheels
+            run: python -m cibuildwheel --output-dir wheelhouse
+
+          - uses: actions/upload-artifact@v2
+            with:
+              path: ./wheelhouse/*.whl
+    ```
+
+
+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.
 
+
 # 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" %}
 ```
@@ -38,11 +121,12 @@ Wheels will be stored for you and available through the Pipelines interface. For
 To build Linux, Mac, 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.
+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.
 
@@ -50,35 +134,6 @@ Then setup a deployment method by following the [Travis CI deployment docs](http
 
 [`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.
-
 # AppVeyor [linux/mac/windows] {: #appveyor}
 
 To build Linux, Mac, and Windows wheels on AppVeyor, create an `appveyor.yml` file in your repo.
@@ -95,6 +150,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>

docs/working-examples.md

@@ -0,0 +1,20 @@
+---
+title: Working examples
+---
+
+{%
+   include-markdown "../README.md"
+   start="<!--working-examples-start-->"
+   end="<!--working-examples-end-->"
+%}
+
+<style>
+.wy-nav-content {
+  /* this table benefits from a wider page */
+  max-width: 1000px;
+}
+.rst-content .section table img {
+  /* make the icons darker on this page */
+  filter: brightness(0.5);
+}
+</style>

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.6.1
+install: python -m pip install cibuildwheel==1.11.0
 
 build_script: python -m cibuildwheel --output-dir wheelhouse
 

examples/azure-pipelines-minimal.yml

@@ -4,9 +4,12 @@ jobs:
   steps:
     - task: UsePythonVersion@0
     - bash: |
+        set -o errexit
         python3 -m pip install --upgrade pip
-        pip3 install cibuildwheel==1.6.1
-        cibuildwheel --output-dir wheelhouse .
+        pip3 install cibuildwheel==1.11.0
+      displayName: Install dependencies
+    - bash: cibuildwheel --output-dir wheelhouse .
+      displayName: Build wheels
     - task: PublishBuildArtifacts@1
       inputs: {pathtoPublish: 'wheelhouse'}
 
@@ -15,21 +18,25 @@ jobs:
   steps:
     - task: UsePythonVersion@0
     - bash: |
+        set -o errexit
         python3 -m pip install --upgrade pip
-        pip3 install cibuildwheel==1.6.1
-        cibuildwheel --output-dir wheelhouse .
+        python3 -m pip install cibuildwheel==1.11.0
+      displayName: Install dependencies
+    - bash: cibuildwheel --output-dir wheelhouse .
+      displayName: Build wheels
     - task: PublishBuildArtifacts@1
-      inputs: {pathtoPublish: 'wheelhouse'}
+      inputs: {pathtoPublish: wheelhouse}
 
 - job: windows
   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.6.1
-        cibuildwheel --output-dir wheelhouse .
+        pip install cibuildwheel==1.11.0
+      displayName: Install dependencies
+    - bash: cibuildwheel --output-dir wheelhouse .
+      displayName: Build wheels
     - task: PublishBuildArtifacts@1
       inputs: {pathtoPublish: 'wheelhouse'}

examples/circleci-minimal.yml

@@ -11,7 +11,7 @@ jobs:
       - run:
           name: Build the Linux wheels.
           command: |
-            pip3 install --user cibuildwheel==1.6.1
+            pip3 install --user cibuildwheel==1.11.0
             cibuildwheel --output-dir wheelhouse
       - store_artifacts:
           path: wheelhouse/
@@ -19,13 +19,13 @@ jobs:
   osx-wheels:
     working_directory: ~/osx-wheels
     macos:
-      xcode: "10.0.0"
+      xcode: 10.0.0
     steps:
       - checkout
       - run:
           name: Build the OS X wheels.
           command: |
-            pip3 install cibuildwheel==1.6.1
+            pip3 install cibuildwheel==1.11.0
             cibuildwheel --output-dir wheelhouse
       - store_artifacts:
           path: wheelhouse/

examples/github-apple-silicon.yml

@@ -0,0 +1,19 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  build_wheels_macos:
+    name: Build wheels on macos-10.15
+    runs-on: macos-10.15
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Build wheels
+        uses: joerick/cibuildwheel@v1.11.0
+        env:
+          CIBW_ARCHS_MACOS: x86_64 universal2
+
+      - uses: actions/upload-artifact@v2
+        with:
+          path: ./wheelhouse/*.whl

examples/github-deploy.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, windows-latest, macos-latest]
+        os: [ubuntu-20.04, windows-2019, macos-10.15]
 
     steps:
       - uses: actions/checkout@v2
@@ -24,20 +24,10 @@ jobs:
       - uses: actions/setup-python@v2
         name: Install Python
         with:
-          python-version: '3.7'
-
-      - name: Install cibuildwheel
-        run: |
-          python -m pip install cibuildwheel==1.6.1
-
-      - name: Install Visual C++ for Python 2.7
-        if: runner.os == 'Windows'
-        run: |
-          choco install vcpython27 -f -y
+          python-version: '3.8'
 
       - name: Build wheels
-        run: |
-          python -m cibuildwheel --output-dir wheelhouse
+        uses: joerick/cibuildwheel@v1.11.0
 
       - uses: actions/upload-artifact@v2
         with:
@@ -52,7 +42,7 @@ jobs:
       - uses: actions/setup-python@v2
         name: Install Python
         with:
-          python-version: '3.7'
+          python-version: '3.8'
 
       - name: Build sdist
         run: python setup.py sdist

examples/github-minimal.yml

@@ -8,28 +8,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, windows-latest, macos-latest]
+        os: [ubuntu-20.04, windows-2019, macos-10.15]
 
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-python@v2
-        name: Install Python
-        with:
-          python-version: '3.7'
-
-      - name: Install cibuildwheel
-        run: |
-          python -m pip install cibuildwheel==1.6.1
-
-      - name: Install Visual C++ for Python 2.7
-        if: runner.os == 'Windows'
-        run: |
-          choco install vcpython27 -f -y
-
       - name: Build wheels
-        run: |
-          python -m cibuildwheel --output-dir wheelhouse
+        uses: joerick/cibuildwheel@v1.11.0
+        # to supply options, put them in 'env', like:
+        # env:
+        #   CIBW_SOME_OPTION: value
 
       - uses: actions/upload-artifact@v2
         with:

examples/github-with-qemu.yml

@@ -0,0 +1,36 @@
+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
+
+      - uses: actions/setup-python@v2
+        name: Install Python
+        with:
+          python-version: '3.7'
+
+      - name: Set up QEMU
+        if: runner.os == 'Linux'
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: all
+
+      - name: Build wheels
+        uses: joerick/cibuildwheel@v1.11.0
+        env:
+          # configure cibuildwheel to build native archs ('auto'), and some
+          # emulated ones
+          CIBW_ARCHS_LINUX: auto aarch64 ppc64le s390x
+
+      - uses: actions/upload-artifact@v2
+        with:
+          path: ./wheelhouse/*.whl

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==1.11.0
     - cibuildwheel --output-dir wheelhouse
   artifacts:
     paths:

examples/travis-ci-deploy.yml

@@ -14,27 +14,23 @@ jobs:
     - os: windows
       language: shell
       before_install:
-        - choco install python --version 3.8.0
+        - 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
 
-env:
-  global:
-    - TWINE_USERNAME=__token__
-    # Note: TWINE_PASSWORD is set to a PyPI API token in Travis settings
-
 install:
-  - python3 -m pip install cibuildwheel==1.6.1
+  - python3 -m pip install cibuildwheel==1.11.0
 
 script:
   # build the wheels, put them into './wheelhouse'
   - python3 -m cibuildwheel --output-dir wheelhouse
 
-after_success:
-  # if the release was tagged, upload them to PyPI
-  - |
-    if [[ $TRAVIS_TAG ]]; then
-      python3 -m pip install twine
-      python3 -m twine upload wheelhouse/*.whl
-    fi
+deploy:
+  provider: pypi
+  username: "__token__"
+  skip_cleanup: true
+  on:
+    tags: true
+  password:
+    secure: "" # Set to an encrypted API token. See https://docs.travis-ci.com/user/deployment/pypi/

examples/travis-ci-minimal.yml

@@ -20,13 +20,13 @@ jobs:
     - os: windows
       language: shell
       before_install:
-        - choco install python --version 3.8.0
+        - 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.6.1
+  - python3 -m pip install cibuildwheel==1.11.0
 
 script:
   # build the wheels, put them into './wheelhouse'

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

@@ -14,7 +14,7 @@ python:
 before_install:
   - |
     if [[ "$TRAVIS_OS_NAME" = windows ]]; then
-        choco install python --version 3.8.0
+        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
@@ -55,7 +55,7 @@ jobs:
     - stage: deploy
       name: Build and deploy Linux wheels
       services: docker
-      install: python3 -m pip install cibuildwheel==1.6.1
+      install: python3 -m pip install cibuildwheel==1.11.0
       script: python3 -m cibuildwheel --output-dir wheelhouse
       after_success: |
         python3 -m pip install twine
@@ -65,7 +65,7 @@ jobs:
       name: Build and deploy macOS wheels
       os: osx
       language: shell
-      install: python3 -m pip install cibuildwheel==1.6.1
+      install: python3 -m pip install cibuildwheel==1.11.0
       script: python3 -m cibuildwheel --output-dir wheelhouse
       after_success: |
         python3 -m pip install twine
@@ -75,7 +75,7 @@ jobs:
       name: Build and deploy Windows wheels
       os: windows
       language: shell
-      install: python3 -m pip install cibuildwheel==1.6.1
+      install: python3 -m pip install cibuildwheel==1.11.0
       script: python3 -m cibuildwheel --output-dir wheelhouse
       after_success: |
         python3 -m pip install twine

mkdocs.yml

@@ -20,16 +20,23 @@ nav:
   - deliver-to-pypi.md
   - cpp_standards.md
   - faq.md
+  - working-examples.md
   - contributing.md
+  - 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:
-  - importmarkdown
+  - include-markdown
+  - search

pyproject.toml

@@ -0,0 +1,12 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
+
+build-backend = "setuptools.build_meta"
+
+[tool.black]
+line-length = 120
+target-version = ['py36', 'py37', 'py38']
+skip-string-normalization = true

requirements-dev.txt

@@ -1,10 +1 @@
--e .
--e ./docs/mkdocs_include_markdown_plugin
-pytest
-mkdocs==1.0.4
-pymdown-extensions
-pip-tools
-requests
-click
-mypy
-typing-extensions
+-e .[dev,docs]

setup.cfg

@@ -1,29 +1,87 @@
+[metadata]
+name = cibuildwheel
+version = 1.11.0
+description = Build Python wheels on CI with minimal configuration.
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/joerick/cibuildwheel
+author = Joe Rickerby
+author_email = joerick@mac.com
+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
+    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
+keywords = ci,wheel,packaging,pypi,travis,appveyor,macos,linux,windows
+project_urls =
+    Changelog=https://github.com/joerick/cibuildwheel#changelog
+    Documentation=https://cibuildwheel.readthedocs.io/
+
+[options]
+packages = find:
+install_requires =
+    bashlex!=0.13
+    bracex
+    certifi
+    packaging
+    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/*
+
+[options.packages.find]
+include =
+    cibuildwheel
+
 [flake8]
 ignore = E501,W503,E741,E226,B950
 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.6
-files = cibuildwheel,test
-
+python_version = 3.7
+files = cibuildwheel/*.py,test/**/*.py,unit_test/**/*.py,bin/*.py
 warn_unused_configs = True
 warn_redundant_casts = True
 
-[mypy-cibuildwheel]
+[mypy-test.*,mypy-unit_test.*]
+check_untyped_defs = True
+
+[mypy-cibuildwheel.*]
 disallow_any_generics = True
 disallow_subclassing_any = True
 disallow_untyped_calls = True
@@ -37,5 +95,27 @@ warn_return_any = True
 no_implicit_reexport = True
 strict_equality = True
 
-[mypy-pytest,setuptools]
+[mypy-setuptools.*]
 ignore_missing_imports = True
+
+# Ignored for pre-commit to speed up check
+# Not ignored if manually running and pytest installed
+[mypy-pytest.*]
+ignore_missing_imports = True
+
+[mypy-bashlex.*]
+ignore_missing_imports = True
+
+# Has type stubs, but no pyproject.toml or .pyi files in the wheel.
+[mypy-toml.*]
+ignore_missing_imports = True
+
+[mypy-bracex.*]
+ignore_missing_imports = True
+
+[mypy-importlib_resources.*]
+ignore_missing_imports = True
+
+[tool:isort]
+profile = black
+multi_line_output = 3

setup.py

@@ -1,49 +1,31 @@
-# -*- coding: utf-8 -*-
-from pathlib import Path
+from setuptools import setup
 
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
-
-this_directory = Path(__file__).parent
-long_description = (this_directory / 'README.md').read_text(encoding='utf-8')
-
-setup(
-    name='cibuildwheel',
-    version='1.6.1',
-    install_requires=['bashlex!=0.13', 'toml'],
-    description="Build Python wheels on CI with minimal configuration.",
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    author="Joe Rickerby",
-    author_email='joerick@mac.com',
-    url='https://github.com/joerick/cibuildwheel',
-    project_urls={
-        'Changelog': 'https://github.com/joerick/cibuildwheel#changelog',
-        'Documentation': 'https://cibuildwheel.readthedocs.io/',
-    },
-    packages=['cibuildwheel', ],
-    license="BSD",
-    zip_safe=False,
-    package_data={
-        'cibuildwheel': ['resources/*'],
-    },
-    # Supported python versions
-    python_requires='>=3.6',
-    keywords='ci wheel packaging pypi travis appveyor macos linux windows',
-    classifiers=[
-        'Intended Audience :: Developers',
-        'Natural Language :: English',
-        'Programming Language :: Python :: 3',
-        'Development Status :: 5 - Production/Stable',
-        'License :: OSI Approved :: BSD License',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Topic :: Software Development :: Build Tools',
+extras = {
+    "docs": [
+        "mkdocs-include-markdown-plugin==2.8.0",
+        "mkdocs==1.0.4",
+        "pymdown-extensions",
     ],
-    entry_points={
-        'console_scripts': [
-            'cibuildwheel = cibuildwheel.__main__:main',
-        ],
-    },
-)
+    "test": [
+        "jinja2",
+        "pytest>=4",
+        "pytest-timeout",
+    ],
+    "dev": [
+        "click",
+        "ghapi",
+        "mypy>=0.800",
+        "packaging>=20.8",
+        "pip-tools",
+        "pygithub",
+        "pyyaml",
+        "requests",
+        "rich>=9.6",
+        "typing-extensions",
+    ],
+}
+
+extras["all"] = sum(extras.values(), [])
+extras["dev"] += extras["test"]
+
+setup(extras_require=extras)

test/conftest.py

@@ -0,0 +1,21 @@
+import pytest
+
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--run-emulation", action="store_true", default=False, help="run emulation tests"
+    )
+
+
+def pytest_configure(config):
+    config.addinivalue_line("markers", "emulation: mark test requiring qemu binfmt_misc to run")
+
+
+def pytest_collection_modifyitems(config, items):
+    if config.getoption("--run-emulation"):
+        # --run-emulation given in cli: do not skip emulation tests
+        return
+    skip_emulation = pytest.mark.skip(reason="need --run-emulation option to run")
+    for item in items:
+        if "emulation" in item.keywords:
+            item.add_marker(skip_emulation)

test/test_0_basic.py

@@ -1,7 +1,11 @@
-import textwrap
 import platform
-from . import test_projects
-from . import utils
+import textwrap
+
+import pytest
+
+from cibuildwheel.logger import Logger
+
+from . import test_projects, utils
 
 basic_project = test_projects.new_c_project(
     setup_py_add=textwrap.dedent('''
@@ -25,6 +29,22 @@ def test(tmp_path):
     assert set(actual_wheels) == set(expected_wheels)
 
 
+@pytest.mark.skip(reason='to keep test output clean')
+def test_sample_build(tmp_path, capfd):
+    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')
+        try:
+            utils.cibuildwheel_run(project_dir)
+        finally:
+            logger.step_end()
+
+
 def test_build_identifiers(tmp_path):
     project_dir = tmp_path / 'project'
     basic_project.generate(project_dir)

test/test_before_all.py

@@ -1,9 +1,9 @@
-import pytest
 import subprocess
 import textwrap
 
-from . import utils
-from . import test_projects
+import pytest
+
+from . import test_projects, utils
 
 project_with_before_build_asserts = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(r'''
@@ -26,10 +26,12 @@ def test(tmp_path):
         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': '''python -c "import os;open('{project}/text_info.txt', 'w').write('sample text '+os.environ.get('TEST_VAL', ''))"''',
+        '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'"
     })
 

test/test_before_build.py

@@ -1,13 +1,13 @@
-import pytest
 import subprocess
 import textwrap
 
-from . import utils
-from . import test_projects
+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
+        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.

test/test_before_test.py

@@ -1,5 +1,4 @@
-from . import test_projects
-from . import utils
+from . import test_projects, utils
 
 before_test_project = test_projects.new_c_project()
 before_test_project.files['test/spam_test.py'] = r'''
@@ -37,13 +36,15 @@ class TestBeforeTest(TestCase):
 def test(tmp_path):
     project_dir = tmp_path / 'project'
     before_test_project.generate(project_dir)
+    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)"''',
-        '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)"''',
+        '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.

test/test_build_skip.py

@@ -1,7 +1,6 @@
 import textwrap
 
-from . import utils
-from . import test_projects
+from . import test_projects, utils
 
 project_with_skip_asserts = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(r'''

test/test_cpp_standards.py

@@ -202,7 +202,7 @@ def test_cpp17_py27_modern_msvc_workaround(tmp_path):
     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')
+    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]
 

test/test_dependency_versions.py

@@ -1,11 +1,11 @@
 import re
-import pytest
 import textwrap
+
+import pytest
+
 import cibuildwheel.util
 
-from . import utils
-from . import test_projects
-
+from . import test_projects, utils
 
 project_with_expected_version_checks = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(r'''
@@ -40,11 +40,10 @@ VERSION_REGEX = r'([\w-]+)==([^\s]+)'
 def get_versions_from_constraint_file(constraint_file):
     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'])
@@ -52,6 +51,16 @@ 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 == 'windows' and python_version == '2.7':
+        pytest.skip('Windows 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_with_expected_version_checks.generate(project_dir)
 
@@ -66,6 +75,9 @@ def test_pinned_versions(tmp_path, python_version):
     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-*'
     else:
         constraint_filename = 'constraints.txt'
         build_pattern = '[cp]p38-*'
@@ -78,7 +90,7 @@ def test_pinned_versions(tmp_path, python_version):
         build_environment[env_name] = constraint_versions[package]
 
     cibw_environment_option = ' '.join(
-        [f'{k}={v}' for k, v in build_environment.items()]
+        f'{k}={v}' for k, v in build_environment.items()
     )
 
     # build and test the wheels
@@ -111,6 +123,9 @@ 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')
 
+    if utils.platform == 'windows' and python_version == '2.7':
+        pytest.skip('Windows + Travis CI requires a workaround')
+
     project_dir = tmp_path / 'project'
     project_with_expected_version_checks.generate(project_dir)
 
@@ -138,7 +153,7 @@ def test_dependency_constraints_file(tmp_path, python_version):
         build_environment[env_name] = version
 
     cibw_environment_option = ' '.join(
-        [f'{k}={v}' for k, v in build_environment.items()]
+        f'{k}={v}' for k, v in build_environment.items()
     )
 
     # build and test the wheels

test/test_docker_images.py

@@ -3,12 +3,11 @@ import textwrap
 
 import pytest
 
-from . import utils
-from . import test_projects
+from . import test_projects, utils
 
 dockcross_only_project = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(r'''
-        import os, sys
+        import os
 
         # check that we're running in the correct docker image as specified in the
         # environment options CIBW_MANYLINUX1_*_IMAGE
@@ -32,10 +31,10 @@ def test(tmp_path):
     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-*',
+        'CIBW_SKIP': 'pp* cp27-* cp39-*',
     })
 
     # 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]
+                       if '-pp' not in w and '-cp39-' not in w and '-cp27-' not in w]
     assert set(actual_wheels) == set(expected_wheels)

test/test_emulation.py

@@ -0,0 +1,53 @@
+import subprocess
+
+import pytest
+
+from . import test_projects, utils
+
+project_with_a_test = test_projects.new_c_project()
+
+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_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',
+    })
+
+    # 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')
+    )
+    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')
+
+    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',
+        })
+
+    captured = capfd.readouterr()
+    assert "Invalid archs option" in captured.err

test/test_environment.py

@@ -1,10 +1,10 @@
 import os
-import pytest
 import subprocess
 import textwrap
-from . import utils
-from . import test_projects
 
+import pytest
+
+from . import test_projects, utils
 
 project_with_environment_asserts = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(r'''

test/test_macos_archs.py

@@ -0,0 +1,121 @@
+import platform
+import subprocess
+from typing import Tuple
+
+import pytest
+
+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')
+)
+
+
+def get_xcode_version() -> Tuple[int, int]:
+    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('.')
+    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 get_xcode_version() < (12, 2):
+        pytest.skip('this test only works with Xcode 12.2 or greater')
+
+    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',
+    })
+
+    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])
+def test_cross_compiled_test(tmp_path, capfd, build_universal2):
+    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')
+
+    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',
+    })
+
+    captured = capfd.readouterr()
+
+    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
+        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
+        else:
+            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
+
+    if build_universal2:
+        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]
+
+    assert set(actual_wheels) == set(expected_wheels)
+
+
+@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 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')
+
+    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 '',
+    })
+
+    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
+
+        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]
+
+    assert set(actual_wheels) == set(expected_wheels)