Bump version: v2.3.0

docs: note about musllinux mess

.circleci/config.yml

@@ -22,6 +22,9 @@ jobs:
       - image: circleci/python:3.6
     environment:
       PYTHON: python3
+      # Temporarily restrict the tests that are run on CircleCI to prevent
+      # test timeouts.
+      PYTEST_ADDOPTS: -k "unit_test or main_tests or test_0_basic or test_docker_images"
     steps:
       - checkout
       - setup_remote_docker

.circleci/prepare.sh

@@ -1,9 +1,10 @@
+#!/usr/bin/env bash
 set -o errexit
 set -o xtrace
 
 $PYTHON --version
 $PYTHON -m pip --version
-$PYTHON -m virtualenv -p $PYTHON venv
+$PYTHON -m virtualenv -p "$PYTHON" venv
 venv/bin/python -m pip install -e ".[dev]"
 venv/bin/python -m pip freeze
 venv/bin/python --version

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,31 @@
+name: General issue
+description: Open a general issue
+
+body:
+- type: markdown
+  attributes:
+    value: |
+      Hi! If you're not sure whether your problem is a bug in cibuildwheel or something else, please consider asking a question in the Discussions tab first.
+
+- type: textarea
+  id: description
+  attributes:
+    label: Description
+
+- type: input
+  id: log
+  attributes:
+    label: Build log
+    description: If relevant, please provide a link to a build log that shows the problem
+    placeholder: https://...
+  validations:
+    required: false
+
+- type: input
+  id: ci-config
+  attributes:
+    label: CI config
+    description: Link to the CI config that produced the build log above. e.g. the Github Actions workflow file
+    placeholder: https://...
+  validations:
+    required: false

.github/workflows/release.yml

@@ -0,0 +1,40 @@
+name: Release
+
+on:
+  workflow_dispatch:
+  pull_request:
+  release:
+    types:
+    - published
+
+jobs:
+  dist:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build SDist and wheel
+      run: pipx run build
+
+    - uses: actions/upload-artifact@v2
+      with:
+        path: dist/*
+
+    - name: Check metadata
+      run: pipx run twine check dist/*
+
+  publish:
+    needs: [dist]
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release' && github.event.action == 'published'
+
+    steps:
+    - uses: actions/download-artifact@v2
+      with:
+        name: artifact
+        path: dist
+
+    - uses: pypa/gh-action-pypi-publish@v1.4.2
+      with:
+        user: __token__
+        password: ${{ secrets.pypi_password }}

.github/workflows/test.yml

@@ -10,6 +10,10 @@ on:
   workflow_dispatch:
     # allow manual runs on branches without a PR
 
+concurrency:
+  group: test-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   pre-commit:
     name: Pre-commit checks (mypy, flake8, etc.)
@@ -18,6 +22,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
     - uses: pre-commit/action@v2.0.3
+    - run: pipx run nox -s check_manifest
 
   test:
     name: Test cibuildwheel on ${{ matrix.os }}
@@ -25,8 +30,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        python_version: ['3.7']
+        os: [ubuntu-latest, windows-latest, macos-11]
+        python_version: ['3.10']
     timeout-minutes: 180
     steps:
     - uses: actions/checkout@v2

.github/workflows/update-dependencies.yml

@@ -8,6 +8,7 @@ on:
 jobs:
   update-dependencies:
     name: Update dependencies
+    if: github.repository_owner == 'pypa' || github.event_name != 'schedule'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -18,12 +19,13 @@ jobs:
     - name: "Run update: python configs"
       run: nox --force-color -s update_pins
     - name: "Run update: docs user projects"
-      run: nox --force-color -s update_proj
+      run: nox --force-color -s update_proj -- --auth=${{ secrets.GITHUB_TOKEN }}
 
     # we use this step to grab a Github App auth token, so that PRs generated by this workflow
     # run the GHA tests.
     - uses: tibdex/github-app-token@v1
       id: generate-token
+      if: github.ref == 'refs/heads/main' && github.repository == 'pypa/cibuildwheel'
       with:
         app_id: ${{ secrets.CIBUILDWHEEL_BOT_APP_ID }}
         private_key: ${{ secrets.CIBUILDWHEEL_BOT_APP_PRIVATE_KEY }}

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/asottile/pyupgrade
-  rev: v2.20.0
+  rev: v2.29.1
   hooks:
   - id: pyupgrade
     name: PyUpgrade 3.6+
@@ -25,58 +25,99 @@ repos:
     exclude: ^(cibuildwheel|unit_test|test)/
     args: ["--py37-plus"]
 
+# Autoremoves unused imports
+- repo: https://github.com/hadialqattan/pycln
+  rev: v1.1.0
+  hooks:
+  - id: pycln
+    args: [--config=pyproject.toml]
+
 - repo: https://github.com/PyCQA/isort
-  rev: 5.9.1
+  rev: 5.10.1
   hooks:
   - id: isort
 
 - repo: https://github.com/psf/black
-  rev: 21.6b0
+  rev: 21.11b1
   hooks:
   - id: black
 
 - repo: https://github.com/asottile/setup-cfg-fmt
-  rev: v1.17.0
+  rev: v1.20.0
   hooks:
   - id: setup-cfg-fmt
-    stages: [manual]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.910
+  rev: v0.910-1
   hooks:
   - id: mypy
     exclude: ^(bin|cibuildwheel/resources|docs)/.*py$
-    args: ["--python-version=3.6", "--scripts-are-modules"]
-    additional_dependencies:
-      - packaging
-      - types-jinja2
-      - types-certifi
-      - types-toml
-  - id: mypy
-    name: mypy 3.7+ on bin/
-    files: ^(bin|docs)/.*py$
-    args: ["--python-version=3.7", "--scripts-are-modules"]
-    additional_dependencies:
+    args: ["--python-version=3.6", "--scripts-are-modules", "--show-error-codes"]
+    additional_dependencies: &mypy-dependencies
+      - nox
       - packaging>=21.0
+      - pygithub
       - rich
+      - tomli
+      - types-certifi
+      - types-click
+      - types-dataclasses
       - types-jinja2
       - types-pyyaml
-      - types-click
       - types-requests
-      - types-toml
+      - bracex
+  - id: mypy
+    name: mypy 3.7+ on bin/
+    files: ^((bin|docs)/.*py)$
+    args: ["--python-version=3.7", "--scripts-are-modules", "--show-error-codes"]
+    additional_dependencies: *mypy-dependencies
+
+- repo: https://github.com/asottile/yesqa
+  rev: v1.3.0
+  hooks:
+  - id: yesqa
+    additional_dependencies: &flake8-dependencies
+    - flake8-bugbear
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 3.9.2
+  rev: 4.0.1
   hooks:
   - id: flake8
     exclude: cibuildwheel/resources/
-    additional_dependencies: [flake8-bugbear]
+    additional_dependencies: *flake8-dependencies
+
+- repo: https://github.com/pre-commit/pygrep-hooks
+  rev: v1.9.0
+  hooks:
+  - id: python-check-blanket-noqa
+    stages: [manual]
+  - id: python-check-blanket-type-ignore
+    stages: [manual]
+  - id: python-no-log-warn
+  - id: python-no-eval
+  - id: python-use-type-annotations
+
+- repo: https://github.com/shellcheck-py/shellcheck-py
+  rev: v0.8.0.1
+  hooks:
+  - id: shellcheck
 
 - repo: local
   hooks:
   - id: disallow-caps
     name: Disallow improper capitalization
     language: pygrep
-    entry: PyBind|Numpy|Cmake|Github
+    entry: PyBind|Numpy|Cmake|Github|PyTest
     types:
     - markdown
+  - id: update-readme-changelog
+    name: Update README changelog
+    language: python
+    entry: bin/update_readme_changelog.py
+    files: ^docs/changelog.md$
+
+- repo: https://github.com/codespell-project/codespell
+  rev: v2.1.0
+  hooks:
+  - id: codespell
+    args: ["-L", "sur"]

MANIFEST.in

@@ -0,0 +1,6 @@
+recursive-include cibuildwheel *.cfg
+recursive-include cibuildwheel *.in
+recursive-include cibuildwheel *.py
+recursive-include cibuildwheel *.toml
+recursive-include cibuildwheel *.txt
+recursive-include cibuildwheel *.typed

README.md

@@ -22,18 +22,20 @@ Python wheels are great. Building them across **Mac, Linux, Windows**, on **mult
 What does it do?
 ----------------
 
-|   | macOS Intel | macOS Apple Silicon | Windows 64bit | Windows 32bit | manylinux x86_64 | manylinux i686 | manylinux aarch64 | manylinux ppc64le | manylinux s390x |
-|---------------|----|-----|-----|-----|----|-----|----|-----|-----|
-| CPython 3.6   | ✅ | N/A | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.7   | ✅ | N/A | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.8   | ✅ | ✅  | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.9   | ✅ | ✅  | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.10¹ | ✅ | ✅  | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| PyPy 3.7 v7.3 | ✅ | N/A | ✅  | N/A | ✅ | ✅  | ✅ | N/A | N/A |
+|   | macOS Intel | macOS Apple Silicon | Windows 64bit | Windows 32bit | Windows Arm64 | manylinux<br/>musllinux x86_64 | manylinux<br/>musllinux i686 | manylinux<br/>musllinux aarch64 | manylinux<br/>musllinux ppc64le | manylinux<br/>musllinux s390x |
+|---------------|----|-----|-----|-----|-----|----|-----|----|-----|-----|
+| CPython 3.6   | ✅ | N/A | ✅  | ✅  | N/A | ✅  | ✅  | ✅ | ✅  | ✅  |
+| CPython 3.7   | ✅ | N/A | ✅  | ✅  | N/A | ✅ | ✅  | ✅ | ✅  | ✅  |
+| CPython 3.8   | ✅ | ✅  | ✅  | ✅  | N/A | ✅ | ✅  | ✅ | ✅  | ✅  |
+| CPython 3.9   | ✅ | ✅  | ✅  | ✅  | ✅² | ✅³ | ✅ | ✅ | ✅  | ✅  |
+| CPython 3.10  | ✅ | ✅  | ✅  | ✅  | ✅² | ✅ | ✅  | ✅ | ✅  | ✅  |
+| PyPy 3.7 v7.3 | ✅ | N/A | ✅  | N/A | N/A | ✅¹ | ✅¹  | ✅¹ | N/A | N/A |
 
-<sup>¹ Available as a prerelease under a [flag](https://cibuildwheel.readthedocs.io/en/stable/options/#prerelease-pythons)</sup><br>
+<sup>¹ PyPy is only supported for manylinux wheels.</sup><br>
+<sup>² Windows arm64 support is experimental.</sup><br>
+<sup>³ Alpine 3.14 and very briefly 3.15's default python3 [was not able to load](https://github.com/pypa/cibuildwheel/issues/934) musllinux wheels. This has been fixed; please upgrade the python package if using Alpine from before the fix.</sup><br>
 
-- Builds manylinux, macOS 10.9+, and Windows wheels for CPython and PyPy
+- Builds manylinux, musllinux, macOS 10.9+, and Windows wheels for CPython and PyPy
 - Works on GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, and GitLab CI
 - Bundles shared library dependencies on Linux and macOS through [auditwheel](https://github.com/pypa/auditwheel) and [delocate](https://github.com/matthew-brett/delocate)
 - Runs your library's tests against the wheel-installed version of your library
@@ -63,7 +65,7 @@ Usage
 Example setup
 -------------
 
-To build manylinux, macOS, and Windows wheels on GitHub Actions, you could use this `.github/workflows/wheels.yml`:
+To build manylinux, musllinux, macOS, and Windows wheels on GitHub Actions, you could use this `.github/workflows/wheels.yml`:
 
 ```yaml
 name: Build
@@ -85,7 +87,7 @@ jobs:
       - uses: actions/setup-python@v2
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.0.0b2
+        run: python -m pip install cibuildwheel==2.3.0
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
@@ -109,13 +111,14 @@ Options
 |   | [`CIBW_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip)  <br> [`CIBW_SKIP`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip)  | Choose the Python versions to build |
 |   | [`CIBW_ARCHS`](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)  | Change the architectures built on your machine by default. |
 |   | [`CIBW_PROJECT_REQUIRES_PYTHON`](https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python)  | Manually set the Python compatibility of your project |
-|   | [`CIBW_PRERELEASE_PYTHONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#prerelease-pythons)  | Enable building with pre-release versions of Python |
+|   | [`CIBW_PRERELEASE_PYTHONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#prerelease-pythons)  | Enable building with pre-release versions of Python if available |
 | **Build customization** | [`CIBW_BUILD_FRONTEND`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-frontend)  | Set the tool to use to build, either "pip" (default for now) or "build" |
 |   | [`CIBW_ENVIRONMENT`](https://cibuildwheel.readthedocs.io/en/stable/options/#environment)  | Set environment variables needed during the build |
+|   | [`CIBW_ENVIRONMENT_PASS_LINUX`](https://cibuildwheel.readthedocs.io/en/stable/options/#environment-pass)  | Set environment variables on the host to pass-through to the container during the build. |
 |   | [`CIBW_BEFORE_ALL`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-all)  | Execute a shell command on the build system before any wheels are built. |
 |   | [`CIBW_BEFORE_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-build)  | Execute a shell command preparing each wheel's build |
 |   | [`CIBW_REPAIR_WHEEL_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#repair-wheel-command)  | Execute a shell command to repair each (non-pure Python) built wheel |
-|   | [`CIBW_MANYLINUX_*_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  | Specify alternative manylinux Docker images |
+|   | [`CIBW_MANYLINUX_*_IMAGE`<br/>`CIBW_MUSLLINUX_*_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image)  | Specify alternative manylinux / musllinux Docker images |
 |   | [`CIBW_DEPENDENCY_VERSIONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#dependency-versions)  | Specify how cibuildwheel controls the versions of the tools it uses |
 | **Testing** | [`CIBW_TEST_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-command)  | Execute a shell command to test each built wheel |
 |   | [`CIBW_BEFORE_TEST`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-test)  | Execute a shell command before testing each wheel |
@@ -129,8 +132,6 @@ These options can be specified in a pyproject.toml file, as well; see [configura
 Working examples
 ----------------
 
-<!--working-examples-start-->
-
 Here are some repos that use cibuildwheel.
 
 <!-- START bin/projects.py -->
@@ -140,122 +141,26 @@ Here are some repos that use cibuildwheel.
 | 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.  |
+| [Tornado][]                       | ![travisci icon][] | ![apple icon][] ![linux icon][] | Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed. |
 | [Matplotlib][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The venerable Matplotlib, a Python library with C++ portions |
+| [pytorch-fairseq][]               | ![github icon][] | ![apple icon][] ![linux icon][] | Facebook AI Research Sequence-to-Sequence Toolkit written in Python. |
 | [MyPy][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | MyPyC, the compiled component of MyPy. |
+| [uvloop][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | Ultra fast asyncio event loop. |
+| [pydantic][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Data parsing and validation using Python type hints |
 | [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. |
-| [River][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python |
-| [coverage.py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python |
-| [numexpr][]                       | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas, bcolz and more |
-| [h5py][]                          | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. |
-| [Dependency Injector][]           | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI |
-| [PyAV][]                          | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Pythonic bindings for FFmpeg's libraries. |
-| [PyTables][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data |
-| [ruptures][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. |
-| [aioquic][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python |
-| [pikepdf][]                       | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by qpdf |
-| [google neuroglancer][]           | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data |
-| [DeepForest][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) |
-| [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. |
-| [H3-py][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system |
-| [pybind11 cmake_example][]        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system |
-| [KDEpy][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Kernel Density Estimation in Python |
-| [cyvcf2][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing |
-| [pybind11 python_example][]       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a Python-based build system |
-| [sourmash][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. |
-| [dd-trace-py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub |
-| [iminuit][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 |
-| [time-machine][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. |
-| [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. |
-| [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. |
-| [jq.py][]                         | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq |
-| [Tokenizer][]                     | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support |
-| [PyGLM][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Fast OpenGL Mathematics (GLM) for Python |
-| [bx-python][]                     | ![travisci icon][] | ![apple icon][] ![linux icon][] | A library that includes Cython extensions. |
-| [iDynTree][]                      | ![github icon][] | ![linux icon][] | Uses manylinux_2_24 |
-| [boost-histogram][]               | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. |
-| [TgCrypto][]                      | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
-| [pybase64][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python |
-| [etebase-py][]                    | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. |
-| [fathon][]                        | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms |
-| [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 |
-| [polaroid][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. |
-| [GSD][]                           | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Cython and NumPy project with 64-bit wheels. |
-| [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 |
-| [pyinstrument_cext][]             | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies |
-| [Imagecodecs (fork)][]            | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. |
-| [xmlstarlet][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. |
-| [CorrectionLib][]                 | ![github icon][] | ![apple icon][] ![linux icon][] | Structured JSON powered correction library for HEP, designed for the CMS experiment at CERN. |
-| [SiPM][]                          | ![github icon][] | ![apple icon][] ![linux icon][] | High performance library for SiPM detectors simulation using C++17, OpenMP and AVX2 intrinsics. |
+| [vaex][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Out-of-Core hybrid Apache Arrow/NumPy DataFrame for Python, ML, visualize and explore big tabular data at a billion rows per second 🚀 |
+| [Google Benchmark][]              | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A microbenchmark support library |
 
 [scikit-learn]: https://github.com/scikit-learn/scikit-learn
+[Tornado]: https://github.com/tornadoweb/tornado
 [Matplotlib]: https://github.com/matplotlib/matplotlib
+[pytorch-fairseq]: https://github.com/pytorch/fairseq
 [MyPy]: https://github.com/mypyc/mypy_mypyc-wheels
+[uvloop]: https://github.com/MagicStack/uvloop
+[pydantic]: https://github.com/samuelcolvin/pydantic
 [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
-[River]: https://github.com/online-ml/river
-[coverage.py]: https://github.com/nedbat/coveragepy
-[numexpr]: https://github.com/pydata/numexpr
-[h5py]: https://github.com/h5py/h5py
-[Dependency Injector]: https://github.com/ets-labs/python-dependency-injector
-[PyAV]: https://github.com/PyAV-Org/PyAV
-[PyTables]: https://github.com/PyTables/PyTables
-[ruptures]: https://github.com/deepcharles/ruptures
-[aioquic]: https://github.com/aiortc/aioquic
-[pikepdf]: https://github.com/pikepdf/pikepdf
-[google neuroglancer]: https://github.com/google/neuroglancer
-[DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest
-[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
-[H3-py]: https://github.com/uber/h3-py
-[pybind11 cmake_example]: https://github.com/pybind/cmake_example
-[KDEpy]: https://github.com/tommyod/KDEpy
-[cyvcf2]: https://github.com/brentp/cyvcf2
-[pybind11 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
-[time-machine]: https://github.com/adamchainz/time-machine
-[CTranslate2]: https://github.com/OpenNMT/CTranslate2
-[matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile
-[jq.py]: https://github.com/mwilliamson/jq.py
-[Tokenizer]: https://github.com/OpenNMT/Tokenizer
-[PyGLM]: https://github.com/Zuzu-Typ/PyGLM
-[bx-python]: https://github.com/bxlab/bx-python
-[iDynTree]: https://github.com/robotology/idyntree
-[boost-histogram]: https://github.com/scikit-hep/boost-histogram
-[TgCrypto]: https://github.com/pyrogram/tgcrypto
-[pybase64]: https://github.com/mayeut/pybase64
-[etebase-py]: https://github.com/etesync/etebase-py
-[fathon]: https://github.com/stfbnc/fathon
-[pyjet]: https://github.com/scikit-hep/pyjet
-[numpythia]: https://github.com/scikit-hep/numpythia
-[polaroid]: https://github.com/daggy1234/polaroid
-[GSD]: https://github.com/glotzerlab/gsd
-[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example
-[pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext
-[Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build
-[xmlstarlet]: https://github.com/dimitern/xmlstarlet
-[CorrectionLib]: https://github.com/cms-nanoAOD/correctionlib
-[SiPM]: https://github.com/EdoPro98/SimSiPM
+[vaex]: https://github.com/vaexio/vaex
+[Google Benchmark]: https://github.com/google/benchmark
 
 [appveyor icon]: docs/data/readme_icons/appveyor.svg
 [github icon]: docs/data/readme_icons/github.svg
@@ -267,72 +172,9 @@ Here are some repos that use cibuildwheel.
 [apple icon]: docs/data/readme_icons/apple.svg
 [linux icon]: docs/data/readme_icons/linux.svg
 
-<!-- scikit-learn: 46313, last pushed 0 days ago -->
-<!-- Matplotlib: 13847, last pushed 0 days ago -->
-<!-- MyPy: 10969, last pushed 0 days ago -->
-<!-- psutil: 7454, last pushed 4 days ago -->
-<!-- scikit-image: 4405, last pushed 0 days ago -->
-<!-- twisted-iocpsupport: 4293, last pushed 8 days ago -->
-<!-- websockets: 3442, last pushed 8 days ago -->
-<!-- pyzmq: 2832, last pushed 16 days ago -->
-<!-- aiortc: 2457, last pushed 23 days ago -->
-<!-- River: 1722, last pushed 5 days ago -->
-<!-- coverage.py: 1639, last pushed 11 days ago -->
-<!-- numexpr: 1600, last pushed 123 days ago -->
-<!-- h5py: 1533, last pushed 6 days ago -->
-<!-- Dependency Injector: 1422, last pushed 10 days ago -->
-<!-- PyAV: 1286, last pushed 28 days ago -->
-<!-- PyTables: 1037, last pushed 101 days ago -->
-<!-- ruptures: 749, last pushed 6 days ago -->
-<!-- aioquic: 693, last pushed 20 days ago -->
-<!-- pikepdf: 671, last pushed 4 days ago -->
-<!-- google neuroglancer: 655, last pushed 3 days ago -->
-<!-- DeepForest: 627, last pushed 34 days ago -->
-<!-- AutoPy: 544, last pushed 17 days ago -->
-<!-- Parselmouth: 524, last pushed 11 days ago -->
-<!-- python-rapidjson: 423, last pushed 9 days ago -->
-<!-- Rtree: 412, last pushed 106 days ago -->
-<!-- python-snappy: 405, last pushed 129 days ago -->
-<!-- markupsafe: 402, last pushed 2 days ago -->
-<!-- H3-py: 397, last pushed 22 days ago -->
-<!-- pybind11 cmake_example: 285, last pushed 9 days ago -->
-<!-- KDEpy: 280, last pushed 31 days ago -->
-<!-- cyvcf2: 265, last pushed 66 days ago -->
-<!-- pybind11 python_example: 255, last pushed 12 days ago -->
-<!-- sourmash: 252, last pushed 0 days ago -->
-<!-- dd-trace-py: 251, last pushed 3 days ago -->
-<!-- iminuit: 181, last pushed 0 days ago -->
-<!-- time-machine: 178, last pushed 1 days ago -->
-<!-- CTranslate2: 170, last pushed 3 days ago -->
-<!-- matrixprofile: 167, last pushed 9 days ago -->
-<!-- jq.py: 159, last pushed 12 days ago -->
-<!-- Tokenizer: 147, last pushed 9 days ago -->
-<!-- PyGLM: 105, last pushed 54 days ago -->
-<!-- bx-python: 103, last pushed 20 days ago -->
-<!-- iDynTree: 82, last pushed 19 days ago -->
-<!-- boost-histogram: 81, last pushed 4 days ago -->
-<!-- TgCrypto: 66, last pushed 35 days ago -->
-<!-- pybase64: 65, last pushed 0 days ago -->
-<!-- etebase-py: 50, last pushed 181 days ago -->
-<!-- fathon: 32, last pushed 32 days ago -->
-<!-- pyjet: 29, last pushed 46 days ago -->
-<!-- numpythia: 28, last pushed 11 days ago -->
-<!-- polaroid: 18, last pushed 6 days ago -->
-<!-- GSD: 16, last pushed 3 days ago -->
-<!-- pybind11 scikit_build_example: 14, last pushed 12 days ago -->
-<!-- pyinstrument_cext: 10, last pushed 4 days ago -->
-<!-- Imagecodecs (fork): 10, last pushed 9 days ago -->
-<!-- xmlstarlet: 7, last pushed 76 days ago -->
-<!-- CorrectionLib: 6, last pushed 12 days ago -->
-<!-- SiPM: 4, last pushed 1 days ago -->
-
 <!-- END bin/projects.py -->
 
-> Add your repo here! Let us know on [GitHub Discussions](https://github.com/pypa/cibuildwheel/discussions/485), or send a PR, adding your information to `docs/data/projects.yml`.
->
-> <sup>I'd like to include notes here to indicate why an example might be interesting to cibuildwheel users - the styles/technologies/techniques used in each. Please include that in future additions!</sup>
-
-<!--working-examples-end-->
+> ℹ️ That's just a handful, there are many more! Check out the [Working Examples](https://cibuildwheel.readthedocs.io/en/stable/working-examples) page in the docs.
 
 Legal note
 ----------
@@ -346,578 +188,71 @@ This is similar to static linking, so it might have some licence implications. C
 Changelog
 =========
 
-<!--changelog-start-->
+<!-- START bin/update_readme_changelog.py -->
 
-### v2.0.0 (prerelease)
+<!-- this section was generated by bin/update_readme_changelog.py -- do not edit manually -->
 
-_This release is currently in prerelease. The below release notes will be condensed into a single entry when we do a final release._
+### v2.3.0
 
-_v2.0.0b2 (9 July 2021)_
+_26 November 2021_
 
-- 🐛 Bug fix to the GitHub action (#753)
+- 📈 cibuildwheel now defaults to manylinux2014 image for linux builds, rather than manylinux2010. If you want to stick with manylinux2010, it's simple to set this using [the image options](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image). (#926)
+- ✨ You can now pass environment variables from the host machine into the Docker container during a Linux build. Check out [the docs for `CIBW_ENVIRONMENT_PASS_LINUX `](https://cibuildwheel.readthedocs.io/en/latest/options/#environment-pass) for the details. (#914)
+- ✨ Added support for building PyPy 3.8 wheels. (#881)
+- ✨ Added support for building Windows arm64 CPython wheels on a Windows arm64 runner. We can't test this in CI yet, so for now, this is experimental. (#920)
+- 📚 Improved the deployment documentation (#911)
+- 🛠 Changed the escaping behaviour inside cibuildwheel's  option placeholders e.g. `{project}` in `before_build` or `{dest_dir}` in `repair_wheel_command`. This allows bash syntax like `${SOME_VAR}` to passthrough without being interpreted as a placeholder by cibuildwheel. See [this section](https://cibuildwheel.readthedocs.io/en/stable/options/#placeholders) in the docs for more info. (#889)
+- 🛠 Pip updated to 21.3, meaning it now defaults to in-tree builds again. If this causes an issue with your project, setting environment variable `PIP_USE_DEPRECATED=out-of-tree-build` is available as a temporary flag to restore the old behaviour. However, be aware that this flag will probably be removed soon. (#881)
+- 🐛 You can now access the current Python interpreter using `python3` within a build on Windows (#917)
 
-_v2.0.0b1 (9 July 2021)_
+### v2.2.2
 
-- 🐛 Bug fixes & docs improvements
+_26 October 2021_
 
-_v2.0.0a4 (25 June 2021)_
+- 🐛 Fix bug in the GitHub Action step causing a syntax error (#895)
 
-- 🌟 Added support for building wheels with [build](https://github.com/pypa/build), as well as pip. This feature is controlled with the [`CIBW_BUILD_FRONTEND`](https://cibuildwheel.readthedocs.io/en/latest/options/#build-frontend) option.
+### v2.2.1
 
-_v2.0.0a3 (22 June 2021)_
+_26 October 2021_
 
-- 🌟 You can now configure cibuildwheel options inside your project's `pyproject.toml`! Environment variables still work of course. Check out the [documentation](https://cibuildwheel.readthedocs.io/en/latest/options/#setting-options) for more info.
+- 🛠 Added a `config-file` option on the GitHub Action to specify something other than pyproject.toml in your GitHub Workflow file. (#883)
+- 🐛 Fix missing resources in sdist and released wheel on PyPI. We've also made some internal changes to our release processes to make them more reliable. (#893, #894)
 
-_v2.0.0a2 (1 June 2021)_
+### v2.2.0
 
-- 🌟 Added the ability to test building wheels on CPython 3.10! Because CPython 3.10 is in beta, these wheels should not be distributed, because they might not be compatible with the final release, but it's available to build for testing purposes. Use the flag [`--prerelease-pythons` or `CIBW_PRERELEASE_PYTHONS`](https://cibuildwheel.readthedocs.io/en/latest/options/#prerelease-pythons) to test. (#675)
-- ✨ Added the ability to build CPython 3.8 wheels for Apple Silicon. (#704)
-- 🛠 Update to the latest build dependencies, including auditwheel 4. (#633)
-- 🛠 Use the unified pypa/manylinux images to build PyPy (#671)
-- ⚠️ Removed support for building Python 2.7 and Python 3.5 wheels, for both CPython and PyPy. If you still need to build on these versions, please use the latest v1.x version. (#596)
+_22 October 2021_
 
-### v1.12.0
+- 🌟 Added support for [musllinux](https://www.python.org/dev/peps/pep-0656/). Support for this new wheel format lets projects build wheels for Linux distributions that use [musl libc](https://musl.libc.org/), notably, [Alpine](https://alpinelinux.org/) Docker containers. (#768)
 
-_22 June 2021_
+  Musllinux builds are enabled by default. If you're not ready to build musllinux, add `*-musllinux_*` to your [`CIBW_SKIP`/`skip`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip) option. Or, you might have to make some changes to your options - to simplify that process, you can use...
 
-- ✨ Adds support building macOS universal2/arm64 wheels on Python 3.8.
+- 🌟 TOML option overrides! This provides much greater flexibility in configuration via pyproject.toml. (#854)
 
-### v1.11.1
+  You can now set build options for any subset of your builds using a match pattern. So, for example, you can customise CPython 3.8 builds with an override on `cp38-*` or musllinux builds by selecting `*musllinux*`. Check out [the docs](https://cibuildwheel.readthedocs.io/en/latest/options/#overrides) for more info on the specifics.
 
-_28 May 2021_
+- 🛠 Added support for building PyPy wheels on macOS 11 CI runners. (#875)
 
-- ✨ cibuildwheel is now part of the PyPA!
-- 📚 Minor docs changes, fixing links related to the above transition
-- 🛠 Update manylinux pins to the last version containing Python 2.7 and 3.5. (#674)
+- 🛠 Setting an empty string for the [`CIBW_*_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) option will now fallthrough to the config file or cibuildwheel's default, rather than causing an error. This makes the option easier to use in CI build matricies. (#829)
 
-### v1.11.0
+- 🛠 Support for TOML 1.0 when reading config files, via the `tomli` package. (#876)
 
-_1 May 2021_
+<sup>Note: This version is not available on PyPI due to some missing resources in the release files. Please use a later version instead.</sup>
 
-- 📚 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).
+### v2.1.3
 
-### v1.10.0
+_6 October 2021_
 
-_22 Feb 2021_
+- 🛠 Updated CPython 3.10 to the 3.10.0 final release
 
-- ✨ 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.
+<!-- END bin/update_readme_changelog.py -->
 
-### v1.9.0
+---
 
-_5 February 2021_
+That's the last few versions.
 
-- 🌟 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:
+ℹ️ **Want more changelog? Head over to [the changelog page in the docs](https://cibuildwheel.readthedocs.io/en/stable/changelog/).**
 
-  ```yaml
-  - name: Build wheels
-    uses: pypa/cibuildwheel@version # e.g. v1.9.0
-    with:
-      output-dir: wheelhouse
-    # env:
-    #   CIBW_SOME_OPTION: value
-  ```
-
-  This saves a bit of boilerplate, and you can [use Dependabot to keep the
-  pinned version up-to-date](https://cibuildwheel.readthedocs.io/en/stable/faq/#automatic-updates).
-
-- ✨ Added `auto64` and `auto32` shortcuts to the
-  [CIBW_ARCHS](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)
-  option. (#553)
-- ✨ 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_
-
-- 🛠 Add PPC64LE manylinux image supporting Python 3.9. (#436)
-- 📚 Add project URLs to PyPI listing (#428)
-
-### 1.6.0
-
-_9 September 2020_
-
-- 🌟 Add Python 3.9 support! This initial support uses release candidate
-  builds. You can start publishing wheels for Python 3.9 now, ahead of
-  the official release. (#382)
-
-  Minor note - if you're building PPC64LE wheels, the manylinux image pinned
-  by this version is
-  [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
-  Windows (#420)
-- 📚 Added some information about Windows VC++ runtimes and how they relate
-  to wheels.
-
-### 1.5.5
-
-_22 July 2020_
-
-- 🐛 Fix a bug that would cause command substitutions in CIBW_ENVIRONMENT to
-  produce no output on Linux (#411)
-- 🐛 Fix regression (introduced in 1.5.3) which caused BEFORE_BUILD and
-  BEFORE_ALL to be executed in the wrong directory (#410)
-
-### 1.5.4
-
-_19 June 2020_
-
-- 🐛 Fix a bug that would cause command substitutions in CIBW_ENVIRONMENT
-  variables to not interpret quotes in commands correctly (#406, #408)
-
-### 1.5.3
-
-_19 July 2020_
-
-- 🛠 Update CPython 3.8 to 3.8.3 (#405)
-- 🛠 Internal refactoring of Linux build, to move control flow into Python (#386)
-
-### 1.5.2
-
-_8 July 2020_
-
-- 🐛 Fix an issue on Windows where pyproject.toml would cause an error when
-  some requirements formats were used. (#401)
-- 🛠 Update CPython 3.7 to 3.7.8 (#394)
-
-### 1.5.1
-
-_25 June 2020_
-
-- 🐛 Fix "OSError: [WinError 17] The system cannot move the file to a different
-  disk drive" on GitHub Actions (#388, #389)
-
-### 1.5.0
-
-_24 June 2020_
-
-- 🌟 Add [`CIBW_BEFORE_ALL`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-all)
-  option, which lets you run a command on the build machine before any wheels
-  are built. This is especially useful when building on Linux, to `make`
-  something external to Python, or to `yum install` a dependency. (#342)
-- ✨ Added support for projects using pyproject.toml instead of setup.py
-  (#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)
-- 🐛 Ensure pip wheel uses the specified package, and doesn't build a wheel
-  from PyPI (#369)
-- 🛠 Internal changes: using pathlib.Path, precommit hooks, testing
-  improvements.
-
-### 1.4.2
-
-_25 May 2020_
-
-- 🛠 Dependency updates, including CPython 3.8.3 & manylinux images.
-- 🛠 Lots of internal updates - type annotations and checking using mypy, and
-  a new integration testing system.
-- ⚠️ Removed support for *running* cibuildwheel using Python 3.5. cibuildwheel
-  will continue to build Python 3.5 wheels until EOL.
-
-### 1.4.1
-
-_4 May 2020_
-
-- 🐛 Fix a bug causing programs running inside the i686 manylinux images to
-  think they were running x86_64 and target the wrong architecture. (#336,
-  #338)
-
-### 1.4.0
-
-_2 May 2020_
-
-- 🌟 Deterministic builds. cibuildwheel now locks the versions of the tools it
-  uses. This means that pinning your version of cibuildwheel pins the versions
-  of pip, setuptools, manylinux etc. that are used under the hood. This should
-  make things more reliable. But note that we don't control the entire build
-  environment on macOS and Windows, where the version of Xcode and Visual
-  Studio can still effect things.
-
-  This can be controlled using the [CIBW_DEPENDENCY_VERSIONS](https://cibuildwheel.readthedocs.io/en/stable/options/#dependency-versions)
-  and [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)
-  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)
-  for more information.
-
-  Note that this change makes the working directory (where you call
-  cibuildwheel from) relevant on Linux, as it's considered the 'project' and
-  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.
-
-### 1.3.0
-
-_12 March 2020_
-
-- 🌟 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
-  prepare the environment before your tests are run. (#242)
-
-### 1.2.0
-
-_8 March 2020_
-
-- 🌟 Add support for building PyPy wheels, across Manylinux, macOS, and
-  Windows. (#185)
-- 🌟 Added the ability to build ARM64 (aarch64), ppc64le, and s390x wheels,
-  using manylinux2014 and Travis CI. (#273)
-- ✨ You can now build macOS wheels on Appveyor. (#230)
-- 🛠 Changed default macOS minimum target to 10.9, from 10.6. This allows the
-  use of more modern C++ libraries, among other things. (#156)
-- 🛠 Stop building universal binaries on macOS. We now only build x86_64
-  wheels on macOS. (#220)
-- ✨ Allow chaining of commands using `&&` and `||` on Windows inside
-  CIBW_BEFORE_BUILD and CIBW_TEST_COMMAND. (#293)
-- 🛠 Improved error reporting for failed Cython builds due to stale .so files
-  (#263)
-- 🛠 Update CPython from 3.7.5 to 3.7.6 and from 3.8.0 to 3.8.2 on Mac/Windows
-- 🛠 Improved error messages when a bad config breaks cibuildwheel's PATH
-  variable. (#264)
-- ⚠️ Removed support for *running* cibuildwheel on Python 2.7. cibuildwheel
-  will continue to build Python 2.7 wheels for a little while. (#265)
-
-### 1.1.0
-
-_7 December 2019_
-
-- 🌟 Add support for building manylinux2014 wheels. To use, set
-  `CIBW_MANYLINUX_X86_64_IMAGE` and CIBW_MANYLINUX_I686_IMAGE to
-  `manylinux2014`.
-- ✨ Add support for [Linux on Appveyor](https://www.appveyor.com/blog/2018/03/06/appveyor-for-linux/) (#204, #207)
-- ✨ Add `CIBW_REPAIR_WHEEL_COMMAND` env variable, for changing how
-  `auditwheel` or `delocate` are invoked, or testing an equivalent on
-  Windows. (#211)
-- 📚 Added some travis example configs - these are available in /examples. (#228)
-
-### 1.0.0
-
-_10 November 2019_
-
-- 🌟 Add support for building Python 3.8 wheels! (#180)
-- 🌟 Add support for building manylinux2010 wheels. cibuildwheel will now
-  build using the manylinux2010 images by default. If your project is still
-  manylinux1 compatible, you should get both manylinux1 and manylinux2010
-  wheels - you can upload both to PyPI. If you always require manylinux1 wheels, you can
-  build using the old manylinux1 image using the [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) option.
-  (#155)
-- 📚 Documentation is now on its [own mini-site](https://cibuildwheel.readthedocs.io),
-   rather than on the README (#169)
-- ✨ Add support for building Windows wheels on Travis CI. (#160)
-- 🛠 If you set `CIBW_TEST_COMMAND`, your tests now run in a virtualenv. (#164)
-- 🛠 Windows now uses Python as installed by nuget, rather than the versions
-  installed by the various CI providers. (#180)
-- 🛠 Update Python from 2.7.16 to 2.7.17 and 3.7.4 to 3.7.5 on macOS (#171)
-- ⚠️ Removed support for Python 3.4 (#168)
-
-### 0.12.0
-
-_29 September 2019_
-
-- ✨ Add CIBW_TEST_EXTRAS option, to allow testing using extra_require
-  options. For example, set `CIBW_TEST_EXTRAS=test,qt` to make the wheel
-  installed with `pip install <wheel_file>[test,qt]`
-- 🛠 Update Python from 3.7.2 to 3.7.4 on macOS
-- 🛠 Update OpenSSL patch to 1.0.2t on macOS
-
-### 0.11.1
-
-_28 May 2019_
-
-- 🐛 Fix missing file in the release tarball, that was causing problems with
-  Windows builds (#141)
-
-### 0.11.0
-
-_26 May 2019_
-
-- 🌟 Add support for building on Azure pipelines! This lets you build all
-  Linux, Mac and Windows wheels on one service, so it promises to be the
-  easiest to set up! Check out the quickstart in the docs, or
-  [cibuildwheel-azure-example](https://github.com/pypa/cibuildwheel-azure-example)
-  for an example project. (#126, #132)
-- 🛠 Internal change - the end-to-end test projects format was updated, so we
-  can more precisely assert what should be produced for each one. (#136, #137).
-
-### 0.10.2
-
-_10 March 2019_
-
-- 🛠 Revert temporary fix in macOS, that was working around a bug in pip 19 (#129)
-- 🛠 Update Python to 2.7.16 on macOS
-- 🛠 Update OpenSSL patch to 1.0.2r on macOS
-
-### 0.10.1
-
-_3 February 2019_
-
-- 🐛 Fix build stalling on macOS (that was introduced in pip 19) (#122)
-- 🐛 Fix "AttributeError: 'Popen' object has no attribute 'args'" on Python 2.7 for Linux builds (#108)
-- 🛠 Update Python from 3.6.7, 3.7.1 to 3.6.8, 3.7.2 on macOS
-- 🛠 Update openssl patch from 1.0.2p to 1.0.2q on macOS
-- 🛠 Sorting build options dict items when printing preamble (#114)
-
-### 0.10.0
-
-_23 September 2018_
-
-- 🌟 Add `CIBW_BUILD` option, for specifying which specific builds to perform (#101)
-- 🌟 Add support for building Mac and Linux on CircleCI (#91, #97)
-- 🛠 Improved support for building universal wheels (#95)
-- 🛠 Ensure log output is unbuffered and therefore in the correct order (#92)
-- 🛠 Improved error reporting for errors that occur inside a package's setup.py (#88)
-- ⚠️ Removed support for Python 3.3 on Windows.
-
-### 0.9.4
-
-_29 July 2018_
-
-- 🛠 CIBW_TEST_COMMAND now runs in a shell on Mac (as well as Linux) (#81)
-
-### 0.9.3
-
-_10 July 2018_
-
-- 🛠 Update to Python 3.6.6 on macOS (#82)
-- ✨ Add support for building Python 3.7 wheels on Windows (#76)
-- ⚠️ Deprecated support for Python 3.3 on Windows.
-
-### 0.9.2
-
-_1 July 2018_
-
-- 🛠  Update Python 3.7.0rc1 to 3.7.0 on macOS (#79)
-
-### 0.9.1
-
-_18 June 2018_
-
-- 🛠 Removed the need to use `{python}` and `{pip}` in `CIBW_BEFORE_BUILD` statements, by ensuring the correct version is always on the path at `python` and `pip` instead. (#60)
-- 🛠 We now patch the _ssl module on Python 3.4 and 3.5 so these versions can still make SSL web requests using TLS 1.2 while building. (#71)
-
-### 0.9.0
-
-_18 June 2018_
-
-- ✨ Add support for Python 3.7 (#73)
-
-### 0.8.0
-
-_4 May 2018_
-
-- ⚠️ Drop support for Python 3.3 on Linux (#67)
-- 🐛 Fix TLS by updating setuptools (#69)
-
-### 0.7.1
-
-_2 April 2017_
-
-- 🐛 macOS: Fix Pip bugs resulting from PyPI TLS 1.2 enforcement
-- 🐛 macOS: Fix brew Python3 version problems in the CI
-
-### 0.7.0
-
-_7 January 2018_
-
-- ✨ You can now specify a custom docker image using the `CIBW_MANYLINUX1_X86_64_IMAGE` and `CIBW_MANYLINUX1_I686_IMAGE` options. (#46)
-- 🐛 Fixed a bug where cibuildwheel would download and build a package from PyPI(!) instead of building the package on the local machine. (#51)
-
-### 0.6.0
-
-_9 October 2017_
-
-- ✨ On the Linux build, the host filesystem is now accessible via `/host` (#36)
-- 🐛 Fixed a bug where setup.py scripts would run the wrong version of Python when running subprocesses on Linux (#35)
-
-### 0.5.1
-
-_10 September 2017_
-
-- 🐛 Fixed a couple of bugs on Python 3.
-- ✨ Added experimental support for Mac builds on [Bitrise.io](https://www.bitrise.io)
-
-### 0.5.0
-
-_7 September 2017_
-
-- ✨ `CIBW_ENVIRONMENT` added. You can now set environment variables for each build, even within the Docker container on Linux. This is a big one! (#21)
-- ✨ `CIBW_BEFORE_BUILD` now runs in a system shell on all platforms. You can now do things like `CIBW_BEFORE_BUILD="cmd1 && cmd2"`. (#32)
-
-### 0.4.1
-
-_14 August 2017_
-
-- 🐛 Fixed a bug on Windows where subprocess' output was hidden (#23)
-- 🐛 Fixed a bug on AppVeyor where logs would appear in the wrong order due to output buffering (#24, thanks @YannickJadoul!)
-
-### 0.4.0
-
-_23 July 2017_
-
-- 🐛 Fixed a bug that was increasing the build time by building the wheel twice. This was a problem for large projects that have a long build time. If you're upgrading and you need the old behaviour, use `CIBW_BEFORE_BUILD={pip} install .`, or install exactly the dependencies you need in `CIBW_BEFORE_BUILD`. See #18.
-
-### 0.3.0
-
-_27 June 2017_
-
-- ⚠️ Removed Python 2.6 support on Linux (#12)
-
-### 0.2.1
-
-_11 June 2017_
-
-- 🛠 Changed the build process to install the package before building the wheel - this allows direct dependencies to be installed first (#9, thanks @tgarc!)
-- ✨ Added Python 3 support for the main process, for systems where Python 3 is the default (#8, thanks @tgarc).
-
-### 0.2.0
-
-_13 April 2017_
-
-- ✨ Added `CIBW_SKIP` option, letting users explicitly skip a build
-- ✨ Added `CIBW_BEFORE_BUILD` option, letting users run a shell command before the build starts
-
-### 0.1.3
-
-_31 March 2017_
-
-- 🌟 First public release!
-
-<!--changelog-end-->
+---
 
 Contributing
 ============
@@ -939,7 +274,7 @@ Credits
 
 `cibuildwheel` stands on the shoulders of giants.
 
-- ⭐️ @matthew-brett for [matthew-brett/multibuild](http://github.com/matthew-brett/multibuild) and [matthew-brett/delocate](http://github.com/matthew-brett/delocate)
+- ⭐️ @matthew-brett for [multibuild](https://github.com/multi-build/multibuild) and [matthew-brett/delocate](http://github.com/matthew-brett/delocate)
 - @PyPA for the manylinux Docker images [pypa/manylinux](https://github.com/pypa/manylinux)
 - @ogrisel for [wheelhouse-uploader](https://github.com/ogrisel/wheelhouse-uploader) and `run_with_env.cmd`
 

action.yml

@@ -9,6 +9,10 @@ inputs:
     description: 'Folder to place the outputs in, defaults to "wheelhouse"'
     required: false
     default: wheelhouse
+  config-file:
+    description: 'File containing the config, defaults to {package}/pyproject.toml'
+    required: false
+    default: ''
 branding:
   icon: package
   color: yellow
@@ -24,5 +28,6 @@ runs:
         cibuildwheel
         ${{ inputs.package-dir }}
         --output-dir ${{ inputs.output-dir }}
+        --config-file "${{ inputs.config-file }}"
         2>&1
       shell: bash

azure-pipelines.yml

@@ -1,5 +1,6 @@
 jobs:
 - job: linux_38
+  timeoutInMinutes: 120
   pool: {vmImage: 'Ubuntu-18.04'}
   steps:
     - task: UsePythonVersion@0

bin/bump_version.py

@@ -68,7 +68,7 @@ def bump_version() -> None:
         sys.exit(1)
 
     # fmt: off
-    print(              'Current version:', current_version)  # noqa
+    print(              'Current version:', current_version)  # noqa: E201 whitespace
     new_version = input('    New version: ').strip()
     # fmt: on
 
@@ -136,6 +136,25 @@ def bump_version() -> None:
     while input('Type "done" to continue: ').strip().lower() != "done":
         pass
 
+    # run pre-commit to update the README changelog
+    subprocess.run(
+        [
+            "pre-commit",
+            "run",
+            "--files=docs/changelog.md",
+        ]
+    )
+
+    # run pre-commit to check that no errors occurred on the second run
+    subprocess.run(
+        [
+            "pre-commit",
+            "run",
+            "--files=docs/changelog.md",
+        ],
+        check=True,
+    )
+
     subprocess.run(
         [
             "git",

bin/inspect_all_known_projects.py

@@ -7,7 +7,7 @@ from typing import Iterator
 
 import click
 import yaml
-from ghapi.core import GhApi, HTTP404NotFoundError  # type: ignore
+from ghapi.core import GhApi, HTTP404NotFoundError
 from rich import print
 
 from cibuildwheel.projectfiles import Analyzer

bin/projects.py

@@ -5,7 +5,7 @@ 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
+    ./bin/projects.py docs/data/projects.yml --online --auth $GITHUB_API_TOKEN
     git diff
 """
 
@@ -139,28 +139,35 @@ def fetch_icon(icon_name: str) -> None:
         f.write(svgElement.toxml())
 
 
-def path_for_icon(icon_name: str) -> Path:
-    return Path(".") / "docs" / "data" / "readme_icons" / f"{icon_name}.svg"
+def path_for_icon(icon_name: str, relative_to: Path | None = None) -> Path:
+    from_path = Path.cwd() if relative_to is None else relative_to.parent
+
+    absolute_path = PROJECT_ROOT / "docs" / "data" / "readme_icons" / f"{icon_name}.svg"
+
+    return absolute_path.resolve().relative_to(from_path.resolve())
 
 
-def str_projects(
+def get_projects(
     config: list[dict[str, Any]],
     *,
     online: bool = True,
     auth: str | None = None,
-) -> str:
-    io = StringIO()
-    print = functools.partial(builtins.print, file=io)
-
+) -> list[Project]:
     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)
+    return sorted((Project(item, github) for item in config), reverse=online)
+
+
+def render_projects(projects: list[Project], *, dest_path: Path, include_info: bool = True):
+    io = StringIO()
+    print = functools.partial(builtins.print, file=io)
 
     print(Project.header())
+
     for project in projects:
         print(project.table_row())
 
@@ -170,42 +177,73 @@ def str_projects(
 
     print()
     for icon in ICONS:
-        print(f"[{icon} icon]: {path_for_icon(icon).as_posix()}")
+        print(f"[{icon} icon]: {path_for_icon(icon, relative_to=dest_path).as_posix()}")
 
-    print()
-    for project in projects:
-        print(project.info())
+    if include_info:
+        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")
+def insert_projects_table(
+    file: Path,
+    *,
+    projects: list[Project],
+    input_filename: str,
+    include_info: bool = True,
+):
+    text = file.read_text()
+    projects_table = render_projects(projects, include_info=include_info, dest_path=file)
+
+    start_str = "<!-- START bin/projects.py -->\n"
+
+    start = text.find(start_str)
+    assert start != -1
+
+    end = text.find("<!-- END bin/projects.py -->\n")
+    assert end != -1
+
+    generated_note = f"<!-- this section is generated by bin/projects.py. Don't edit it directly, instead, edit {input_filename} -->"
+    new_text = (
+        f"{text[:start + len(start_str)]}\n{generated_note}\n\n{projects_table}\n{text[end:]}"
+    )
+
+    file.write_text(new_text)
+
+
+PROJECT_ROOT = Path(__file__).parent / ".."
+README_FILE = PROJECT_ROOT / "README.md"
+DOCS_PAGE = PROJECT_ROOT / "docs" / "working-examples.md"
+
+
+@click.command(help="Try ./bin/projects.py docs/data/projects.yml")
 @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")
+@click.option(
+    "--dry-run", default=False, help="Print the output, rather than writing it to files in the repo"
+)
 def projects(
     input: TextIO,
     online: bool,
     auth: str | None,
-    readme: TextIO | None,
+    dry_run: bool,
 ) -> None:
     config = yaml.safe_load(input)
-    output = str_projects(config, online=online, auth=auth)
+    projects = get_projects(config, online=online, auth=auth)
 
-    if readme is None:
+    if dry_run:
+        output = render_projects(projects, dest_path=README_FILE)
         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()
+        insert_projects_table(
+            README_FILE, projects=projects[:10], input_filename=input.name, include_info=False
+        )
+        insert_projects_table(
+            DOCS_PAGE, projects=projects, input_filename=input.name, include_info=True
+        )
 
 
 if __name__ == "__main__":

bin/run_tests.py

@@ -16,8 +16,20 @@ if __name__ == "__main__":
         unit_test_args += ["--run-docker"]
     subprocess.run(unit_test_args, check=True)
 
+    xdist_test_args = ["-n", "2"] if sys.platform.startswith("linux") else []
+
     # run the integration tests
     subprocess.run(
-        [sys.executable, "-m", "pytest", "-x", "--durations", "0", "--timeout=2400", "test"],
+        [
+            sys.executable,
+            "-m",
+            "pytest",
+            *xdist_test_args,
+            "-x",
+            "--durations",
+            "0",
+            "--timeout=2400",
+            "test",
+        ],
         check=True,
     )

bin/update_docker.py

@@ -19,14 +19,15 @@ class Image(NamedTuple):
 
 
 images = [
+    # manylinux1 images
     Image("manylinux1", "x86_64", "quay.io/pypa/manylinux1_x86_64", None),
     Image("manylinux1", "i686", "quay.io/pypa/manylinux1_i686", None),
-    # 2010 images
+    # manylinux2010 images
     Image("manylinux2010", "x86_64", "quay.io/pypa/manylinux2010_x86_64", None),
     Image("manylinux2010", "i686", "quay.io/pypa/manylinux2010_i686", None),
     Image("manylinux2010", "pypy_x86_64", "quay.io/pypa/manylinux2010_x86_64", None),
     Image("manylinux2010", "pypy_i686", "quay.io/pypa/manylinux2010_i686", None),
-    # 2014 images
+    # manylinux2014 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),
@@ -35,7 +36,7 @@ images = [
     Image("manylinux2014", "pypy_x86_64", "quay.io/pypa/manylinux2014_x86_64", None),
     Image("manylinux2014", "pypy_i686", "quay.io/pypa/manylinux2014_i686", None),
     Image("manylinux2014", "pypy_aarch64", "quay.io/pypa/manylinux2014_aarch64", None),
-    # 2_24 images
+    # manylinux_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),
@@ -44,6 +45,12 @@ images = [
     Image("manylinux_2_24", "pypy_x86_64", "quay.io/pypa/manylinux_2_24_x86_64", None),
     Image("manylinux_2_24", "pypy_i686", "quay.io/pypa/manylinux_2_24_i686", None),
     Image("manylinux_2_24", "pypy_aarch64", "quay.io/pypa/manylinux_2_24_aarch64", None),
+    # musllinux_1_1 images
+    Image("musllinux_1_1", "x86_64", "quay.io/pypa/musllinux_1_1_x86_64", None),
+    Image("musllinux_1_1", "i686", "quay.io/pypa/musllinux_1_1_i686", None),
+    Image("musllinux_1_1", "aarch64", "quay.io/pypa/musllinux_1_1_aarch64", None),
+    Image("musllinux_1_1", "ppc64le", "quay.io/pypa/musllinux_1_1_ppc64le", None),
+    Image("musllinux_1_1", "s390x", "quay.io/pypa/musllinux_1_1_s390x", None),
 ]
 
 config = configparser.ConfigParser()

bin/update_pythons.py

@@ -11,13 +11,13 @@ from typing import Any, Union
 import click
 import requests
 import rich
-import toml
+import tomli
 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.extra import dump_python_configurations
 from cibuildwheel.typing import Final, Literal, TypedDict
 
 log = logging.getLogger("cibw")
@@ -28,7 +28,7 @@ DIR: Final[Path] = Path(__file__).parent.parent.resolve()
 RESOURCES_DIR: Final[Path] = DIR / "cibuildwheel/resources"
 
 
-ArchStr = Literal["32", "64"]
+ArchStr = Literal["32", "64", "ARM64"]
 
 
 class ConfigWinCP(TypedDict):
@@ -68,8 +68,8 @@ class WindowsVersions:
             if resource["@type"] == "PackageBaseAddress/3.0.0":
                 endpoint = resource["@id"]
 
-        ARCH_DICT = {"32": "win32", "64": "win_amd64"}
-        PACKAGE_DICT = {"32": "pythonx86", "64": "python"}
+        ARCH_DICT = {"32": "win32", "64": "win_amd64", "ARM64": "win_arm64"}
+        PACKAGE_DICT = {"32": "pythonx86", "64": "python", "ARM64": "pythonarm64"}
 
         self.arch_str = arch_str
         self.arch = ARCH_DICT[arch_str]
@@ -131,7 +131,7 @@ class PyPyVersions:
 
     def update_version_windows(self, spec: Specifier) -> ConfigWinCP:
         releases = [r for r in self.releases if spec.contains(r["python_version"])]
-        releases = sorted(releases, key=lambda r: r["pypy_version"])  # type: ignore
+        releases = sorted(releases, key=lambda r: r["pypy_version"])  # type: ignore[no-any-return]
         releases = [r for r in releases if self.get_arch_file(r)]
 
         if not releases:
@@ -156,7 +156,7 @@ class PyPyVersions:
             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"])  # type: ignore
+        releases = sorted(releases, key=lambda r: r["pypy_version"])  # type: ignore[no-any-return]
 
         if not releases:
             raise RuntimeError(f"PyPy macOS {self.arch} not found for {spec}!")
@@ -237,6 +237,7 @@ class AllVersions:
     def __init__(self) -> None:
         self.windows_32 = WindowsVersions("32")
         self.windows_64 = WindowsVersions("64")
+        self.windows_arm64 = WindowsVersions("ARM64")
         self.windows_pypy_64 = PyPyVersions("64")
 
         self.macos_cpython = CPythonVersions()
@@ -264,6 +265,9 @@ class AllVersions:
                 config_update = self.windows_64.update_version_windows(spec)
             elif identifier.startswith("pp"):
                 config_update = self.windows_pypy_64.update_version_windows(spec)
+        elif "win_arm64" in identifier:
+            if identifier.startswith("cp"):
+                config_update = self.windows_arm64.update_version_windows(spec)
 
         assert config_update is not None, f"{identifier} not found!"
         config.update(**config_update)
@@ -291,7 +295,8 @@ def update_pythons(force: bool, level: str) -> None:
     toml_file_path = RESOURCES_DIR / "build-platforms.toml"
 
     original_toml = toml_file_path.read_text()
-    configs = toml.loads(original_toml)
+    with toml_file_path.open("rb") as f:
+        configs = tomli.load(f)
 
     for config in configs["windows"]["python_configurations"]:
         all_versions.update_config(config)
@@ -299,7 +304,7 @@ def update_pythons(force: bool, level: str) -> None:
     for config in configs["macos"]["python_configurations"]:
         all_versions.update_config(config)
 
-    result_toml = toml.dumps(configs, encoder=InlineArrayDictEncoder())  # type: ignore
+    result_toml = dump_python_configurations(configs)
 
     rich.print()  # spacer
 

bin/update_readme_changelog.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+
+import re
+import sys
+from pathlib import Path
+
+PROJECT_ROOT = Path(__file__).parent / ".."
+CHANGELOG_FILE = PROJECT_ROOT / "docs" / "changelog.md"
+README_FILE = PROJECT_ROOT / "README.md"
+
+# https://regexr.com/622ds
+FIRST_5_CHANGELOG_ENTRIES_REGEX = re.compile(r"""(^###.*?(?=###)){5}""", re.DOTALL | re.MULTILINE)
+
+# https://regexr.com/622e5
+README_CHANGELOG_SECTION = re.compile(
+    r"""(?<=<!-- START bin\/update_readme_changelog.py -->\n).*(?=<!-- END bin\/update_readme_changelog.py -->)""",
+    re.DOTALL,
+)
+
+
+def main():
+    changelog_text = CHANGELOG_FILE.read_text()
+    readme_text = README_FILE.read_text()
+
+    mini_changelog_match = FIRST_5_CHANGELOG_ENTRIES_REGEX.search(changelog_text)
+    assert mini_changelog_match, "Failed to find the first few changelog entries"
+
+    mini_changelog = "\n".join(
+        [
+            "",
+            "<!-- this section was generated by bin/update_readme_changelog.py -- do not edit manually -->",
+            "",
+            mini_changelog_match.group(0).strip(),
+            "",
+            "",
+        ]
+    )
+
+    if not re.search(README_CHANGELOG_SECTION, readme_text):
+        sys.exit("Changelog section not found in README")
+
+    readme_text = re.sub(README_CHANGELOG_SECTION, mini_changelog, readme_text)
+    README_FILE.write_text(readme_text)
+
+
+if __name__ == "__main__":
+    main()

cibuildwheel/__init__.py

@@ -1 +1 @@
-__version__ = "2.0.0b2"
+__version__ = "2.3.0"

cibuildwheel/__main__.py

@@ -2,12 +2,7 @@ import argparse
 import os
 import sys
 import textwrap
-import traceback
-from configparser import ConfigParser
-from pathlib import Path
-from typing import Dict, List, Optional, Set, Union
-
-from packaging.specifiers import SpecifierSet
+from typing import List, Set, Union
 
 import cibuildwheel
 import cibuildwheel.linux
@@ -15,31 +10,9 @@ import cibuildwheel.macos
 import cibuildwheel.util
 import cibuildwheel.windows
 from cibuildwheel.architecture import Architecture, allowed_architectures_check
-from cibuildwheel.environment import EnvironmentParseError, parse_environment
-from cibuildwheel.options import ConfigOptions
-from cibuildwheel.projectfiles import get_requires_python_str
+from cibuildwheel.options import CommandLineArguments, Options, compute_options
 from cibuildwheel.typing import PLATFORMS, PlatformName, assert_never
-from cibuildwheel.util import (
-    BuildFrontend,
-    BuildOptions,
-    BuildSelector,
-    DependencyConstraints,
-    TestSelector,
-    Unbuffered,
-    detect_ci_provider,
-    resources_dir,
-)
-
-MANYLINUX_ARCHS = (
-    "x86_64",
-    "i686",
-    "pypy_x86_64",
-    "aarch64",
-    "ppc64le",
-    "s390x",
-    "pypy_aarch64",
-    "pypy_i686",
-)
+from cibuildwheel.util import BuildSelector, Unbuffered, detect_ci_provider
 
 
 def main() -> None:
@@ -84,14 +57,15 @@ def main() -> None:
 
     parser.add_argument(
         "--output-dir",
-        help="Destination folder for the wheels.",
+        help="Destination folder for the wheels. Default: wheelhouse.",
     )
 
     parser.add_argument(
         "--config-file",
+        default="",
         help="""
-            TOML config file for cibuildwheel. Defaults to pyproject.toml, but
-            can be overridden with this option.
+            TOML config file. Default: "", meaning {package}/pyproject.toml,
+            if it exists.
         """,
     )
 
@@ -125,7 +99,7 @@ def main() -> None:
         help="Enable pre-release Python versions if available.",
     )
 
-    args = parser.parse_args()
+    args = parser.parse_args(namespace=CommandLineArguments())
 
     if args.platform != "auto":
         platform = args.platform
@@ -162,56 +136,9 @@ def main() -> None:
         print(f"cibuildwheel: Unsupported platform: {platform}", file=sys.stderr)
         sys.exit(2)
 
-    package_dir = Path(args.package_dir)
-
-    manylinux_identifiers = {
-        f"manylinux-{build_platform}-image" for build_platform in MANYLINUX_ARCHS
-    }
-    disallow = {
-        "linux": {"dependency-versions"},
-        "macos": manylinux_identifiers,
-        "windows": manylinux_identifiers,
-    }
-    options = ConfigOptions(package_dir, args.config_file, platform=platform, disallow=disallow)
-    output_dir = Path(
-        args.output_dir
-        if args.output_dir is not None
-        else os.environ.get("CIBW_OUTPUT_DIR", "wheelhouse")
-    )
-
-    build_config = options("build", env_plat=False, sep=" ") or "*"
-    skip_config = options("skip", env_plat=False, sep=" ")
-    test_skip = options("test-skip", env_plat=False, sep=" ")
-
-    archs_config_str = args.archs or options("archs", sep=" ")
-
-    build_frontend_str = options("build-frontend", env_plat=False)
-    environment_config = options("environment", table={"item": '{k}="{v}"', "sep": " "})
-    before_all = options("before-all", sep=" && ")
-    before_build = options("before-build", sep=" && ")
-    repair_command = options("repair-wheel-command", sep=" && ")
-
-    dependency_versions = options("dependency-versions")
-    test_command = options("test-command", sep=" && ")
-    before_test = options("before-test", sep=" && ")
-    test_requires = options("test-requires", sep=" ").split()
-    test_extras = options("test-extras", sep=",")
-    build_verbosity_str = options("build-verbosity")
-
-    prerelease_pythons = args.prerelease_pythons or cibuildwheel.util.strtobool(
-        os.environ.get("CIBW_PRERELEASE_PYTHONS", "0")
-    )
-
-    build_frontend: BuildFrontend
-    if build_frontend_str == "build":
-        build_frontend = "build"
-    elif build_frontend_str == "pip":
-        build_frontend = "pip"
-    else:
-        msg = f"cibuildwheel: Unrecognised build frontend '{build_frontend}', only 'pip' and 'build' are supported"
-        print(msg, file=sys.stderr)
-        sys.exit(2)
+    options = compute_options(platform=platform, command_line_arguments=args)
 
+    package_dir = options.globals.package_dir
     package_files = {"setup.py", "setup.cfg", "pyproject.toml"}
 
     if not any(package_dir.joinpath(name).exists() for name in package_files):
@@ -220,125 +147,43 @@ def main() -> None:
         print(msg, file=sys.stderr)
         sys.exit(2)
 
-    # This is not supported in tool.cibuildwheel, as it comes from a standard location.
-    # 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)
-
-    deprecated_selectors("CIBW_BUILD", build_config, error=True)
-    deprecated_selectors("CIBW_SKIP", skip_config)
-    deprecated_selectors("CIBW_TEST_SKIP", test_skip)
-
-    build_selector = BuildSelector(
-        build_config=build_config,
-        skip_config=skip_config,
-        requires_python=requires_python,
-        prerelease_pythons=prerelease_pythons,
+    identifiers = get_build_identifiers(
+        platform=platform,
+        build_selector=options.globals.build_selector,
+        architectures=options.globals.architectures,
     )
-    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)
-        sys.exit(2)
-
-    if dependency_versions == "pinned":
-        dependency_constraints: Optional[
-            DependencyConstraints
-        ] = DependencyConstraints.with_defaults()
-    elif dependency_versions == "latest":
-        dependency_constraints = None
-    else:
-        dependency_versions_path = Path(dependency_versions)
-        dependency_constraints = DependencyConstraints(dependency_versions_path)
-
-    if test_extras:
-        test_extras = f"[{test_extras}]"
-
-    try:
-        build_verbosity = min(3, max(-3, int(build_verbosity_str)))
-    except ValueError:
-        build_verbosity = 0
-
-    # Add CIBUILDWHEEL environment variable
-    # This needs to be passed on to the docker container in linux.py
-    os.environ["CIBUILDWHEEL"] = "1"
-
-    archs = Architecture.parse_config(archs_config_str, platform=platform)
-
-    identifiers = get_build_identifiers(platform, build_selector, archs)
 
     if args.print_build_identifiers:
         for identifier in identifiers:
             print(identifier)
         sys.exit(0)
 
-    manylinux_images: Dict[str, str] = {}
-    if platform == "linux":
-        pinned_docker_images_file = resources_dir / "pinned_docker_images.cfg"
-        all_pinned_docker_images = ConfigParser()
-        all_pinned_docker_images.read(pinned_docker_images_file)
-        # all_pinned_docker_images looks like a dict of dicts, e.g.
-        # { 'x86_64': {'manylinux1': '...', 'manylinux2010': '...', 'manylinux2014': '...'},
-        #   'i686': {'manylinux1': '...', 'manylinux2010': '...', 'manylinux2014': '...'},
-        #   'pypy_x86_64': {'manylinux2010': '...' }
-        #   ... }
-
-        for build_platform in MANYLINUX_ARCHS:
-            pinned_images = all_pinned_docker_images[build_platform]
-
-            config_value = options(f"manylinux-{build_platform}-image")
-
-            if config_value is None:
-                # default to manylinux2010 if it's available, otherwise manylinux2014
-                image = pinned_images.get("manylinux2010") or pinned_images.get("manylinux2014")
-            elif config_value in pinned_images:
-                image = pinned_images[config_value]
-            else:
-                image = config_value
-
-            manylinux_images[build_platform] = image
-
-    build_options = BuildOptions(
-        architectures=archs,
-        package_dir=package_dir,
-        output_dir=output_dir,
-        test_command=test_command,
-        test_requires=test_requires,
-        test_extras=test_extras,
-        before_test=before_test,
-        before_build=before_build,
-        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,
-        manylinux_images=manylinux_images or None,
-        build_frontend=build_frontend,
-    )
+    # Add CIBUILDWHEEL environment variable
+    # This needs to be passed on to the docker container in linux.py
+    os.environ["CIBUILDWHEEL"] = "1"
 
     # Python is buffering by default when running on the CI platforms, giving problems interleaving subprocess call output with unflushed calls to 'print'
-    sys.stdout = Unbuffered(sys.stdout)  # type: ignore
+    sys.stdout = Unbuffered(sys.stdout)  # type: ignore[assignment]
 
-    print_preamble(platform, build_options)
+    print_preamble(platform=platform, options=options, identifiers=identifiers)
 
     try:
-        allowed_architectures_check(platform, build_options.architectures)
+        options.check_for_invalid_configuration(identifiers)
+        allowed_architectures_check(platform, options.globals.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)
+        print(
+            f"cibuildwheel: No build identifiers selected: {options.globals.build_selector}",
+            file=sys.stderr,
+        )
         if not args.allow_empty:
             sys.exit(3)
 
+    output_dir = options.globals.output_dir
+
     if not output_dir.exists():
         output_dir.mkdir(parents=True)
 
@@ -346,24 +191,16 @@ def main() -> None:
         "\n{n} wheels produced in {m:.0f} minutes:", output_dir
     ):
         if platform == "linux":
-            cibuildwheel.linux.build(build_options)
+            cibuildwheel.linux.build(options)
         elif platform == "windows":
-            cibuildwheel.windows.build(build_options)
+            cibuildwheel.windows.build(options)
         elif platform == "macos":
-            cibuildwheel.macos.build(build_options)
+            cibuildwheel.macos.build(options)
         else:
             assert_never(platform)
 
 
-def deprecated_selectors(name: str, selector: str, *, error: bool = False) -> None:
-    if "p2" in selector or "p35" in selector:
-        msg = f"cibuildwheel 2.x no longer supports Python < 3.6. Please use the 1.x series or update {name}"
-        print(msg, file=sys.stderr)
-        if error:
-            sys.exit(4)
-
-
-def print_preamble(platform: str, build_options: BuildOptions) -> None:
+def print_preamble(platform: str, options: Options, identifiers: List[str]) -> None:
     print(
         textwrap.dedent(
             """
@@ -379,10 +216,9 @@ def print_preamble(platform: str, build_options: BuildOptions) -> None:
 
     print("Build options:")
     print(f"  platform: {platform!r}")
-    for option, value in sorted(build_options._asdict().items()):
-        print(f"  {option}: {value!r}")
+    print(textwrap.indent(options.summary(identifiers), "  "))
 
-    warnings = detect_warnings(platform, build_options)
+    warnings = detect_warnings(platform=platform, options=options, identifiers=identifiers)
     if warnings:
         print("\nWarnings:")
         for warning in warnings:
@@ -418,14 +254,14 @@ def get_build_identifiers(
     return [config.identifier for config in python_configurations]
 
 
-def detect_warnings(platform: str, build_options: BuildOptions) -> List[str]:
+def detect_warnings(platform: str, options: Options, identifiers: List[str]) -> List[str]:
     warnings = []
 
     # warn about deprecated {python} and {pip}
     for option_name in ["test_command", "before_build"]:
-        option_value = getattr(build_options, option_name)
+        option_values = [getattr(options.build_options(i), option_name) for i in identifiers]
 
-        if option_value and ("{python}" in option_value or "{pip}" in option_value):
+        if any(o and ("{python}" in o or "{pip}" in o) for o in option_values):
             # Reminder: in an f-string, double braces means literal single brace
             msg = (
                 f"{option_name}: '{{python}}' and '{{pip}}' are no longer needed, "

cibuildwheel/architecture.py

@@ -29,6 +29,7 @@ class Architecture(Enum):
     # windows archs
     x86 = "x86"
     AMD64 = "AMD64"
+    ARM64 = "ARM64"
 
     # Allow this to be sorted
     def __lt__(self, other: "Architecture") -> bool:
@@ -83,7 +84,7 @@ class Architecture(Enum):
         elif platform == "macos":
             return {Architecture.x86_64, Architecture.arm64, Architecture.universal2}
         elif platform == "windows":
-            return {Architecture.x86, Architecture.AMD64}
+            return {Architecture.x86, Architecture.AMD64, Architecture.ARM64}
         else:
             assert_never(platform)
 

cibuildwheel/docker_container.py

@@ -17,7 +17,7 @@ class DockerContainer:
     An object that represents a running Docker container.
 
     Intended for use as a context manager e.g.
-    `with DockerContainer('ubuntu') as docker:`
+    `with DockerContainer(docker_image = 'ubuntu') as docker:`
 
     A bash shell is running in the remote container. When `call()` is invoked,
     the command is relayed to the remote shell, and the results are streamed
@@ -31,7 +31,7 @@ class DockerContainer:
     bash_stdout: IO[bytes]
 
     def __init__(
-        self, docker_image: str, simulate_32_bit: bool = False, cwd: Optional[PathOrStr] = None
+        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.")

cibuildwheel/environment.py

@@ -1,7 +1,10 @@
-from typing import Dict, List, Mapping, Optional
+import dataclasses
+from typing import Any, Dict, List, Mapping, Optional, Sequence
 
 import bashlex
 
+from cibuildwheel.typing import Protocol
+
 from . import bashlex_eval
 
 
@@ -38,7 +41,41 @@ def split_env_items(env_string: str) -> List[str]:
     return result
 
 
-class EnvironmentAssignment:
+class EnvironmentAssignment(Protocol):
+    name: str
+
+    def evaluated_value(
+        self,
+        *,
+        environment: Dict[str, str],
+        executor: Optional[bashlex_eval.EnvironmentExecutor] = None,
+    ) -> str:
+        """Returns the value of this assignment, as evaluated in the environment"""
+        ...
+
+
+class EnvironmentAssignmentRaw:
+    """
+    An environment variable - a simple name/value pair
+    """
+
+    def __init__(self, name: str, value: str):
+        self.name = name
+        self.value = value
+
+    def __repr__(self) -> str:
+        return f"{self.name}: {self.value}"
+
+    def evaluated_value(self, **kwargs: Any) -> str:
+        return self.value
+
+
+class EnvironmentAssignmentBash:
+    """
+    An environment variable, in bash syntax. The value can use bash constructs
+    like "$OTHER_VAR" and "$(command arg1 arg2)".
+    """
+
     def __init__(self, assignment: str):
         name, equals, value = assignment.partition("=")
         if not equals:
@@ -51,19 +88,23 @@ class EnvironmentAssignment:
         environment: Dict[str, str],
         executor: Optional[bashlex_eval.EnvironmentExecutor] = None,
     ) -> str:
-        """Returns the value of this assignment, as evaluated in the environment"""
         return bashlex_eval.evaluate(self.value, environment=environment, executor=executor)
 
-    def as_shell_assignment(self) -> str:
-        return f"export {self.name}={self.value}"
-
     def __repr__(self) -> str:
         return f"{self.name}={self.value}"
 
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, EnvironmentAssignmentBash):
+            return self.name == other.name and self.value == other.value
+        return False
 
+
+@dataclasses.dataclass
 class ParsedEnvironment:
-    def __init__(self, assignments: List[EnvironmentAssignment]):
-        self.assignments = assignments
+    assignments: List[EnvironmentAssignment]
+
+    def __init__(self, assignments: Sequence[EnvironmentAssignment]) -> None:
+        self.assignments = list(assignments)
 
     def as_dictionary(
         self,
@@ -78,14 +119,14 @@ class ParsedEnvironment:
 
         return environment
 
-    def as_shell_commands(self) -> List[str]:
-        return [a.as_shell_assignment() for a in self.assignments]
+    def add(self, name: str, value: str) -> None:
+        self.assignments.append(EnvironmentAssignmentRaw(name=name, value=value))
 
     def __repr__(self) -> str:
-        return f"ParsedEnvironment({[repr(a) for a in self.assignments]!r})"
+        return f"{self.__class__.__name__}({[repr(a) for a in self.assignments]!r})"
 
 
 def parse_environment(env_string: str) -> ParsedEnvironment:
     env_items = split_env_items(env_string)
-    assignments = [EnvironmentAssignment(item) for item in env_items]
+    assignments = [EnvironmentAssignmentBash(item) for item in env_items]
     return ParsedEnvironment(assignments=assignments)

cibuildwheel/extra.py

@@ -2,22 +2,31 @@
 These are utilities for the `/bin` scripts, not for the `cibuildwheel` program.
 """
 
-from typing import Any, Dict
+from io import StringIO
+from typing import Dict, List
 
-import toml.encoder
-from packaging.version import Version
+from .typing import Protocol
+
+__all__ = ("Printable", "dump_python_configurations")
 
 
-class InlineArrayDictEncoder(toml.encoder.TomlEncoder):  # type: ignore
-    def __init__(self) -> None:
-        super().__init__()
-        self.dump_funcs[Version] = lambda v: f'"{v}"'
+class Printable(Protocol):
+    def __str__(self) -> str:
+        ...
 
-    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()
+
+def dump_python_configurations(inp: Dict[str, Dict[str, List[Dict[str, Printable]]]]) -> str:
+    output = StringIO()
+    for header, values in inp.items():
+        output.write(f"[{header}]\n")
+        for inner_header, listing in values.items():
+            output.write(f"{inner_header} = [\n")
+            for item in listing:
+                output.write("  { ")
+                dict_contents = (f'{key} = "{value}"' for key, value in item.items())
+                output.write(", ".join(dict_contents))
+                output.write(" },\n")
+            output.write("]\n")
+        output.write("\n")
+    # Strip the final newline, to avoid two blank lines at the end.
+    return output.getvalue()[:-1]

cibuildwheel/linux.py

@@ -2,14 +2,14 @@ import subprocess
 import sys
 import textwrap
 from pathlib import Path, PurePath
-from typing import List, NamedTuple, Set
+from typing import Iterator, List, NamedTuple, Set, Tuple
 
 from .architecture import Architecture
 from .docker_container import DockerContainer
 from .logger import log
-from .typing import PathOrStr, assert_never
+from .options import Options
+from .typing import OrderedDict, PathOrStr, assert_never
 from .util import (
-    BuildOptions,
     BuildSelector,
     NonPlatformWheelError,
     get_build_verbosity_extra_flags,
@@ -28,6 +28,12 @@ class PythonConfiguration(NamedTuple):
         return PurePath(self.path_str)
 
 
+class BuildStep(NamedTuple):
+    platform_configs: List[PythonConfiguration]
+    platform_tag: str
+    docker_image: str
+
+
 def get_python_configurations(
     build_selector: BuildSelector,
     architectures: Set[Architecture],
@@ -47,7 +53,257 @@ def get_python_configurations(
     ]
 
 
-def build(options: BuildOptions) -> None:
+def docker_image_for_python_configuration(config: PythonConfiguration, options: Options) -> str:
+    build_options = options.build_options(config.identifier)
+    # e.g
+    # identifier is 'cp310-manylinux_x86_64'
+    # platform_tag is 'manylinux_x86_64'
+    # platform_arch is 'x86_64'
+    _, platform_tag = config.identifier.split("-", 1)
+    _, platform_arch = platform_tag.split("_", 1)
+
+    assert build_options.manylinux_images is not None
+    assert build_options.musllinux_images is not None
+
+    return (
+        build_options.manylinux_images[platform_arch]
+        if platform_tag.startswith("manylinux")
+        else build_options.musllinux_images[platform_arch]
+    )
+
+
+def get_build_steps(
+    options: Options, python_configurations: List[PythonConfiguration]
+) -> Iterator[BuildStep]:
+    """
+    Groups PythonConfigurations into BuildSteps. Each BuildStep represents a
+    separate Docker container.
+    """
+    steps = OrderedDict[Tuple[str, str, str], BuildStep]()
+
+    for config in python_configurations:
+        _, platform_tag = config.identifier.split("-", 1)
+
+        before_all = options.build_options(config.identifier).before_all
+        docker_image = docker_image_for_python_configuration(config, options)
+
+        step_key = (platform_tag, docker_image, before_all)
+
+        if step_key in steps:
+            steps[step_key].platform_configs.append(config)
+        else:
+            steps[step_key] = BuildStep(
+                platform_configs=[config], platform_tag=platform_tag, docker_image=docker_image
+            )
+
+    yield from steps.values()
+
+
+def build_on_docker(
+    *,
+    options: Options,
+    platform_configs: List[PythonConfiguration],
+    docker: DockerContainer,
+    container_project_path: PurePath,
+    container_package_dir: PurePath,
+) -> None:
+    container_output_dir = PurePath("/output")
+
+    log.step("Copying project into Docker...")
+    docker.copy_into(Path.cwd(), container_project_path)
+
+    before_all_options_identifier = platform_configs[0].identifier
+    before_all_options = options.build_options(before_all_options_identifier)
+
+    if before_all_options.before_all:
+        log.step("Running before_all...")
+
+        env = docker.get_environment()
+        env["PATH"] = f'/opt/python/cp38-cp38/bin:{env["PATH"]}'
+        env["PIP_DISABLE_PIP_VERSION_CHECK"] = "1"
+        env = before_all_options.environment.as_dictionary(
+            env, executor=docker.environment_executor
+        )
+
+        before_all_prepared = prepare_command(
+            before_all_options.before_all,
+            project=container_project_path,
+            package=container_package_dir,
+        )
+        docker.call(["sh", "-c", before_all_prepared], env=env)
+
+    for config in platform_configs:
+        log.build_start(config.identifier)
+        build_options = options.build_options(config.identifier)
+
+        dependency_constraint_flags: List[PathOrStr] = []
+
+        if build_options.dependency_constraints:
+            constraints_file = build_options.dependency_constraints.get_for_python_version(
+                config.version
+            )
+            container_constraints_file = PurePath("/constraints.txt")
+
+            docker.copy_into(constraints_file, container_constraints_file)
+            dependency_constraint_flags = ["-c", container_constraints_file]
+
+        log.step("Setting up build environment...")
+
+        env = docker.get_environment()
+
+        # put this config's python top of the list
+        python_bin = config.path / "bin"
+        env["PATH"] = f'{python_bin}:{env["PATH"]}'
+
+        env = build_options.environment.as_dictionary(env, executor=docker.environment_executor)
+
+        # check config python is still on PATH
+        which_python = docker.call(["which", "python"], env=env, capture_output=True).strip()
+        if PurePath(which_python) != python_bin / "python":
+            print(
+                "cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.",
+                file=sys.stderr,
+            )
+            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,
+            )
+            sys.exit(1)
+
+        if build_options.before_build:
+            log.step("Running before_build...")
+            before_build_prepared = prepare_command(
+                build_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])
+        docker.call(["mkdir", "-p", built_wheel_dir])
+
+        verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity)
+
+        if build_options.build_frontend == "pip":
+            docker.call(
+                [
+                    "python",
+                    "-m",
+                    "pip",
+                    "wheel",
+                    container_package_dir,
+                    f"--wheel-dir={built_wheel_dir}",
+                    "--no-deps",
+                    *verbosity_flags,
+                ],
+                env=env,
+            )
+        elif build_options.build_frontend == "build":
+            config_setting = " ".join(verbosity_flags)
+            docker.call(
+                [
+                    "python",
+                    "-m",
+                    "build",
+                    container_package_dir,
+                    "--wheel",
+                    f"--outdir={built_wheel_dir}",
+                    f"--config-setting={config_setting}",
+                ],
+                env=env,
+            )
+        else:
+            assert_never(build_options.build_frontend)
+
+        built_wheel = docker.glob(built_wheel_dir, "*.whl")[0]
+
+        repaired_wheel_dir = temp_dir / "repaired_wheel"
+        docker.call(["rm", "-rf", repaired_wheel_dir])
+        docker.call(["mkdir", "-p", repaired_wheel_dir])
+
+        if built_wheel.name.endswith("none-any.whl"):
+            raise NonPlatformWheelError()
+
+        if build_options.repair_command:
+            log.step("Repairing wheel...")
+            repair_command_prepared = prepare_command(
+                build_options.repair_command, wheel=built_wheel, dest_dir=repaired_wheel_dir
+            )
+            docker.call(["sh", "-c", repair_command_prepared], env=env)
+        else:
+            docker.call(["mv", built_wheel, repaired_wheel_dir])
+
+        repaired_wheels = docker.glob(repaired_wheel_dir, "*.whl")
+
+        if build_options.test_command and build_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)
+            venv_dir = PurePath(docker.call(["mktemp", "-d"], capture_output=True).strip()) / "venv"
+
+            docker.call(["python", "-m", "virtualenv", "--no-download", venv_dir], env=env)
+
+            virtualenv_env = env.copy()
+            virtualenv_env["PATH"] = f"{venv_dir / 'bin'}:{virtualenv_env['PATH']}"
+
+            if build_options.before_test:
+                before_test_prepared = prepare_command(
+                    build_options.before_test,
+                    project=container_project_path,
+                    package=container_package_dir,
+                )
+                docker.call(["sh", "-c", before_test_prepared], env=virtualenv_env)
+
+            # Install the wheel we just built
+            # Note: If auditwheel produced two wheels, it's because the earlier produced wheel
+            # conforms to multiple manylinux standards. These multiple versions of the wheel are
+            # functionally the same, differing only in name, wheel metadata, and possibly include
+            # different external shared libraries. so it doesn't matter which one we run the tests on.
+            # Let's just pick the first one.
+            wheel_to_test = repaired_wheels[0]
+            docker.call(
+                ["pip", "install", str(wheel_to_test) + build_options.test_extras],
+                env=virtualenv_env,
+            )
+
+            # Install any requirements to run the tests
+            if build_options.test_requires:
+                docker.call(["pip", "install", *build_options.test_requires], env=virtualenv_env)
+
+            # Run the tests from a different directory
+            test_command_prepared = prepare_command(
+                build_options.test_command,
+                project=container_project_path,
+                package=container_package_dir,
+            )
+            docker.call(["sh", "-c", test_command_prepared], cwd="/root", env=virtualenv_env)
+
+            # clean up test environment
+            docker.call(["rm", "-rf", venv_dir])
+
+        # move repaired wheels to output
+        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.globals.output_dir)
+    log.step_end()
+
+
+def build(options: Options) -> None:
     try:
         # check docker is installed
         subprocess.run(["docker", "--version"], check=True, stdout=subprocess.DEVNULL)
@@ -60,264 +316,66 @@ def build(options: BuildOptions) -> None:
         )
         sys.exit(2)
 
-    assert options.manylinux_images is not None
-    python_configurations = get_python_configurations(options.build_selector, options.architectures)
-    platforms = [
-        ("cp", "manylinux_x86_64", options.manylinux_images["x86_64"]),
-        ("cp", "manylinux_i686", options.manylinux_images["i686"]),
-        ("cp", "manylinux_aarch64", options.manylinux_images["aarch64"]),
-        ("cp", "manylinux_ppc64le", options.manylinux_images["ppc64le"]),
-        ("cp", "manylinux_s390x", options.manylinux_images["s390x"]),
-        ("pp", "manylinux_x86_64", options.manylinux_images["pypy_x86_64"]),
-        ("pp", "manylinux_aarch64", options.manylinux_images["pypy_aarch64"]),
-        ("pp", "manylinux_i686", options.manylinux_images["pypy_i686"]),
-    ]
+    python_configurations = get_python_configurations(
+        options.globals.build_selector, options.globals.architectures
+    )
 
     cwd = Path.cwd()
-    abs_package_dir = options.package_dir.resolve()
+    abs_package_dir = options.globals.package_dir.resolve()
     if cwd != abs_package_dir and cwd not in abs_package_dir.parents:
         raise Exception("package_dir must be inside the working directory")
 
     container_project_path = PurePath("/project")
     container_package_dir = container_project_path / abs_package_dir.relative_to(cwd)
-    container_output_dir = PurePath("/output")
-
-    for implementation, platform_tag, docker_image in platforms:
-        platform_configs = [
-            c
-            for c in python_configurations
-            if c.identifier.startswith(implementation) and c.identifier.endswith(platform_tag)
-        ]
-        if not platform_configs:
-            continue
 
+    for build_step in get_build_steps(options, python_configurations):
         try:
-            log.step(f"Starting Docker image {docker_image}...")
+            ids_to_build = [x.identifier for x in build_step.platform_configs]
+            log.step(
+                f"Starting Docker image {build_step.docker_image} for {', '.join(ids_to_build)}..."
+            )
+
             with DockerContainer(
-                docker_image,
-                simulate_32_bit=platform_tag.endswith("i686"),
+                docker_image=build_step.docker_image,
+                simulate_32_bit=build_step.platform_tag.endswith("i686"),
                 cwd=container_project_path,
             ) as docker:
 
-                log.step("Copying project into Docker...")
-                docker.copy_into(Path.cwd(), container_project_path)
+                build_on_docker(
+                    options=options,
+                    platform_configs=build_step.platform_configs,
+                    docker=docker,
+                    container_project_path=container_project_path,
+                    container_package_dir=container_package_dir,
+                )
 
-                if options.before_all:
-                    log.step("Running before_all...")
-
-                    env = docker.get_environment()
-                    env["PATH"] = f'/opt/python/cp38-cp38/bin:{env["PATH"]}'
-                    env["PIP_DISABLE_PIP_VERSION_CHECK"] = "1"
-                    env = options.environment.as_dictionary(
-                        env, executor=docker.environment_executor
-                    )
-
-                    before_all_prepared = prepare_command(
-                        options.before_all,
-                        project=container_project_path,
-                        package=container_package_dir,
-                    )
-                    docker.call(["sh", "-c", before_all_prepared], env=env)
-
-                for config in platform_configs:
-                    log.build_start(config.identifier)
-
-                    dependency_constraint_flags: List[PathOrStr] = []
-
-                    if options.dependency_constraints:
-                        constraints_file = options.dependency_constraints.get_for_python_version(
-                            config.version
-                        )
-                        container_constraints_file = PurePath("/constraints.txt")
-
-                        docker.copy_into(constraints_file, container_constraints_file)
-                        dependency_constraint_flags = ["-c", container_constraints_file]
-
-                    log.step("Setting up build environment...")
-
-                    env = docker.get_environment()
-
-                    # put this config's python top of the list
-                    python_bin = config.path / "bin"
-                    env["PATH"] = f'{python_bin}:{env["PATH"]}'
-
-                    env = options.environment.as_dictionary(
-                        env, executor=docker.environment_executor
-                    )
-
-                    # check config python is still on PATH
-                    which_python = docker.call(
-                        ["which", "python"], env=env, capture_output=True
-                    ).strip()
-                    if PurePath(which_python) != python_bin / "python":
-                        print(
-                            "cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.",
-                            file=sys.stderr,
-                        )
-                        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,
-                        )
-                        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])
-                    docker.call(["mkdir", "-p", built_wheel_dir])
-
-                    verbosity_flags = get_build_verbosity_extra_flags(options.build_verbosity)
-
-                    if options.build_frontend == "pip":
-                        docker.call(
-                            [
-                                "python",
-                                "-m",
-                                "pip",
-                                "wheel",
-                                container_package_dir,
-                                f"--wheel-dir={built_wheel_dir}",
-                                "--no-deps",
-                                *verbosity_flags,
-                            ],
-                            env=env,
-                        )
-                    elif options.build_frontend == "build":
-                        config_setting = " ".join(verbosity_flags)
-                        docker.call(
-                            [
-                                "python",
-                                "-m",
-                                "build",
-                                container_package_dir,
-                                "--wheel",
-                                f"--outdir={built_wheel_dir}",
-                                f"--config-setting={config_setting}",
-                            ],
-                            env=env,
-                        )
-                    else:
-                        assert_never(options.build_frontend)
-
-                    built_wheel = docker.glob(built_wheel_dir, "*.whl")[0]
-
-                    repaired_wheel_dir = temp_dir / "repaired_wheel"
-                    docker.call(["rm", "-rf", repaired_wheel_dir])
-                    docker.call(["mkdir", "-p", repaired_wheel_dir])
-
-                    if built_wheel.name.endswith("none-any.whl"):
-                        raise NonPlatformWheelError()
-
-                    if options.repair_command:
-                        log.step("Repairing wheel...")
-                        repair_command_prepared = prepare_command(
-                            options.repair_command, wheel=built_wheel, dest_dir=repaired_wheel_dir
-                        )
-                        docker.call(["sh", "-c", repair_command_prepared], env=env)
-                    else:
-                        docker.call(["mv", built_wheel, repaired_wheel_dir])
-
-                    repaired_wheels = docker.glob(repaired_wheel_dir, "*.whl")
-
-                    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
-                        )
-                        venv_dir = (
-                            PurePath(docker.call(["mktemp", "-d"], capture_output=True).strip())
-                            / "venv"
-                        )
-
-                        docker.call(
-                            ["python", "-m", "virtualenv", "--no-download", venv_dir], env=env
-                        )
-
-                        virtualenv_env = env.copy()
-                        virtualenv_env["PATH"] = f"{venv_dir / 'bin'}:{virtualenv_env['PATH']}"
-
-                        if options.before_test:
-                            before_test_prepared = prepare_command(
-                                options.before_test,
-                                project=container_project_path,
-                                package=container_package_dir,
-                            )
-                            docker.call(["sh", "-c", before_test_prepared], env=virtualenv_env)
-
-                        # Install the wheel we just built
-                        # Note: If auditwheel produced two wheels, it's because the earlier produced wheel
-                        # conforms to multiple manylinux standards. These multiple versions of the wheel are
-                        # functionally the same, differing only in name, wheel metadata, and possibly include
-                        # different external shared libraries. so it doesn't matter which one we run the tests on.
-                        # Let's just pick the first one.
-                        wheel_to_test = repaired_wheels[0]
-                        docker.call(
-                            ["pip", "install", str(wheel_to_test) + options.test_extras],
-                            env=virtualenv_env,
-                        )
-
-                        # Install any requirements to run the tests
-                        if options.test_requires:
-                            docker.call(
-                                ["pip", "install", *options.test_requires], env=virtualenv_env
-                            )
-
-                        # Run the tests from a different directory
-                        test_command_prepared = prepare_command(
-                            options.test_command,
-                            project=container_project_path,
-                            package=container_package_dir,
-                        )
-                        docker.call(
-                            ["sh", "-c", test_command_prepared], cwd="/root", env=virtualenv_env
-                        )
-
-                        # clean up test environment
-                        docker.call(["rm", "-rf", venv_dir])
-
-                    # move repaired wheels to output
-                    docker.call(["mkdir", "-p", container_output_dir])
-                    docker.call(["mv", *repaired_wheels, container_output_dir])
-
-                    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:
             log.step_end_with_error(
                 f"Command {error.cmd} failed with code {error.returncode}. {error.stdout}"
             )
-            troubleshoot(options.package_dir, error)
+            troubleshoot(options, error)
             sys.exit(1)
 
 
-def troubleshoot(package_dir: Path, error: Exception) -> None:
+def _matches_prepared_command(error_cmd: List[str], command_template: str) -> bool:
+    if len(error_cmd) < 3 or error_cmd[0:2] != ["sh", "-c"]:
+        return False
+    command_prefix = command_template.split("{", maxsplit=1)[0].strip()
+    return error_cmd[2].startswith(command_prefix)
+
+
+def troubleshoot(options: Options, error: Exception) -> None:
+
     if isinstance(error, subprocess.CalledProcessError) and (
         error.cmd[0:4] == ["python", "-m", "pip", "wheel"]
         or error.cmd[0:3] == ["python", "-m", "build"]
+        or _matches_prepared_command(
+            error.cmd, options.build_options(None).repair_command
+        )  # TODO allow matching of overrides too?
     ):
-        # the wheel build step failed
+        # the wheel build step or the repair step failed
         print("Checking for common errors...")
-        so_files = list(package_dir.glob("**/*.so"))
+        so_files = list(options.globals.package_dir.glob("**/*.so"))
 
         if so_files:
             print(
@@ -326,10 +384,17 @@ def troubleshoot(package_dir: Path, error: Exception) -> None:
                     NOTE: Shared object (.so) files found in this project.
 
                     These files might be built against the wrong OS, causing problems with
-                    auditwheel.
+                    auditwheel. If possible, run cibuildwheel in a clean checkout.
 
                     If you're using Cython and have previously done an in-place build,
                     remove those build files (*.so and *.c) before starting cibuildwheel.
+
+                    setuptools uses the build/ folder to store its build cache. It
+                    may be necessary to remove those build files (*.so and *.o) before
+                    starting cibuildwheel.
+
+                    Files that belong to a virtual environment are probably not an issue
+                    unless you used a custom command telling cibuildwheel to activate it.
                     """
                 ),
                 file=sys.stderr,

cibuildwheel/logger.py

@@ -20,8 +20,14 @@ PLATFORM_IDENTIFIER_DESCIPTIONS = {
     "manylinux_aarch64": "manylinux aarch64",
     "manylinux_ppc64le": "manylinux ppc64le",
     "manylinux_s390x": "manylinux s390x",
+    "musllinux_x86_64": "musllinux x86_64",
+    "musllinux_i686": "musllinux i686",
+    "musllinux_aarch64": "musllinux aarch64",
+    "musllinux_ppc64le": "musllinux ppc64le",
+    "musllinux_s390x": "manylinux s390x",
     "win32": "Windows 32bit",
     "win_amd64": "Windows 64bit",
+    "win_arm64": "Windows on ARM 64bit",
     "macosx_x86_64": "macOS x86_64",
     "macosx_universal2": "macOS Universal 2 - x86_64 and arm64",
     "macosx_arm64": "macOS arm64 - Apple Silicon",

cibuildwheel/macos.py

@@ -12,10 +12,10 @@ from typing import Any, Dict, List, NamedTuple, Optional, Sequence, Set, Tuple,
 from .architecture import Architecture
 from .environment import ParsedEnvironment
 from .logger import log
+from .options import Options
 from .typing import Literal, PathOrStr, assert_never
 from .util import (
     BuildFrontend,
-    BuildOptions,
     BuildSelector,
     NonPlatformWheelError,
     download,
@@ -90,28 +90,7 @@ def get_python_configurations(
     ]
 
     # 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")
-            ]
-
-    return python_configurations
+    return [c for c in python_configurations if build_selector(c.identifier)]
 
 
 SYMLINKS_DIR = Path("/tmp/cibw_bin")
@@ -343,49 +322,53 @@ def setup_python(
     return env
 
 
-def build(options: BuildOptions) -> None:
+def build(options: Options) -> None:
     temp_dir = Path(tempfile.mkdtemp(prefix="cibuildwheel"))
     built_wheel_dir = temp_dir / "built_wheel"
     repaired_wheel_dir = temp_dir / "repaired_wheel"
 
+    python_configurations = get_python_configurations(
+        options.globals.build_selector, options.globals.architectures
+    )
+
     try:
-        if options.before_all:
+        before_all_options_identifier = python_configurations[0].identifier
+        before_all_options = options.build_options(before_all_options_identifier)
+
+        if before_all_options.before_all:
             log.step("Running before_all...")
-            env = options.environment.as_dictionary(prev_environment=os.environ)
+            env = before_all_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
+                before_all_options.before_all, project=".", package=before_all_options.package_dir
             )
             call([before_all_prepared], shell=True, env=env)
 
-        python_configurations = get_python_configurations(
-            options.build_selector, options.architectures
-        )
-
         for config in python_configurations:
+            build_options = options.build_options(config.identifier)
             log.build_start(config.identifier)
 
             config_is_arm64 = config.identifier.endswith("arm64")
             config_is_universal2 = config.identifier.endswith("universal2")
 
             dependency_constraint_flags: Sequence[PathOrStr] = []
-            if options.dependency_constraints:
+            if build_options.dependency_constraints:
                 dependency_constraint_flags = [
                     "-c",
-                    options.dependency_constraints.get_for_python_version(config.version),
+                    build_options.dependency_constraints.get_for_python_version(config.version),
                 ]
 
             env = setup_python(
                 config,
                 dependency_constraint_flags,
-                options.environment,
-                options.build_frontend,
+                build_options.environment,
+                build_options.build_frontend,
             )
 
-            if options.before_build:
+            if build_options.before_build:
                 log.step("Running before_build...")
                 before_build_prepared = prepare_command(
-                    options.before_build, project=".", package=options.package_dir
+                    build_options.before_build, project=".", package=build_options.package_dir
                 )
                 call(before_build_prepared, env=env, shell=True)
 
@@ -394,9 +377,9 @@ def build(options: BuildOptions) -> None:
                 shutil.rmtree(built_wheel_dir)
             built_wheel_dir.mkdir(parents=True)
 
-            verbosity_flags = get_build_verbosity_extra_flags(options.build_verbosity)
+            verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity)
 
-            if options.build_frontend == "pip":
+            if build_options.build_frontend == "pip":
                 # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org
                 # see https://github.com/pypa/cibuildwheel/pull/369
                 call(
@@ -405,18 +388,20 @@ def build(options: BuildOptions) -> None:
                         "-m",
                         "pip",
                         "wheel",
-                        options.package_dir.resolve(),
+                        build_options.package_dir.resolve(),
                         f"--wheel-dir={built_wheel_dir}",
                         "--no-deps",
                         *verbosity_flags,
                     ],
                     env=env,
                 )
-            elif options.build_frontend == "build":
+            elif build_options.build_frontend == "build":
                 config_setting = " ".join(verbosity_flags)
                 build_env = env.copy()
-                if options.dependency_constraints:
-                    constr = options.dependency_constraints.get_for_python_version(config.version)
+                if build_options.dependency_constraints:
+                    constr = build_options.dependency_constraints.get_for_python_version(
+                        config.version
+                    )
                     build_env["PIP_CONSTRAINT"] = constr.as_uri()
                 build_env["VIRTUALENV_PIP"] = get_pip_version(env)
                 call(
@@ -424,7 +409,7 @@ def build(options: BuildOptions) -> None:
                         "python",
                         "-m",
                         "build",
-                        options.package_dir,
+                        build_options.package_dir,
                         "--wheel",
                         f"--outdir={built_wheel_dir}",
                         f"--config-setting={config_setting}",
@@ -432,7 +417,7 @@ def build(options: BuildOptions) -> None:
                     env=build_env,
                 )
             else:
-                assert_never(options.build_frontend)
+                assert_never(build_options.build_frontend)
 
             built_wheel = next(built_wheel_dir.glob("*.whl"))
 
@@ -443,7 +428,7 @@ def build(options: BuildOptions) -> None:
             if built_wheel.name.endswith("none-any.whl"):
                 raise NonPlatformWheelError()
 
-            if options.repair_command:
+            if build_options.repair_command:
                 log.step("Repairing wheel...")
 
                 if config_is_universal2:
@@ -454,7 +439,7 @@ def build(options: BuildOptions) -> None:
                     delocate_archs = "x86_64"
 
                 repair_command_prepared = prepare_command(
-                    options.repair_command,
+                    build_options.repair_command,
                     wheel=built_wheel,
                     dest_dir=repaired_wheel_dir,
                     delocate_archs=delocate_archs,
@@ -467,7 +452,7 @@ def build(options: BuildOptions) -> None:
 
             log.step_end()
 
-            if options.test_command and options.test_selector(config.identifier):
+            if build_options.test_command and build_options.test_selector(config.identifier):
                 machine_arch = platform.machine()
                 testing_archs: List[Literal["x86_64", "arm64"]] = []
 
@@ -481,7 +466,7 @@ def build(options: BuildOptions) -> None:
                 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):
+                        if not build_options.test_selector(arch_specific_identifier):
                             continue
 
                     if machine_arch == "x86_64" and testing_arch == "arm64":
@@ -562,31 +547,33 @@ def build(options: BuildOptions) -> None:
                     # check that we are using the Python from the virtual environment
                     call_with_arch(["which", "python"], env=virtualenv_env)
 
-                    if options.before_test:
+                    if build_options.before_test:
                         before_test_prepared = prepare_command(
-                            options.before_test, project=".", package=options.package_dir
+                            build_options.before_test,
+                            project=".",
+                            package=build_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}"],
+                        ["pip", "install", f"{repaired_wheel}{build_options.test_extras}"],
                         env=virtualenv_env,
                     )
 
                     # test the wheel
-                    if options.test_requires:
+                    if build_options.test_requires:
                         call_with_arch(
-                            ["pip", "install"] + options.test_requires, env=virtualenv_env
+                            ["pip", "install"] + build_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,
+                        build_options.test_command,
                         project=Path(".").resolve(),
-                        package=options.package_dir.resolve(),
+                        package=build_options.package_dir.resolve(),
                     )
                     call_with_arch(
                         test_command_prepared,
@@ -599,7 +586,7 @@ def build(options: BuildOptions) -> None:
                     shutil.rmtree(venv_dir)
 
             # we're all done here; move it to output (overwrite existing)
-            shutil.move(str(repaired_wheel), options.output_dir)
+            shutil.move(str(repaired_wheel), build_options.output_dir)
             log.build_end()
     except subprocess.CalledProcessError as error:
         log.step_end_with_error(

cibuildwheel/options.py

@@ -1,15 +1,116 @@
 import os
+import sys
+import traceback
+from configparser import ConfigParser
+from contextlib import contextmanager
 from pathlib import Path
-from typing import Any, Dict, List, Mapping, Optional, Set, Tuple, Union
+from typing import (
+    Any,
+    Dict,
+    Iterator,
+    List,
+    Mapping,
+    NamedTuple,
+    Optional,
+    Set,
+    Tuple,
+    Union,
+)
 
-import toml
+import tomli
+from packaging.specifiers import SpecifierSet
+
+from .architecture import Architecture
+from .environment import EnvironmentParseError, ParsedEnvironment, parse_environment
+from .projectfiles import get_requires_python_str
+from .typing import PLATFORMS, Literal, PlatformName, TypedDict
+from .util import (
+    MANYLINUX_ARCHS,
+    MUSLLINUX_ARCHS,
+    BuildFrontend,
+    BuildSelector,
+    DependencyConstraints,
+    TestSelector,
+    resources_dir,
+    selector_matches,
+    strtobool,
+    unwrap,
+)
+
+
+class CommandLineArguments:
+    platform: Literal["auto", "linux", "macos", "windows"]
+    archs: Optional[str]
+    output_dir: Optional[str]
+    config_file: str
+    package_dir: str
+    print_build_identifiers: bool
+    allow_empty: bool
+    prerelease_pythons: bool
+
+
+class GlobalOptions(NamedTuple):
+    package_dir: Path
+    output_dir: Path
+    build_selector: BuildSelector
+    test_selector: TestSelector
+    architectures: Set[Architecture]
+
+
+class BuildOptions(NamedTuple):
+    globals: GlobalOptions
+    environment: ParsedEnvironment
+    before_all: str
+    before_build: Optional[str]
+    repair_command: str
+    manylinux_images: Optional[Dict[str, str]]
+    musllinux_images: Optional[Dict[str, str]]
+    dependency_constraints: Optional[DependencyConstraints]
+    test_command: Optional[str]
+    before_test: Optional[str]
+    test_requires: List[str]
+    test_extras: str
+    build_verbosity: int
+    build_frontend: BuildFrontend
+
+    @property
+    def package_dir(self) -> Path:
+        return self.globals.package_dir
+
+    @property
+    def output_dir(self) -> Path:
+        return self.globals.output_dir
+
+    @property
+    def build_selector(self) -> BuildSelector:
+        return self.globals.build_selector
+
+    @property
+    def test_selector(self) -> TestSelector:
+        return self.globals.test_selector
+
+    @property
+    def architectures(self) -> Set[Architecture]:
+        return self.globals.architectures
 
-from .typing import PLATFORMS, TypedDict
-from .util import resources_dir
 
 Setting = Union[Dict[str, str], List[str], str]
 
 
+class Override(NamedTuple):
+    select_pattern: str
+    options: Dict[str, Setting]
+
+
+MANYLINUX_OPTIONS = {f"manylinux-{build_platform}-image" for build_platform in MANYLINUX_ARCHS}
+MUSLLINUX_OPTIONS = {f"musllinux-{build_platform}-image" for build_platform in MUSLLINUX_ARCHS}
+DISALLOWED_OPTIONS = {
+    "linux": {"dependency-versions"},
+    "macos": MANYLINUX_OPTIONS | MUSLLINUX_OPTIONS,
+    "windows": MANYLINUX_OPTIONS | MUSLLINUX_OPTIONS,
+}
+
+
 class TableFmt(TypedDict):
     item: str
     sep: str
@@ -19,40 +120,50 @@ class ConfigOptionError(KeyError):
     pass
 
 
-def _dig_first(*pairs: Tuple[Mapping[str, Any], str]) -> Setting:
+def _dig_first(*pairs: Tuple[Mapping[str, Setting], str], ignore_empty: bool = False) -> Setting:
     """
     Return the first dict item that matches from pairs of dicts and keys.
-    Final result is will throw a KeyError if missing.
+    Will throw a KeyError if missing.
 
     _dig_first((dict1, "key1"), (dict2, "key2"), ...)
     """
-    (dict_like, key), *others = pairs
-    return dict_like.get(key, _dig_first(*others)) if others else dict_like[key]
+    if not pairs:
+        raise ValueError("pairs cannot be empty")
+
+    for dict_like, key in pairs:
+        if key in dict_like:
+            value = dict_like[key]
+
+            if ignore_empty and value == "":
+                continue
+
+            return value
+
+    raise KeyError(key)
 
 
-class ConfigOptions:
+class OptionsReader:
     """
     Gets options from the environment, config or defaults, optionally scoped
     by the platform.
 
     Example:
-      >>> options = ConfigOptions(package_dir, platform='macos')
-      >>> options('cool-color')
+      >>> options_reader = OptionsReader(config_file, platform='macos')
+      >>> options_reader.get('cool-color')
 
       This will return the value of CIBW_COOL_COLOR_MACOS if it exists,
       otherwise the value of CIBW_COOL_COLOR, otherwise
       'tool.cibuildwheel.macos.cool-color' or 'tool.cibuildwheel.cool-color'
-      from pyproject.toml, or from cibuildwheel/resources/defaults.toml. An
+      from `config_file`, or from cibuildwheel/resources/defaults.toml. An
       error is thrown if there are any unexpected keys or sections in
       tool.cibuildwheel.
     """
 
     def __init__(
         self,
-        package_path: Path,
-        config_file: Optional[str] = None,
+        config_file_path: Optional[Path] = None,
         *,
-        platform: str,
+        platform: PlatformName,
         disallow: Optional[Dict[str, Set[str]]] = None,
     ) -> None:
         self.platform = platform
@@ -62,20 +173,14 @@ class ConfigOptions:
         defaults_path = resources_dir / "defaults.toml"
         self.default_options, self.default_platform_options = self._load_file(defaults_path)
 
-        # load the project config file
+        # Load the project config file
         config_options: Dict[str, Any] = {}
         config_platform_options: Dict[str, Any] = {}
 
-        if config_file is not None:
-            config_path = Path(config_file.format(package=package_path))
-            config_options, config_platform_options = self._load_file(config_path)
-        else:
-            # load pyproject.toml, if it's available
-            pyproject_toml_path = package_path / "pyproject.toml"
-            if pyproject_toml_path.exists():
-                config_options, config_platform_options = self._load_file(pyproject_toml_path)
+        if config_file_path is not None:
+            config_options, config_platform_options = self._load_file(config_file_path)
 
-        # validate project config
+        # Validate project config
         for option_name in config_options:
             if not self._is_valid_global_option(option_name):
                 raise ConfigOptionError(f'Option "{option_name}" not supported in a config file')
@@ -89,12 +194,32 @@ class ConfigOptions:
         self.config_options = config_options
         self.config_platform_options = config_platform_options
 
+        self.overrides: List[Override] = []
+        self.current_identifier: Optional[str] = None
+
+        config_overrides = self.config_options.get("overrides")
+
+        if config_overrides is not None:
+            if not isinstance(config_overrides, list):
+                raise ConfigOptionError('"tool.cibuildwheel.overrides" must be a list')
+
+            for config_override in config_overrides:
+                select = config_override.pop("select", None)
+
+                if not select:
+                    raise ConfigOptionError('"select" must be set in an override')
+
+                if isinstance(select, list):
+                    select = " ".join(select)
+
+                self.overrides.append(Override(select, config_override))
+
     def _is_valid_global_option(self, name: str) -> bool:
         """
         Returns True if an option with this name is allowed in the
         [tool.cibuildwheel] section of a config file.
         """
-        allowed_option_names = self.default_options.keys() | PLATFORMS
+        allowed_option_names = self.default_options.keys() | PLATFORMS | {"overrides"}
 
         return name in allowed_option_names
 
@@ -115,20 +240,38 @@ class ConfigOptions:
         """
         Load a toml file, returns global and platform as separate dicts.
         """
-        config = toml.load(filename)
+        with filename.open("rb") as f:
+            config = tomli.load(f)
 
         global_options = config.get("tool", {}).get("cibuildwheel", {})
         platform_options = global_options.get(self.platform, {})
 
         return global_options, platform_options
 
-    def __call__(
+    @property
+    def active_config_overrides(self) -> List[Override]:
+        if self.current_identifier is None:
+            return []
+        return [
+            o for o in self.overrides if selector_matches(o.select_pattern, self.current_identifier)
+        ]
+
+    @contextmanager
+    def identifier(self, identifier: Optional[str]) -> Iterator[None]:
+        self.current_identifier = identifier
+        try:
+            yield
+        finally:
+            self.current_identifier = None
+
+    def get(
         self,
         name: str,
         *,
         env_plat: bool = True,
         sep: Optional[str] = None,
         table: Optional[TableFmt] = None,
+        ignore_empty: bool = False,
     ) -> str:
         """
         Get and return the value for the named option from environment,
@@ -136,7 +279,8 @@ class ConfigOptions:
         accept platform versions of the environment variable. If this is an
         array it will be merged with "sep" before returning. If it is a table,
         it will be formatted with "table['item']" using {k} and {v} and merged
-        with "table['sep']".
+        with "table['sep']". Empty variables will not override if ignore_empty
+        is True.
         """
 
         if name not in self.default_options and name not in self.default_platform_options:
@@ -146,15 +290,20 @@ class ConfigOptions:
         envvar = f"CIBW_{name.upper().replace('-', '_')}"
         plat_envvar = f"{envvar}_{self.platform.upper()}"
 
+        # later overrides take precedence over earlier ones, so reverse the list
+        active_config_overrides = reversed(self.active_config_overrides)
+
         # get the option from the environment, then the config file, then finally the default.
         # platform-specific options are preferred, if they're allowed.
         result = _dig_first(
-            (os.environ if env_plat else {}, plat_envvar),  # type: ignore
+            (os.environ if env_plat else {}, plat_envvar),  # type: ignore[arg-type]
             (os.environ, envvar),
+            *[(o.options, name) for o in active_config_overrides],
             (self.config_platform_options, name),
             (self.config_options, name),
             (self.default_platform_options, name),
             (self.default_options, name),
+            ignore_empty=ignore_empty,
         )
 
         if isinstance(result, dict):
@@ -169,3 +318,285 @@ class ConfigOptions:
             return str(result)
         else:
             return result
+
+
+class Options:
+    def __init__(self, platform: PlatformName, command_line_arguments: CommandLineArguments):
+        self.platform = platform
+        self.command_line_arguments = command_line_arguments
+
+        self.reader = OptionsReader(
+            self.config_file_path,
+            platform=platform,
+            disallow=DISALLOWED_OPTIONS,
+        )
+
+    @property
+    def config_file_path(self) -> Optional[Path]:
+        args = self.command_line_arguments
+
+        if args.config_file:
+            return Path(args.config_file.format(package=args.package_dir))
+
+        # return pyproject.toml, if it's available
+        pyproject_toml_path = Path(args.package_dir) / "pyproject.toml"
+        if pyproject_toml_path.exists():
+            return pyproject_toml_path
+
+        return None
+
+    @property
+    def package_requires_python_str(self) -> Optional[str]:
+        if not hasattr(self, "_package_requires_python_str"):
+            args = self.command_line_arguments
+            self._package_requires_python_str = get_requires_python_str(Path(args.package_dir))
+        return self._package_requires_python_str
+
+    @property
+    def globals(self) -> GlobalOptions:
+        args = self.command_line_arguments
+        package_dir = Path(args.package_dir)
+        output_dir = Path(
+            args.output_dir
+            if args.output_dir is not None
+            else os.environ.get("CIBW_OUTPUT_DIR", "wheelhouse")
+        )
+
+        build_config = self.reader.get("build", env_plat=False, sep=" ") or "*"
+        skip_config = self.reader.get("skip", env_plat=False, sep=" ")
+        test_skip = self.reader.get("test-skip", env_plat=False, sep=" ")
+
+        prerelease_pythons = args.prerelease_pythons or strtobool(
+            os.environ.get("CIBW_PRERELEASE_PYTHONS", "0")
+        )
+
+        # This is not supported in tool.cibuildwheel, as it comes from a standard location.
+        # 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 self.package_requires_python_str
+        )
+        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,
+            prerelease_pythons=prerelease_pythons,
+        )
+        test_selector = TestSelector(skip_config=test_skip)
+
+        archs_config_str = args.archs or self.reader.get("archs", sep=" ")
+        architectures = Architecture.parse_config(archs_config_str, platform=self.platform)
+
+        return GlobalOptions(
+            package_dir=package_dir,
+            output_dir=output_dir,
+            build_selector=build_selector,
+            test_selector=test_selector,
+            architectures=architectures,
+        )
+
+    def build_options(self, identifier: Optional[str]) -> BuildOptions:
+        """
+        Compute BuildOptions for a single run configuration.
+        """
+
+        with self.reader.identifier(identifier):
+            before_all = self.reader.get("before-all", sep=" && ")
+
+            build_frontend_str = self.reader.get("build-frontend", env_plat=False)
+            environment_config = self.reader.get(
+                "environment", table={"item": '{k}="{v}"', "sep": " "}
+            )
+            environment_pass = self.reader.get("environment-pass", sep=" ").split()
+            before_build = self.reader.get("before-build", sep=" && ")
+            repair_command = self.reader.get("repair-wheel-command", sep=" && ")
+
+            dependency_versions = self.reader.get("dependency-versions")
+            test_command = self.reader.get("test-command", sep=" && ")
+            before_test = self.reader.get("before-test", sep=" && ")
+            test_requires = self.reader.get("test-requires", sep=" ").split()
+            test_extras = self.reader.get("test-extras", sep=",")
+            build_verbosity_str = self.reader.get("build-verbosity")
+
+            build_frontend: BuildFrontend
+            if build_frontend_str == "build":
+                build_frontend = "build"
+            elif build_frontend_str == "pip":
+                build_frontend = "pip"
+            else:
+                msg = f"cibuildwheel: Unrecognised build frontend '{build_frontend_str}', only 'pip' and 'build' are supported"
+                print(msg, file=sys.stderr)
+                sys.exit(2)
+
+            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)
+                sys.exit(2)
+
+            # Pass through environment variables
+            if self.platform == "linux":
+                for env_var_name in environment_pass:
+                    try:
+                        environment.add(env_var_name, os.environ[env_var_name])
+                    except KeyError:
+                        pass
+
+            if dependency_versions == "pinned":
+                dependency_constraints: Optional[
+                    DependencyConstraints
+                ] = DependencyConstraints.with_defaults()
+            elif dependency_versions == "latest":
+                dependency_constraints = None
+            else:
+                dependency_versions_path = Path(dependency_versions)
+                dependency_constraints = DependencyConstraints(dependency_versions_path)
+
+            if test_extras:
+                test_extras = f"[{test_extras}]"
+
+            try:
+                build_verbosity = min(3, max(-3, int(build_verbosity_str)))
+            except ValueError:
+                build_verbosity = 0
+
+            manylinux_images: Dict[str, str] = {}
+            musllinux_images: Dict[str, str] = {}
+            if self.platform == "linux":
+                all_pinned_docker_images = _get_pinned_docker_images()
+
+                for build_platform in MANYLINUX_ARCHS:
+                    pinned_images = all_pinned_docker_images[build_platform]
+
+                    config_value = self.reader.get(
+                        f"manylinux-{build_platform}-image", ignore_empty=True
+                    )
+
+                    if not config_value:
+                        # default to manylinux2014
+                        image = pinned_images.get("manylinux2014")
+                    elif config_value in pinned_images:
+                        image = pinned_images[config_value]
+                    else:
+                        image = config_value
+
+                    assert image is not None
+                    manylinux_images[build_platform] = image
+
+                for build_platform in MUSLLINUX_ARCHS:
+                    pinned_images = all_pinned_docker_images[build_platform]
+
+                    config_value = self.reader.get(f"musllinux-{build_platform}-image")
+
+                    if config_value is None:
+                        image = pinned_images["musllinux_1_1"]
+                    elif config_value in pinned_images:
+                        image = pinned_images[config_value]
+                    else:
+                        image = config_value
+
+                    musllinux_images[build_platform] = image
+
+            return BuildOptions(
+                globals=self.globals,
+                test_command=test_command,
+                test_requires=test_requires,
+                test_extras=test_extras,
+                before_test=before_test,
+                before_build=before_build,
+                before_all=before_all,
+                build_verbosity=build_verbosity,
+                repair_command=repair_command,
+                environment=environment,
+                dependency_constraints=dependency_constraints,
+                manylinux_images=manylinux_images or None,
+                musllinux_images=musllinux_images or None,
+                build_frontend=build_frontend,
+            )
+
+    def check_for_invalid_configuration(self, identifiers: List[str]) -> None:
+        if self.platform in ["macos", "windows"]:
+            before_all_values = {self.build_options(i).before_all for i in identifiers}
+
+            if len(before_all_values) > 1:
+                raise ValueError(
+                    unwrap(
+                        f"""
+                        before_all cannot be set to multiple values. On macOS and Windows,
+                        before_all is only run once, at the start of the build. before_all values
+                        are: {before_all_values!r}
+                        """
+                    )
+                )
+
+    def check_for_deprecated_options(self) -> None:
+        build_selector = self.globals.build_selector
+        test_selector = self.globals.test_selector
+
+        deprecated_selectors("CIBW_BUILD", build_selector.build_config, error=True)
+        deprecated_selectors("CIBW_SKIP", build_selector.skip_config)
+        deprecated_selectors("CIBW_TEST_SKIP", test_selector.skip_config)
+
+    def summary(self, identifiers: List[str]) -> str:
+        lines = [
+            f"{option_name}: {option_value!r}"
+            for option_name, option_value in sorted(self.globals._asdict().items())
+        ]
+
+        build_option_defaults = self.build_options(identifier=None)
+
+        for option_name, default_value in sorted(build_option_defaults._asdict().items()):
+            if option_name == "globals":
+                continue
+
+            lines.append(f"{option_name}: {default_value!r}")
+
+            # if any identifiers have an overridden value, print that too
+            for identifier in identifiers:
+                option_value = self.build_options(identifier=identifier)._asdict()[option_name]
+                if option_value != default_value:
+                    lines.append(f"  {identifier}: {option_value!r}")
+
+        return "\n".join(lines)
+
+
+def compute_options(
+    platform: PlatformName,
+    command_line_arguments: CommandLineArguments,
+) -> Options:
+    options = Options(platform=platform, command_line_arguments=command_line_arguments)
+    options.check_for_deprecated_options()
+    return options
+
+
+_all_pinned_docker_images: Optional[ConfigParser] = None
+
+
+def _get_pinned_docker_images() -> Mapping[str, Mapping[str, str]]:
+    """
+    This looks like a dict of dicts, e.g.
+    { 'x86_64': {'manylinux1': '...', 'manylinux2010': '...', 'manylinux2014': '...'},
+      'i686': {'manylinux1': '...', 'manylinux2010': '...', 'manylinux2014': '...'},
+      'pypy_x86_64': {'manylinux2010': '...' }
+      ... }
+    """
+    global _all_pinned_docker_images
+
+    if _all_pinned_docker_images is None:
+        pinned_docker_images_file = resources_dir / "pinned_docker_images.cfg"
+        _all_pinned_docker_images = ConfigParser()
+        _all_pinned_docker_images.read(pinned_docker_images_file)
+    return _all_pinned_docker_images
+
+
+def deprecated_selectors(name: str, selector: str, *, error: bool = False) -> None:
+    if "p2" in selector or "p35" in selector:
+        msg = f"cibuildwheel 2.x no longer supports Python < 3.6. Please use the 1.x series or update {name}"
+        print(msg, file=sys.stderr)
+        if error:
+            sys.exit(4)

cibuildwheel/projectfiles.py

@@ -4,7 +4,7 @@ from configparser import ConfigParser
 from pathlib import Path
 from typing import Any, Optional
 
-import toml
+import tomli
 
 if sys.version_info < (3, 8):
     Constant = ast.Str
@@ -27,7 +27,7 @@ class Analyzer(ast.NodeVisitor):
     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
+                child.parent = node  # type: ignore[attr-defined]
         super().visit(content)
 
     def visit_keyword(self, node: ast.keyword) -> None:
@@ -35,7 +35,7 @@ class Analyzer(ast.NodeVisitor):
         if node.arg == "python_requires":
             # Must not be nested in an if or other structure
             # This will be Module -> Expr -> Call -> keyword
-            if not hasattr(node.parent.parent.parent, "parent") and isinstance(  # type: ignore
+            if not hasattr(node.parent.parent.parent, "parent") and isinstance(  # type: ignore[attr-defined]
                 node.value, Constant
             ):
                 self.requires_python = get_constant(node.value)
@@ -56,7 +56,8 @@ def get_requires_python_str(package_dir: Path) -> Optional[str]:
 
     # Read in from pyproject.toml:project.requires-python
     try:
-        info = toml.load(package_dir / "pyproject.toml")
+        with (package_dir / "pyproject.toml").open("rb") as f1:
+            info = tomli.load(f1)
         return str(info["project"]["requires-python"])
     except (FileNotFoundError, KeyError, IndexError, TypeError):
         pass
@@ -70,8 +71,8 @@ def get_requires_python_str(package_dir: Path) -> Optional[str]:
         pass
 
     try:
-        with open(package_dir / "setup.py") as f:
-            return setup_py_python_requires(f.read())
+        with (package_dir / "setup.py").open() as f2:
+            return setup_py_python_requires(f2.read())
     except FileNotFoundError:
         pass
 

cibuildwheel/resources/build-platforms.toml

@@ -11,6 +11,7 @@ python_configurations = [
   { identifier = "cp39-manylinux_i686", version = "3.9", path_str = "/opt/python/cp39-cp39" },
   { identifier = "cp310-manylinux_i686", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { identifier = "pp37-manylinux_x86_64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
+  { identifier = "pp38-manylinux_x86_64", version = "3.8", path_str = "/opt/python/pp38-pypy38_pp73" },
   { 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" },
@@ -27,7 +28,34 @@ python_configurations = [
   { identifier = "cp39-manylinux_s390x", version = "3.9", path_str = "/opt/python/cp39-cp39" },
   { identifier = "cp310-manylinux_s390x", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { identifier = "pp37-manylinux_aarch64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
+  { identifier = "pp38-manylinux_aarch64", version = "3.8", path_str = "/opt/python/pp38-pypy38_pp73" },
   { identifier = "pp37-manylinux_i686", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
+  { identifier = "pp38-manylinux_i686", version = "3.8", path_str = "/opt/python/pp38-pypy38_pp73" },
+  { identifier = "cp36-musllinux_x86_64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-musllinux_x86_64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-musllinux_x86_64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-musllinux_x86_64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp310-musllinux_x86_64", version = "3.10", path_str = "/opt/python/cp310-cp310" },
+  { identifier = "cp36-musllinux_i686", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-musllinux_i686", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-musllinux_i686", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-musllinux_i686", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp310-musllinux_i686", version = "3.10", path_str = "/opt/python/cp310-cp310" },
+  { identifier = "cp36-musllinux_aarch64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-musllinux_aarch64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-musllinux_aarch64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-musllinux_aarch64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp310-musllinux_aarch64", version = "3.10", path_str = "/opt/python/cp310-cp310" },
+  { identifier = "cp36-musllinux_ppc64le", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-musllinux_ppc64le", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-musllinux_ppc64le", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-musllinux_ppc64le", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp310-musllinux_ppc64le", version = "3.10", path_str = "/opt/python/cp310-cp310" },
+  { identifier = "cp36-musllinux_s390x", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-musllinux_s390x", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-musllinux_s390x", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-musllinux_s390x", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp310-musllinux_s390x", version = "3.10", path_str = "/opt/python/cp310-cp310" },
 ]
 
 [macos]
@@ -37,13 +65,14 @@ python_configurations = [
   { identifier = "cp38-macosx_x86_64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" },
   { identifier = "cp38-macosx_arm64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" },
   { identifier = "cp38-macosx_universal2", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" },
-  { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.6/python-3.9.6-macos11.pkg" },
-  { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.6/python-3.9.6-macos11.pkg" },
-  { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.6/python-3.9.6-macos11.pkg" },
-  { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0b3-macos11.pkg" },
-  { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0b3-macos11.pkg" },
-  { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0b3-macos11.pkg" },
-  { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5-osx64.tar.bz2" },
+  { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.9/python-3.9.9-macos11.pkg" },
+  { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.9/python-3.9.9-macos11.pkg" },
+  { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.9/python-3.9.9-macos11.pkg" },
+  { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0post2-macos11.pkg" },
+  { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0post2-macos11.pkg" },
+  { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0post2-macos11.pkg" },
+  { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-osx64.tar.bz2" },
+  { identifier = "pp38-macosx_x86_64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.7-osx64.tar.bz2" },
 ]
 
 [windows]
@@ -54,9 +83,12 @@ python_configurations = [
   { identifier = "cp37-win_amd64", version = "3.7.9", arch = "64" },
   { identifier = "cp38-win32", version = "3.8.10", arch = "32" },
   { identifier = "cp38-win_amd64", version = "3.8.10", arch = "64" },
-  { identifier = "cp39-win32", version = "3.9.6", arch = "32" },
-  { identifier = "cp39-win_amd64", version = "3.9.6", arch = "64" },
-  { identifier = "cp310-win32", version = "3.10.0-b3", arch = "32" },
-  { identifier = "cp310-win_amd64", version = "3.10.0-b3", arch = "64" },
-  { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5-win64.zip" },
+  { identifier = "cp39-win32", version = "3.9.9", arch = "32" },
+  { identifier = "cp39-win_amd64", version = "3.9.9", arch = "64" },
+  { identifier = "cp310-win32", version = "3.10.0", arch = "32" },
+  { identifier = "cp310-win_amd64", version = "3.10.0", arch = "64" },
+  { identifier = "cp39-win_arm64", version = "3.9.9", arch = "ARM64" },
+  { identifier = "cp310-win_arm64", version = "3.10.0", arch = "ARM64" },
+  { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-win64.zip" },
+  { identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.7-win64.zip" },
 ]

cibuildwheel/resources/constraints-python36.txt

@@ -4,35 +4,41 @@
 #
 #    bin/update_dependencies.py
 #
-appdirs==1.4.4
+backports.entry-points-selectable==1.1.1
     # via virtualenv
-delocate==0.8.2
+delocate==0.10.0
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.2
+distlib==0.3.3
     # via virtualenv
-filelock==3.0.12
+filelock==3.4.0
     # via virtualenv
-importlib-metadata==4.6.1
+importlib-metadata==4.8.2
+    # via
+    #   backports.entry-points-selectable
+    #   virtualenv
+importlib-resources==5.4.0
     # via virtualenv
-importlib-resources==5.2.0
+platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
     # via virtualenv
-typing-extensions==3.10.0.0
-    # via importlib-metadata
-virtualenv==20.4.7
+typing-extensions==4.0.0
+    # via
+    #   delocate
+    #   importlib-metadata
+virtualenv==20.10.0
     # via -r cibuildwheel/resources/constraints.in
-wheel==0.36.2
+wheel==0.37.0
     # via
     #   -r cibuildwheel/resources/constraints.in
     #   delocate
-zipp==3.5.0
+zipp==3.6.0
     # via
     #   importlib-metadata
     #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.1.3
+pip==21.3.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==57.1.0
+setuptools==59.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python37.txt

@@ -4,31 +4,37 @@
 #
 #    bin/update_dependencies.py
 #
-appdirs==1.4.4
+backports.entry-points-selectable==1.1.1
     # via virtualenv
-delocate==0.8.2
+delocate==0.10.0
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.2
+distlib==0.3.3
     # via virtualenv
-filelock==3.0.12
+filelock==3.4.0
     # via virtualenv
-importlib-metadata==4.6.1
+importlib-metadata==4.8.2
+    # via
+    #   backports.entry-points-selectable
+    #   virtualenv
+platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
     # via virtualenv
-typing-extensions==3.10.0.0
-    # via importlib-metadata
-virtualenv==20.4.7
+typing-extensions==4.0.0
+    # via
+    #   delocate
+    #   importlib-metadata
+virtualenv==20.10.0
     # via -r cibuildwheel/resources/constraints.in
-wheel==0.36.2
+wheel==0.37.0
     # via
     #   -r cibuildwheel/resources/constraints.in
     #   delocate
-zipp==3.5.0
+zipp==3.6.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.1.3
+pip==21.3.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==57.1.0
+setuptools==59.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python38.txt

@@ -4,25 +4,29 @@
 #
 #    bin/update_dependencies.py
 #
-appdirs==1.4.4
+backports.entry-points-selectable==1.1.1
     # via virtualenv
-delocate==0.8.2
+delocate==0.10.0
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.2
+distlib==0.3.3
     # via virtualenv
-filelock==3.0.12
+filelock==3.4.0
+    # via virtualenv
+platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
     # via virtualenv
-virtualenv==20.4.7
+typing-extensions==4.0.0
+    # via delocate
+virtualenv==20.10.0
     # via -r cibuildwheel/resources/constraints.in
-wheel==0.36.2
+wheel==0.37.0
     # via
     #   -r cibuildwheel/resources/constraints.in
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.1.3
+pip==21.3.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==57.1.0
+setuptools==59.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python39.txt

@@ -4,25 +4,29 @@
 #
 #    bin/update_dependencies.py
 #
-appdirs==1.4.4
+backports.entry-points-selectable==1.1.1
     # via virtualenv
-delocate==0.8.2
+delocate==0.10.0
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.2
+distlib==0.3.3
     # via virtualenv
-filelock==3.0.12
+filelock==3.4.0
+    # via virtualenv
+platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
     # via virtualenv
-virtualenv==20.4.7
+typing-extensions==4.0.0
+    # via delocate
+virtualenv==20.10.0
     # via -r cibuildwheel/resources/constraints.in
-wheel==0.36.2
+wheel==0.37.0
     # via
     #   -r cibuildwheel/resources/constraints.in
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.1.3
+pip==21.3.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==57.1.0
+setuptools==59.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints.txt

@@ -4,25 +4,29 @@
 #
 #    bin/update_dependencies.py
 #
-appdirs==1.4.4
+backports.entry-points-selectable==1.1.1
     # via virtualenv
-delocate==0.8.2
+delocate==0.10.0
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.2
+distlib==0.3.3
     # via virtualenv
-filelock==3.0.12
+filelock==3.4.0
+    # via virtualenv
+platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
     # via virtualenv
-virtualenv==20.4.7
+typing-extensions==4.0.0
+    # via delocate
+virtualenv==20.10.0
     # via -r cibuildwheel/resources/constraints.in
-wheel==0.36.2
+wheel==0.37.0
     # via
     #   -r cibuildwheel/resources/constraints.in
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.1.3
+pip==21.3.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==57.1.0
+setuptools==59.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/defaults.toml

@@ -7,6 +7,7 @@ archs = ["auto"]
 build-frontend = "pip"
 dependency-versions = "pinned"
 environment = {}
+environment-pass = []
 build-verbosity = ""
 
 before-all = ""
@@ -18,15 +19,21 @@ before-test = ""
 test-requires = []
 test-extras = []
 
-manylinux-x86_64-image = "manylinux2010"
-manylinux-i686-image = "manylinux2010"
+manylinux-x86_64-image = "manylinux2014"
+manylinux-i686-image = "manylinux2014"
 manylinux-aarch64-image = "manylinux2014"
 manylinux-ppc64le-image = "manylinux2014"
 manylinux-s390x-image = "manylinux2014"
-manylinux-pypy_x86_64-image = "manylinux2010"
-manylinux-pypy_i686-image = "manylinux2010"
+manylinux-pypy_x86_64-image = "manylinux2014"
+manylinux-pypy_i686-image = "manylinux2014"
 manylinux-pypy_aarch64-image = "manylinux2014"
 
+musllinux-x86_64-image = "musllinux_1_1"
+musllinux-i686-image = "musllinux_1_1"
+musllinux-aarch64-image = "musllinux_1_1"
+musllinux-ppc64le-image = "musllinux_1_1"
+musllinux-s390x-image = "musllinux_1_1"
+
 
 [tool.cibuildwheel.linux]
 repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel}"

cibuildwheel/resources/pinned_docker_images.cfg

@@ -1,38 +1,43 @@
 [x86_64]
-manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-07-04-13bcf48
-manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-07-04-1e3ce39
-manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-07-04-1e3ce39
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-07-04-1e3ce39
+manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-11-20-c4c639c
+manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-11-20-f410d11
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-11-20-f410d11
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-11-20-f410d11
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2021-11-20-f410d11
 
 [i686]
-manylinux1 = quay.io/pypa/manylinux1_i686:2021-07-04-13bcf48
-manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-07-04-1e3ce39
-manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-07-04-1e3ce39
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-07-04-1e3ce39
+manylinux1 = quay.io/pypa/manylinux1_i686:2021-11-20-c4c639c
+manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-11-20-f410d11
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-11-20-f410d11
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-11-20-f410d11
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2021-11-20-f410d11
 
 [pypy_x86_64]
-manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-07-04-1e3ce39
-manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-07-04-1e3ce39
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-07-04-1e3ce39
+manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-11-20-f410d11
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-11-20-f410d11
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-11-20-f410d11
 
 [pypy_i686]
-manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-07-04-1e3ce39
-manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-07-04-1e3ce39
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-07-04-1e3ce39
+manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-11-20-f410d11
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-11-20-f410d11
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-11-20-f410d11
 
 [aarch64]
-manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-07-04-1e3ce39
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-07-04-1e3ce39
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-11-20-f410d11
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-11-20-f410d11
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2021-11-20-f410d11
 
 [ppc64le]
-manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-07-04-1e3ce39
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2021-07-04-1e3ce39
+manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-11-20-f410d11
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2021-11-20-f410d11
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2021-11-20-f410d11
 
 [s390x]
-manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-07-04-1e3ce39
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2021-07-04-1e3ce39
+manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-11-20-f410d11
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2021-11-20-f410d11
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2021-11-20-f410d11
 
 [pypy_aarch64]
-manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-07-04-1e3ce39
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-07-04-1e3ce39
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-11-20-f410d11
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-11-20-f410d11
 

cibuildwheel/typing.py

@@ -4,21 +4,25 @@ import sys
 from typing import TYPE_CHECKING, NoReturn, Set, Union
 
 if sys.version_info < (3, 8):
-    from typing_extensions import Final, Literal, TypedDict
+    from typing_extensions import Final, Literal, OrderedDict, Protocol, TypedDict
 else:
-    from typing import Final, Literal, TypedDict
+    from typing import Final, Literal, OrderedDict, Protocol, TypedDict
 
 
 __all__ = (
     "Final",
     "Literal",
-    "TypedDict",
-    "Set",
-    "Union",
-    "PopenBytes",
+    "PLATFORMS",
     "PathOrStr",
     "PlatformName",
+    "Protocol",
     "PLATFORMS",
+    "PopenBytes",
+    "Protocol",
+    "Set",
+    "TypedDict",
+    "OrderedDict",
+    "Union",
     "assert_never",
 )
 

cibuildwheel/util.py

@@ -12,16 +12,14 @@ import urllib.request
 from enum import Enum
 from pathlib import Path
 from time import sleep
-from typing import Dict, Iterator, List, NamedTuple, Optional, Set
+from typing import Any, Dict, Iterable, Iterator, List, Optional, TextIO
 
 import bracex
 import certifi
-import toml
+import tomli
 from packaging.specifiers import SpecifierSet
 from packaging.version import Version
 
-from .architecture import Architecture
-from .environment import ParsedEnvironment
 from .typing import Literal, PathOrStr, PlatformName
 
 resources_dir = Path(__file__).parent / "resources"
@@ -30,15 +28,76 @@ install_certifi_script = resources_dir / "install_certifi.py"
 
 BuildFrontend = Literal["pip", "build"]
 
+MANYLINUX_ARCHS = (
+    "x86_64",
+    "i686",
+    "pypy_x86_64",
+    "aarch64",
+    "ppc64le",
+    "s390x",
+    "pypy_aarch64",
+    "pypy_i686",
+)
+
+MUSLLINUX_ARCHS = (
+    "x86_64",
+    "i686",
+    "aarch64",
+    "ppc64le",
+    "s390x",
+)
+
+
+def format_safe(template: str, **kwargs: Any) -> str:
+    """
+    Works similarly to `template.format(**kwargs)`, except that unmatched
+    fields in `template` are passed through untouched.
+
+    >>> format_safe('{a} {b}', a='123')
+    '123 {b}'
+    >>> format_safe('{a} {b[4]:3f}', a='123')
+    '123 {b[4]:3f}'
+
+    To avoid variable expansion, precede with a single backslash e.g.
+    >>> format_safe('\\{a} {b}', a='123')
+    '{a} {b}'
+    """
+
+    result = template
+
+    for key, value in kwargs.items():
+        find_pattern = re.compile(
+            fr"""
+                (?<!\#)  # don't match if preceded by a hash
+                {{  # literal open curly bracket
+                {re.escape(key)}  # the field name
+                }}  # literal close curly bracket
+            """,
+            re.VERBOSE,
+        )
+
+        # we use a lambda for repl to prevent re.sub interpreting backslashes
+        # in repl as escape sequences
+        result = re.sub(
+            pattern=find_pattern,
+            repl=lambda _: str(value),
+            string=result,
+        )
+
+        # transform escaped sequences into their literal equivalents
+        result = result.replace(f"#{{{key}}}", f"{{{key}}}")
+
+    return result
+
 
 def prepare_command(command: str, **kwargs: PathOrStr) -> str:
     """
     Preprocesses a command by expanding variables like {python}.
 
     For example, used in the test_command option to specify the path to the
-    project's root.
+    project's root. Unmatched syntax will mostly be allowed through.
     """
-    return command.format(python="python", pip="pip", **kwargs)
+    return format_safe(command, python="python", pip="pip", **kwargs)
 
 
 def get_build_verbosity_extra_flags(level: int) -> List[str]:
@@ -52,11 +111,26 @@ def get_build_verbosity_extra_flags(level: int) -> List[str]:
 
 def read_python_configs(config: PlatformName) -> List[Dict[str, str]]:
     input_file = resources_dir / "build-platforms.toml"
-    loaded_file = toml.load(input_file)
+    with input_file.open("rb") as f:
+        loaded_file = tomli.load(f)
     results: List[Dict[str, str]] = list(loaded_file[config]["python_configurations"])
     return results
 
 
+def selector_matches(patterns: str, string: str) -> bool:
+    """
+    Returns True if `string` is matched by any of the wildcard patterns in
+    `patterns`.
+
+    Matching is according to fnmatch, but with shell-like curly brace
+    expansion. For example, 'cp{36,37}-*' would match either of 'cp36-*' or
+    'cp37-*'.
+    """
+    patterns_list = patterns.split()
+    expanded_patterns = itertools.chain.from_iterable(bracex.expand(p) for p in patterns_list)
+    return any(fnmatch.fnmatch(string, pat) for pat in expanded_patterns)
+
+
 class IdentifierSelector:
     """
     This class holds a set of build/skip patterns. You call an instance with a
@@ -67,7 +141,7 @@ class IdentifierSelector:
     """
 
     # a pattern that skips prerelease versions, when include_prereleases is False.
-    PRERELEASE_SKIP = "cp310-*"
+    PRERELEASE_SKIP = ""
 
     def __init__(
         self,
@@ -77,8 +151,8 @@ class IdentifierSelector:
         requires_python: Optional[SpecifierSet] = None,
         prerelease_pythons: bool = False,
     ):
-        self.build_patterns = build_config.split()
-        self.skip_patterns = skip_config.split()
+        self.build_config = build_config
+        self.skip_config = skip_config
         self.requires_python = requires_python
         self.prerelease_pythons = prerelease_pythons
 
@@ -92,30 +166,22 @@ class IdentifierSelector:
             if not self.requires_python.contains(version):
                 return False
 
-        build_patterns = itertools.chain.from_iterable(
-            bracex.expand(p) for p in self.build_patterns
-        )
+        # filter out the prerelease pythons if self.prerelease_pythons is False
+        if not self.prerelease_pythons and selector_matches(
+            BuildSelector.PRERELEASE_SKIP, build_id
+        ):
+            return False
 
-        unexpanded_skip_patterns = self.skip_patterns.copy()
+        should_build = selector_matches(self.build_config, build_id)
+        should_skip = selector_matches(self.skip_config, build_id)
 
-        if not self.prerelease_pythons:
-            # filter out the prerelease pythons, alongside the user-defined
-            # skip patterns
-            unexpanded_skip_patterns += BuildSelector.PRERELEASE_SKIP.split()
-
-        skip_patterns = itertools.chain.from_iterable(
-            bracex.expand(p) for p in unexpanded_skip_patterns
-        )
-
-        build: bool = any(fnmatch.fnmatch(build_id, pat) for pat in build_patterns)
-        skip: bool = any(fnmatch.fnmatch(build_id, pat) for pat in skip_patterns)
-        return build and not skip
+        return should_build and not should_skip
 
     def __repr__(self) -> str:
-        result = f'{self.__class__.__name__}(build_config={" ".join(self.build_patterns)!r}'
+        result = f"{self.__class__.__name__}(build_config={self.build_config!r}"
 
-        if self.skip_patterns:
-            result += f', skip_config={" ".join(self.skip_patterns)!r}'
+        if self.skip_config:
+            result += f", skip_config={self.skip_config!r}"
         if self.prerelease_pythons:
             result += ", prerelease_pythons=True"
 
@@ -137,18 +203,18 @@ class TestSelector(IdentifierSelector):
 
 # Taken from https://stackoverflow.com/a/107717
 class Unbuffered:
-    def __init__(self, stream):  # type: ignore
+    def __init__(self, stream: TextIO) -> None:
         self.stream = stream
 
-    def write(self, data):  # type: ignore
+    def write(self, data: str) -> None:
         self.stream.write(data)
         self.stream.flush()
 
-    def writelines(self, datas):  # type: ignore
-        self.stream.writelines(datas)
+    def writelines(self, data: Iterable[str]) -> None:
+        self.stream.writelines(data)
         self.stream.flush()
 
-    def __getattr__(self, attr):  # type: ignore
+    def __getattr__(self, attr: str) -> Any:
         return getattr(self.stream, attr)
 
 
@@ -202,27 +268,13 @@ class DependencyConstraints:
             return self.base_file_path
 
     def __repr__(self) -> str:
-        return f"{self.__class__.__name__}{self.base_file_path!r})"
+        return f"{self.__class__.__name__}({self.base_file_path!r})"
 
+    def __eq__(self, o: object) -> bool:
+        if not isinstance(o, DependencyConstraints):
+            return False
 
-class BuildOptions(NamedTuple):
-    package_dir: Path
-    output_dir: Path
-    build_selector: BuildSelector
-    architectures: Set[Architecture]
-    environment: ParsedEnvironment
-    before_all: str
-    before_build: Optional[str]
-    repair_command: str
-    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
-    build_frontend: BuildFrontend
+        return self.base_file_path == o.base_file_path
 
 
 class NonPlatformWheelError(Exception):

cibuildwheel/windows.py

@@ -7,13 +7,15 @@ from pathlib import Path
 from typing import Dict, List, NamedTuple, Optional, Sequence, Set
 from zipfile import ZipFile
 
+from packaging.version import Version
+
 from .architecture import Architecture
 from .environment import ParsedEnvironment
 from .logger import log
+from .options import Options
 from .typing import PathOrStr, assert_never
 from .util import (
     BuildFrontend,
-    BuildOptions,
     BuildSelector,
     NonPlatformWheelError,
     download,
@@ -43,9 +45,8 @@ def shell(
 
 
 def get_nuget_args(version: str, arch: str) -> List[str]:
-    python_name = "python"
-    if arch == "32":
-        python_name += "x86"
+    platform_suffix = {"32": "x86", "64": "", "ARM64": "arm64"}
+    python_name = "python" + platform_suffix[arch]
     return [
         python_name,
         "-Version",
@@ -73,10 +74,7 @@ def get_python_configurations(
 
     python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
 
-    map_arch = {
-        "32": Architecture.x86,
-        "64": Architecture.AMD64,
-    }
+    map_arch = {"32": Architecture.x86, "64": Architecture.AMD64, "ARM64": Architecture.ARM64}
 
     # skip builds as required
     python_configurations = [
@@ -97,6 +95,10 @@ def install_cpython(version: str, arch: str, nuget: Path) -> Path:
     nuget_args = get_nuget_args(version, arch)
     installation_path = Path(nuget_args[-1]) / (nuget_args[0] + "." + version) / "tools"
     call([nuget, "install", *nuget_args])
+    # "python3" is not included in the vanilla nuget package,
+    # though it can be present if modified (like on Azure).
+    if not (installation_path / "python3.exe").exists():
+        (installation_path / "python3.exe").symlink_to(installation_path / "python.exe")
     return installation_path
 
 
@@ -112,7 +114,6 @@ def install_pypy(version: str, arch: str, url: str) -> Path:
         download(url, pypy_zip)
         # Extract to the parent directory because the zip file still contains a directory
         extract_zip(pypy_zip, installation_path.parent)
-        (installation_path / "python.exe").symlink_to(installation_path / "pypy3.exe")
     return installation_path
 
 
@@ -186,10 +187,33 @@ def setup_python(
     # Install pip
 
     requires_reinstall = not (installation_path / "Scripts" / "pip.exe").exists()
+
     if requires_reinstall:
         # maybe pip isn't installed at all. ensurepip resolves that.
         call(["python", "-m", "ensurepip"], env=env, cwd=CIBW_INSTALL_PATH)
 
+    # pip older than 21.3 builds executables such as pip.exe for x64 platform.
+    # The first re-install of pip updates pip module but builds pip.exe using
+    # the old pip which still generates x64 executable. But the second
+    # re-install uses updated pip and correctly builds pip.exe for the target.
+    # This can be removed once ARM64 Pythons (currently 3.9 and 3.10) bundle
+    # pip versions newer than 21.3.
+    if python_configuration.arch == "ARM64" and Version(get_pip_version(env)) < Version("21.3"):
+        call(
+            [
+                "python",
+                "-m",
+                "pip",
+                "install",
+                "--force-reinstall",
+                "--upgrade",
+                "pip",
+                *dependency_constraint_flags,
+            ],
+            env=env,
+            cwd=CIBW_INSTALL_PATH,
+        )
+
     # upgrade pip to the version matching our constraints
     # if necessary, reinstall it to ensure that it's available on PATH as 'pip.exe'
     call(
@@ -246,47 +270,51 @@ def setup_python(
     return env
 
 
-def build(options: BuildOptions) -> None:
+def build(options: Options) -> None:
     temp_dir = Path(tempfile.mkdtemp(prefix="cibuildwheel"))
     built_wheel_dir = temp_dir / "built_wheel"
     repaired_wheel_dir = temp_dir / "repaired_wheel"
 
+    python_configurations = get_python_configurations(
+        options.globals.build_selector, options.globals.architectures
+    )
+
     try:
-        if options.before_all:
+        before_all_options_identifier = python_configurations[0].identifier
+        before_all_options = options.build_options(before_all_options_identifier)
+
+        if before_all_options.before_all:
             log.step("Running before_all...")
-            env = options.environment.as_dictionary(prev_environment=os.environ)
+            env = before_all_options.environment.as_dictionary(prev_environment=os.environ)
             before_all_prepared = prepare_command(
-                options.before_all, project=".", package=options.package_dir
+                before_all_options.before_all, project=".", package=options.globals.package_dir
             )
             shell(before_all_prepared, env=env)
 
-        python_configurations = get_python_configurations(
-            options.build_selector, options.architectures
-        )
-
         for config in python_configurations:
+            build_options = options.build_options(config.identifier)
             log.build_start(config.identifier)
 
             dependency_constraint_flags: Sequence[PathOrStr] = []
-            if options.dependency_constraints:
+            if build_options.dependency_constraints:
                 dependency_constraint_flags = [
                     "-c",
-                    options.dependency_constraints.get_for_python_version(config.version),
+                    build_options.dependency_constraints.get_for_python_version(config.version),
                 ]
 
             # install Python
             env = setup_python(
                 config,
                 dependency_constraint_flags,
-                options.environment,
-                options.build_frontend,
+                build_options.environment,
+                build_options.build_frontend,
             )
 
             # run the before_build command
-            if options.before_build:
+            if build_options.before_build:
                 log.step("Running before_build...")
                 before_build_prepared = prepare_command(
-                    options.before_build, project=".", package=options.package_dir
+                    build_options.before_build, project=".", package=options.globals.package_dir
                 )
                 shell(before_build_prepared, env=env)
 
@@ -295,9 +323,9 @@ def build(options: BuildOptions) -> None:
                 shutil.rmtree(built_wheel_dir)
             built_wheel_dir.mkdir(parents=True)
 
-            verbosity_flags = get_build_verbosity_extra_flags(options.build_verbosity)
+            verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity)
 
-            if options.build_frontend == "pip":
+            if build_options.build_frontend == "pip":
                 # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org
                 # see https://github.com/pypa/cibuildwheel/pull/369
                 call(
@@ -306,18 +334,18 @@ def build(options: BuildOptions) -> None:
                         "-m",
                         "pip",
                         "wheel",
-                        options.package_dir.resolve(),
+                        options.globals.package_dir.resolve(),
                         f"--wheel-dir={built_wheel_dir}",
                         "--no-deps",
-                        *get_build_verbosity_extra_flags(options.build_verbosity),
+                        *get_build_verbosity_extra_flags(build_options.build_verbosity),
                     ],
                     env=env,
                 )
-            elif options.build_frontend == "build":
+            elif build_options.build_frontend == "build":
                 config_setting = " ".join(verbosity_flags)
                 build_env = env.copy()
-                if options.dependency_constraints:
-                    constraints_path = options.dependency_constraints.get_for_python_version(
+                if build_options.dependency_constraints:
+                    constraints_path = build_options.dependency_constraints.get_for_python_version(
                         config.version
                     )
                     # Bug in pip <= 21.1.3 - we can't have a space in the
@@ -339,7 +367,7 @@ def build(options: BuildOptions) -> None:
                             "python",
                             "-m",
                             "build",
-                            options.package_dir,
+                            build_options.package_dir,
                             "--wheel",
                             f"--outdir={built_wheel_dir}",
                             f"--config-setting={config_setting}",
@@ -347,7 +375,7 @@ def build(options: BuildOptions) -> None:
                         env=build_env,
                     )
             else:
-                assert_never(options.build_frontend)
+                assert_never(build_options.build_frontend)
 
             built_wheel = next(built_wheel_dir.glob("*.whl"))
 
@@ -359,10 +387,10 @@ def build(options: BuildOptions) -> None:
             if built_wheel.name.endswith("none-any.whl"):
                 raise NonPlatformWheelError()
 
-            if options.repair_command:
+            if build_options.repair_command:
                 log.step("Repairing wheel...")
                 repair_command_prepared = prepare_command(
-                    options.repair_command, wheel=built_wheel, dest_dir=repaired_wheel_dir
+                    build_options.repair_command, wheel=built_wheel, dest_dir=repaired_wheel_dir
                 )
                 shell(repair_command_prepared, env=env)
             else:
@@ -370,7 +398,7 @@ def build(options: BuildOptions) -> None:
 
             repaired_wheel = next(repaired_wheel_dir.glob("*.whl"))
 
-            if options.test_command and options.test_selector(config.identifier):
+            if build_options.test_command and options.globals.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.
@@ -392,31 +420,31 @@ def build(options: BuildOptions) -> None:
                 # check that we are using the Python from the virtual environment
                 call(["where", "python"], env=virtualenv_env)
 
-                if options.before_test:
+                if build_options.before_test:
                     before_test_prepared = prepare_command(
-                        options.before_test,
+                        build_options.before_test,
                         project=".",
-                        package=options.package_dir,
+                        package=build_options.package_dir,
                     )
                     shell(before_test_prepared, env=virtualenv_env)
 
                 # install the wheel
                 call(
-                    ["pip", "install", str(repaired_wheel) + options.test_extras],
+                    ["pip", "install", str(repaired_wheel) + build_options.test_extras],
                     env=virtualenv_env,
                 )
 
                 # test the wheel
-                if options.test_requires:
-                    call(["pip", "install"] + options.test_requires, env=virtualenv_env)
+                if build_options.test_requires:
+                    call(["pip", "install"] + build_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,
+                    build_options.test_command,
                     project=Path(".").resolve(),
-                    package=options.package_dir.resolve(),
+                    package=options.globals.package_dir.resolve(),
                 )
                 shell(test_command_prepared, cwd="c:\\", env=virtualenv_env)
 
@@ -424,7 +452,7 @@ def build(options: BuildOptions) -> None:
                 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)
+            shutil.move(str(repaired_wheel), build_options.output_dir)
             log.build_end()
     except subprocess.CalledProcessError as error:
         log.step_end_with_error(

docs/changelog.md

@@ -2,11 +2,634 @@
 title: Changelog
 ---
 
-{%
-   include-markdown "../README.md"
-   start="<!--changelog-start-->"
-   end="<!--changelog-end-->"
-%}
+### v2.3.0
+
+_26 November 2021_
+
+- 📈 cibuildwheel now defaults to manylinux2014 image for linux builds, rather than manylinux2010. If you want to stick with manylinux2010, it's simple to set this using [the image options](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image). (#926)
+- ✨ You can now pass environment variables from the host machine into the Docker container during a Linux build. Check out [the docs for `CIBW_ENVIRONMENT_PASS_LINUX `](https://cibuildwheel.readthedocs.io/en/latest/options/#environment-pass) for the details. (#914)
+- ✨ Added support for building PyPy 3.8 wheels. (#881)
+- ✨ Added support for building Windows arm64 CPython wheels on a Windows arm64 runner. We can't test this in CI yet, so for now, this is experimental. (#920)
+- 📚 Improved the deployment documentation (#911)
+- 🛠 Changed the escaping behaviour inside cibuildwheel's  option placeholders e.g. `{project}` in `before_build` or `{dest_dir}` in `repair_wheel_command`. This allows bash syntax like `${SOME_VAR}` to passthrough without being interpreted as a placeholder by cibuildwheel. See [this section](https://cibuildwheel.readthedocs.io/en/stable/options/#placeholders) in the docs for more info. (#889)
+- 🛠 Pip updated to 21.3, meaning it now defaults to in-tree builds again. If this causes an issue with your project, setting environment variable `PIP_USE_DEPRECATED=out-of-tree-build` is available as a temporary flag to restore the old behaviour. However, be aware that this flag will probably be removed soon. (#881)
+- 🐛 You can now access the current Python interpreter using `python3` within a build on Windows (#917)
+
+### v2.2.2
+
+_26 October 2021_
+
+- 🐛 Fix bug in the GitHub Action step causing a syntax error (#895)
+
+### v2.2.1
+
+_26 October 2021_
+
+- 🛠 Added a `config-file` option on the GitHub Action to specify something other than pyproject.toml in your GitHub Workflow file. (#883)
+- 🐛 Fix missing resources in sdist and released wheel on PyPI. We've also made some internal changes to our release processes to make them more reliable. (#893, #894)
+
+### v2.2.0
+
+_22 October 2021_
+
+- 🌟 Added support for [musllinux](https://www.python.org/dev/peps/pep-0656/). Support for this new wheel format lets projects build wheels for Linux distributions that use [musl libc](https://musl.libc.org/), notably, [Alpine](https://alpinelinux.org/) Docker containers. (#768)
+
+  Musllinux builds are enabled by default. If you're not ready to build musllinux, add `*-musllinux_*` to your [`CIBW_SKIP`/`skip`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip) option. Or, you might have to make some changes to your options - to simplify that process, you can use...
+
+- 🌟 TOML option overrides! This provides much greater flexibility in configuration via pyproject.toml. (#854)
+
+  You can now set build options for any subset of your builds using a match pattern. So, for example, you can customise CPython 3.8 builds with an override on `cp38-*` or musllinux builds by selecting `*musllinux*`. Check out [the docs](https://cibuildwheel.readthedocs.io/en/latest/options/#overrides) for more info on the specifics.
+
+- 🛠 Added support for building PyPy wheels on macOS 11 CI runners. (#875)
+
+- 🛠 Setting an empty string for the [`CIBW_*_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) option will now fallthrough to the config file or cibuildwheel's default, rather than causing an error. This makes the option easier to use in CI build matricies. (#829)
+
+- 🛠 Support for TOML 1.0 when reading config files, via the `tomli` package. (#876)
+
+<sup>Note: This version is not available on PyPI due to some missing resources in the release files. Please use a later version instead.</sup>
+
+### v2.1.3
+
+_6 October 2021_
+
+- 🛠 Updated CPython 3.10 to the 3.10.0 final release
+
+### v2.1.2
+
+_14 September 2021_
+
+- 🛠 Updated CPython 3.10 to 3.10.0rc2
+- 📚 Multiple docs updates
+- 🐛 Improved warnings when built binaries are bundled into the container on Linux. (#807)
+
+### v2.1.1
+
+_7 August 2021_
+
+- ✨ Corresponding with the release of CPython 3.10.0rc1, which is ABI stable, cibuildwheel now builds CPython 3.10 by default - without the CIBW_PRERELEASE_PYTHONS flag.
+
+<sup>Note: v2.1.0 was a bad release, it was yanked from PyPI.</sup>
+
+### v2.0.1
+
+_25 July 2021_
+
+- 📚 Docs improvements (#767)
+- 🛠 Dependency updates, including delocate 0.9.0.
+
+### v2.0.0 🎉
+
+_16 July 2021_
+
+- 🌟 You can now configure cibuildwheel options inside your project's `pyproject.toml`! Environment variables still work of course. Check out the [documentation](https://cibuildwheel.readthedocs.io/en/stable/options/#setting-options) for more info.
+- 🌟 Added support for building wheels with [build](https://github.com/pypa/build), as well as pip. This feature is controlled with the [`CIBW_BUILD_FRONTEND`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-frontend) option.
+- 🌟 Added the ability to test building wheels on CPython 3.10! Because CPython 3.10 is in beta, these wheels should not be distributed, because they might not be compatible with the final release, but it's available to build for testing purposes. Use the flag [`--prerelease-pythons` or `CIBW_PRERELEASE_PYTHONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#prerelease-pythons) to test. (#675) This version of cibuildwheel includes CPython 3.10.0b4.
+- ⚠️ **Removed support for building Python 2.7 and Python 3.5 wheels**, for both CPython and PyPy. If you still need to build on these versions, please use the latest v1.x version. (#596)
+- ✨ Added the ability to build CPython 3.8 wheels for Apple Silicon. (#704)
+- 🛠 Update to the latest build dependencies, including Auditwheel 4. (#633)
+- 🛠 Use the unified pypa/manylinux images to build PyPy (#671)
+- 🐛 Numerous bug fixes & docs improvements
+
+### v1.12.0
+
+_22 June 2021_
+
+- ✨ Adds support building macOS universal2/arm64 wheels on Python 3.8.
+
+### v1.11.1
+
+_28 May 2021_
+
+- ✨ cibuildwheel is now part of the PyPA!
+- 📚 Minor docs changes, fixing links related to the above transition
+- 🛠 Update manylinux pins to the last version containing Python 2.7 and 3.5. (#674)
+
+### v1.11.0
+
+_1 May 2021_
+
+- 📚 Lots of docs improvements! (#650, #623, #616, #609, #606)
+- 🐛 Fix nuget "Package is not found" error on Windows. (#653)
+- ⚠️ cibuildwheel will no longer build Windows 2.7 wheels, unless you specify a custom toolchain using `DISTUTILS_USE_SDK=1` and `MSSdk=1`. This is because Microsoft have stopped distributing Visual C++ Compiler for Python 2.7. See [this FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#windows-and-python-27) for more details. (#649)
+- 🐛 Fix crash on Windows due to missing `which` command (#641).
+
+### v1.10.0
+
+_22 Feb 2021_
+
+- ✨ Added `manylinux_2_24` support. To use these new Debian-based manylinux
+  images, set your [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-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: pypa/cibuildwheel@version # e.g. v1.9.0
+    with:
+      output-dir: wheelhouse
+    # env:
+    #   CIBW_SOME_OPTION: value
+  ```
+
+  This saves a bit of boilerplate, and you can [use Dependabot to keep the
+  pinned version up-to-date](https://cibuildwheel.readthedocs.io/en/stable/faq/#automatic-updates).
+
+- ✨ Added `auto64` and `auto32` shortcuts to the
+  [CIBW_ARCHS](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)
+  option. (#553)
+- ✨ 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_
+
+- 🛠 Add PPC64LE manylinux image supporting Python 3.9. (#436)
+- 📚 Add project URLs to PyPI listing (#428)
+
+### 1.6.0
+
+_9 September 2020_
+
+- 🌟 Add Python 3.9 support! This initial support uses release candidate
+  builds. You can start publishing wheels for Python 3.9 now, ahead of
+  the official release. (#382)
+
+  Minor note - if you're building PPC64LE wheels, the manylinux image pinned
+  by this version is
+  [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
+  Windows (#420)
+- 📚 Added some information about Windows VC++ runtimes and how they relate
+  to wheels.
+
+### 1.5.5
+
+_22 July 2020_
+
+- 🐛 Fix a bug that would cause command substitutions in CIBW_ENVIRONMENT to
+  produce no output on Linux (#411)
+- 🐛 Fix regression (introduced in 1.5.3) which caused BEFORE_BUILD and
+  BEFORE_ALL to be executed in the wrong directory (#410)
+
+### 1.5.4
+
+_19 June 2020_
+
+- 🐛 Fix a bug that would cause command substitutions in CIBW_ENVIRONMENT
+  variables to not interpret quotes in commands correctly (#406, #408)
+
+### 1.5.3
+
+_19 July 2020_
+
+- 🛠 Update CPython 3.8 to 3.8.3 (#405)
+- 🛠 Internal refactoring of Linux build, to move control flow into Python (#386)
+
+### 1.5.2
+
+_8 July 2020_
+
+- 🐛 Fix an issue on Windows where pyproject.toml would cause an error when
+  some requirements formats were used. (#401)
+- 🛠 Update CPython 3.7 to 3.7.8 (#394)
+
+### 1.5.1
+
+_25 June 2020_
+
+- 🐛 Fix "OSError: [WinError 17] The system cannot move the file to a different
+  disk drive" on GitHub Actions (#388, #389)
+
+### 1.5.0
+
+_24 June 2020_
+
+- 🌟 Add [`CIBW_BEFORE_ALL`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-all)
+  option, which lets you run a command on the build machine before any wheels
+  are built. This is especially useful when building on Linux, to `make`
+  something external to Python, or to `yum install` a dependency. (#342)
+- ✨ Added support for projects using pyproject.toml instead of setup.py
+  (#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)
+- 🐛 Ensure pip wheel uses the specified package, and doesn't build a wheel
+  from PyPI (#369)
+- 🛠 Internal changes: using pathlib.Path, precommit hooks, testing
+  improvements.
+
+### 1.4.2
+
+_25 May 2020_
+
+- 🛠 Dependency updates, including CPython 3.8.3 & manylinux images.
+- 🛠 Lots of internal updates - type annotations and checking using mypy, and
+  a new integration testing system.
+- ⚠️ Removed support for *running* cibuildwheel using Python 3.5. cibuildwheel
+  will continue to build Python 3.5 wheels until EOL.
+
+### 1.4.1
+
+_4 May 2020_
+
+- 🐛 Fix a bug causing programs running inside the i686 manylinux images to
+  think they were running x86_64 and target the wrong architecture. (#336,
+  #338)
+
+### 1.4.0
+
+_2 May 2020_
+
+- 🌟 Deterministic builds. cibuildwheel now locks the versions of the tools it
+  uses. This means that pinning your version of cibuildwheel pins the versions
+  of pip, setuptools, manylinux etc. that are used under the hood. This should
+  make things more reliable. But note that we don't control the entire build
+  environment on macOS and Windows, where the version of Xcode and Visual
+  Studio can still effect things.
+
+  This can be controlled using the [CIBW_DEPENDENCY_VERSIONS](https://cibuildwheel.readthedocs.io/en/stable/options/#dependency-versions)
+  and [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image)
+  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)
+  for more information.
+
+  Note that this change makes the working directory (where you call
+  cibuildwheel from) relevant on Linux, as it's considered the 'project' and
+  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.
+
+### 1.3.0
+
+_12 March 2020_
+
+- 🌟 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
+  prepare the environment before your tests are run. (#242)
+
+### 1.2.0
+
+_8 March 2020_
+
+- 🌟 Add support for building PyPy wheels, across Manylinux, macOS, and
+  Windows. (#185)
+- 🌟 Added the ability to build ARM64 (aarch64), ppc64le, and s390x wheels,
+  using manylinux2014 and Travis CI. (#273)
+- ✨ You can now build macOS wheels on Appveyor. (#230)
+- 🛠 Changed default macOS minimum target to 10.9, from 10.6. This allows the
+  use of more modern C++ libraries, among other things. (#156)
+- 🛠 Stop building universal binaries on macOS. We now only build x86_64
+  wheels on macOS. (#220)
+- ✨ Allow chaining of commands using `&&` and `||` on Windows inside
+  CIBW_BEFORE_BUILD and CIBW_TEST_COMMAND. (#293)
+- 🛠 Improved error reporting for failed Cython builds due to stale .so files
+  (#263)
+- 🛠 Update CPython from 3.7.5 to 3.7.6 and from 3.8.0 to 3.8.2 on Mac/Windows
+- 🛠 Improved error messages when a bad config breaks cibuildwheel's PATH
+  variable. (#264)
+- ⚠️ Removed support for *running* cibuildwheel on Python 2.7. cibuildwheel
+  will continue to build Python 2.7 wheels for a little while. (#265)
+
+### 1.1.0
+
+_7 December 2019_
+
+- 🌟 Add support for building manylinux2014 wheels. To use, set
+  `CIBW_MANYLINUX_X86_64_IMAGE` and CIBW_MANYLINUX_I686_IMAGE to
+  `manylinux2014`.
+- ✨ Add support for [Linux on Appveyor](https://www.appveyor.com/blog/2018/03/06/appveyor-for-linux/) (#204, #207)
+- ✨ Add `CIBW_REPAIR_WHEEL_COMMAND` env variable, for changing how
+  `auditwheel` or `delocate` are invoked, or testing an equivalent on
+  Windows. (#211)
+- 📚 Added some travis example configs - these are available in /examples. (#228)
+
+### 1.0.0
+
+_10 November 2019_
+
+- 🌟 Add support for building Python 3.8 wheels! (#180)
+- 🌟 Add support for building manylinux2010 wheels. cibuildwheel will now
+  build using the manylinux2010 images by default. If your project is still
+  manylinux1 compatible, you should get both manylinux1 and manylinux2010
+  wheels - you can upload both to PyPI. If you always require manylinux1 wheels, you can
+  build using the old manylinux1 image using the [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image) option.
+  (#155)
+- 📚 Documentation is now on its [own mini-site](https://cibuildwheel.readthedocs.io),
+   rather than on the README (#169)
+- ✨ Add support for building Windows wheels on Travis CI. (#160)
+- 🛠 If you set `CIBW_TEST_COMMAND`, your tests now run in a virtualenv. (#164)
+- 🛠 Windows now uses Python as installed by nuget, rather than the versions
+  installed by the various CI providers. (#180)
+- 🛠 Update Python from 2.7.16 to 2.7.17 and 3.7.4 to 3.7.5 on macOS (#171)
+- ⚠️ Removed support for Python 3.4 (#168)
+
+### 0.12.0
+
+_29 September 2019_
+
+- ✨ Add CIBW_TEST_EXTRAS option, to allow testing using extra_require
+  options. For example, set `CIBW_TEST_EXTRAS=test,qt` to make the wheel
+  installed with `pip install <wheel_file>[test,qt]`
+- 🛠 Update Python from 3.7.2 to 3.7.4 on macOS
+- 🛠 Update OpenSSL patch to 1.0.2t on macOS
+
+### 0.11.1
+
+_28 May 2019_
+
+- 🐛 Fix missing file in the release tarball, that was causing problems with
+  Windows builds (#141)
+
+### 0.11.0
+
+_26 May 2019_
+
+- 🌟 Add support for building on Azure pipelines! This lets you build all
+  Linux, Mac and Windows wheels on one service, so it promises to be the
+  easiest to set up! Check out the quickstart in the docs, or
+  [cibuildwheel-azure-example](https://github.com/joerick/cibuildwheel-azure-example)
+  for an example project. (#126, #132)
+- 🛠 Internal change - the end-to-end test projects format was updated, so we
+  can more precisely assert what should be produced for each one. (#136, #137).
+
+### 0.10.2
+
+_10 March 2019_
+
+- 🛠 Revert temporary fix in macOS, that was working around a bug in pip 19 (#129)
+- 🛠 Update Python to 2.7.16 on macOS
+- 🛠 Update OpenSSL patch to 1.0.2r on macOS
+
+### 0.10.1
+
+_3 February 2019_
+
+- 🐛 Fix build stalling on macOS (that was introduced in pip 19) (#122)
+- 🐛 Fix "AttributeError: 'Popen' object has no attribute 'args'" on Python 2.7 for Linux builds (#108)
+- 🛠 Update Python from 3.6.7, 3.7.1 to 3.6.8, 3.7.2 on macOS
+- 🛠 Update openssl patch from 1.0.2p to 1.0.2q on macOS
+- 🛠 Sorting build options dict items when printing preamble (#114)
+
+### 0.10.0
+
+_23 September 2018_
+
+- 🌟 Add `CIBW_BUILD` option, for specifying which specific builds to perform (#101)
+- 🌟 Add support for building Mac and Linux on CircleCI (#91, #97)
+- 🛠 Improved support for building universal wheels (#95)
+- 🛠 Ensure log output is unbuffered and therefore in the correct order (#92)
+- 🛠 Improved error reporting for errors that occur inside a package's setup.py (#88)
+- ⚠️ Removed support for Python 3.3 on Windows.
+
+### 0.9.4
+
+_29 July 2018_
+
+- 🛠 CIBW_TEST_COMMAND now runs in a shell on Mac (as well as Linux) (#81)
+
+### 0.9.3
+
+_10 July 2018_
+
+- 🛠 Update to Python 3.6.6 on macOS (#82)
+- ✨ Add support for building Python 3.7 wheels on Windows (#76)
+- ⚠️ Deprecated support for Python 3.3 on Windows.
+
+### 0.9.2
+
+_1 July 2018_
+
+- 🛠  Update Python 3.7.0rc1 to 3.7.0 on macOS (#79)
+
+### 0.9.1
+
+_18 June 2018_
+
+- 🛠 Removed the need to use `{python}` and `{pip}` in `CIBW_BEFORE_BUILD` statements, by ensuring the correct version is always on the path at `python` and `pip` instead. (#60)
+- 🛠 We now patch the _ssl module on Python 3.4 and 3.5 so these versions can still make SSL web requests using TLS 1.2 while building. (#71)
+
+### 0.9.0
+
+_18 June 2018_
+
+- ✨ Add support for Python 3.7 (#73)
+
+### 0.8.0
+
+_4 May 2018_
+
+- ⚠️ Drop support for Python 3.3 on Linux (#67)
+- 🐛 Fix TLS by updating setuptools (#69)
+
+### 0.7.1
+
+_2 April 2017_
+
+- 🐛 macOS: Fix Pip bugs resulting from PyPI TLS 1.2 enforcement
+- 🐛 macOS: Fix brew Python3 version problems in the CI
+
+### 0.7.0
+
+_7 January 2018_
+
+- ✨ You can now specify a custom docker image using the `CIBW_MANYLINUX1_X86_64_IMAGE` and `CIBW_MANYLINUX1_I686_IMAGE` options. (#46)
+- 🐛 Fixed a bug where cibuildwheel would download and build a package from PyPI(!) instead of building the package on the local machine. (#51)
+
+### 0.6.0
+
+_9 October 2017_
+
+- ✨ On the Linux build, the host filesystem is now accessible via `/host` (#36)
+- 🐛 Fixed a bug where setup.py scripts would run the wrong version of Python when running subprocesses on Linux (#35)
+
+### 0.5.1
+
+_10 September 2017_
+
+- 🐛 Fixed a couple of bugs on Python 3.
+- ✨ Added experimental support for Mac builds on [Bitrise.io](https://www.bitrise.io)
+
+### 0.5.0
+
+_7 September 2017_
+
+- ✨ `CIBW_ENVIRONMENT` added. You can now set environment variables for each build, even within the Docker container on Linux. This is a big one! (#21)
+- ✨ `CIBW_BEFORE_BUILD` now runs in a system shell on all platforms. You can now do things like `CIBW_BEFORE_BUILD="cmd1 && cmd2"`. (#32)
+
+### 0.4.1
+
+_14 August 2017_
+
+- 🐛 Fixed a bug on Windows where subprocess' output was hidden (#23)
+- 🐛 Fixed a bug on AppVeyor where logs would appear in the wrong order due to output buffering (#24, thanks @YannickJadoul!)
+
+### 0.4.0
+
+_23 July 2017_
+
+- 🐛 Fixed a bug that was increasing the build time by building the wheel twice. This was a problem for large projects that have a long build time. If you're upgrading and you need the old behaviour, use `CIBW_BEFORE_BUILD={pip} install .`, or install exactly the dependencies you need in `CIBW_BEFORE_BUILD`. See #18.
+
+### 0.3.0
+
+_27 June 2017_
+
+- ⚠️ Removed Python 2.6 support on Linux (#12)
+
+### 0.2.1
+
+_11 June 2017_
+
+- 🛠 Changed the build process to install the package before building the wheel - this allows direct dependencies to be installed first (#9, thanks @tgarc!)
+- ✨ Added Python 3 support for the main process, for systems where Python 3 is the default (#8, thanks @tgarc).
+
+### 0.2.0
+
+_13 April 2017_
+
+- ✨ Added `CIBW_SKIP` option, letting users explicitly skip a build
+- ✨ Added `CIBW_BEFORE_BUILD` option, letting users run a shell command before the build starts
+
+### 0.1.3
+
+_31 March 2017_
+
+- 🌟 First public release!
 
 <script>
   // undo the scrollTop that the theme did on this page, as there are loads

docs/contributing.md

@@ -20,7 +20,7 @@ Design Goals
 
 Other notes:
 
-- The platforms are very similar, until they're not. I'd rather have straight-forward code than totally DRY code, so let's keep airy platfrom abstractions to a minimum.
+- The platforms are very similar, until they're not. I'd rather have straight-forward code than totally DRY code, so let's keep airy platform abstractions to a minimum.
 - I might want to break the options into a shared config file one day, so that config is more easily shared. That has motivated some of the design decisions.
 
 ### cibuildwheel's relationship with build errors
@@ -127,13 +127,10 @@ 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 push to GitHub.
 
 ```bash
-rm -rf dist
-python setup.py sdist bdist_wheel
-twine upload dist/*
 git push && git push --tags
 ```
 
-Then head to https://github.com/pypa/cibuildwheel/releases and create a GitHub release from the new tag, pasting in the changelog entry.
+Then head to https://github.com/pypa/cibuildwheel/releases and create a GitHub release from the new tag, pasting in the changelog entry. Once the release is created inside GitHub, a CI job will create the assets and upload them to PyPI.

docs/cpp_standards.md

@@ -6,7 +6,7 @@ Building Python wheels with modern C++ standards (C++11 and later) requires a fe
 
 
 ## manylinux1 and C++14
-The default `manylinux1` image (based on CentOS 5) contains a version of GCC and libstdc++ that only supports C++11 and earlier standards. There are however ways to compile wheels with the C++14 standard (and later): https://github.com/pypa/manylinux/issues/118
+The old `manylinux1` image (based on CentOS 5) contains a version of GCC and libstdc++ that only supports C++11 and earlier standards. There are however ways to compile wheels with the C++14 standard (and later): https://github.com/pypa/manylinux/issues/118
 
 `manylinux2010` and `manylinux2014` are newer and support all C++ standards (up to C++17).
 

docs/data/projects.yml

@@ -102,7 +102,7 @@
 
 - name: pikepdf
   gh: pikepdf/pikepdf
-  ci: [azurepipelines]
+  ci: [github]
   os: [windows, apple, linux]
 
 - name: fathon
@@ -256,8 +256,8 @@
 
 - name: Tokenizer
   gh: OpenNMT/Tokenizer
-  ci: [github, travisci]
-  os: [apple, linux]
+  ci: [github]
+  os: [windows, apple, linux]
 
 - name: matrixprofile
   gh: matrix-profile-foundation/matrixprofile
@@ -363,3 +363,150 @@
   gh: LAMDA-NJU/Deep-Forest
   ci: [github]
   os: [apple, linux, windows]
+
+- name: cmake
+  gh: scikit-build/cmake-python-distributions
+  stars: Kitware/CMake
+  ci: [github, travisci]
+  os: [apple, linux, windows]
+  notes: Multitagged binary builds for all supported platforms, using cibw 2 config configuration.
+
+- name: ninja
+  gh: scikit-build/ninja-python-distributions
+  ci: [github, travisci]
+  os: [apple, linux, windows]
+  notes: Multitagged binary builds for all supported platforms, using cibw 2 config configuration.
+
+- name: tgcalls
+  gh: MarshalX/tgcalls
+  pypi: pytgcalls
+  ci: [github]
+  os: [apple, windows]
+  notes: Python `pybind11` binding to Telegram's WebRTC library with third party dependencies like `OpenSSL`, `MozJPEG`, `FFmpeg`, etc.
+
+- name: pillow-heif
+  gh: bigcat88/pillow_heif
+  pypi: pillow-heif
+  ci: [github]
+  os: [apple, linux]
+  notes: Python CFFI binding to libheif library with third party dependencies like `libde265`, `x265`, `libaom` with test & publishing on PyPi.
+
+- name: clang-format
+  gh: ssciwr/clang-format-wheel
+  ci: [github]
+  os: [apple, linux, windows]
+  notes: Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels.
+
+- name: Tornado
+  gh: tornadoweb/tornado
+  ci: [travisci]
+  os: [apple, linux]
+
+- name: pytorch-fairseq
+  gh: pytorch/fairseq
+  ci: [github]
+  os: [apple, linux]
+
+- name: uvloop
+  gh: MagicStack/uvloop
+  ci: [github]
+  os: [apple, linux]
+
+- name: asyncpg
+  gh: MagicStack/asyncpg
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: pydantic
+  gh: samuelcolvin/pydantic
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: vaex
+  gh: vaexio/vaex
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: cvxpy
+  gh: cvxpy/cvxpy
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: duckdb
+  gh: duckdb/duckdb
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: Triton
+  gh: openai/triton
+  ci: [github]
+  os: [linux]
+  notes: Self hosted runners
+
+- name: vispy
+  gh: vispy/vispy
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: Confluent client for Kafka
+  gh: confluentinc/confluent-kafka-python
+  ci: [travisci]
+  os: [apple, linux, windows]
+  notes: setup in `tools/wheels/build-wheels.bat`
+
+- name: tinyobjloader
+  gh: tinyobjloader/tinyobjloader
+  ci: [azurepipelines]
+  os: [apple, linux, windows]
+
+- name: PyOxidizer
+  gh: indygreg/PyOxidizer
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: OpenSpiel
+  gh: deepmind/open_spiel
+  ci: [github]
+  os: [apple, linux]
+
+- name: Google Benchmark
+  gh: google/benchmark
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: Apache Beam
+  gh: apache/beam
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: PyCryptodome
+  gh: Legrandin/pycryptodome
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: PyYAML
+  gh: yaml/pyyaml
+  ci: [github]
+  os: [apple]
+
+- name: Line Profiler
+  gh: pyutils/line_profiler
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: OpenTimelineIO
+  gh: PixarAnimationStudios/OpenTimelineIO
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: OpenColorIO
+  gh: AcademySoftwareFoundation/OpenColorIO
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: Psycopg 3
+  gh: psycopg/psycopg
+  pypi: psycopg_binary
+  notes: A modern implementation of a PostgreSQL adapter for Python
+  ci: [github]
+  os: [windows, apple, linux]

docs/deliver-to-pypi.md

@@ -4,15 +4,16 @@ title: Delivering to PyPI
 
 After you've built your wheels, you'll probably want to deliver them to PyPI.
 
-### Manual method
+## Manual method
 
-On your development machine, do the following...
+On your development machine, install [pipx](https://pypa.github.io/pipx/) and do the following:
 
 ```bash
+# Either download the SDist from your CI, or make it:
 # Clear out your 'dist' folder.
 rm -rf dist
 # Make a source distribution
-python setup.py sdist
+pipx run build --sdist
 
 # 🏃🏻
 # Go and download your wheel files from wherever you put them. e.g. your CI
@@ -20,17 +21,77 @@ python setup.py sdist
 # 'dist' folder.
 
 # Upload using 'twine' (you may need to 'pip install twine')
-twine upload dist/*
+pipx run twine upload dist/*
 ```
 
-### Semi-automatic method using wheelhouse-uploader
+## Automatic method
 
-Obviously, manual steps are for chumps, so we can automate this a little by using [wheelhouse-uploader](https://github.com/ogrisel/wheelhouse-uploader).
+If you don't need much control over the release of a package, you can set up
+cibuildwheel to deliver the wheels straight to PyPI. You just need to bump the
+version and tag it.
 
-> Quick note from me - using S3 as a storage didn't work due to a [bug](https://issues.apache.org/jira/browse/LIBCLOUD-792) in libcloud. Feel free to use my fork of that package that fixes the bug `pip install https://github.com/joerick/libcloud/archive/v1.5.0-s3fix.zip`
+### Generic instructions
 
-### Automatic method
+Make your SDist with the [build](https://github.com/pypa/build) tool, and your wheels with cibuildwheel. If you can make the files available as
+downloadable artifacts, this make testing before releases easier (depending on your CI provider's options). The "publish" job/step should collect the
+files, and then run `twine upload <paths>` (possibly via [pipx](https://github.com/pypa/pipx)); this should only happen on tags or "releases".
 
-If you don't need much control over the release of a package, you can set up cibuildwheel to deliver the wheels straight to PyPI. This doesn't require anycloud storage to work - you just need to bump the version and tag it.
+### GitHub Actions
 
-[`examples/travis-ci-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/travis-ci-deploy.yml) and [`examples/github-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml) are example configurations that automatically upload wheels to PyPI. Also check out [this example repo](https://github.com/pypa/cibuildwheel-autopypi-example) for more detailed instructions on how to set this up.
+GitHub actions has pipx in all the runners as a supported package manager, as
+well as several useful actions. Alongside your existing job(s) that runs cibuildwheel to make wheels, you will probably want to build an SDist:
+
+```yaml
+  make_sdist:
+    name: Make SDist
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0  # Optional, use if you use setuptools_scm
+        submodules: true  # Optional, use if you have submodules
+
+    - name: Build SDist
+      run: pipx run build --sdist
+
+    - uses: actions/upload-artifact@v2
+      with:
+        path: dist/*.tar.gz
+```
+
+Then, you need to publish the artifacts that the previous jobs have built. This final job should run only on release or tag, depending on your preference. It gathers the artifacts from the sdist and wheel jobs and uploads them to PyPI.
+
+This requires a [PyPI upload token](https://pypi.org/manage/account/token/), stored in your [GitHub repo's secrets](https://docs.github.com/en/actions/security-guides/encrypted-secrets#creating-encrypted-secrets-for-a-repository) as `pypi_password`.
+
+```yaml
+  upload_all:
+    needs: [build_wheels, make_sdist]
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release' && github.event.action == 'published'
+    steps:
+    - uses: actions/download-artifact@v2
+      with:
+        name: artifact
+        path: dist
+
+    - uses: pypa/gh-action-pypi-publish@v1.4.2
+      with:
+        user: __token__
+        password: ${{ secrets.pypi_password }}
+```
+
+You should use dependabot to keep the publish action up to date. In the above
+example, the same name (the default, "artifact" is used for all upload-artifact
+runs, so we can just download all of the in one step into a common directory.
+
+See
+[`examples/github-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml)
+for an example configuration that automatically upload wheels to PyPI. Also see
+[scikit-hep.org/developer/gha_wheels](https://scikit-hep.org/developer/gha_wheels)
+for a complete guide.
+
+### TravisCI
+
+See
+[`examples/travis-ci-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/travis-ci-deploy.yml)
+for an example configuration.

docs/extra.css

@@ -10,6 +10,14 @@ p {
     line-height: 26px;
 }
 
+pre {
+  margin: 1em 0;
+}
+
+pre:first-child {
+  margin-top: 0;
+}
+
 code {
     font-size: 85%;
     background-color: rgba(27,31,35,.05);
@@ -22,6 +30,7 @@ code {
 
 code, pre, tt {
     font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
+    line-height: 1.4;
 }
 
 pre code, pre code.hljs {
@@ -148,7 +157,7 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 .tabs-header button:focus-visible {
-  /* preserve an outline for accesibility purposes */
+  /* preserve an outline for accessibility purposes */
   outline: 1px solid currentColor;
   outline-offset: -1px;
 }
@@ -216,6 +225,3 @@ h1, h2, h3, h4, h5, h6 {
   padding-right: 0;
   margin-bottom: 0.5em;
 }
-.tabs.examples pre:first-child {
-  margin-top: 0;
-}

docs/faq.md

@@ -2,35 +2,23 @@
 title: Tips and tricks
 ---
 
-### Troubleshooting
-
-If your wheel didn't compile, check the list below for some debugging tips.
-
-- A mistake in your config. To quickly test your config without doing a git push and waiting for your code to build on CI, you can test the Linux build in a Docker container. On Mac or Linux, with Docker running, try `cibuildwheel --platform linux`. You'll have to bring your config into the current environment first.
-
-- Missing dependency. You might need to install something on the build machine. You can do this in `.travis.yml`, `appveyor.yml`, or `.circleci/config.yml`, with apt-get, brew or choco. Given how the Linux build works, you'll need to use the [`CIBW_BEFORE_BUILD`](options.md#before-build) option.
-
-- Windows: missing C feature. The Windows C compiler doesn't support C language features invented after 1990, so you'll have to backport your C code to C90. For me, this mostly involved putting my variable declarations at the top of the function like an animal.
-
-- MacOS: calling cibuildwheel from a python3 script and getting a `ModuleNotFoundError`? Due to a (fixed) [bug](https://bugs.python.org/issue22490) in CPython, you'll need to [unset the `__PYVENV_LAUNCHER__` variable](https://github.com/pypa/cibuildwheel/issues/133#issuecomment-478288597) before activating a venv.
-
-### Building Python 2.7 / PyPy2 wheels
-
-See the [cibuildwheel verison 1 docs](https://cibuildwheel.readthedocs.io/en/1.x/) for information about building Python 2.7 or PyPy2 wheels. There are lots of tricks and workaround there that are no longer required for Python 3 in cibuildwheel 2.
+## Tips
 
 ### 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:
+Linux wheels are built in the [`manylinux`/`musllinux` docker images](https://github.com/pypa/manylinux) to provide binary compatible wheels on Linux, according to [PEP 600](https://www.python.org/dev/peps/pep-0600/) / [PEP 656](https://www.python.org/dev/peps/pep-0656/). Because of this, when building with `cibuildwheel` on Linux, a few things should be taken into account:
 
-- 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.
+-   Programs and libraries are not installed on the CI runner host, but rather should be installed inside of the Docker image - using `yum` for `manylinux2010` or `manylinux2014`, `apt-get` for `manylinux_2_24` and `apk` for `musllinux_1_1`, or manually. The same goes for environment variables that are potentially needed to customize the wheel building.
 
-- 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.
+    `cibuildwheel` supports this by providing the [`CIBW_ENVIRONMENT`](options.md#environment) and [`CIBW_BEFORE_ALL`](options.md#before-all) options to setup the build environment inside the running Docker image.
 
-- 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.
+-   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 `/host` is not available on CircleCI due to their Docker policies.
+
+-   Alternative Docker images can be specified with the `CIBW_MANYLINUX_*_IMAGE`/`CIBW_MUSLLINUX_*_IMAGE` options to allow for a custom, preconfigured build environment for the Linux builds. See [options](options.md#linux-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+:
+`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.8+:
 
 #### `x86_64`
 
@@ -89,6 +77,7 @@ by default, and require opt-in by setting `CIBW_ARCHS_MACOS`.
 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" %}
 ```
@@ -114,33 +103,6 @@ Linux), and the other architectures are emulated automatically.
 {% 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" %}
-```
-
-
 ### 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.
@@ -155,51 +117,6 @@ myextension = Extension(
 )
 ```
 
-### 'No module named XYZ' errors after running cibuildwheel on macOS
-
-`cibuildwheel` on Mac installs the distributions from Python.org system-wide during its operation. This is necessary, but it can cause some confusing errors after cibuildwheel has finished.
-
-Consider the build script:
-
-```bash
-python3 -m pip install twine cibuildwheel
-python3 -m cibuildwheel --output-dir wheelhouse
-python3 -m twine upload wheelhouse/*.whl
-# error: no module named 'twine'
-```
-
-This doesn't work because while `cibuildwheel` was running, it installed a few new versions of 'python3', so the `python3` run on line 3 isn't the same as the `python3` that ran on line 1.
-
-Solutions to this vary, but the simplest is to install tools immediately before they're used:
-
-```bash
-python3 -m pip install cibuildwheel
-python3 -m cibuildwheel --output-dir wheelhouse
-python3 -m pip install twine
-python3 -m twine upload wheelhouse/*.whl
-```
-
-### 'ImportError: DLL load failed: The specific module could not be found' error on Windows
-
-Visual Studio and MSVC link the compiled binary wheels to the Microsoft Visual C++ Runtime. Normally, these are included with Python, but when compiling with a newer version of Visual Studio, it is possible users will run into problems on systems that do not have these runtime libraries installed. The solution is to ask users to download the corresponding Visual C++ Redistributable from the [Microsoft website](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) and install it. Since a Python installation normally includes these VC++ Redistributable files for [the version of the MSVC compiler used to compile Python](https://wiki.python.org/moin/WindowsCompilers), this is typically only a problem when compiling a Python C extension with a newer compiler.
-
-Additionally, Visual Studio 2019 started linking to an even newer DLL, `VCRUNTIME140_1.dll`, besides the `VCRUNTIME140.dll` that is included with recent Python versions (starting from Python 3.5; see [here](https://wiki.python.org/moin/WindowsCompilers) for more details on the corresponding Visual Studio & MSVC versions used to compile the different Python versions). To avoid this extra dependency on `VCRUNTIME140_1.dll`, the [`/d2FH4-` flag](https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64/) can be added to the MSVC invocations (check out [this issue](https://github.com/pypa/cibuildwheel/issues/423) for details and references).
-
-To add the `/d2FH4-` flag to a standard `setup.py` using `setuptools`, the `extra_compile_args` option can be used:
-
-```python
-    ext_modules=[
-        Extension(
-            'c_module',
-            sources=['extension.c'],
-            extra_compile_args=['/d2FH4-'] if sys.platform == 'win32' else []
-        )
-    ],
-```
-
-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.
@@ -210,7 +127,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead
 If you use GitHub Actions for builds, you can use cibuildwheel as an action:
 
 ```yaml
-uses: pypa/cibuildwheel@v2.0.0b2
+uses: pypa/cibuildwheel@v2.3.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.
@@ -236,7 +153,7 @@ The second option, and the only one that supports other CI systems, is using a `
 
 ```bash
 # requirements-cibw.txt
-cibuildwheel==2.0.0b2
+cibuildwheel==2.3.0
 ```
 
 Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this:
@@ -251,3 +168,159 @@ updates:
 ```
 
 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.
+
+
+### Alternatives to cibuildwheel options {: #cibw-options-alternatives}
+
+cibuildwheel provides lots of opportunities to configure the build
+environment. However, you  might consider adding this build configuration into
+the package itself - in general, this is preferred, because users of your
+package 'sdist' will also benefit.
+
+#### Missing build dependencies {: #cibw-options-alternatives-deps}
+
+If your build needs Python dependencies, rather than using CIBW_BEFORE_BUILD, it's best to add these to the
+[`build-system.requires`](https://www.python.org/dev/peps/pep-0518/#build-system-table)
+section of your pyproject.toml. For example, if your project requires Cython
+to build, your pyproject.toml might include a section like this:
+
+```toml
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel",
+    "Cython",
+]
+
+build-backend = "setuptools.build_meta"
+```
+
+#### Actions you need to perform before building
+
+You might need to run some other commands before building, like running a
+script that performs codegen or downloading some data that's not stored in
+your source tree.
+
+Rather than using CIBW_BEFORE_ALL or CIBW_BEFORE_BUILD, you could incorporate
+these steps into your package's build process. For example, if you're using
+setuptools, you can add steps to your package's `setup.py` using a structure
+like this:
+
+    ```python
+    import subprocess
+    import setuptools
+    import setuptools.command.build_py
+
+
+    class BuildPyCommand(setuptools.command.build_py.build_py):
+      """Custom build command."""
+
+      def run(self):
+        # your custom build steps here
+        # e.g.
+        #   subprocess.run(['python', 'scripts/my_custom_script.py'], check=True)
+        setuptools.command.build_py.build_py.run(self)
+
+
+    setuptools.setup(
+        cmdclass={
+            'build_py': BuildPyCommand,
+        },
+        # Usual setup() args.
+        # ...
+    )
+    ```
+
+#### Compiler flags
+
+Your build might need some compiler flags to be set through environment variables.
+Consider incorporating these into your package, for example, in `setup.py` using [`extra_compile_args` or
+`extra_link_args`](https://docs.python.org/3/distutils/setupscript.html#other-options).
+
+### Python 2.7 / PyPy2 wheels
+
+See the [cibuildwheel version 1 docs](https://cibuildwheel.readthedocs.io/en/1.x/) for information about building Python 2.7 or PyPy2 wheels. There are lots of tricks and workaround there that are no longer required for Python 3 in cibuildwheel 2.
+
+## Troubleshooting
+
+If your wheel didn't compile, you might have a mistake in your config.
+
+To quickly test your config without doing a git push and waiting for your code to build on CI, you can [test the Linux build in a local Docker container](setup.md#local).
+
+### Missing dependencies
+
+You might need to install something on the build machine. You can do this with apt/yum, brew or choco, using the [`CIBW_BEFORE_ALL`](options.md#before-all) option. Or, for a Python dependency, consider [adding it to pyproject.toml](#cibw-options-alternatives-deps).
+
+### macOS: ModuleNotFoundError
+
+Calling cibuildwheel from a python3 script and getting a `ModuleNotFoundError`? Due to a (fixed) [bug](https://bugs.python.org/issue22490) in CPython, you'll need to [unset the `__PYVENV_LAUNCHER__` variable](https://github.com/pypa/cibuildwheel/issues/133#issuecomment-478288597) before activating a venv.
+
+### macOS: 'No module named XYZ' errors after running cibuildwheel
+
+`cibuildwheel` on Mac installs the distributions from Python.org system-wide during its operation. This is necessary, but it can cause some confusing errors after cibuildwheel has finished.
+
+Consider the build script:
+
+```bash
+python3 -m pip install twine cibuildwheel
+python3 -m cibuildwheel --output-dir wheelhouse
+python3 -m twine upload wheelhouse/*.whl
+# error: no module named 'twine'
+```
+
+This doesn't work because while `cibuildwheel` was running, it installed a few new versions of 'python3', so the `python3` run on line 3 isn't the same as the `python3` that ran on line 1.
+
+Solutions to this vary, but the simplest is to install tools immediately before they're used:
+
+```bash
+python3 -m pip install cibuildwheel
+python3 -m cibuildwheel --output-dir wheelhouse
+python3 -m pip install twine
+python3 -m twine upload wheelhouse/*.whl
+```
+
+### macOS: Passing DYLD_LIBRARY_PATH to delocate
+
+macOS has built-in [System Integrity protections](https://developer.apple.com/library/archive/documentation/Security/Conceptual/System_Integrity_Protection_Guide/RuntimeProtections/RuntimeProtections.html) which limits the use of `DYLD_LIBRARY_PATH` and `LD_LIBRARY_PATH` so that it does not automatically pass to children processes. This means if you set `DYLD_LIBRARY_PATH` before running cibuildwheel, or even set it in `CIBW_ENVIRONMENT`, it will be stripped out of the environment before delocate is called.
+
+To work around this, use a different environment variable such as `REPAIR_LIBRARY_PATH` to store the library path, and set `DYLD_LIBRARY_PATH` in [`CIBW_REPAIR_WHEEL_COMMAND_MACOS`](https://cibuildwheel.readthedocs.io/en/stable/options/#repair-wheel-command), like this:
+
+!!! tab examples "Environment variables"
+
+    ```yaml
+    CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
+        DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} &&
+        DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
+    ```
+
+!!! tab examples "pyproject.toml"
+
+    ```toml
+    [tool.cibuildwheel.macos]
+    repair-wheel-command = [
+        "DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel}",
+        "DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}"
+    ]
+    ```
+
+See [#816](https://github.com/pypa/cibuildwheel/issues/816), thanks to @phoerious for reporting.
+
+### Windows: 'ImportError: DLL load failed: The specific module could not be found'
+
+Visual Studio and MSVC link the compiled binary wheels to the Microsoft Visual C++ Runtime. Normally, these are included with Python, but when compiling with a newer version of Visual Studio, it is possible users will run into problems on systems that do not have these runtime libraries installed. The solution is to ask users to download the corresponding Visual C++ Redistributable from the [Microsoft website](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) and install it. Since a Python installation normally includes these VC++ Redistributable files for [the version of the MSVC compiler used to compile Python](https://wiki.python.org/moin/WindowsCompilers), this is typically only a problem when compiling a Python C extension with a newer compiler.
+
+Additionally, Visual Studio 2019 started linking to an even newer DLL, `VCRUNTIME140_1.dll`, besides the `VCRUNTIME140.dll` that is included with recent Python versions (starting from Python 3.5; see [here](https://wiki.python.org/moin/WindowsCompilers) for more details on the corresponding Visual Studio & MSVC versions used to compile the different Python versions). To avoid this extra dependency on `VCRUNTIME140_1.dll`, the [`/d2FH4-` flag](https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64/) can be added to the MSVC invocations (check out [this issue](https://github.com/pypa/cibuildwheel/issues/423) for details and references).
+
+To add the `/d2FH4-` flag to a standard `setup.py` using `setuptools`, the `extra_compile_args` option can be used:
+
+```python
+    ext_modules=[
+        Extension(
+            'c_module',
+            sources=['extension.c'],
+            extra_compile_args=['/d2FH4-'] if sys.platform == 'win32' else []
+        )
+    ],
+```
+
+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.

docs/options.md

@@ -107,6 +107,57 @@ The complete set of defaults for the current version of cibuildwheel are shown b
     not want to change a `pyproject.toml` file. You can specify a different file to
     use with `--config-file` on the command line, as well.
 
+### Configuration overrides {: #overrides }
+
+One feature specific to the configuration files is the ability to override
+settings based on selectors. To use, add a ``tool.cibuildwheel.overrides``
+array, and specify a ``select`` string. Then any options you set will only
+apply to items that match that selector. These are applied in order, with later
+matches overriding earlier ones if multiple selectors match. Environment
+variables always override static configuration.
+
+A few of the options below have special handling in overrides. A different
+`before-all` will trigger a new docker launch on Linux, and cannot be
+overridden on macOS or Windows.  Overriding the image on linux will also
+generate new docker launches, one per image.  Some commands are not supported;
+`output-dir`, build/skip/test_skip selectors, and architectures cannot be
+overridden.
+
+##### Examples:
+
+```toml
+[tool.cibuildwheel.linux]
+before-all = "yum install mylib"
+test-command = "echo 'installed'"
+
+[[tool.cibuildwheel.overrides]]
+select = "*-musllinux*"
+before-all = "apk add mylib"
+```
+
+This example will override the before-all command on musllinux only, but will
+still run the test-command. Note the double brackets, this is an array in TOML,
+which means it can be given multiple times.
+
+```toml
+[tool.cibuildwheel]
+# Normal options, etc.
+manylinux-x86_64-image = "manylinux2014"
+
+[[tool.cibuildwheel.overrides]]
+select = "cp36-*"
+manylinux-x86_64-image = "manylinux1"
+
+[[tool.cibuildwheel.overrides]]
+select = "cp3{7,8,9}-*"
+manylinux-x86_64-image = "manylinux2010"
+```
+
+This example will build CPython 3.6 wheels on manylinux1, CPython 3.7-3.9
+wheels on manylinux2010, and manylinux2014 wheels for any newer Python
+(like 3.10).
+
+
 ## Options summary
 
 <div class="options-toc"></div>
@@ -151,20 +202,23 @@ When setting the options, you can use shell-style globbing syntax, as per [fnmat
 
 <div class="build-id-table-marker"></div>
 
-|              | macOS                                                               | Windows                       | Manylinux Intel                               | Manylinux Other                                                            |
-|--------------|---------------------------------------------------------------------|-------------------------------|-----------------------------------------------|----------------------------------------------------------------------------|
-| Python 3.6   | cp36-macosx_x86_64                                                  | cp36-win_amd64<br/>cp36-win32 | cp36-manylinux_x86_64<br/>cp36-manylinux_i686 | cp36-manylinux_aarch64<br/>cp36-manylinux_ppc64le<br/>cp36-manylinux_s390x |
-| Python 3.7   | cp37-macosx_x86_64                                                  | cp37-win_amd64<br/>cp37-win32 | cp37-manylinux_x86_64<br/>cp37-manylinux_i686 | cp37-manylinux_aarch64<br/>cp37-manylinux_ppc64le<br/>cp37-manylinux_s390x |
-| Python 3.8   | cp38-macosx_x86_64<br/>cp38-macosx_universal2<br/>cp38-macosx_arm64 | cp38-win_amd64<br/>cp38-win32 | cp38-manylinux_x86_64<br/>cp38-manylinux_i686 | cp38-manylinux_aarch64<br/>cp38-manylinux_ppc64le<br/>cp38-manylinux_s390x |
-| Python 3.9   | cp39-macosx_x86_64<br/>cp39-macosx_universal2<br/>cp39-macosx_arm64 | cp39-win_amd64<br/>cp39-win32 | cp39-manylinux_x86_64<br/>cp39-manylinux_i686 | cp39-manylinux_aarch64<br/>cp39-manylinux_ppc64le<br/>cp39-manylinux_s390x |
-| PyPy3.7 v7.3 | pp37-macosx_x86_64                                                  |                pp37-win_amd64 | pp37-manylinux_x86_64                         |                                                                            |
-
+|              | macOS                                                                  | Windows                          | Linux Intel                                                                                         | Linux Other                                                                                                                                                     |
+|--------------|------------------------------------------------------------------------|----------------------------------|-----------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Python 3.6   | cp36-macosx_x86_64                                                     | cp36-win_amd64<br/>cp36-win32    | cp36-manylinux_x86_64<br/>cp36-manylinux_i686<br/>cp36-musllinux_x86_64<br/>cp36-musllinux_i686     | cp36-manylinux_aarch64<br/>cp36-manylinux_ppc64le<br/>cp36-manylinux_s390x<br/>cp36-musllinux_aarch64<br/>cp36-musllinux_ppc64le<br/>cp36-musllinux_s390x       |
+| Python 3.7   | cp37-macosx_x86_64                                                     | cp37-win_amd64<br/>cp37-win32    | cp37-manylinux_x86_64<br/>cp37-manylinux_i686<br/>cp37-musllinux_x86_64<br/>cp37-musllinux_i686     | cp37-manylinux_aarch64<br/>cp37-manylinux_ppc64le<br/>cp37-manylinux_s390x<br/>cp37-musllinux_aarch64<br/>cp37-musllinux_ppc64le<br/>cp37-musllinux_s390x       |
+| Python 3.8   | cp38-macosx_x86_64<br/>cp38-macosx_universal2<br/>cp38-macosx_arm64    | cp38-win_amd64<br/>cp38-win32    | cp38-manylinux_x86_64<br/>cp38-manylinux_i686<br/>cp38-musllinux_x86_64<br/>cp38-musllinux_i686     | cp38-manylinux_aarch64<br/>cp38-manylinux_ppc64le<br/>cp38-manylinux_s390x<br/>cp38-musllinux_aarch64<br/>cp38-musllinux_ppc64le<br/>cp38-musllinux_s390x       |
+| Python 3.9   | cp39-macosx_x86_64<br/>cp39-macosx_universal2<br/>cp39-macosx_arm64    | cp39-win_amd64<br/>cp39-win32<br/>cp39-win_arm64    | cp39-manylinux_x86_64<br/>cp39-manylinux_i686<br/>cp39-musllinux_x86_64<br/>cp39-musllinux_i686     | cp39-manylinux_aarch64<br/>cp39-manylinux_ppc64le<br/>cp39-manylinux_s390x<br/>cp39-musllinux_aarch64<br/>cp39-musllinux_ppc64le<br/>cp39-musllinux_s390x       |
+| Python 3.10  | cp310-macosx_x86_64<br/>cp310-macosx_universal2<br/>cp310-macosx_arm64 | cp310-win_amd64<br/>cp310-win32<br/>cp310-win_arm64   | cp310-manylinux_x86_64<br/>cp310-manylinux_i686<br/>cp310-musllinux_x86_64<br/>cp310-musllinux_i686 | cp310-manylinux_aarch64<br/>cp310-manylinux_ppc64le<br/>cp310-manylinux_s390x<br/>cp310-musllinux_aarch64<br/>cp310-musllinux_ppc64le<br/>cp310-musllinux_s390x |
+| PyPy3.7 v7.3 | pp37-macosx_x86_64                                                     | pp37-win_amd64                   | pp37-manylinux_x86_64<br/>pp37-manylinux_i686                                                       | pp37-manylinux_aarch64                                                                                                                                          |
+| PyPy3.8 v7.3 | pp38-macosx_x86_64                                                     | pp38-win_amd64                   | pp38-manylinux_x86_64<br/>pp38-manylinux_i686                                                       | pp38-manylinux_aarch64                                                                                                                                          |
 
 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 3.7, macOS 10.13 or higher is required.
 
+Windows arm64 platform support is experimental.
+
 See the [cibuildwheel 1 documentation](https://cibuildwheel.readthedocs.io/en/1.x/) for past end of life versions of Python, and PyPy2.7.
 
 #### Examples
@@ -240,7 +294,7 @@ See the [cibuildwheel 1 documentation](https://cibuildwheel.readthedocs.io/en/1.
     skip = "pp*"
     ```
 
-    It is generally recommened to set `CIBW_BUILD` as an environment variable, though `skip`
+    It is generally recommended to set `CIBW_BUILD` as an environment variable, though `skip`
     tends to be useful in a config file; you can statically declare that you don't
     support pypy, for example.
 
@@ -305,7 +359,8 @@ If not listed above, `auto` is the same as `native`.
 Platform-specific environment variables are 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`.
+This option can also be set using the [command-line option](#command-line)
+`--archs`. This option cannot be set in an `overrides` section in `pyproject.toml`.
 
 #### Examples
 
@@ -337,7 +392,7 @@ This option can also be set using the [command-line option](#command-line) `--ar
     archs = ["auto", "aarch64"]
     ```
 
-    It is generally recommmended to use the environment variable or
+    It is generally recommended to use the environment variable or
     command-line option for Linux, as selecting archs often depends
     on your specific runner having qemu installed.
 
@@ -406,7 +461,7 @@ This option is not available in `pyproject.toml` under
     ```
 
 ###  `CIBW_PRERELEASE_PYTHONS` {: #prerelease-pythons}
-> Enable building with pre-release versions of Python
+> Enable building with pre-release versions of Python if available
 
 During the beta period, when new versions of Python are being tested,
 cibuildwheel will often gain early support for beta releases. If you would
@@ -494,19 +549,23 @@ Platform-specific environment variables are also available:<br/>
 
     ```yaml
     # Set some compiler flags
-    CIBW_ENVIRONMENT: "CFLAGS='-g -Wall' CXXFLAGS='-Wall'"
+    CIBW_ENVIRONMENT: CFLAGS='-g -Wall' CXXFLAGS='-Wall'
 
     # Append a directory to the PATH variable (this is expanded in the build environment)
-    CIBW_ENVIRONMENT: "PATH=$PATH:/usr/local/bin"
+    CIBW_ENVIRONMENT: PATH=$PATH:/usr/local/bin
+
+    # Prepend a directory containing spaces on Windows.
+    CIBW_ENVIRONMENT_WINDOWS: >
+      PATH="C:\\Program Files\\PostgreSQL\\13\\bin;$PATH"
 
     # Set BUILD_TIME to the output of the `date` command
-    CIBW_ENVIRONMENT: "BUILD_TIME=$(date)"
+    CIBW_ENVIRONMENT: BUILD_TIME="$(date)"
 
     # Supply options to `pip` to affect how it downloads dependencies
-    CIBW_ENVIRONMENT: "PIP_EXTRA_INDEX_URL=https://pypi.myorg.com/simple"
+    CIBW_ENVIRONMENT: PIP_EXTRA_INDEX_URL=https://pypi.myorg.com/simple
 
     # Set two flags on linux only
-    CIBW_ENVIRONMENT_LINUX: "BUILD_TIME=$(date) SAMPLE_TEXT=\"sample text\""
+    CIBW_ENVIRONMENT_LINUX: BUILD_TIME="$(date)" SAMPLE_TEXT="sample text"
     ```
 
     Separate multiple values with a space.
@@ -524,6 +583,10 @@ Platform-specific environment variables are also available:<br/>
     # Append a directory to the PATH variable (this is expanded in the build environment)
     environment = { PATH="$PATH:/usr/local/bin" }
 
+    # Prepend a directory containing spaces on Windows.
+    [tool.cibuildwheel.windows]
+    environment = { PATH='C:\\Program Files\\PostgreSQL\\13\\bin;$PATH' }
+
     # Set BUILD_TIME to the output of the `date` command
     environment = { BUILD_TIME="$(date)" }
 
@@ -545,6 +608,41 @@ Platform-specific environment variables are also available:<br/>
 !!! 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).
 
+### `CIBW_ENVIRONMENT_PASS_LINUX` {: #environment-pass}
+> Set environment variables on the host to pass-through to the container during the build.
+
+A list of environment variables to pass into the linux container during the build. It has no affect on the other platforms, which can already access all environment variables directly.
+
+To specify more than one environment variable, separate the variable names by spaces.
+
+#### Examples
+
+!!! tab examples "Environment passthrough"
+
+    ```yaml
+    # Export a variable
+    CIBW_ENVIRONMENT_PASS_LINUX: CFLAGS
+
+    # Set two flags variables
+    CIBW_ENVIRONMENT_PASS_LINUX: BUILD_TIME SAMPLE_TEXT
+    ```
+
+    Separate multiple values with a space.
+
+!!! tab examples "pyproject.toml"
+
+    ```toml
+    [tool.cibuildwheel.linux]
+
+    # Export a variable
+    environment-pass = ["CFLAGS"]
+
+    # Set two flags variables
+    environment-pass = ["BUILD_TIME", "SAMPLE_TEXT"]
+    ```
+
+    In configuration mode, you can use a [TOML][] list instead of a raw string as shown above.
+
 ### `CIBW_BEFORE_ALL` {: #before-all}
 > Execute a shell command on the build system before any wheels are built.
 
@@ -556,6 +654,10 @@ The placeholder `{package}` can be used here; it will be replaced by the path to
 
 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.
 
+This option has special behavior in the overrides section in `pyproject.toml`.
+On linux, overriding it triggers a new docker launch. It cannot be overridden
+on macOS and Windows.
+
 Platform-specific environment variables also available:<br/>
 `CIBW_BEFORE_ALL_MACOS` | `CIBW_BEFORE_ALL_WINDOWS` | `CIBW_BEFORE_ALL_LINUX`
 
@@ -568,7 +670,7 @@ Platform-specific environment variables also available:<br/>
     CIBW_BEFORE_ALL: make -C third_party_lib
 
     # Install system library
-    CIBW_BEFORE_ALL_LINUX: yum install -y libffi-dev
+    CIBW_BEFORE_ALL_LINUX: yum install -y libffi-devel
 
     # Chain multiple commands using && and > in a YAML file, like:
     CIBW_BEFORE_ALL: >
@@ -590,7 +692,7 @@ Platform-specific environment variables also available:<br/>
 
     # Install system library
     [tool.cibuildwheel.linux]
-    before-all = "yum install -y libffi-dev"
+    before-all = "yum install -y libffi-devel"
 
     # Run multiple commands using an array
     before-all = [
@@ -738,6 +840,11 @@ Platform-specific environment variables are also available:<br/>
 
     # Pass the `--lib-sdir .` flag to auditwheel on Linux
     CIBW_REPAIR_WHEEL_COMMAND_LINUX: "auditwheel repair --lib-sdir . -w {dest_dir} {wheel}"
+
+    # Multi-line example - use && to join on all platforms
+    CIBW_REPAIR_WHEEL_COMMAND: >
+      python scripts/repair_wheel.py -w {dest_dir} {wheel} &&
+      python scripts/check_repaired_wheel.py -w {dest_dir} {wheel}
     ```
 
 !!! tab examples "pyproject.toml"
@@ -745,44 +852,61 @@ Platform-specific environment variables are also available:<br/>
     ```toml
     # Use delvewheel on windows
     [tool.cibuildwheel.windows]
-    before_build = "pip install delvewheel"
-    repair_wheel_command = "delvewheel repair -w {dest_dir} {wheel}"
+    before-build = "pip install delvewheel"
+    repair-wheel-command = "delvewheel repair -w {dest_dir} {wheel}"
 
     # Don't repair macOS wheels
     [tool.cibuildwheel.macos]
-    repair_wheel_command = ""
+    repair-wheel-command = ""
 
     # Pass the `--lib-sdir .` flag to auditwheel on Linux
     [tool.cibuildwheel.linux]
-    repair_wheel_command = "auditwheel repair --lib-sdir . -w {dest_dir} {wheel}"
+    repair-wheel-command = "auditwheel repair --lib-sdir . -w {dest_dir} {wheel}"
+
+    # Multi-line example
+    [tool.cibuildwheel]
+    repair-wheel-command = [
+      'python scripts/repair_wheel.py -w {dest_dir} {wheel}',
+      'python scripts/check_repaired_wheel.py -w {dest_dir} {wheel}',
+    ]
     ```
 
     In configuration mode, you can use an inline array, and the items will be joined with `&&`.
 
 
-### CIBW_MANYLINUX_*_IMAGE {: #manylinux-image}
-> Specify alternative manylinux Docker images
+<div class="link-target" id="manylinux-image"></div>
 
-The available options are:
+### `CIBW_MANYLINUX_*_IMAGE`, `CIBW_MUSLLINUX_*_IMAGE` {: #linux-image}
+> Specify alternative manylinux / musllinux Docker images
 
-- `CIBW_MANYLINUX_X86_64_IMAGE`
-- `CIBW_MANYLINUX_I686_IMAGE`
-- `CIBW_MANYLINUX_PYPY_X86_64_IMAGE`
-- `CIBW_MANYLINUX_AARCH64_IMAGE`
-- `CIBW_MANYLINUX_PPC64LE_IMAGE`
-- `CIBW_MANYLINUX_S390X_IMAGE`
-- `CIBW_MANYLINUX_PYPY_AARCH64_IMAGE`
-- `CIBW_MANYLINUX_PYPY_I686_IMAGE`
+The available options are (default value):
 
-Set an alternative Docker image to be used for building [manylinux](https://github.com/pypa/manylinux) wheels. cibuildwheel will then pull these instead of the default images, [`quay.io/pypa/manylinux2010_x86_64`](https://quay.io/pypa/manylinux2010_x86_64), [`quay.io/pypa/manylinux2010_i686`](https://quay.io/pypa/manylinux2010_i686), [`quay.io/pypa/manylinux2010_x86_64`](https://quay.io/pypa/manylinux2010_x86_64), [`quay.io/pypa/manylinux2014_aarch64`](https://quay.io/pypa/manylinux2014_aarch64), [`quay.io/pypa/manylinux2014_ppc64le`](https://quay.io/pypa/manylinux2014_ppc64le), and [`quay.io/pypa/manylinux2014_s390x`](https://quay.io/pypa/manylinux2010_s390x).
+- `CIBW_MANYLINUX_X86_64_IMAGE` ([`quay.io/pypa/manylinux2014_x86_64`](https://quay.io/pypa/manylinux2014_x86_64))
+- `CIBW_MANYLINUX_I686_IMAGE` ([`quay.io/pypa/manylinux2014_i686`](https://quay.io/pypa/manylinux2014_i686))
+- `CIBW_MANYLINUX_PYPY_X86_64_IMAGE` ([`quay.io/pypa/manylinux2014_x86_64`](https://quay.io/pypa/manylinux2014_x86_64))
+- `CIBW_MANYLINUX_AARCH64_IMAGE` ([`quay.io/pypa/manylinux2014_aarch64`](https://quay.io/pypa/manylinux2014_aarch64))
+- `CIBW_MANYLINUX_PPC64LE_IMAGE` ([`quay.io/pypa/manylinux2014_ppc64le`](https://quay.io/pypa/manylinux2014_ppc64le))
+- `CIBW_MANYLINUX_S390X_IMAGE` ([`quay.io/pypa/manylinux2014_s390x`](https://quay.io/pypa/manylinux2014_s390x))
+- `CIBW_MANYLINUX_PYPY_AARCH64_IMAGE` ([`quay.io/pypa/manylinux2014_aarch64`](https://quay.io/pypa/manylinux2014_aarch64))
+- `CIBW_MANYLINUX_PYPY_I686_IMAGE` ([`quay.io/pypa/manylinux2014_i686`](https://quay.io/pypa/manylinux2014_i686))
+- `CIBW_MUSLLINUX_X86_64_IMAGE` ([`quay.io/pypa/musllinux_1_1_x86_64`](https://quay.io/pypa/musllinux_1_1_x86_64))
+- `CIBW_MUSLLINUX_I686_IMAGE` ([`quay.io/pypa/musllinux_1_1_i686`](https://quay.io/pypa/musllinux_1_1_i686))
+- `CIBW_MUSLLINUX_AARCH64_IMAGE` ([`quay.io/pypa/musllinux_1_1_aarch64`](https://quay.io/pypa/musllinux_1_1_aarch64))
+- `CIBW_MUSLLINUX_PPC64LE_IMAGE` ([`quay.io/pypa/musllinux_1_1_ppc64le`](https://quay.io/pypa/musllinux_1_1_ppc64le))
+- `CIBW_MUSLLINUX_S390X_IMAGE` ([`quay.io/pypa/musllinux_1_1_s390x`](https://quay.io/pypa/musllinux_1_1_s390x))
 
-The value of this option can either be set to `manylinux1`, `manylinux2010`, `manylinux2014` or `manylinux_2_24` to use a pinned version of the [official manylinux images](https://github.com/pypa/manylinux). Alternatively, set these options to any other valid Docker image name. For PyPy, the `manylinux1` image is not available. For architectures other
+Set an alternative Docker image to be used for building [manylinux / musllinux](https://github.com/pypa/manylinux) wheels.
+
+For `CIBW_MANYLINUX_*_IMAGE`, the value of this option can either be set to `manylinux1`, `manylinux2010`, `manylinux2014` or `manylinux_2_24` to use a pinned version of the [official manylinux images](https://github.com/pypa/manylinux). Alternatively, set these options to any other valid Docker image name. For PyPy, the `manylinux1` image is not available. For architectures other
 than x86 (x86\_64 and i686) `manylinux2014` or `manylinux_2_24` must be used, because the first version of the manylinux specification that supports additional architectures is `manylinux2014`.
 
+For `CIBW_MUSLLINUX_*_IMAGE`, the value of this option can either be set to `musllinux_1_1` to use a pinned version of the [official musllinux images](https://github.com/pypa/musllinux). Alternatively, set these options to any other valid Docker image name.
 
-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).
+If this option is blank, it will fall though to the next available definition (environment variable -> pyproject.toml -> default).
 
-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)"'`).
+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/musllinux_1_1 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/), [PEP 600](https://www.python.org/dev/peps/pep-0600/) and [PEP 656](https://www.python.org/dev/peps/pep-0656/) for more details).
+
+Auditwheel detects the version of the manylinux / musllinux 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
 
@@ -801,12 +925,12 @@ Auditwheel detects the version of the manylinux standard in the Docker image thr
     CIBW_MANYLINUX_PYPY_X86_64_IMAGE: manylinux2014
     CIBW_MANYLINUX_PYPY_I686_IMAGE: manylinux2014
 
-    # Build using the latest manylinux2010 release, instead of the cibuildwheel
+    # Build using the latest manylinux2014 release, instead of the cibuildwheel
     # pinned version
-    CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2010_x86_64:latest
-    CIBW_MANYLINUX_I686_IMAGE: quay.io/pypa/manylinux2010_i686:latest
-    CIBW_MANYLINUX_PYPY_X86_64_IMAGE: quay.io/pypa/manylinux2010_x86_64:latest
-    CIBW_MANYLINUX_PYPY_I686_IMAGE: quay.io/pypa/manylinux2010_i686:latest
+    CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64:latest
+    CIBW_MANYLINUX_I686_IMAGE: quay.io/pypa/manylinux2014_i686:latest
+    CIBW_MANYLINUX_PYPY_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64:latest
+    CIBW_MANYLINUX_PYPY_I686_IMAGE: quay.io/pypa/manylinux2014_i686:latest
 
     # Build using a different image from the docker registry
     CIBW_MANYLINUX_X86_64_IMAGE: dockcross/manylinux-x64
@@ -841,7 +965,7 @@ Auditwheel detects the version of the manylinux standard in the Docker image thr
     ```
 
     Like any other option, these can be placed in `[tool.cibuildwheel.linux]`
-    if you perfer; they have no effect on `macos` and `windows`.
+    if you prefer; they have no effect on `macos` and `windows`.
 
 ### `CIBW_DEPENDENCY_VERSIONS` {: #dependency-versions}
 > Specify how cibuildwheel controls the versions of the tools it uses
@@ -875,8 +999,8 @@ Platform-specific environment variables are also available:<br/>
 
 !!! note
     This option does not affect the tools used on the Linux build - those versions
-    are bundled with the manylinux image that cibuildwheel uses. To change
-    dependency versions on Linux, use the [CIBW_MANYLINUX_*](#manylinux-image)
+    are bundled with the manylinux/musllinux image that cibuildwheel uses. To change
+    dependency versions on Linux, use the [CIBW_MANYLINUX_* / CIBW_MUSLLINUX_*](#linux-image)
     options.
 
 #### Examples
@@ -943,6 +1067,11 @@ Platform-specific environment variables are also available:<br/>
 
     # Trigger an install of the package, but run nothing of note
     CIBW_TEST_COMMAND: "echo Wheel installed"
+
+    # Multi-line example - join with && on all platforms
+    CIBW_TEST_COMMAND: >
+      pytest {package}/tests &&
+      python {package}/test.py
     ```
 
 !!! tab examples "pyproject.toml"
@@ -957,6 +1086,12 @@ Platform-specific environment variables are also available:<br/>
 
     # Trigger an install of the package, but run nothing of note
     test-command = "echo Wheel installed"
+
+    # Multiline example
+    test-command = [
+      "pytest {package}/tests",
+      "python {package}/test.py",
+    ]
     ```
 
     In configuration files, you can use an array, and the items will be joined with `&&`.
@@ -987,7 +1122,11 @@ Platform-specific environment variables are also available:<br/>
     CIBW_BEFORE_TEST: rm -rf ./data/cache && mkdir -p ./data/cache
 
     # Install non pip python package
-    CIBW_BEFORE_TEST: cd some_dir; ./configure; make; make install
+    CIBW_BEFORE_TEST: >
+      cd some_dir &&
+      ./configure &&
+      make &&
+      make install
 
     # Install python packages that are required to install test dependencies
     CIBW_BEFORE_TEST: pip install cmake scikit-build
@@ -1080,14 +1219,14 @@ Platform-specific environment variables are also available:<br/>
     CIBW_TEST_EXTRAS: "test,qt"
     ```
 
-    Seperate multiple items with a comma.
+    Separate multiple items with a comma.
 
 !!! tab examples "pyproject.toml"
 
     ```toml
     [tool.cibuildwheel]
     # Will cause the wheel to be installed with `pip install <wheel_file>[test,qt]`
-    test-extras: ["test", "qt"]
+    test-extras = ["test", "qt"]
     ```
 
     In configuration files, you can use an inline array, and the items will be joined with a comma.
@@ -1099,13 +1238,15 @@ This will skip testing on any identifiers that match the given skip patterns (se
 
 With macOS `universal2` wheels, you can also skip the individual archs inside the wheel using an `:arch` suffix. For example, `cp39-macosx_universal2:x86_64` or `cp39-macosx_universal2:arm64`.
 
+This option is not supported in the overrides section in `pyproject.toml`.
+
 #### Examples
 
 !!! tab examples "Environment variables"
 
     ```yaml
     # Will avoid testing on emulated architectures
-    CIBW_TEST_SKIP: "*-manylinux_{aarch64,ppc64le,s390x}"
+    CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x}"
 
     # Skip trying to test arm64 builds on Intel Macs
     CIBW_TEST_SKIP: "*-macosx_arm64 *-macosx_universal2:arm64"
@@ -1116,7 +1257,7 @@ With macOS `universal2` wheels, you can also skip the individual archs inside th
     ```toml
     [tool.cibuildwheel]
     # Will avoid testing on emulated architectures
-    test-skip = "*-manylinux_{aarch64,ppc64le,s390x}"
+    test-skip = "*-*linux_{aarch64,ppc64le,s390x}"
 
     # Skip trying to test arm64 builds on Intel Macs
     test-skip = "*-macosx_arm64 *-macosx_universal2:arm64"
@@ -1156,6 +1297,10 @@ Platform-specific environment variables are also available:<br/>
 « subprocess_run("cibuildwheel", "--help") »
 ```
 
+## Placeholders
+
+Some options support placeholders, like `{project}`, `{package}` or `{wheel}`, that are substituted by cibuildwheel before they are used. If, for some reason, you need to write the literal name of a placeholder, e.g. literally `{project}` in a command that would ordinarily substitute `{project}`, prefix it with a hash character - `#{project}`. This is only necessary in commands where the specific string between the curly brackets would be substituted - otherwise, strings not modified.
+
 <style>
   .options-toc {
     display: grid;

docs/setup.md

@@ -2,7 +2,79 @@
 title: 'Setup'
 ---
 
-# GitHub Actions [linux/mac/windows] {: #github-actions}
+# Run cibuildwheel locally (optional) {: #local}
+
+Before getting to CI setup, it can be convenient to test cibuildwheel
+locally to quickly iterate and track down issues. If you've got
+[Docker](https://www.docker.com/products/docker-desktop) installed on
+your development machine, you can run a Linux build without even
+touching CI.
+
+!!! tip
+    You can run the Linux build on any platform. Even Windows can run
+    Linux containers these days, but there are a few  hoops to jump
+    through. Check [this document](https://docs.microsoft.com/en-us/virtualization/windowscontainers/quick-start/quick-start-windows-10-linux)
+    for more info.
+
+This is convenient as it's quicker to iterate, and because the builds are
+happening in manylinux Docker containers, they're perfectly reproducible.
+
+Install cibuildwheel and run a build like this:
+
+```sh
+pip install cibuildwheel
+cibuildwheel --platform linux
+```
+
+Or, using [pipx](https://github.com/pypa/pipx):
+```sh
+pipx run cibuildwheel --platform linux
+```
+
+You should see the builds taking place. You can experiment with options using environment variables or pyproject.toml.
+
+!!! tab "Environment variables"
+
+    cibuildwheel will read config from the environment. Syntax varies, depending on your shell:
+
+    > POSIX shell (Linux/macOS)
+
+    ```sh
+    # run a command to set up the build system
+    export CIBW_BEFORE_ALL='apt install libpng-dev'
+
+    cibuildwheel --platform linux
+    ```
+
+    > CMD (Windows)
+
+    ```bat
+    set CIBW_BEFORE_ALL='apt install libpng-dev'
+
+    cibuildwheel --platform linux
+    ```
+
+!!! tab "pyproject.toml"
+
+    If you write your options into [`pyproject.toml`](options.md#configuration-file), you can work on your options locally, and they'll be automatically picked up when running in CI.
+
+    > pyproject.toml
+
+    ```
+    [tool.cibuildwheel]
+    before-all = "apt install libpng-dev"
+    ```
+
+    Then invoke cibuildwheel, like:
+
+    ```console
+    cibuildwheel --platform linux
+    ```
+
+
+# Configure a CI service
+
+## GitHub Actions [linux/mac/windows] {: #github-actions}
 
 To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/workflows/build_wheels.yml` file in your repo.
 
@@ -46,7 +118,7 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/
           - uses: actions/checkout@v2
 
           - name: Build wheels
-            run: pipx run cibuildwheel==2.0.0b2
+            run: pipx run cibuildwheel==2.3.0
 
           - uses: actions/upload-artifact@v2
             with:
@@ -81,7 +153,7 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/
           - uses: actions/setup-python@v2
 
           - name: Install cibuildwheel
-            run: python -m pip install cibuildwheel==2.0.0b2
+            run: python -m pip install cibuildwheel==2.3.0
 
           - name: Build wheels
             run: python -m cibuildwheel --output-dir wheelhouse
@@ -99,7 +171,7 @@ For more info on this file, check out the [docs](https://help.github.com/en/acti
 [`examples/github-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI.
 
 
-# Azure Pipelines [linux/mac/windows] {: #azure-pipelines}
+## 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.
 
@@ -113,7 +185,7 @@ Commit this file, enable building of your repo on Azure Pipelines, and push.
 
 Wheels will be stored for you and available through the Pipelines interface. For more info on this file, check out the [docs](https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema).
 
-# Travis CI [linux/windows] {: #travis-ci}
+## Travis CI [linux/windows] {: #travis-ci}
 
 To build Linux and Windows wheels on Travis CI, create a `.travis.yml` file in your repo.
 
@@ -129,7 +201,7 @@ Then setup a deployment method by following the [Travis CI deployment docs](http
 
 [`examples/travis-ci-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/travis-ci-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI.
 
-# AppVeyor [linux/mac/windows] {: #appveyor}
+## AppVeyor [linux/mac/windows] {: #appveyor}
 
 To build Linux, Mac, and Windows wheels on AppVeyor, create an `appveyor.yml` file in your repo.
 
@@ -145,7 +217,7 @@ 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}
+## CircleCI [linux/mac] {: #circleci}
 
 To build Linux and Mac wheels on CircleCI, create a `.circleci/config.yml` file in your repo,
 
@@ -162,7 +234,7 @@ Commit this file, enable building of your repo on CircleCI, and push.
 
 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}
+## Gitlab CI [linux] {: #gitlab-ci}
 
 To build Linux wheels on Gitlab CI, create a `.gitlab-ci.yml` file in your repo,
 
@@ -178,9 +250,13 @@ Gitlab will store the built wheels for you - you can access them from the Pipeli
 
 > ⚠️ Got an error? Check the [FAQ](faq.md).
 
+# Next steps
+
+Once you've got the wheel building successfully, you might want to set up [testing](options.md#test-command) or [automatic releases to PyPI](deliver-to-pypi.md#automatic-method).
+
 <script>
   document.addEventListener('DOMContentLoaded', function() {
-    $('.toctree-l2 a, .rst-content h1').each(function(i, el) {
+    $('a.toctree-l3, .rst-content h2').each(function(i, el) {
       var text = $(el).text()
       var match = text.match(/(.*) \[([a-z/]+)\]/);
 

docs/working-examples.md

@@ -2,11 +2,282 @@
 title: Working examples
 ---
 
-{%
-   include-markdown "../README.md"
-   start="<!--working-examples-start-->"
-   end="<!--working-examples-end-->"
-%}
+<!-- START bin/projects.py -->
+
+<!-- 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.  |
+| [Tornado][]                       | ![travisci icon][] | ![apple icon][] ![linux icon][] | Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed. |
+| [Matplotlib][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The venerable Matplotlib, a Python library with C++ portions |
+| [pytorch-fairseq][]               | ![github icon][] | ![apple icon][] ![linux icon][] | Facebook AI Research Sequence-to-Sequence Toolkit written in Python. |
+| [MyPy][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | MyPyC, the compiled component of MyPy. |
+| [uvloop][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | Ultra fast asyncio event loop. |
+| [pydantic][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Data parsing and validation using Python type hints |
+| [psutil][]                        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python |
+| [vaex][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Out-of-Core hybrid Apache Arrow/NumPy DataFrame for Python, ML, visualize and explore big tabular data at a billion rows per second 🚀 |
+| [Google Benchmark][]              | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A microbenchmark support library |
+| [asyncpg][]                       | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A fast PostgreSQL Database Client Library for Python/asyncio. |
+| [Apache Beam][]                   | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Apache Beam is a unified programming model for Batch and Streaming |
+| [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. |
+| [cmake][]                         | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
+| [duckdb][]                        | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System |
+| [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.  |
+| [cvxpy][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A Python-embedded modeling language for convex optimization problems. |
+| [Triton][]                        | ![github icon][] | ![linux icon][] | Self hosted runners |
+| [PyOxidizer][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A modern Python application packaging and distribution tool |
+| [OpenSpiel][]                     | ![github icon][] | ![apple icon][] ![linux icon][] | OpenSpiel is a collection of environments and algorithms for research in general reinforcement learning and search/planning in games. |
+| [pyzmq][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython and CFFI.  |
+| [River][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python |
+| [vispy][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Main repository for Vispy |
+| [aiortc][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | WebRTC and ORTC implementation for Python using asyncio. |
+| [Confluent client for Kafka][]    | ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | setup in `tools/wheels/build-wheels.bat` |
+| [tinyobjloader][]                 | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Tiny but powerful single file wavefront obj loader |
+| [coverage.py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python |
+| [PyCryptodome][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A self-contained cryptographic library for Python |
+| [Dependency Injector][]           | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI |
+| [numexpr][]                       | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas, bcolz and more |
+| [PyYAML][]                        | ![github icon][] | ![apple icon][] | Canonical source repository for PyYAML |
+| [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. |
+| [PyAV][]                          | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Pythonic bindings for FFmpeg's libraries. |
+| [OpenColorIO][]                   | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A color management framework for visual effects and animation. |
+| [PyTables][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data |
+| [Line Profiler][]                 | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Line-by-line profiling for Python |
+| [OpenTimelineIO][]                | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Open Source API and interchange format for editorial timeline information. |
+| [ruptures][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. |
+| [pikepdf][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by qpdf |
+| [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 |
+| [DeepForest][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) |
+| [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. |
+| [H3-py][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system |
+| [python-rapidjson][]              | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson |
+| [markupsafe][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. |
+| [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 |
+| [pybind11 cmake_example][]        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system |
+| [KDEpy][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Kernel Density Estimation in Python |
+| [tgcalls][]                       | ![github icon][] | ![apple icon][] ![windows icon][] | Python `pybind11` binding to Telegram's WebRTC library with third party dependencies like `OpenSSL`, `MozJPEG`, `FFmpeg`, etc. |
+| [pybind11 python_example][]       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a Python-based build system |
+| [dd-trace-py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub |
+| [cyvcf2][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing |
+| [sourmash][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. |
+| [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. |
+| [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 |
+| [Tokenizer][]                     | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support |
+| [PyGLM][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Fast OpenGL Mathematics (GLM) for Python |
+| [bx-python][]                     | ![travisci icon][] | ![apple icon][] ![linux icon][] | A library that includes Cython extensions. |
+| [boost-histogram][]               | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. |
+| [iDynTree][]                      | ![github icon][] | ![linux icon][] | Uses manylinux_2_24 |
+| [TgCrypto][]                      | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
+| [pybase64][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python |
+| [etebase-py][]                    | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. |
+| [fathon][]                        | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms |
+| [numpythia][]                     | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy |
+| [pyjet][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy |
+| [polaroid][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. |
+| [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. |
+| [ninja][]                         | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
+| [clang-format][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. |
+| [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 |
+| [GSD][]                           | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Cython and NumPy project with 64-bit wheels. |
+| [pyinstrument_cext][]             | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies |
+| [xmlstarlet][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. |
+| [CorrectionLib][]                 | ![github icon][] | ![apple icon][] ![linux icon][] | Structured JSON powered correction library for HEP, designed for the CMS experiment at CERN. |
+| [pillow-heif][]                   | ![github icon][] | ![apple icon][] ![linux icon][] | Python CFFI binding to libheif library with third party dependencies like `libde265`, `x265`, `libaom` with test & publishing on PyPi. |
+| [SiPM][]                          | ![github icon][] | ![apple icon][] ![linux icon][] | High performance library for SiPM detectors simulation using C++17, OpenMP and AVX2 intrinsics. |
+
+[scikit-learn]: https://github.com/scikit-learn/scikit-learn
+[Tornado]: https://github.com/tornadoweb/tornado
+[Matplotlib]: https://github.com/matplotlib/matplotlib
+[pytorch-fairseq]: https://github.com/pytorch/fairseq
+[MyPy]: https://github.com/mypyc/mypy_mypyc-wheels
+[uvloop]: https://github.com/MagicStack/uvloop
+[pydantic]: https://github.com/samuelcolvin/pydantic
+[psutil]: https://github.com/giampaolo/psutil
+[vaex]: https://github.com/vaexio/vaex
+[Google Benchmark]: https://github.com/google/benchmark
+[asyncpg]: https://github.com/MagicStack/asyncpg
+[Apache Beam]: https://github.com/apache/beam
+[scikit-image]: https://github.com/scikit-image/scikit-image
+[twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport
+[cmake]: https://github.com/scikit-build/cmake-python-distributions
+[duckdb]: https://github.com/duckdb/duckdb
+[websockets]: https://github.com/aaugustin/websockets
+[cvxpy]: https://github.com/cvxpy/cvxpy
+[Triton]: https://github.com/openai/triton
+[PyOxidizer]: https://github.com/indygreg/PyOxidizer
+[OpenSpiel]: https://github.com/deepmind/open_spiel
+[pyzmq]: https://github.com/zeromq/pyzmq
+[River]: https://github.com/online-ml/river
+[vispy]: https://github.com/vispy/vispy
+[aiortc]: https://github.com/aiortc/aiortc
+[Confluent client for Kafka]: https://github.com/confluentinc/confluent-kafka-python
+[tinyobjloader]: https://github.com/tinyobjloader/tinyobjloader
+[coverage.py]: https://github.com/nedbat/coveragepy
+[PyCryptodome]: https://github.com/Legrandin/pycryptodome
+[Dependency Injector]: https://github.com/ets-labs/python-dependency-injector
+[numexpr]: https://github.com/pydata/numexpr
+[PyYAML]: https://github.com/yaml/pyyaml
+[h5py]: https://github.com/h5py/h5py
+[PyAV]: https://github.com/PyAV-Org/PyAV
+[OpenColorIO]: https://github.com/AcademySoftwareFoundation/OpenColorIO
+[PyTables]: https://github.com/PyTables/PyTables
+[Line Profiler]: https://github.com/pyutils/line_profiler
+[OpenTimelineIO]: https://github.com/PixarAnimationStudios/OpenTimelineIO
+[ruptures]: https://github.com/deepcharles/ruptures
+[pikepdf]: https://github.com/pikepdf/pikepdf
+[aioquic]: https://github.com/aiortc/aioquic
+[google neuroglancer]: https://github.com/google/neuroglancer
+[DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest
+[AutoPy]: https://github.com/autopilot-rs/autopy
+[Parselmouth]: https://github.com/YannickJadoul/Parselmouth
+[H3-py]: https://github.com/uber/h3-py
+[python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson
+[markupsafe]: https://github.com/pallets/markupsafe
+[Rtree]: https://github.com/Toblerity/rtree
+[python-snappy]: https://github.com/andrix/python-snappy
+[pybind11 cmake_example]: https://github.com/pybind/cmake_example
+[KDEpy]: https://github.com/tommyod/KDEpy
+[tgcalls]: https://github.com/MarshalX/tgcalls
+[pybind11 python_example]: https://github.com/pybind/python_example
+[dd-trace-py]: https://github.com/DataDog/dd-trace-py
+[cyvcf2]: https://github.com/brentp/cyvcf2
+[sourmash]: https://github.com/dib-lab/sourmash
+[time-machine]: https://github.com/adamchainz/time-machine
+[matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile
+[CTranslate2]: https://github.com/OpenNMT/CTranslate2
+[iminuit]: https://github.com/scikit-hep/iminuit
+[jq.py]: https://github.com/mwilliamson/jq.py
+[Tokenizer]: https://github.com/OpenNMT/Tokenizer
+[PyGLM]: https://github.com/Zuzu-Typ/PyGLM
+[bx-python]: https://github.com/bxlab/bx-python
+[boost-histogram]: https://github.com/scikit-hep/boost-histogram
+[iDynTree]: https://github.com/robotology/idyntree
+[TgCrypto]: https://github.com/pyrogram/tgcrypto
+[pybase64]: https://github.com/mayeut/pybase64
+[etebase-py]: https://github.com/etesync/etebase-py
+[fathon]: https://github.com/stfbnc/fathon
+[numpythia]: https://github.com/scikit-hep/numpythia
+[pyjet]: https://github.com/scikit-hep/pyjet
+[polaroid]: https://github.com/daggy1234/polaroid
+[Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build
+[ninja]: https://github.com/scikit-build/ninja-python-distributions
+[clang-format]: https://github.com/ssciwr/clang-format-wheel
+[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example
+[GSD]: https://github.com/glotzerlab/gsd
+[pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext
+[xmlstarlet]: https://github.com/dimitern/xmlstarlet
+[CorrectionLib]: https://github.com/cms-nanoAOD/correctionlib
+[pillow-heif]: https://github.com/bigcat88/pillow_heif
+[SiPM]: https://github.com/EdoPro98/SimSiPM
+
+[appveyor icon]: data/readme_icons/appveyor.svg
+[github icon]: data/readme_icons/github.svg
+[azurepipelines icon]: data/readme_icons/azurepipelines.svg
+[circleci icon]: data/readme_icons/circleci.svg
+[gitlab icon]: data/readme_icons/gitlab.svg
+[travisci icon]: data/readme_icons/travisci.svg
+[windows icon]: data/readme_icons/windows.svg
+[apple icon]: data/readme_icons/apple.svg
+[linux icon]: data/readme_icons/linux.svg
+
+<!-- scikit-learn: 48028, last pushed 0 days ago -->
+<!-- Tornado: 20274, last pushed 2 days ago -->
+<!-- Matplotlib: 14585, last pushed 0 days ago -->
+<!-- pytorch-fairseq: 14562, last pushed 2 days ago -->
+<!-- MyPy: 11845, last pushed 0 days ago -->
+<!-- uvloop: 8190, last pushed 18 days ago -->
+<!-- pydantic: 8089, last pushed 0 days ago -->
+<!-- psutil: 7862, last pushed 0 days ago -->
+<!-- vaex: 6733, last pushed 2 days ago -->
+<!-- Google Benchmark: 5911, last pushed 2 days ago -->
+<!-- asyncpg: 5183, last pushed 5 days ago -->
+<!-- Apache Beam: 5092, last pushed 0 days ago -->
+<!-- scikit-image: 4641, last pushed 0 days ago -->
+<!-- twisted-iocpsupport: 4422, last pushed 4 days ago -->
+<!-- cmake: 4298, last pushed 0 days ago -->
+<!-- duckdb: 3883, last pushed 0 days ago -->
+<!-- websockets: 3684, last pushed 1 days ago -->
+<!-- cvxpy: 3611, last pushed 3 days ago -->
+<!-- Triton: 3359, last pushed 0 days ago -->
+<!-- PyOxidizer: 3281, last pushed 0 days ago -->
+<!-- OpenSpiel: 2956, last pushed 5 days ago -->
+<!-- pyzmq: 2954, last pushed 2 days ago -->
+<!-- River: 2885, last pushed 2 days ago -->
+<!-- vispy: 2761, last pushed 0 days ago -->
+<!-- aiortc: 2654, last pushed 15 days ago -->
+<!-- Confluent client for Kafka: 2551, last pushed 17 days ago -->
+<!-- tinyobjloader: 2333, last pushed 43 days ago -->
+<!-- coverage.py: 1829, last pushed 0 days ago -->
+<!-- PyCryptodome: 1781, last pushed 0 days ago -->
+<!-- Dependency Injector: 1708, last pushed 13 days ago -->
+<!-- numexpr: 1678, last pushed 4 days ago -->
+<!-- PyYAML: 1664, last pushed 7 days ago -->
+<!-- h5py: 1618, last pushed 4 days ago -->
+<!-- PyAV: 1394, last pushed 56 days ago -->
+<!-- OpenColorIO: 1184, last pushed 5 days ago -->
+<!-- PyTables: 1075, last pushed 56 days ago -->
+<!-- Line Profiler: 957, last pushed 2 days ago -->
+<!-- OpenTimelineIO: 936, last pushed 0 days ago -->
+<!-- ruptures: 848, last pushed 30 days ago -->
+<!-- pikepdf: 798, last pushed 0 days ago -->
+<!-- aioquic: 768, last pushed 19 days ago -->
+<!-- google neuroglancer: 704, last pushed 2 days ago -->
+<!-- DeepForest: 681, last pushed 121 days ago -->
+<!-- AutoPy: 589, last pushed 157 days ago -->
+<!-- Parselmouth: 588, last pushed 0 days ago -->
+<!-- H3-py: 444, last pushed 19 days ago -->
+<!-- python-rapidjson: 435, last pushed 36 days ago -->
+<!-- markupsafe: 431, last pushed 16 days ago -->
+<!-- Rtree: 428, last pushed 46 days ago -->
+<!-- python-snappy: 412, last pushed 3 days ago -->
+<!-- pybind11 cmake_example: 328, last pushed 26 days ago -->
+<!-- KDEpy: 312, last pushed 171 days ago -->
+<!-- tgcalls: 291, last pushed 62 days ago -->
+<!-- pybind11 python_example: 282, last pushed 26 days ago -->
+<!-- dd-trace-py: 282, last pushed 0 days ago -->
+<!-- cyvcf2: 276, last pushed 0 days ago -->
+<!-- sourmash: 266, last pushed 0 days ago -->
+<!-- time-machine: 220, last pushed 0 days ago -->
+<!-- matrixprofile: 213, last pushed 149 days ago -->
+<!-- CTranslate2: 205, last pushed 2 days ago -->
+<!-- iminuit: 189, last pushed 8 days ago -->
+<!-- jq.py: 184, last pushed 111 days ago -->
+<!-- Tokenizer: 161, last pushed 4 days ago -->
+<!-- PyGLM: 123, last pushed 0 days ago -->
+<!-- bx-python: 107, last pushed 23 days ago -->
+<!-- boost-histogram: 100, last pushed 3 days ago -->
+<!-- iDynTree: 90, last pushed 0 days ago -->
+<!-- TgCrypto: 79, last pushed 41 days ago -->
+<!-- pybase64: 76, last pushed 2 days ago -->
+<!-- etebase-py: 52, last pushed 321 days ago -->
+<!-- fathon: 41, last pushed 4 days ago -->
+<!-- numpythia: 31, last pushed 2 days ago -->
+<!-- pyjet: 30, last pushed 26 days ago -->
+<!-- polaroid: 27, last pushed 50 days ago -->
+<!-- Imagecodecs (fork): 26, last pushed 2 days ago -->
+<!-- ninja: 20, last pushed 0 days ago -->
+<!-- clang-format: 20, last pushed 38 days ago -->
+<!-- pybind11 scikit_build_example: 19, last pushed 26 days ago -->
+<!-- GSD: 18, last pushed 4 days ago -->
+<!-- pyinstrument_cext: 10, last pushed 44 days ago -->
+<!-- xmlstarlet: 7, last pushed 13 days ago -->
+<!-- CorrectionLib: 7, last pushed 16 days ago -->
+<!-- pillow-heif: 5, last pushed 16 days ago -->
+<!-- SiPM: 4, last pushed 14 days ago -->
+
+<!-- END bin/projects.py -->
+
+> Add your repo here! Let us know on [GitHub Discussions](https://github.com/pypa/cibuildwheel/discussions/485), or send a PR, adding your information to `docs/data/projects.yml`.
+>
+> <sup>I'd like to include notes here to indicate why an example might be interesting to cibuildwheel users - the styles/technologies/techniques used in each. Please include that in future additions!</sup>
 
 <style>
 .wy-nav-content {

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==2.0.0b2
+install: python -m pip install cibuildwheel==2.3.0
 
 build_script: python -m cibuildwheel --output-dir wheelhouse
 

examples/azure-pipelines-minimal.yml

@@ -6,7 +6,7 @@ jobs:
     - bash: |
         set -o errexit
         python3 -m pip install --upgrade pip
-        pip3 install cibuildwheel==2.0.0b2
+        pip3 install cibuildwheel==2.3.0
       displayName: Install dependencies
     - bash: cibuildwheel --output-dir wheelhouse .
       displayName: Build wheels
@@ -20,7 +20,7 @@ jobs:
     - bash: |
         set -o errexit
         python3 -m pip install --upgrade pip
-        python3 -m pip install cibuildwheel==2.0.0b2
+        python3 -m pip install cibuildwheel==2.3.0
       displayName: Install dependencies
     - bash: cibuildwheel --output-dir wheelhouse .
       displayName: Build wheels
@@ -34,7 +34,7 @@ jobs:
     - bash: |
         set -o errexit
         python -m pip install --upgrade pip
-        pip install cibuildwheel==2.0.0b2
+        pip install cibuildwheel==2.3.0
       displayName: Install dependencies
     - bash: cibuildwheel --output-dir wheelhouse .
       displayName: Build wheels

examples/circleci-minimal.yml

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

examples/github-apple-silicon.yml

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

examples/github-deploy.yml

@@ -21,13 +21,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-python@v2
-        name: Install Python
-        with:
-          python-version: '3.8'
-
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.0.0b2
+        uses: pypa/cibuildwheel@v2.3.0
 
       - uses: actions/upload-artifact@v2
         with:
@@ -39,13 +34,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-python@v2
-        name: Install Python
-        with:
-          python-version: '3.8'
-
       - name: Build sdist
-        run: python setup.py sdist
+        run: pipx run build --sdist
 
       - uses: actions/upload-artifact@v2
         with:

examples/github-minimal.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.0.0b2
+        uses: pypa/cibuildwheel@v2.3.0
         # to supply options, put them in 'env', like:
         # env:
         #   CIBW_SOME_OPTION: value

examples/github-with-qemu.yml

@@ -25,7 +25,7 @@ jobs:
           platforms: all
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.0.0b2
+        uses: pypa/cibuildwheel@v2.3.0
         env:
           # configure cibuildwheel to build native archs ('auto'), and some
           # emulated ones

examples/gitlab-minimal.yml

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

examples/travis-ci-deploy.yml

@@ -19,7 +19,7 @@ jobs:
         - ln -s /c/Python38/python.exe /c/Python38/python3.exe
 
 install:
-  - python3 -m pip install cibuildwheel==2.0.0b2
+  - python3 -m pip install cibuildwheel==2.3.0
 
 script:
   # build the wheels, put them into './wheelhouse'

examples/travis-ci-minimal.yml

@@ -25,7 +25,7 @@ jobs:
         - ln -s /c/Python38/python.exe /c/Python38/python3.exe
 
 install:
-  - python3 -m pip install cibuildwheel==2.0.0b2
+  - python3 -m pip install cibuildwheel==2.3.0
 
 script:
   # build the wheels, put them into './wheelhouse'

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

@@ -26,7 +26,7 @@ install:
   - python3 -m pip install pytest
 
 script:
-  - python3 setup.py install
+  - python3 -m pip install .
   - pytest
 
 stages:
@@ -48,30 +48,24 @@ jobs:
     # Deploy source distribution
     - stage: deploy
       name: Deploy source distribution
-      install: skip
-      script: python3 setup.py sdist --formats=gztar
-      after_success: |
-        python3 -m pip install twine
-        python3 -m twine upload --skip-existing dist/*.tar.gz
+      install: python3 -m pip install build twine
+      script: python3 -m build --sdist --formats=gztar
+      after_success: python3 -m twine upload --skip-existing dist/*.tar.gz
     # Deploy on linux
     - stage: deploy
       name: Build and deploy Linux wheels
       services: docker
-      install: python3 -m pip install cibuildwheel==2.0.0b2
+      install: python3 -m pip install cibuildwheel==2.3.0 twine
       script: python3 -m cibuildwheel --output-dir wheelhouse
-      after_success: |
-        python3 -m pip install twine
-        python3 -m twine upload --skip-existing wheelhouse/*.whl
+      after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl
     # Deploy on windows
     - stage: deploy
       name: Build and deploy Windows wheels
       os: windows
       language: shell
-      install: python3 -m pip install cibuildwheel==2.0.0b2
+      install: python3 -m pip install cibuildwheel==2.3.0 twine
       script: python3 -m cibuildwheel --output-dir wheelhouse
-      after_success: |
-        python3 -m pip install twine
-        python3 -m twine upload --skip-existing wheelhouse/*.whl
+      after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl
 
 env:
   global:

noxfile.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 import nox
 
-nox.options.sessions = ["lint", "tests"]
+nox.options.sessions = ["lint", "check_manifest", "tests"]
 
 PYTHON_ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]
 
@@ -12,7 +12,7 @@ DIR = Path(__file__).parent.resolve()
 
 
 @nox.session
-def tests(session):
+def tests(session: nox.Session) -> None:
     """
     Run the unit and regular tests.
     """
@@ -26,16 +26,26 @@ def tests(session):
 
 
 @nox.session
-def lint(session):
+def lint(session: nox.Session) -> None:
     """
     Run the linter.
     """
     session.install("pre-commit")
-    session.run("pre-commit", "run", "--all-files")
+    session.run("pre-commit", "run", "--all-files", *session.posargs)
+
+
+@nox.session
+def check_manifest(session: nox.Session) -> None:
+    """
+    Ensure all needed files are included in the manifest.
+    """
+
+    session.install("check-manifest")
+    session.run("check-manifest", *session.posargs)
 
 
 @nox.session(python=PYTHON_ALL_VERSIONS)
-def update_constraints(session):
+def update_constraints(session: nox.Session) -> None:
     """
     Update the dependencies inplace.
     """
@@ -44,7 +54,7 @@ def update_constraints(session):
 
 
 @nox.session
-def update_pins(session):
+def update_pins(session: nox.Session) -> None:
     """
     Update the python and docker pins version inplace.
     """
@@ -54,16 +64,21 @@ def update_pins(session):
 
 
 @nox.session
-def update_proj(session):
+def update_proj(session: nox.Session) -> None:
     """
     Update the README inplace.
     """
     session.install("-e", ".[bin]")
-    session.run("python", "bin/projects.py", "docs/data/projects.yml", "--readme=README.md")
+    session.run(
+        "python",
+        "bin/projects.py",
+        "docs/data/projects.yml",
+        *session.posargs,
+    )
 
 
 @nox.session
-def docs(session):
+def docs(session: nox.Session) -> None:
     """
     Build the docs.
     """
@@ -73,13 +88,13 @@ def docs(session):
         if "serve" in session.posargs:
             session.run("mkdocs", "serve")
         else:
-            print("Unrecognized args, use 'serve'")
+            session.error("Unrecognized args, use 'serve'")
     else:
         session.run("mkdocs", "build")
 
 
 @nox.session
-def build(session):
+def build(session: nox.Session) -> None:
     """
     Build an SDist and wheel.
     """

pyproject.toml

@@ -32,7 +32,8 @@ files = [
     "cibuildwheel/*.py",
     "test/**/*.py",
     "unit_test/**/*.py",
-    "bin/*.py"
+    "bin/*.py",
+    "noxfile.py",
 ]
 warn_unused_configs = true
 warn_redundant_casts = true
@@ -58,10 +59,25 @@ module = [
     "setuptools",
     "pytest", # ignored in pre-commit to speed up check
     "bashlex",
-    "toml.encoder", # encoder missing from stub package
-    "bracex",
     "importlib_resources",
-    "nox",
-    "github",
+    "ghapi.*",
 ]
 ignore_missing_imports = true
+
+[tool.pycln]
+all = true
+
+[tool.check-manifest]
+ignore = [
+    ".*",
+    ".circleci/**",
+    "test/**",
+    "unit_test/**",
+    "docs/**",
+    "examples/**",
+    "bin/**",
+    "*.yml",
+    "CI.md",  # TODO: can change test/test_ssl and remove this
+    "requirements-dev.txt",
+    "noxfile.py",
+]

setup.cfg

@@ -1,13 +1,13 @@
 [metadata]
 name = cibuildwheel
-version = 2.0.0b2
+version = 2.3.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/pypa/cibuildwheel
 author = Joe Rickerby
 author_email = joerick@mac.com
-license = BSD
+license = BSD-2-Clause
 license_file = LICENSE
 classifiers =
     Development Status :: 5 - Production/Stable
@@ -20,6 +20,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: Implementation :: CPython
     Topic :: Software Development :: Build Tools
 keywords = ci,wheel,packaging,pypi,travis,appveyor,macos,linux,windows
@@ -34,12 +35,17 @@ install_requires =
     bracex
     certifi
     packaging
-    toml
-    typing_extensions;python_version < '3.8'
+    tomli
+    dataclasses;python_version < '3.7'
+    typing-extensions>=3.10.0.0;python_version < '3.8'
 python_requires = >=3.6
 include_package_data = True
 zip_safe = False
 
+[options.packages.find]
+include =
+    cibuildwheel
+
 [options.entry_points]
 console_scripts =
     cibuildwheel = cibuildwheel.__main__:main
@@ -47,10 +53,6 @@ console_scripts =
 [options.package_data]
 cibuildwheel = resources/*
 
-[options.packages.find]
-include =
-    cibuildwheel
-
 [flake8]
 ignore = E501,W503,E741,E226,B950,E203
 select = C,E,F,W,B,B9

setup.py

@@ -11,6 +11,7 @@ extras = {
         "jinja2",
         "pytest>=6",
         "pytest-timeout",
+        "pytest-xdist; sys_platform == 'linux'",
     ],
     "bin": [
         "click",

test/conftest.py

@@ -27,4 +27,4 @@ def pytest_collection_modifyitems(config, items) -> None:
     params=[{"CIBW_BUILD_FRONTEND": "pip"}, {"CIBW_BUILD_FRONTEND": "build"}], ids=["pip", "build"]
 )
 def build_frontend_env(request) -> Dict[str, str]:
-    return request.param  # type: ignore
+    return request.param  # type: ignore[no-any-return]

test/test_0_basic.py

@@ -56,4 +56,6 @@ def test_build_identifiers(tmp_path):
     build_identifiers = utils.cibuildwheel_get_build_identifiers(
         project_dir, prerelease_pythons=True
     )
-    assert len(expected_wheels) == len(build_identifiers)
+    assert len(expected_wheels) == len(
+        build_identifiers
+    ), f"{expected_wheels} vs {build_identifiers}"

test/test_docker_images.py

@@ -35,16 +35,16 @@ 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_BUILD": "cp3{6,7,8,9}-*",
+            "CIBW_MANYLINUX_X86_64_IMAGE": "dockcross/manylinux2014-x64",
+            "CIBW_MANYLINUX_I686_IMAGE": "dockcross/manylinux2014-x86",
+            "CIBW_BUILD": "cp3{6,7,8,9}-manylinux*",
         },
     )
 
     # also check that we got the right wheels built
     expected_wheels = [
         w
-        for w in utils.expected_wheels("spam", "0.1.0")
+        for w in utils.expected_wheels("spam", "0.1.0", musllinux_versions=[])
         if "-cp36-" in w or "-cp37-" in w or "-cp38-" in w or "-cp39-" in w
     ]
     assert set(actual_wheels) == set(expected_wheels)

test/test_manylinuxXXXX_only.py

@@ -57,6 +57,7 @@ def test(manylinux_image, tmp_path):
     # CFLAGS environment variable is necessary to fail on 'malloc_info' (on manylinux1) during compilation/linking,
     # rather than when dynamically loading the Python
     add_env = {
+        "CIBW_BUILD": "*-manylinux*",
         "CIBW_ENVIRONMENT": 'CFLAGS="$CFLAGS -O0 -Werror=implicit-function-declaration"',
         "CIBW_MANYLINUX_X86_64_IMAGE": manylinux_image,
         "CIBW_MANYLINUX_I686_IMAGE": manylinux_image,
@@ -79,7 +80,10 @@ def test(manylinux_image, tmp_path):
         "manylinux2014": ["manylinux_2_17", "manylinux2014"],
     }
     expected_wheels = utils.expected_wheels(
-        "spam", "0.1.0", manylinux_versions=platform_tag_map.get(manylinux_image, [manylinux_image])
+        "spam",
+        "0.1.0",
+        manylinux_versions=platform_tag_map.get(manylinux_image, [manylinux_image]),
+        musllinux_versions=[],
     )
     if manylinux_image in {"manylinux1"}:
         # remove PyPy & CPython 3.10 and above

test/test_troubleshooting.py

@@ -3,25 +3,23 @@ import subprocess
 import pytest
 
 from . import utils
-from .test_projects import TestProject
+from .test_projects import TestProject, new_c_project
 
-so_file_project = TestProject()
-
-so_file_project.files["libnothing.so"] = ""
-
-so_file_project.files[
-    "setup.py"
-] = """
-raise Exception('this build will fail')
-"""
+SO_FILE_WARNING = "NOTE: Shared object (.so) files found in this project."
 
 
-def test_failed_project_with_so_files(tmp_path, capfd, build_frontend_env):
+@pytest.mark.parametrize("project_contains_so_files", [False, True])
+def test_failed_build_with_so_files(tmp_path, capfd, build_frontend_env, project_contains_so_files):
+    project = TestProject()
+    project.files["setup.py"] = "raise Exception('this build will fail')\n"
+    if project_contains_so_files:
+        project.files["libnothing.so"] = ""
+
     if utils.platform != "linux":
         pytest.skip("this test is only relevant to the linux build")
 
     project_dir = tmp_path / "project"
-    so_file_project.generate(project_dir)
+    project.generate(project_dir)
 
     with pytest.raises(subprocess.CalledProcessError):
         utils.cibuildwheel_run(project_dir, add_env=build_frontend_env)
@@ -29,4 +27,34 @@ def test_failed_project_with_so_files(tmp_path, capfd, build_frontend_env):
     captured = capfd.readouterr()
     print("out", captured.out)
     print("err", captured.err)
-    assert "NOTE: Shared object (.so) files found in this project." in captured.err
+
+    if project_contains_so_files:
+        assert SO_FILE_WARNING in captured.err
+    else:
+        assert SO_FILE_WARNING not in captured.err
+
+
+@pytest.mark.parametrize("project_contains_so_files", [False, True])
+def test_failed_repair_with_so_files(tmp_path, capfd, project_contains_so_files):
+    if utils.platform != "linux":
+        pytest.skip("this test is only relevant to the linux build")
+
+    project = new_c_project()
+
+    if project_contains_so_files:
+        project.files["libnothing.so"] = ""
+
+    project_dir = tmp_path / "project"
+    project.generate(project_dir)
+
+    with pytest.raises(subprocess.CalledProcessError):
+        utils.cibuildwheel_run(project_dir, add_env={"CIBW_REPAIR_WHEEL_COMMAND": "false"})
+
+    captured = capfd.readouterr()
+    print("out", captured.out)
+    print("err", captured.err)
+
+    if project_contains_so_files:
+        assert SO_FILE_WARNING in captured.err
+    else:
+        assert SO_FILE_WARNING not in captured.err

test/test_unicode.py

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

test/test_wheel_tag.py

@@ -0,0 +1,34 @@
+import pytest
+
+from . import test_projects, utils
+
+basic_project = test_projects.new_c_project()
+
+
+def test_wheel_tag_is_correct_when_using_macosx_deployment_target(tmp_path):
+    if utils.platform != "macos":
+        pytest.skip("This test is only relevant to MACOSX_DEPLOYMENT_TARGET")
+
+    project_dir = tmp_path / "project"
+    basic_project.generate(project_dir)
+
+    # build the wheels
+    deployment_target = "10.11"
+    actual_wheels = utils.cibuildwheel_run(
+        project_dir,
+        add_env={
+            "CIBW_BUILD": "cp39-*",
+            "MACOSX_DEPLOYMENT_TARGET": deployment_target,
+        },
+    )
+
+    # check that the expected wheels are produced
+    expected_wheels = utils.expected_wheels(
+        "spam", "0.1.0", macosx_deployment_target=deployment_target
+    )
+    expected_wheels = [w for w in expected_wheels if "cp39" in w]
+
+    print("actual_wheels", actual_wheels)
+    print("expected_wheels", expected_wheels)
+
+    assert set(actual_wheels) == set(expected_wheels)

test/utils.py

@@ -103,6 +103,7 @@ def expected_wheels(
     package_name,
     package_version,
     manylinux_versions=None,
+    musllinux_versions=None,
     macosx_deployment_target="10.9",
     machine_arch=None,
 ):
@@ -119,19 +120,22 @@ def expected_wheels(
 
     if manylinux_versions is None:
         if machine_arch == "x86_64":
-            manylinux_versions = ["manylinux_2_5", "manylinux1", "manylinux_2_12", "manylinux2010"]
+            manylinux_versions = [
+                "manylinux_2_5",
+                "manylinux1",
+                "manylinux_2_17",
+                "manylinux2014",
+            ]
         else:
             manylinux_versions = ["manylinux_2_17", "manylinux2014"]
 
+    if musllinux_versions is None:
+        musllinux_versions = ["musllinux_1_1"]
+
     python_abi_tags = ["cp36-cp36m", "cp37-cp37m", "cp38-cp38", "cp39-cp39", "cp310-cp310"]
 
     if machine_arch in ["x86_64", "AMD64", "x86", "aarch64"]:
-        python_abi_tags += ["pp37-pypy37_pp73"]
-
-    if platform == "macos" and get_macos_version() >= (10, 16):
-        # 10.16 is sometimes reported as the macOS version on macOS 11.
-        # pypy not supported on macOS 11.
-        python_abi_tags = [t for t in python_abi_tags if not t.startswith("pp")]
+        python_abi_tags += ["pp37-pypy37_pp73", "pp38-pypy38_pp73"]
 
     if platform == "macos" and machine_arch == "arm64":
         # currently, arm64 macs are only supported by cp39 & cp310
@@ -155,6 +159,16 @@ def expected_wheels(
                 )
                 for architecture in architectures
             ]
+            if len(musllinux_versions) > 0 and not python_abi_tag.startswith("pp"):
+                platform_tags.extend(
+                    [
+                        ".".join(
+                            f"{musllinux_version}_{architecture}"
+                            for musllinux_version in musllinux_versions
+                        )
+                        for architecture in architectures
+                    ]
+                )
 
         elif platform == "windows":
             if python_abi_tag.startswith("cp"):

unit_test/build_ids_test.py

@@ -1,28 +1,32 @@
-import toml
+from typing import Dict, List
+
+import tomli
 from packaging.version import Version
 
-from cibuildwheel.extra import InlineArrayDictEncoder  # noqa: E402
+from cibuildwheel.extra import Printable, dump_python_configurations
 from cibuildwheel.util import resources_dir
 
 
 def test_compare_configs():
-    with open(resources_dir / "build-platforms.toml") as f:
-        txt = f.read()
+    with open(resources_dir / "build-platforms.toml") as f1:
+        txt = f1.read()
 
-    dict_txt = toml.loads(txt)
+    with open(resources_dir / "build-platforms.toml", "rb") as f2:
+        dict_txt = tomli.load(f2)
 
-    new_txt = toml.dumps(dict_txt, encoder=InlineArrayDictEncoder())  # type: ignore
+    new_txt = dump_python_configurations(dict_txt)
     print(new_txt)
 
     assert new_txt == txt
 
 
 def test_dump_with_Version():
-    example = {
+    # MyPy doesn't understand deeply nested dicts correctly
+    example: Dict[str, Dict[str, List[Dict[str, Printable]]]] = {
         "windows": {
             "python_configurations": [
                 {"identifier": "cp27-win32", "version": Version("2.7.18"), "arch": "32"},
-                {"identifier": "cp27-win_amd64", "version": Version("2.7.18"), "arch": "64"},
+                {"identifier": "cp27-win_amd64", "version": "2.7.18", "arch": "64"},
             ]
         }
     }
@@ -35,6 +39,6 @@ python_configurations = [
 ]
 """
 
-    output = toml.dumps(example, encoder=InlineArrayDictEncoder())  # type: ignore
+    output = dump_python_configurations(example)
     print(output)
     assert output == result

unit_test/build_selector_test.py

@@ -1,3 +1,4 @@
+import pytest
 from packaging.specifiers import SpecifierSet
 
 from cibuildwheel.util import BuildSelector
@@ -8,7 +9,7 @@ def test_build():
 
     assert build_selector("cp36-manylinux_x86_64")
     assert build_selector("cp37-manylinux_x86_64")
-    assert not build_selector("cp310-manylinux_x86_64")
+    assert build_selector("cp310-manylinux_x86_64")
     assert build_selector("pp36-manylinux_x86_64")
     assert build_selector("pp37-manylinux_x86_64")
     assert build_selector("cp36-manylinux_i686")
@@ -26,11 +27,12 @@ def test_build():
     assert not build_selector("pp37-win32")
     assert build_selector("cp36-win_amd64")
     assert build_selector("cp37-win_amd64")
-    assert not build_selector("cp310-win_amd64")
+    assert build_selector("cp310-win_amd64")
     assert not build_selector("pp36-win_amd64")
     assert not build_selector("pp37-win_amd64")
 
 
+@pytest.mark.skip("this test only makes sense when we have a prerelease python to test with")
 def test_build_filter_pre():
     build_selector = BuildSelector(
         build_config="cp3*-* *-manylinux*",
@@ -51,6 +53,9 @@ def test_skip():
 
     assert not build_selector("pp36-manylinux_x86_64")
     assert build_selector("pp37-manylinux_x86_64")
+    assert build_selector("pp38-manylinux_x86_64")
+    assert build_selector("pp37-manylinux_i686")
+    assert build_selector("pp38-manylinux_i686")
     assert build_selector("cp36-manylinux_x86_64")
     assert build_selector("cp37-manylinux_x86_64")
     assert not build_selector("cp36-manylinux_i686")

unit_test/conftest.py

@@ -1,5 +1,10 @@
+import sys
+from pathlib import Path
+
 import pytest
 
+MOCK_PACKAGE_DIR = Path("some_package_dir")
+
 
 def pytest_addoption(parser):
     parser.addoption("--run-docker", action="store_true", default=False, help="run docker tests")
@@ -17,3 +22,22 @@ def pytest_collection_modifyitems(config, items):
     for item in items:
         if "docker" in item.keywords:
             item.add_marker(skip_docker)
+
+
+@pytest.fixture
+def fake_package_dir(monkeypatch):
+    """
+    Monkey-patch enough for the main() function to run
+    """
+    real_path_exists = Path.exists
+
+    def mock_path_exists(path):
+        if path == MOCK_PACKAGE_DIR / "setup.py":
+            return True
+        else:
+            return real_path_exists(path)
+
+    args = ["cibuildwheel", str(MOCK_PACKAGE_DIR)]
+    monkeypatch.setattr(Path, "exists", mock_path_exists)
+    monkeypatch.setattr(sys, "argv", args)
+    return args

unit_test/docker_container_test.py

@@ -8,7 +8,7 @@ from pathlib import Path, PurePath
 import pytest
 
 from cibuildwheel.docker_container import DockerContainer
-from cibuildwheel.environment import EnvironmentAssignment
+from cibuildwheel.environment import EnvironmentAssignmentBash
 
 # for these tests we use manylinux2014 images, because they're available on
 # multi architectures and include python3.8
@@ -25,19 +25,19 @@ elif pm == "s390x":
 
 @pytest.mark.docker
 def test_simple():
-    with DockerContainer(DEFAULT_IMAGE) as container:
+    with DockerContainer(docker_image=DEFAULT_IMAGE) as container:
         assert container.call(["echo", "hello"], capture_output=True) == "hello\n"
 
 
 @pytest.mark.docker
 def test_no_lf():
-    with DockerContainer(DEFAULT_IMAGE) as container:
+    with DockerContainer(docker_image=DEFAULT_IMAGE) as container:
         assert container.call(["printf", "hello"], capture_output=True) == "hello"
 
 
 @pytest.mark.docker
 def test_environment():
-    with DockerContainer(DEFAULT_IMAGE) as container:
+    with DockerContainer(docker_image=DEFAULT_IMAGE) as container:
         assert (
             container.call(
                 ["sh", "-c", "echo $TEST_VAR"], env={"TEST_VAR": "1"}, capture_output=True
@@ -48,14 +48,16 @@ def test_environment():
 
 @pytest.mark.docker
 def test_cwd():
-    with DockerContainer(DEFAULT_IMAGE, cwd="/cibuildwheel/working_directory") as container:
+    with DockerContainer(
+        docker_image=DEFAULT_IMAGE, cwd="/cibuildwheel/working_directory"
+    ) as container:
         assert container.call(["pwd"], capture_output=True) == "/cibuildwheel/working_directory\n"
         assert container.call(["pwd"], capture_output=True, cwd="/opt") == "/opt\n"
 
 
 @pytest.mark.docker
 def test_container_removed():
-    with DockerContainer(DEFAULT_IMAGE) as container:
+    with DockerContainer(docker_image=DEFAULT_IMAGE) as container:
         docker_containers_listing = subprocess.run(
             "docker container ls",
             shell=True,
@@ -88,7 +90,7 @@ def test_large_environment():
         "d": "0" * long_env_var_length,
     }
 
-    with DockerContainer(DEFAULT_IMAGE) as container:
+    with DockerContainer(docker_image=DEFAULT_IMAGE) as container:
         # check the length of d
         assert (
             container.call(["sh", "-c", "echo ${#d}"], env=large_environment, capture_output=True)
@@ -98,7 +100,7 @@ def test_large_environment():
 
 @pytest.mark.docker
 def test_binary_output():
-    with DockerContainer(DEFAULT_IMAGE) as container:
+    with DockerContainer(docker_image=DEFAULT_IMAGE) as container:
         # note: the below embedded snippets are in python2
 
         # check that we can pass though arbitrary binary data without erroring
@@ -149,7 +151,7 @@ def test_binary_output():
 
 @pytest.mark.docker
 def test_file_operations(tmp_path: Path):
-    with DockerContainer(DEFAULT_IMAGE) as container:
+    with DockerContainer(docker_image=DEFAULT_IMAGE) as container:
         # test copying a file in
         test_binary_data = bytes(random.randrange(256) for _ in range(1000))
         original_test_file = tmp_path / "test.dat"
@@ -165,7 +167,7 @@ def test_file_operations(tmp_path: Path):
 
 @pytest.mark.docker
 def test_dir_operations(tmp_path: Path):
-    with DockerContainer(DEFAULT_IMAGE) as container:
+    with DockerContainer(docker_image=DEFAULT_IMAGE) as container:
         test_binary_data = bytes(random.randrange(256) for _ in range(1000))
         original_test_file = tmp_path / "test.dat"
         original_test_file.write_bytes(test_binary_data)
@@ -195,6 +197,6 @@ def test_dir_operations(tmp_path: Path):
 
 @pytest.mark.docker
 def test_environment_executor():
-    with DockerContainer(DEFAULT_IMAGE) as container:
-        assignment = EnvironmentAssignment("TEST=$(echo 42)")
+    with DockerContainer(docker_image=DEFAULT_IMAGE) as container:
+        assignment = EnvironmentAssignmentBash("TEST=$(echo 42)")
         assert assignment.evaluated_value({}, container.environment_executor) == "42"

unit_test/environment_test.py

@@ -7,30 +7,24 @@ def test_basic_parsing():
     environment_recipe = parse_environment("VAR=1 VBR=2")
 
     environment_dict = environment_recipe.as_dictionary(prev_environment={})
-    environment_cmds = environment_recipe.as_shell_commands()
 
     assert environment_dict == {"VAR": "1", "VBR": "2"}
-    assert environment_cmds == ["export VAR=1", "export VBR=2"]
 
 
 def test_quotes():
     environment_recipe = parse_environment("A=1 VAR=\"1 NOT_A_VAR=2\" VBR='vbr'")
 
     environment_dict = environment_recipe.as_dictionary(prev_environment={})
-    environment_cmds = environment_recipe.as_shell_commands()
 
     assert environment_dict == {"A": "1", "VAR": "1 NOT_A_VAR=2", "VBR": "vbr"}
-    assert environment_cmds == ["export A=1", 'export VAR="1 NOT_A_VAR=2"', "export VBR='vbr'"]
 
 
 def test_inheritance():
     environment_recipe = parse_environment("PATH=$PATH:/usr/local/bin")
 
     environment_dict = environment_recipe.as_dictionary(prev_environment={"PATH": "/usr/bin"})
-    environment_cmds = environment_recipe.as_shell_commands()
 
     assert environment_dict == {"PATH": "/usr/bin:/usr/local/bin"}
-    assert environment_cmds == ["export PATH=$PATH:/usr/local/bin"]
 
 
 def test_shell_eval():
@@ -40,40 +34,32 @@ def test_shell_eval():
     env_copy.pop("VAR", None)
 
     environment_dict = environment_recipe.as_dictionary(prev_environment=env_copy)
-    environment_cmds = environment_recipe.as_shell_commands()
 
     assert environment_dict["VAR"] == "a   test string"
-    assert environment_cmds == ['export VAR="$(echo "a   test" string)"']
 
 
 def test_shell_eval_and_env():
     environment_recipe = parse_environment('VAR="$(echo "$PREV_VAR" string)"')
 
     environment_dict = environment_recipe.as_dictionary(prev_environment={"PREV_VAR": "1 2 3"})
-    environment_cmds = environment_recipe.as_shell_commands()
 
     assert environment_dict == {"PREV_VAR": "1 2 3", "VAR": "1 2 3 string"}
-    assert environment_cmds == ['export VAR="$(echo "$PREV_VAR" string)"']
 
 
 def test_empty_var():
     environment_recipe = parse_environment("CFLAGS=")
 
     environment_dict = environment_recipe.as_dictionary(prev_environment={"CFLAGS": "-Wall"})
-    environment_cmds = environment_recipe.as_shell_commands()
 
     assert environment_dict == {"CFLAGS": ""}
-    assert environment_cmds == ["export CFLAGS="]
 
 
 def test_no_vars():
     environment_recipe = parse_environment("")
 
     environment_dict = environment_recipe.as_dictionary(prev_environment={})
-    environment_cmds = environment_recipe.as_shell_commands()
 
     assert environment_dict == {}
-    assert environment_cmds == []
 
 
 def test_no_vars_pass_through():
@@ -106,10 +92,12 @@ def test_substitution_with_backslash():
 
 def test_awkwardly_quoted_variable():
     environment_recipe = parse_environment(
-        'VAR2=something"like this""$VAR1"$VAR1$(echo "theres more")"$(echo "and more!")"'
+        'VAR2=something"like this""$VAR1"$VAR1$(echo "there is more")"$(echo "and more!")"'
     )
 
     # pass the existing process env so PATH is available
     environment_dict = environment_recipe.as_dictionary({"VAR1": "but wait"})
 
-    assert environment_dict.get("VAR2") == "somethinglike thisbut waitbut waittheres moreand more!"
+    assert (
+        environment_dict.get("VAR2") == "somethinglike thisbut waitbut waitthere is moreand more!"
+    )

unit_test/linux_build_steps_test.py

@@ -0,0 +1,70 @@
+import textwrap
+from pathlib import Path
+from pprint import pprint
+
+import cibuildwheel.docker_container
+import cibuildwheel.linux
+from cibuildwheel.options import Options
+
+from .utils import get_default_command_line_arguments
+
+
+def test_linux_container_split(tmp_path: Path, monkeypatch):
+    """
+    Tests splitting linux builds by docker image and before_all
+    """
+
+    args = get_default_command_line_arguments()
+    args.platform = "linux"
+
+    (tmp_path / "pyproject.toml").write_text(
+        textwrap.dedent(
+            """
+                [tool.cibuildwheel]
+                manylinux-x86_64-image = "normal_docker_image"
+                manylinux-i686-image = "normal_docker_image"
+                build = "*-manylinux_x86_64"
+                skip = "pp*"
+                archs = "x86_64 i686"
+
+                [[tool.cibuildwheel.overrides]]
+                select = "cp{38,39,310}-*"
+                manylinux-x86_64-image = "other_docker_image"
+                manylinux-i686-image = "other_docker_image"
+
+                [[tool.cibuildwheel.overrides]]
+                select = "cp39-*"
+                before-all = "echo 'a cp39-only command'"
+            """
+        )
+    )
+
+    monkeypatch.chdir(tmp_path)
+    options = Options("linux", command_line_arguments=args)
+
+    python_configurations = cibuildwheel.linux.get_python_configurations(
+        options.globals.build_selector, options.globals.architectures
+    )
+
+    build_steps = list(cibuildwheel.linux.get_build_steps(options, python_configurations))
+
+    # helper functions to extract test info
+    def identifiers(step):
+        return [c.identifier for c in step.platform_configs]
+
+    def before_alls(step):
+        return [options.build_options(c.identifier).before_all for c in step.platform_configs]
+
+    pprint(build_steps)
+
+    assert build_steps[0].docker_image == "normal_docker_image"
+    assert identifiers(build_steps[0]) == ["cp36-manylinux_x86_64", "cp37-manylinux_x86_64"]
+    assert before_alls(build_steps[0]) == ["", ""]
+
+    assert build_steps[1].docker_image == "other_docker_image"
+    assert identifiers(build_steps[1]) == ["cp38-manylinux_x86_64", "cp310-manylinux_x86_64"]
+    assert before_alls(build_steps[1]) == ["", ""]
+
+    assert build_steps[2].docker_image == "other_docker_image"
+    assert identifiers(build_steps[2]) == ["cp39-manylinux_x86_64"]
+    assert before_alls(build_steps[2]) == ["echo 'a cp39-only command'"]

unit_test/main_tests/conftest.py

@@ -15,9 +15,6 @@ class ArgsInterceptor:
         self.kwargs = kwargs
 
 
-MOCK_PACKAGE_DIR = Path("some_package_dir")
-
-
 @pytest.fixture(autouse=True)
 def mock_protection(monkeypatch):
     """
@@ -41,22 +38,8 @@ def mock_protection(monkeypatch):
 
 
 @pytest.fixture(autouse=True)
-def fake_package_dir(monkeypatch):
-    """
-    Monkey-patch enough for the main() function to run
-    """
-    real_path_exists = Path.exists
-
-    def mock_path_exists(path):
-        if path == MOCK_PACKAGE_DIR / "setup.py":
-            return True
-        else:
-            return real_path_exists(path)
-
-    args = ["cibuildwheel", str(MOCK_PACKAGE_DIR)]
-    monkeypatch.setattr(Path, "exists", mock_path_exists)
-    monkeypatch.setattr(sys, "argv", args)
-    return args
+def fake_package_dir_autouse(fake_package_dir):
+    pass
 
 
 @pytest.fixture(autouse=True)

unit_test/main_tests/main_options_test.py

@@ -3,10 +3,12 @@ from fnmatch import fnmatch
 from pathlib import Path
 
 import pytest
+import tomli
 
 from cibuildwheel.__main__ import main
 from cibuildwheel.environment import ParsedEnvironment
-from cibuildwheel.util import BuildSelector
+from cibuildwheel.options import BuildOptions, _get_pinned_docker_images
+from cibuildwheel.util import BuildSelector, resources_dir
 
 # CIBW_PLATFORM is tested in main_platform_test.py
 
@@ -18,13 +20,13 @@ def test_output_dir(platform, intercepted_build_args, monkeypatch):
 
     main()
 
-    assert intercepted_build_args.args[0].output_dir == OUTPUT_DIR
+    assert intercepted_build_args.args[0].globals.output_dir == OUTPUT_DIR
 
 
 def test_output_dir_default(platform, intercepted_build_args, monkeypatch):
     main()
 
-    assert intercepted_build_args.args[0].output_dir == Path("wheelhouse")
+    assert intercepted_build_args.args[0].globals.output_dir == Path("wheelhouse")
 
 
 @pytest.mark.parametrize("also_set_environment", [False, True])
@@ -37,7 +39,7 @@ def test_output_dir_argument(also_set_environment, platform, intercepted_build_a
 
     main()
 
-    assert intercepted_build_args.args[0].output_dir == OUTPUT_DIR
+    assert intercepted_build_args.args[0].globals.output_dir == OUTPUT_DIR
 
 
 def test_build_selector(platform, intercepted_build_args, monkeypatch, allow_empty):
@@ -49,7 +51,7 @@ def test_build_selector(platform, intercepted_build_args, monkeypatch, allow_emp
 
     main()
 
-    intercepted_build_selector = intercepted_build_args.args[0].build_selector
+    intercepted_build_selector = intercepted_build_args.args[0].globals.build_selector
     assert isinstance(intercepted_build_selector, BuildSelector)
     assert intercepted_build_selector("build24-this")
     assert not intercepted_build_selector("skip65-that")
@@ -69,19 +71,19 @@ def test_empty_selector(platform, intercepted_build_args, monkeypatch):
 @pytest.mark.parametrize(
     "architecture, image, full_image",
     [
-        ("x86_64", None, "quay.io/pypa/manylinux2010_x86_64:*"),
+        ("x86_64", None, "quay.io/pypa/manylinux2014_x86_64:*"),
         ("x86_64", "manylinux1", "quay.io/pypa/manylinux1_x86_64:*"),
         ("x86_64", "manylinux2010", "quay.io/pypa/manylinux2010_x86_64:*"),
         ("x86_64", "manylinux2014", "quay.io/pypa/manylinux2014_x86_64:*"),
         ("x86_64", "manylinux_2_24", "quay.io/pypa/manylinux_2_24_x86_64:*"),
         ("x86_64", "custom_image", "custom_image"),
-        ("i686", None, "quay.io/pypa/manylinux2010_i686:*"),
+        ("i686", None, "quay.io/pypa/manylinux2014_i686:*"),
         ("i686", "manylinux1", "quay.io/pypa/manylinux1_i686:*"),
         ("i686", "manylinux2010", "quay.io/pypa/manylinux2010_i686:*"),
         ("i686", "manylinux2014", "quay.io/pypa/manylinux2014_i686:*"),
         ("i686", "manylinux_2_24", "quay.io/pypa/manylinux_2_24_i686:*"),
         ("i686", "custom_image", "custom_image"),
-        ("pypy_x86_64", None, "quay.io/pypa/manylinux2010_x86_64:*"),
+        ("pypy_x86_64", None, "quay.io/pypa/manylinux2014_x86_64:*"),
         ("pypy_x86_64", "manylinux1", "manylinux1"),  # Does not exist
         ("pypy_x86_64", "manylinux2010", "quay.io/pypa/manylinux2010_x86_64:*"),
         ("pypy_x86_64", "manylinux2014", "quay.io/pypa/manylinux2014_x86_64:*"),
@@ -97,10 +99,15 @@ def test_manylinux_images(
 
     main()
 
+    build_options = intercepted_build_args.args[0].build_options(identifier=None)
+
     if platform == "linux":
-        assert fnmatch(intercepted_build_args.args[0].manylinux_images[architecture], full_image)
+        assert fnmatch(
+            build_options.manylinux_images[architecture],
+            full_image,
+        )
     else:
-        assert intercepted_build_args.args[0].manylinux_images is None
+        assert build_options.manylinux_images is None
 
 
 def get_default_repair_command(platform):
@@ -128,8 +135,10 @@ def test_repair_command(
 
     main()
 
+    build_options = intercepted_build_args.args[0].build_options(identifier=None)
+
     expected_repair = repair_command or get_default_repair_command(platform)
-    assert intercepted_build_args.args[0].repair_command == expected_repair
+    assert build_options.repair_command == expected_repair
 
 
 @pytest.mark.parametrize(
@@ -147,7 +156,9 @@ def test_environment(environment, platform_specific, platform, intercepted_build
 
     main()
 
-    intercepted_environment = intercepted_build_args.args[0].environment
+    build_options = intercepted_build_args.args[0].build_options(identifier=None)
+    intercepted_environment = build_options.environment
+
     assert isinstance(intercepted_environment, ParsedEnvironment)
     assert intercepted_environment.as_dictionary(prev_environment={}) == environment
 
@@ -166,7 +177,9 @@ def test_test_requires(
 
     main()
 
-    assert intercepted_build_args.args[0].test_requires == (test_requires or "").split()
+    build_options = intercepted_build_args.args[0].build_options(identifier=None)
+
+    assert build_options.test_requires == (test_requires or "").split()
 
 
 @pytest.mark.parametrize("test_extras", [None, "extras"])
@@ -181,9 +194,9 @@ def test_test_extras(test_extras, platform_specific, platform, intercepted_build
 
     main()
 
-    assert intercepted_build_args.args[0].test_extras == (
-        "[" + test_extras + "]" if test_extras else ""
-    )
+    build_options = intercepted_build_args.args[0].build_options(identifier=None)
+
+    assert build_options.test_extras == ("[" + test_extras + "]" if test_extras else "")
 
 
 @pytest.mark.parametrize("test_command", [None, "test --command"])
@@ -200,7 +213,9 @@ def test_test_command(
 
     main()
 
-    assert intercepted_build_args.args[0].test_command == (test_command or "")
+    build_options = intercepted_build_args.args[0].build_options(identifier=None)
+
+    assert build_options.test_command == (test_command or "")
 
 
 @pytest.mark.parametrize("before_build", [None, "before --build"])
@@ -217,7 +232,8 @@ def test_before_build(
 
     main()
 
-    assert intercepted_build_args.args[0].before_build == (before_build or "")
+    build_options = intercepted_build_args.args[0].build_options(identifier=None)
+    assert build_options.before_build == (before_build or "")
 
 
 @pytest.mark.parametrize("build_verbosity", [None, 0, 2, -2, 4, -4])
@@ -233,9 +249,10 @@ def test_build_verbosity(
             monkeypatch.setenv("CIBW_BUILD_VERBOSITY", str(build_verbosity))
 
     main()
+    build_options = intercepted_build_args.args[0].build_options(identifier=None)
 
     expected_verbosity = max(-3, min(3, int(build_verbosity or 0)))
-    assert intercepted_build_args.args[0].build_verbosity == expected_verbosity
+    assert build_options.build_verbosity == expected_verbosity
 
 
 @pytest.mark.parametrize(
@@ -286,4 +303,36 @@ def test_before_all(before_all, platform_specific, platform, intercepted_build_a
 
     main()
 
-    assert intercepted_build_args.args[0].before_all == (before_all or "")
+    build_options = intercepted_build_args.args[0].build_options(identifier=None)
+
+    assert build_options.before_all == (before_all or "")
+
+
+def test_defaults(platform, intercepted_build_args):
+    main()
+
+    build_options: BuildOptions = intercepted_build_args.args[0].build_options(identifier=None)
+    defaults_config_path = resources_dir / "defaults.toml"
+    with defaults_config_path.open("rb") as f:
+        defaults_toml = tomli.load(f)
+
+    root_defaults = defaults_toml["tool"]["cibuildwheel"]
+    platform_defaults = defaults_toml["tool"]["cibuildwheel"][platform]
+
+    defaults = {}
+    defaults.update(root_defaults)
+    defaults.update(platform_defaults)
+
+    # test a few options
+    assert build_options.before_all == defaults["before-all"]
+    repair_wheel_default = defaults["repair-wheel-command"]
+    if isinstance(repair_wheel_default, list):
+        repair_wheel_default = " && ".join(repair_wheel_default)
+    assert build_options.repair_command == repair_wheel_default
+    assert build_options.build_frontend == defaults["build-frontend"]
+
+    if platform == "linux":
+        assert build_options.manylinux_images
+        pinned_images = _get_pinned_docker_images()
+        default_x86_64_image = pinned_images["x86_64"][defaults["manylinux-x86_64-image"]]
+        assert build_options.manylinux_images["x86_64"] == default_x86_64_image

unit_test/main_tests/main_platform_test.py

@@ -5,7 +5,7 @@ import pytest
 from cibuildwheel.__main__ import main
 from cibuildwheel.architecture import Architecture
 
-from .conftest import MOCK_PACKAGE_DIR
+from ..conftest import MOCK_PACKAGE_DIR
 
 
 def test_unknown_platform_non_ci(monkeypatch, capsys):
@@ -58,26 +58,29 @@ def test_platform_argument(platform, intercepted_build_args, monkeypatch):
 
     main()
 
-    assert intercepted_build_args.args[0].package_dir == MOCK_PACKAGE_DIR
+    options = intercepted_build_args.args[0]
+
+    assert options.globals.package_dir == MOCK_PACKAGE_DIR
 
 
 def test_platform_environment(platform, intercepted_build_args, monkeypatch):
     main()
+    options = intercepted_build_args.args[0]
 
-    assert intercepted_build_args.args[0].package_dir == MOCK_PACKAGE_DIR
+    assert options.globals.package_dir == MOCK_PACKAGE_DIR
 
 
 def test_archs_default(platform, intercepted_build_args, monkeypatch):
 
     main()
-    build_options = intercepted_build_args.args[0]
+    options = intercepted_build_args.args[0]
 
     if platform == "linux":
-        assert build_options.architectures == {Architecture.x86_64, Architecture.i686}
+        assert options.globals.architectures == {Architecture.x86_64, Architecture.i686}
     elif platform == "windows":
-        assert build_options.architectures == {Architecture.AMD64, Architecture.x86}
+        assert options.globals.architectures == {Architecture.AMD64, Architecture.x86}
     else:
-        assert build_options.architectures == {Architecture.x86_64}
+        assert options.globals.architectures == {Architecture.x86_64}
 
 
 @pytest.mark.parametrize("use_env_var", [False, True])
@@ -96,8 +99,8 @@ def test_archs_argument(platform, intercepted_build_args, monkeypatch, use_env_v
 
     else:
         main()
-        build_options = intercepted_build_args.args[0]
-        assert build_options.architectures == {Architecture.ppc64le}
+        options = intercepted_build_args.args[0]
+        assert options.globals.architectures == {Architecture.ppc64le}
 
 
 def test_archs_platform_specific(platform, intercepted_build_args, monkeypatch):
@@ -107,38 +110,38 @@ def test_archs_platform_specific(platform, intercepted_build_args, monkeypatch):
     monkeypatch.setenv("CIBW_ARCHS_MACOS", "x86_64")
 
     main()
-    build_options = intercepted_build_args.args[0]
+    options = intercepted_build_args.args[0]
 
     if platform == "linux":
-        assert build_options.architectures == {Architecture.ppc64le}
+        assert options.globals.architectures == {Architecture.ppc64le}
     elif platform == "windows":
-        assert build_options.architectures == {Architecture.x86}
+        assert options.globals.architectures == {Architecture.x86}
     elif platform == "macos":
-        assert build_options.architectures == {Architecture.x86_64}
+        assert options.globals.architectures == {Architecture.x86_64}
 
 
 def test_archs_platform_native(platform, intercepted_build_args, monkeypatch):
     monkeypatch.setenv("CIBW_ARCHS", "native")
 
     main()
-    build_options = intercepted_build_args.args[0]
+    options = intercepted_build_args.args[0]
 
     if platform in {"linux", "macos"}:
-        assert build_options.architectures == {Architecture.x86_64}
+        assert options.globals.architectures == {Architecture.x86_64}
     elif platform == "windows":
-        assert build_options.architectures == {Architecture.AMD64}
+        assert options.globals.architectures == {Architecture.AMD64}
 
 
 def test_archs_platform_auto64(platform, intercepted_build_args, monkeypatch):
     monkeypatch.setenv("CIBW_ARCHS", "auto64")
 
     main()
-    build_options = intercepted_build_args.args[0]
+    options = intercepted_build_args.args[0]
 
     if platform in {"linux", "macos"}:
-        assert build_options.architectures == {Architecture.x86_64}
+        assert options.globals.architectures == {Architecture.x86_64}
     elif platform == "windows":
-        assert build_options.architectures == {Architecture.AMD64}
+        assert options.globals.architectures == {Architecture.AMD64}
 
 
 def test_archs_platform_auto32(platform, intercepted_build_args, monkeypatch):
@@ -152,22 +155,22 @@ def test_archs_platform_auto32(platform, intercepted_build_args, monkeypatch):
     else:
         main()
 
-        build_options = intercepted_build_args.args[0]
+        options = intercepted_build_args.args[0]
 
         if platform == "linux":
-            assert build_options.architectures == {Architecture.i686}
+            assert options.globals.architectures == {Architecture.i686}
         elif platform == "windows":
-            assert build_options.architectures == {Architecture.x86}
+            assert options.globals.architectures == {Architecture.x86}
 
 
 def test_archs_platform_all(platform, intercepted_build_args, monkeypatch):
     monkeypatch.setenv("CIBW_ARCHS", "all")
 
     main()
-    build_options = intercepted_build_args.args[0]
+    options = intercepted_build_args.args[0]
 
     if platform == "linux":
-        assert build_options.architectures == {
+        assert options.globals.architectures == {
             Architecture.x86_64,
             Architecture.i686,
             Architecture.aarch64,
@@ -175,9 +178,13 @@ def test_archs_platform_all(platform, intercepted_build_args, monkeypatch):
             Architecture.s390x,
         }
     elif platform == "windows":
-        assert build_options.architectures == {Architecture.x86, Architecture.AMD64}
+        assert options.globals.architectures == {
+            Architecture.x86,
+            Architecture.AMD64,
+            Architecture.ARM64,
+        }
     elif platform == "macos":
-        assert build_options.architectures == {
+        assert options.globals.architectures == {
             Architecture.x86_64,
             Architecture.arm64,
             Architecture.universal2,

unit_test/main_tests/main_requires_python_test.py

@@ -27,7 +27,8 @@ def test_no_override(platform, monkeypatch, intercepted_build_args):
 
     main()
 
-    intercepted_build_selector = intercepted_build_args.args[0].build_selector
+    options = intercepted_build_args.args[0]
+    intercepted_build_selector = options.globals.build_selector
 
     assert intercepted_build_selector("cp39-win32")
     assert intercepted_build_selector("cp36-win32")
@@ -40,7 +41,8 @@ def test_override_env(platform, monkeypatch, intercepted_build_args):
 
     main()
 
-    intercepted_build_selector = intercepted_build_args.args[0].build_selector
+    options = intercepted_build_args.args[0]
+    intercepted_build_selector = options.globals.build_selector
 
     assert intercepted_build_selector.requires_python == SpecifierSet(">=3.8")
 
@@ -61,7 +63,8 @@ def test_override_setup_cfg(platform, monkeypatch, intercepted_build_args, fake_
 
     main()
 
-    intercepted_build_selector = intercepted_build_args.args[0].build_selector
+    options = intercepted_build_args.args[0]
+    intercepted_build_selector = options.globals.build_selector
 
     assert intercepted_build_selector.requires_python == SpecifierSet(">=3.8")
 
@@ -82,7 +85,8 @@ def test_override_pyproject_toml(platform, monkeypatch, intercepted_build_args,
 
     main()
 
-    intercepted_build_selector = intercepted_build_args.args[0].build_selector
+    options = intercepted_build_args.args[0]
+    intercepted_build_selector = options.globals.build_selector
 
     assert intercepted_build_selector.requires_python == SpecifierSet(">=3.8")
 
@@ -107,7 +111,8 @@ def test_override_setup_py_simple(platform, monkeypatch, intercepted_build_args,
 
     main()
 
-    intercepted_build_selector = intercepted_build_args.args[0].build_selector
+    options = intercepted_build_args.args[0]
+    intercepted_build_selector = options.globals.build_selector
 
     assert intercepted_build_selector.requires_python == SpecifierSet(">=3.7")
 

unit_test/option_prepare_test.py

@@ -0,0 +1,175 @@
+import platform as platform_module
+import subprocess
+import sys
+from contextlib import contextmanager
+from pathlib import Path
+from typing import cast
+from unittest import mock
+
+import pytest
+
+from cibuildwheel import linux, util
+from cibuildwheel.__main__ import main
+
+ALL_IDS = {"cp36", "cp37", "cp38", "cp39", "cp310", "pp37", "pp38"}
+
+
+@pytest.fixture
+def mock_build_docker(monkeypatch):
+    def fail_on_call(*args, **kwargs):
+        raise RuntimeError("This should never be called")
+
+    def ignore_call(*args, **kwargs):
+        pass
+
+    @contextmanager
+    def nullcontext(enter_result=None):
+        yield enter_result
+
+    def ignore_context_call(*args, **kwargs):
+        return nullcontext(kwargs)
+
+    monkeypatch.setenv("CIBW_PLATFORM", "linux")
+    monkeypatch.setattr(platform_module, "machine", lambda: "x86_64")
+
+    monkeypatch.setattr(subprocess, "Popen", fail_on_call)
+    monkeypatch.setattr(subprocess, "run", ignore_call)
+    monkeypatch.setattr(util, "download", fail_on_call)
+    monkeypatch.setattr("cibuildwheel.linux.DockerContainer", ignore_context_call)
+
+    monkeypatch.setattr("cibuildwheel.linux.build_on_docker", mock.Mock(spec=linux.build_on_docker))
+    monkeypatch.setattr("cibuildwheel.util.print_new_wheels", ignore_context_call)
+
+
+def test_build_default_launches(mock_build_docker, fake_package_dir, monkeypatch):
+    monkeypatch.setattr(sys, "argv", ["cibuildwheel", "--platform=linux"])
+
+    main()
+
+    build_on_docker = cast(mock.Mock, linux.build_on_docker)
+
+    assert build_on_docker.call_count == 4
+
+    # In Python 3.8+, this can be simplified to [0].kwargs
+    kwargs = build_on_docker.call_args_list[0][1]
+    assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["docker_image"]
+    assert kwargs["docker"]["cwd"] == Path("/project")
+    assert not kwargs["docker"]["simulate_32_bit"]
+
+    identifiers = {x.identifier for x in kwargs["platform_configs"]}
+    assert identifiers == {f"{x}-manylinux_x86_64" for x in ALL_IDS}
+
+    kwargs = build_on_docker.call_args_list[1][1]
+    assert "quay.io/pypa/manylinux2014_i686" in kwargs["docker"]["docker_image"]
+    assert kwargs["docker"]["cwd"] == Path("/project")
+    assert kwargs["docker"]["simulate_32_bit"]
+
+    identifiers = {x.identifier for x in kwargs["platform_configs"]}
+    assert identifiers == {f"{x}-manylinux_i686" for x in ALL_IDS}
+
+    kwargs = build_on_docker.call_args_list[2][1]
+    assert "quay.io/pypa/musllinux_1_1_x86_64" in kwargs["docker"]["docker_image"]
+    assert kwargs["docker"]["cwd"] == Path("/project")
+    assert not kwargs["docker"]["simulate_32_bit"]
+
+    identifiers = {x.identifier for x in kwargs["platform_configs"]}
+    assert identifiers == {
+        f"{x}-musllinux_x86_64" for x in ALL_IDS for x in ALL_IDS if "pp" not in x
+    }
+
+    kwargs = build_on_docker.call_args_list[3][1]
+    assert "quay.io/pypa/musllinux_1_1_i686" in kwargs["docker"]["docker_image"]
+    assert kwargs["docker"]["cwd"] == Path("/project")
+    assert kwargs["docker"]["simulate_32_bit"]
+
+    identifiers = {x.identifier for x in kwargs["platform_configs"]}
+    assert identifiers == {f"{x}-musllinux_i686" for x in ALL_IDS if "pp" not in x}
+
+
+def test_build_with_override_launches(mock_build_docker, monkeypatch, tmp_path):
+    pkg_dir = tmp_path / "cibw_package"
+    pkg_dir.mkdir()
+
+    cibw_toml = pkg_dir / "pyproject.toml"
+    cibw_toml.write_text(
+        """
+[tool.cibuildwheel]
+manylinux-x86_64-image = "manylinux_2_24"
+
+# Before Python 3.10, use manylinux2014
+[[tool.cibuildwheel.overrides]]
+select = "cp3?-*"
+manylinux-x86_64-image = "manylinux2014"
+manylinux-i686-image = "manylinux2014"
+
+[[tool.cibuildwheel.overrides]]
+select = "cp36-manylinux_x86_64"
+before-all = "true"
+"""
+    )
+
+    monkeypatch.chdir(pkg_dir)
+    monkeypatch.setattr(sys, "argv", ["cibuildwheel", "--platform=linux"])
+
+    main()
+
+    build_on_docker = cast(mock.Mock, linux.build_on_docker)
+
+    assert build_on_docker.call_count == 6
+
+    kwargs = build_on_docker.call_args_list[0][1]
+    assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["docker_image"]
+    assert kwargs["docker"]["cwd"] == Path("/project")
+    assert not kwargs["docker"]["simulate_32_bit"]
+
+    identifiers = {x.identifier for x in kwargs["platform_configs"]}
+    assert identifiers == {"cp36-manylinux_x86_64"}
+    assert kwargs["options"].build_options("cp36-manylinux_x86_64").before_all == "true"
+
+    kwargs = build_on_docker.call_args_list[1][1]
+    assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["docker_image"]
+    assert kwargs["docker"]["cwd"] == Path("/project")
+    assert not kwargs["docker"]["simulate_32_bit"]
+
+    identifiers = {x.identifier for x in kwargs["platform_configs"]}
+    assert identifiers == {
+        f"{x}-manylinux_x86_64" for x in ALL_IDS - {"cp36", "cp310", "pp37", "pp38"}
+    }
+    assert kwargs["options"].build_options("cp37-manylinux_x86_64").before_all == ""
+
+    kwargs = build_on_docker.call_args_list[2][1]
+    assert "quay.io/pypa/manylinux_2_24_x86_64" in kwargs["docker"]["docker_image"]
+    assert kwargs["docker"]["cwd"] == Path("/project")
+    assert not kwargs["docker"]["simulate_32_bit"]
+    identifiers = {x.identifier for x in kwargs["platform_configs"]}
+    assert identifiers == {
+        "cp310-manylinux_x86_64",
+        "pp37-manylinux_x86_64",
+        "pp38-manylinux_x86_64",
+    }
+
+    kwargs = build_on_docker.call_args_list[3][1]
+    assert "quay.io/pypa/manylinux2014_i686" in kwargs["docker"]["docker_image"]
+    assert kwargs["docker"]["cwd"] == Path("/project")
+    assert kwargs["docker"]["simulate_32_bit"]
+
+    identifiers = {x.identifier for x in kwargs["platform_configs"]}
+    assert identifiers == {f"{x}-manylinux_i686" for x in ALL_IDS}
+
+    kwargs = build_on_docker.call_args_list[4][1]
+    assert "quay.io/pypa/musllinux_1_1_x86_64" in kwargs["docker"]["docker_image"]
+    assert kwargs["docker"]["cwd"] == Path("/project")
+    assert not kwargs["docker"]["simulate_32_bit"]
+
+    identifiers = {x.identifier for x in kwargs["platform_configs"]}
+    assert identifiers == {
+        f"{x}-musllinux_x86_64" for x in ALL_IDS for x in ALL_IDS if "pp" not in x
+    }
+
+    kwargs = build_on_docker.call_args_list[5][1]
+    assert "quay.io/pypa/musllinux_1_1_i686" in kwargs["docker"]["docker_image"]
+    assert kwargs["docker"]["cwd"] == Path("/project")
+    assert kwargs["docker"]["simulate_32_bit"]
+
+    identifiers = {x.identifier for x in kwargs["platform_configs"]}
+    assert identifiers == {f"{x}-musllinux_i686" for x in ALL_IDS if "pp" not in x}

unit_test/options_test.py

@@ -0,0 +1,116 @@
+import platform as platform_module
+
+import pytest
+
+from cibuildwheel.__main__ import get_build_identifiers
+from cibuildwheel.environment import parse_environment
+from cibuildwheel.options import Options, _get_pinned_docker_images
+
+from .utils import get_default_command_line_arguments
+
+PYPROJECT_1 = """
+[tool.cibuildwheel]
+build = ["cp38*", "cp37*"]
+environment = {FOO="BAR"}
+
+test-command = "pyproject"
+
+manylinux-x86_64-image = "manylinux1"
+
+environment-pass = ["EXAMPLE_ENV"]
+
+[tool.cibuildwheel.macos]
+test-requires = "else"
+
+[[tool.cibuildwheel.overrides]]
+select = "cp37*"
+test-command = "pyproject-override"
+manylinux-x86_64-image = "manylinux2014"
+"""
+
+
+def test_options_1(tmp_path, monkeypatch):
+    with tmp_path.joinpath("pyproject.toml").open("w") as f:
+        f.write(PYPROJECT_1)
+
+    args = get_default_command_line_arguments()
+    args.package_dir = str(tmp_path)
+
+    monkeypatch.setattr(platform_module, "machine", lambda: "x86_64")
+
+    options = Options(platform="linux", command_line_arguments=args)
+
+    identifiers = get_build_identifiers(
+        platform="linux",
+        build_selector=options.globals.build_selector,
+        architectures=options.globals.architectures,
+    )
+
+    override_display = """\
+test_command: 'pyproject'
+  cp37-manylinux_x86_64: 'pyproject-override'"""
+
+    print(options.summary(identifiers))
+
+    assert override_display in options.summary(identifiers)
+
+    default_build_options = options.build_options(identifier=None)
+
+    assert default_build_options.environment == parse_environment('FOO="BAR"')
+
+    all_pinned_docker_images = _get_pinned_docker_images()
+    pinned_x86_64_docker_image = all_pinned_docker_images["x86_64"]
+
+    local = options.build_options("cp38-manylinux_x86_64")
+    assert local.manylinux_images is not None
+    assert local.test_command == "pyproject"
+    assert local.manylinux_images["x86_64"] == pinned_x86_64_docker_image["manylinux1"]
+
+    local = options.build_options("cp37-manylinux_x86_64")
+    assert local.manylinux_images is not None
+    assert local.test_command == "pyproject-override"
+    assert local.manylinux_images["x86_64"] == pinned_x86_64_docker_image["manylinux2014"]
+
+
+def test_passthrough(tmp_path, monkeypatch):
+    with tmp_path.joinpath("pyproject.toml").open("w") as f:
+        f.write(PYPROJECT_1)
+
+    args = get_default_command_line_arguments()
+    args.package_dir = str(tmp_path)
+
+    monkeypatch.setattr(platform_module, "machine", lambda: "x86_64")
+    monkeypatch.setenv("EXAMPLE_ENV", "ONE")
+
+    options = Options(platform="linux", command_line_arguments=args)
+
+    default_build_options = options.build_options(identifier=None)
+
+    assert default_build_options.environment.as_dictionary(prev_environment={}) == {
+        "FOO": "BAR",
+        "EXAMPLE_ENV": "ONE",
+    }
+
+
+@pytest.mark.parametrize(
+    "env_var_value",
+    [
+        "normal value",
+        '"value wrapped in quotes"',
+        "an unclosed single-quote: '",
+        'an unclosed double-quote: "',
+        "string\nwith\ncarriage\nreturns\n",
+        "a trailing backslash \\",
+    ],
+)
+def test_passthrough_evil(tmp_path, monkeypatch, env_var_value):
+    args = get_default_command_line_arguments()
+    args.package_dir = str(tmp_path)
+
+    monkeypatch.setattr(platform_module, "machine", lambda: "x86_64")
+    monkeypatch.setenv("CIBW_ENVIRONMENT_PASS_LINUX", "ENV_VAR")
+    options = Options(platform="linux", command_line_arguments=args)
+
+    monkeypatch.setenv("ENV_VAR", env_var_value)
+    parsed_environment = options.build_options(identifier=None).environment
+    assert parsed_environment.as_dictionary(prev_environment={}) == {"ENV_VAR": env_var_value}

unit_test/options_toml_test.py

@@ -1,6 +1,8 @@
+from pathlib import Path
+
 import pytest
 
-from cibuildwheel.options import ConfigOptionError, ConfigOptions
+from cibuildwheel.options import ConfigOptionError, OptionsReader, _dig_first
 
 PYPROJECT_1 = """
 [tool.cibuildwheel]
@@ -28,86 +30,92 @@ def platform(request):
 
 @pytest.mark.parametrize("fname", ["pyproject.toml", "cibuildwheel.toml"])
 def test_simple_settings(tmp_path, platform, fname):
-    with tmp_path.joinpath(fname).open("w") as f:
-        f.write(PYPROJECT_1)
+    config_file_path: Path = tmp_path / fname
+    config_file_path.write_text(PYPROJECT_1)
 
-    options = ConfigOptions(tmp_path, f"{{package}}/{fname}", platform=platform)
+    options_reader = OptionsReader(config_file_path, platform=platform)
 
-    assert options("build", env_plat=False, sep=" ") == "cp39*"
+    assert options_reader.get("build", env_plat=False, sep=" ") == "cp39*"
 
-    assert options("test-command") == "pyproject"
-    assert options("archs", sep=" ") == "auto"
+    assert options_reader.get("test-command") == "pyproject"
+    assert options_reader.get("archs", sep=" ") == "auto"
     assert (
-        options("test-requires", sep=" ")
+        options_reader.get("test-requires", sep=" ")
         == {"windows": "something", "macos": "else", "linux": "other many"}[platform]
     )
 
     # Also testing options for support for both lists and tables
     assert (
-        options("environment", table={"item": '{k}="{v}"', "sep": " "}) == 'THING="OTHER" FOO="BAR"'
-    )
-    assert (
-        options("environment", sep="x", table={"item": '{k}="{v}"', "sep": " "})
+        options_reader.get("environment", table={"item": '{k}="{v}"', "sep": " "})
         == 'THING="OTHER" FOO="BAR"'
     )
-    assert options("test-extras", sep=",") == "one,two"
-    assert options("test-extras", sep=",", table={"item": '{k}="{v}"', "sep": " "}) == "one,two"
+    assert (
+        options_reader.get("environment", sep="x", table={"item": '{k}="{v}"', "sep": " "})
+        == 'THING="OTHER" FOO="BAR"'
+    )
+    assert options_reader.get("test-extras", sep=",") == "one,two"
+    assert (
+        options_reader.get("test-extras", sep=",", table={"item": '{k}="{v}"', "sep": " "})
+        == "one,two"
+    )
 
-    assert options("manylinux-x86_64-image") == "manylinux1"
-    assert options("manylinux-i686-image") == "manylinux2010"
+    assert options_reader.get("manylinux-x86_64-image") == "manylinux1"
+    assert options_reader.get("manylinux-i686-image") == "manylinux2014"
 
     with pytest.raises(ConfigOptionError):
-        options("environment", sep=" ")
+        options_reader.get("environment", sep=" ")
 
     with pytest.raises(ConfigOptionError):
-        options("test-extras", table={"item": '{k}="{v}"', "sep": " "})
+        options_reader.get("test-extras", table={"item": '{k}="{v}"', "sep": " "})
 
 
 def test_envvar_override(tmp_path, platform, monkeypatch):
     monkeypatch.setenv("CIBW_BUILD", "cp38*")
-    monkeypatch.setenv("CIBW_MANYLINUX_X86_64_IMAGE", "manylinux2014")
+    monkeypatch.setenv("CIBW_MANYLINUX_X86_64_IMAGE", "manylinux_2_24")
     monkeypatch.setenv("CIBW_TEST_COMMAND", "mytest")
     monkeypatch.setenv("CIBW_TEST_REQUIRES", "docs")
     monkeypatch.setenv("CIBW_TEST_REQUIRES_LINUX", "scod")
 
-    with tmp_path.joinpath("pyproject.toml").open("w") as f:
-        f.write(PYPROJECT_1)
+    config_file_path: Path = tmp_path / "pyproject.toml"
+    config_file_path.write_text(PYPROJECT_1)
 
-    options = ConfigOptions(tmp_path, platform=platform)
+    options_reader = OptionsReader(config_file_path, platform=platform)
 
-    assert options("archs", sep=" ") == "auto"
+    assert options_reader.get("archs", sep=" ") == "auto"
 
-    assert options("build", sep=" ") == "cp38*"
-    assert options("manylinux-x86_64-image") == "manylinux2014"
-    assert options("manylinux-i686-image") == "manylinux2010"
+    assert options_reader.get("build", sep=" ") == "cp38*"
+    assert options_reader.get("manylinux-x86_64-image") == "manylinux_2_24"
+    assert options_reader.get("manylinux-i686-image") == "manylinux2014"
 
     assert (
-        options("test-requires", sep=" ")
+        options_reader.get("test-requires", sep=" ")
         == {"windows": "docs", "macos": "docs", "linux": "scod"}[platform]
     )
-    assert options("test-command") == "mytest"
+    assert options_reader.get("test-command") == "mytest"
 
 
 def test_project_global_override_default_platform(tmp_path, platform):
-    tmp_path.joinpath("pyproject.toml").write_text(
+    pyproject_toml = tmp_path / "pyproject.toml"
+    pyproject_toml.write_text(
         """
 [tool.cibuildwheel]
 repair-wheel-command = "repair-project-global"
 """
     )
-    options = ConfigOptions(tmp_path, platform=platform)
-    assert options("repair-wheel-command") == "repair-project-global"
+    options_reader = OptionsReader(pyproject_toml, platform=platform)
+    assert options_reader.get("repair-wheel-command") == "repair-project-global"
 
 
 def test_env_global_override_default_platform(tmp_path, platform, monkeypatch):
     monkeypatch.setenv("CIBW_REPAIR_WHEEL_COMMAND", "repair-env-global")
-    options = ConfigOptions(tmp_path, platform=platform)
-    assert options("repair-wheel-command") == "repair-env-global"
+    options_reader = OptionsReader(platform=platform)
+    assert options_reader.get("repair-wheel-command") == "repair-env-global"
 
 
 def test_env_global_override_project_platform(tmp_path, platform, monkeypatch):
     monkeypatch.setenv("CIBW_REPAIR_WHEEL_COMMAND", "repair-env-global")
-    tmp_path.joinpath("pyproject.toml").write_text(
+    pyproject_toml = tmp_path / "pyproject.toml"
+    pyproject_toml.write_text(
         """
 [tool.cibuildwheel.linux]
 repair-wheel-command = "repair-project-linux"
@@ -117,12 +125,13 @@ repair-wheel-command = "repair-project-windows"
 repair-wheel-command = "repair-project-macos"
 """
     )
-    options = ConfigOptions(tmp_path, platform=platform)
-    assert options("repair-wheel-command") == "repair-env-global"
+    options_reader = OptionsReader(pyproject_toml, platform=platform)
+    assert options_reader.get("repair-wheel-command") == "repair-env-global"
 
 
 def test_global_platform_order(tmp_path, platform):
-    tmp_path.joinpath("pyproject.toml").write_text(
+    pyproject_toml = tmp_path / "pyproject.toml"
+    pyproject_toml.write_text(
         """
 [tool.cibuildwheel.linux]
 repair-wheel-command = "repair-project-linux"
@@ -134,14 +143,15 @@ repair-wheel-command = "repair-project-macos"
 repair-wheel-command = "repair-project-global"
 """
     )
-    options = ConfigOptions(tmp_path, platform=platform)
-    assert options("repair-wheel-command") == f"repair-project-{platform}"
+    options_reader = OptionsReader(pyproject_toml, platform=platform)
+    assert options_reader.get("repair-wheel-command") == f"repair-project-{platform}"
 
 
 def test_unexpected_key(tmp_path):
     # Note that platform contents are only checked when running
     # for that platform.
-    tmp_path.joinpath("pyproject.toml").write_text(
+    pyproject_toml = tmp_path / "pyproject.toml"
+    pyproject_toml.write_text(
         """
 [tool.cibuildwheel]
 repairs-wheel-command = "repair-project-linux"
@@ -149,42 +159,154 @@ repairs-wheel-command = "repair-project-linux"
     )
 
     with pytest.raises(ConfigOptionError):
-        ConfigOptions(tmp_path, platform="linux")
+        OptionsReader(pyproject_toml, platform="linux")
 
 
 def test_unexpected_table(tmp_path):
-    tmp_path.joinpath("pyproject.toml").write_text(
+    pyproject_toml = tmp_path / "pyproject.toml"
+    pyproject_toml.write_text(
         """
 [tool.cibuildwheel.linus]
 repair-wheel-command = "repair-project-linux"
 """
     )
     with pytest.raises(ConfigOptionError):
-        ConfigOptions(tmp_path, platform="linux")
+        OptionsReader(pyproject_toml, platform="linux")
 
 
 def test_unsupported_join(tmp_path):
-    tmp_path.joinpath("pyproject.toml").write_text(
+    pyproject_toml = tmp_path / "pyproject.toml"
+    pyproject_toml.write_text(
         """
 [tool.cibuildwheel]
 build = ["1", "2"]
 """
     )
-    options = ConfigOptions(tmp_path, platform="linux")
+    options_reader = OptionsReader(pyproject_toml, platform="linux")
 
-    assert "1, 2" == options("build", sep=", ")
+    assert "1, 2" == options_reader.get("build", sep=", ")
     with pytest.raises(ConfigOptionError):
-        options("build")
+        options_reader.get("build")
 
 
 def test_disallowed_a(tmp_path):
-    tmp_path.joinpath("pyproject.toml").write_text(
+    pyproject_toml = tmp_path / "pyproject.toml"
+    pyproject_toml.write_text(
         """
 [tool.cibuildwheel.windows]
-manylinux-x64_86-image = "manylinux1"
+manylinux-x86_64-image = "manylinux1"
 """
     )
-    disallow = {"windows": {"manylinux-x64_86-image"}}
-    ConfigOptions(tmp_path, platform="linux", disallow=disallow)
+    disallow = {"windows": {"manylinux-x86_64-image"}}
+    OptionsReader(pyproject_toml, platform="linux", disallow=disallow)
     with pytest.raises(ConfigOptionError):
-        ConfigOptions(tmp_path, platform="windows", disallow=disallow)
+        OptionsReader(pyproject_toml, platform="windows", disallow=disallow)
+
+
+def test_environment_override_empty(tmp_path, monkeypatch):
+    pyproject_toml = tmp_path / "pyproject.toml"
+    pyproject_toml.write_text(
+        """
+[tool.cibuildwheel]
+manylinux-i686-image = "manylinux1"
+manylinux-x86_64-image = ""
+"""
+    )
+
+    monkeypatch.setenv("CIBW_MANYLINUX_I686_IMAGE", "")
+    monkeypatch.setenv("CIBW_MANYLINUX_AARCH64_IMAGE", "manylinux1")
+
+    options_reader = OptionsReader(pyproject_toml, platform="linux")
+
+    assert options_reader.get("manylinux-x86_64-image") == ""
+    assert options_reader.get("manylinux-i686-image") == ""
+    assert options_reader.get("manylinux-aarch64-image") == "manylinux1"
+
+    assert options_reader.get("manylinux-x86_64-image", ignore_empty=True) == "manylinux2014"
+    assert options_reader.get("manylinux-i686-image", ignore_empty=True) == "manylinux1"
+    assert options_reader.get("manylinux-aarch64-image", ignore_empty=True) == "manylinux1"
+
+
+@pytest.mark.parametrize("ignore_empty", (True, False))
+def test_dig_first(ignore_empty):
+    d1 = {"random": "thing"}
+    d2 = {"this": "that", "empty": ""}
+    d3 = {"other": "hi"}
+    d4 = {"this": "d4", "empty": "not"}
+
+    answer = _dig_first(
+        (d1, "empty"),
+        (d2, "empty"),
+        (d3, "empty"),
+        (d4, "empty"),
+        ignore_empty=ignore_empty,
+    )
+    assert answer == ("not" if ignore_empty else "")
+
+    answer = _dig_first(
+        (d1, "this"),
+        (d2, "this"),
+        (d3, "this"),
+        (d4, "this"),
+        ignore_empty=ignore_empty,
+    )
+    assert answer == "that"
+
+    with pytest.raises(KeyError):
+        _dig_first(
+            (d1, "this"),
+            (d2, "other"),
+            (d3, "this"),
+            (d4, "other"),
+            ignore_empty=ignore_empty,
+        )
+
+
+PYPROJECT_2 = """
+[tool.cibuildwheel]
+build = ["cp38*", "cp37*"]
+environment = {FOO="BAR"}
+
+test-command = "pyproject"
+
+manylinux-x86_64-image = "manylinux1"
+
+[tool.cibuildwheel.macos]
+test-requires = "else"
+
+[[tool.cibuildwheel.overrides]]
+select = "cp37*"
+test-command = "pyproject-override"
+manylinux-x86_64-image = "manylinux2014"
+"""
+
+
+def test_pyproject_2(tmp_path, platform):
+    pyproject_toml: Path = tmp_path / "pyproject.toml"
+    pyproject_toml.write_text(PYPROJECT_2)
+
+    options_reader = OptionsReader(config_file_path=pyproject_toml, platform=platform)
+    assert options_reader.get("test-command") == "pyproject"
+
+    with options_reader.identifier("random"):
+        assert options_reader.get("test-command") == "pyproject"
+
+    with options_reader.identifier("cp37-something"):
+        assert options_reader.get("test-command") == "pyproject-override"
+
+
+def test_overrides_not_a_list(tmp_path, platform):
+    pyproject_toml: Path = tmp_path / "pyproject.toml"
+
+    pyproject_toml.write_text(
+        """\
+[tool.cibuildwheel]
+build = ["cp38*", "cp37*"]
+[tool.cibuildwheel.overrides]
+select = "cp37*"
+test-command = "pyproject-override"
+"""
+    )
+
+    with pytest.raises(ConfigOptionError):
+        OptionsReader(config_file_path=pyproject_toml, platform=platform)

unit_test/utils.py

@@ -0,0 +1,16 @@
+from cibuildwheel.options import CommandLineArguments
+
+
+def get_default_command_line_arguments() -> CommandLineArguments:
+    defaults = CommandLineArguments()
+
+    defaults.platform = "auto"
+    defaults.allow_empty = False
+    defaults.archs = None
+    defaults.config_file = ""
+    defaults.output_dir = None
+    defaults.package_dir = "."
+    defaults.prerelease_pythons = False
+    defaults.print_build_identifiers = False
+
+    return defaults

unit_test/utils_test.py

@@ -0,0 +1,48 @@
+from cibuildwheel.util import format_safe, prepare_command
+
+
+def test_format_safe():
+    assert format_safe("{wheel}", wheel="filename.whl") == "filename.whl"
+    assert format_safe("command #{wheel}", wheel="filename.whl") == "command {wheel}"
+    assert format_safe("{command #{wheel}}", wheel="filename.whl") == "{command {wheel}}"
+
+    # check unmatched brackets
+    assert format_safe("{command {wheel}", wheel="filename.whl") == "{command filename.whl"
+
+    # check positional-style arguments i.e. {}
+    assert (
+        format_safe("find . -name  * -exec ls -a {} \\;", project="/project")
+        == "find . -name  * -exec ls -a {} \\;"
+    )
+
+    assert format_safe("{param} {param}", param="1") == "1 1"
+    assert format_safe("# {param} {param}", param="1") == "# 1 1"
+    assert format_safe("#{not_a_param} {param}", param="1") == "#{not_a_param} 1"
+
+
+def test_prepare_command():
+    assert prepare_command("python -m {project}", project="project") == "python -m project"
+    assert prepare_command("python -m {something}", project="project") == "python -m {something}"
+    assert (
+        prepare_command("python -m {something.abc}", project="project")
+        == "python -m {something.abc}"
+    )
+
+    assert (
+        prepare_command("python -m {something.abc[4]:3f}", project="project")
+        == "python -m {something.abc[4]:3f}"
+    )
+
+    # test backslashes in the replacement
+    assert (
+        prepare_command(
+            "command {wheel} \\Users\\Temp\\output_dir", wheel="\\Temporary Files\\cibw"
+        )
+        == "command \\Temporary Files\\cibw \\Users\\Temp\\output_dir"
+    )
+
+    # test some unusual syntax that used to trip up the str.format approach
+    assert (
+        prepare_command("{a}{a,b}{b:.2e}{c}{d%s}{e:3}{f[0]}", a="42", b="3.14159")
+        == "42{a,b}{b:.2e}{c}{d%s}{e:3}{f[0]}"
+    )