Bump version: v2.2.2

ci: release to PyPI from CI on GitHub Release

.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/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]
+        os: [ubuntu-latest, windows-latest, macos-11]
-        python_version: ['3.7']
+        python_version: ['3.10']
     timeout-minutes: 180
     steps:
     - uses: actions/checkout@v2

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/asottile/pyupgrade
-  rev: v2.26.0
+  rev: v2.29.0
   hooks:
   - id: pyupgrade
     name: PyUpgrade 3.6+
@@ -25,6 +25,14 @@ repos:
     exclude: ^(cibuildwheel|unit_test|test)/
     args: ["--py37-plus"]
 
+# Autoremoves unused imports
+- repo: https://github.com/hadialqattan/pycln
+  rev: v1.0.3
+  hooks:
+  - id: pycln
+    args: [--config=pyproject.toml]
+    stages: [manual]  # disabled due to artificial limit on Python 3.10
+
 - repo: https://github.com/PyCQA/isort
   rev: 5.9.3
   hooks:
@@ -36,41 +44,61 @@ repos:
   - id: black
 
 - repo: https://github.com/asottile/setup-cfg-fmt
-  rev: v1.17.0
+  rev: v1.18.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"]
+    args: ["--python-version=3.6", "--scripts-are-modules", "--show-error-codes"]
-    additional_dependencies:
+    additional_dependencies: &mypy-dependencies
-      - packaging
+      - packaging>=21.0
-      - types-jinja2
+      - rich
+      - tomli
       - types-certifi
-      - types-toml
+      - types-click
+      - types-dataclasses
+      - types-jinja2
+      - types-pyyaml
+      - types-requests
   - id: mypy
     name: mypy 3.7+ on bin/
     files: ^((bin|docs)/.*py|noxfile.py)$
-    args: ["--python-version=3.7", "--scripts-are-modules"]
+    args: ["--python-version=3.7", "--scripts-are-modules", "--show-error-codes"]
-    additional_dependencies:
+    additional_dependencies: *mypy-dependencies
-      - packaging>=21.0
+
-      - rich
+- repo: https://github.com/asottile/yesqa
-      - types-jinja2
+  rev: v1.3.0
-      - types-pyyaml
+  hooks:
-      - types-click
+  - id: yesqa
-      - types-requests
+    additional_dependencies: &flake8-dependencies
-      - types-toml
+    - 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.7.2.1
+  hooks:
+  - id: shellcheck
 
 - repo: local
   hooks:

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

@@ -85,7 +85,7 @@ jobs:
       - uses: actions/setup-python@v2
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.2.0a1
+        run: python -m pip install cibuildwheel==2.2.2
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
@@ -138,26 +138,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.  |
+| [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 🚀 |
-| [twisted-iocpsupport][]           | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. |
+| [Google Benchmark][]              | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A microbenchmark support library |
-| [cmake][]                         | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
-| [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. |
 
 [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
+[vaex]: https://github.com/vaexio/vaex
-[twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport
+[Google Benchmark]: https://github.com/google/benchmark
-[cmake]: https://github.com/scikit-build/cmake-python-distributions
-[websockets]: https://github.com/aaugustin/websockets
-[pyzmq]: https://github.com/zeromq/pyzmq
-[aiortc]: https://github.com/aiortc/aiortc
 
 [appveyor icon]: docs/data/readme_icons/appveyor.svg
 [github icon]: docs/data/readme_icons/github.svg
@@ -189,18 +189,45 @@ Changelog
 
 <!-- this section was generated by bin/update_readme_changelog.py -- do not edit manually -->
 
-### v2.2.0 (prerelease)
+### v2.2.2
 
-_Currently in prerelease. The below release notes will be condensed into a single entry on final release._
+_26 October 2021_
 
-_v2.2.0a1 (23 September 2021)_
+- 🐛 Fix bug in the GitHub Action step causing a syntax error (#895)
 
-- 🌟 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.
+### 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)
 
-  Musllinux builds are enabled by default. To disable them on your project, add `*-musllinux_*` to your [`CIBW_SKIP`/`skip`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip)
- option. (#768)
 - 🛠 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_
@@ -209,34 +236,6 @@ _14 September 2021_
 - 📚 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
-
 <!-- END bin/update_readme_changelog.py -->
 
 ---

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

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
 

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  # type: ignore[import]
 from rich import print
 
 from cibuildwheel.projectfiles import Analyzer

bin/run_tests.py

@@ -16,10 +16,9 @@ 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
-    xdist_test_args = []
-    if sys.platform.startswith("linux"):
-        xdist_test_args = ["-n", "2"]
     subprocess.run(
         [
             sys.executable,

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")
@@ -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}!")
@@ -291,7 +291,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 +300,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
 

cibuildwheel/__init__.py

@@ -1 +1 @@
-__version__ = "2.2.0a1"
+__version__ = "2.2.2"

cibuildwheel/__main__.py

@@ -2,12 +2,7 @@ import argparse
 import os
 import sys
 import textwrap
-import traceback
+from typing import List, Set, Union
-from configparser import ConfigParser
-from pathlib import Path
-from typing import Dict, List, Optional, Set, Union
-
-from packaging.specifiers import SpecifierSet
 
 import cibuildwheel
 import cibuildwheel.linux
@@ -15,39 +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 CommandLineArguments, Options, compute_options
-from cibuildwheel.options import ConfigOptions
-from cibuildwheel.projectfiles import get_requires_python_str
 from cibuildwheel.typing import PLATFORMS, PlatformName, assert_never
-from cibuildwheel.util import (
+from cibuildwheel.util import BuildSelector, Unbuffered, detect_ci_provider
-    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",
-)
-
-MUSLLINUX_ARCHS = (
-    "x86_64",
-    "i686",
-    "aarch64",
-    "ppc64le",
-    "s390x",
-)
 
 
 def main() -> None:
@@ -92,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
+            TOML config file. Default: "", meaning {package}/pyproject.toml,
-            can be overridden with this option.
+            if it exists.
         """,
     )
 
@@ -133,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
@@ -170,59 +136,9 @@ def main() -> None:
         print(f"cibuildwheel: Unsupported platform: {platform}", file=sys.stderr)
         sys.exit(2)
 
-    package_dir = Path(args.package_dir)
+    options = compute_options(platform=platform, command_line_arguments=args)
-
-    manylinux_identifiers = {
-        f"manylinux-{build_platform}-image" for build_platform in MANYLINUX_ARCHS
-    }
-    musllinux_identifiers = {
-        f"musllinux-{build_platform}-image" for build_platform in MUSLLINUX_ARCHS
-    }
-    disallow = {
-        "linux": {"dependency-versions"},
-        "macos": manylinux_identifiers | musllinux_identifiers,
-        "windows": manylinux_identifiers | musllinux_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)
 
+    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):
@@ -231,141 +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.
+    identifiers = get_build_identifiers(
-    # Passing this in as an environment variable will override pyproject.toml, setup.cfg, or setup.py
+        platform=platform,
-    requires_python_str: Optional[str] = os.environ.get(
+        build_selector=options.globals.build_selector,
-        "CIBW_PROJECT_REQUIRES_PYTHON"
+        architectures=options.globals.architectures,
-    ) 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,
     )
-    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] = {}
+    # Add CIBUILDWHEEL environment variable
-    musllinux_images: Dict[str, str] = {}
+    # This needs to be passed on to the docker container in linux.py
-    if platform == "linux":
+    os.environ["CIBUILDWHEEL"] = "1"
-        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", ignore_empty=True)
-
-            if not config_value:
-                # 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
-
-        for build_platform in MUSLLINUX_ARCHS:
-            pinned_images = all_pinned_docker_images[build_platform]
-
-            config_value = options(f"musllinux-{build_platform}-image")
-
-            if config_value is None:
-                image = pinned_images.get("musllinux_1_1")
-            elif config_value in pinned_images:
-                image = pinned_images[config_value]
-            else:
-                image = config_value
-
-            musllinux_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,
-        musllinux_images=musllinux_images or None,
-        build_frontend=build_frontend,
-    )
 
     # 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[no-untyped-call,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)
 
@@ -373,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:
+def print_preamble(platform: str, options: Options, identifiers: List[str]) -> None:
-    if "p2" in selector or "p35" in selector:
-        msg = f"cibuildwheel 2.x no longer supports Python < 3.6. Please use the 1.x series or update {name}"
-        print(msg, file=sys.stderr)
-        if error:
-            sys.exit(4)
-
-
-def print_preamble(platform: str, build_options: BuildOptions) -> None:
     print(
         textwrap.dedent(
             """
@@ -406,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(textwrap.indent(options.summary(identifiers), "  "))
-        print(f"  {option}: {value!r}")
 
-    warnings = detect_warnings(platform, build_options)
+    warnings = detect_warnings(platform=platform, options=options, identifiers=identifiers)
     if warnings:
         print("\nWarnings:")
         for warning in warnings:
@@ -445,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/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,3 +1,4 @@
+import dataclasses
 from typing import Dict, List, Mapping, Optional
 
 import bashlex
@@ -60,10 +61,15 @@ class EnvironmentAssignment:
     def __repr__(self) -> str:
         return f"{self.name}={self.value}"
 
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, EnvironmentAssignment):
+            return self.name == other.name and self.value == other.value
+        return False
 
+
+@dataclasses.dataclass
 class ParsedEnvironment:
-    def __init__(self, assignments: List[EnvironmentAssignment]):
+    assignments: List[EnvironmentAssignment]
-        self.assignments = assignments
 
     def as_dictionary(
         self,
@@ -82,7 +88,7 @@ class ParsedEnvironment:
         return [a.as_shell_assignment() for a in self.assignments]
 
     def __repr__(self) -> str:
-        return f"ParsedEnvironment({[repr(a) for a in self.assignments]!r})"
+        return f"{self.__class__.__name__}({[repr(a) for a in self.assignments]!r})"
 
 
 def parse_environment(env_string: str) -> ParsedEnvironment:

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 .typing import Protocol
-from packaging.version import Version
+
+__all__ = ("Printable", "dump_python_configurations")
 
 
-class InlineArrayDictEncoder(toml.encoder.TomlEncoder):  # type: ignore
+class Printable(Protocol):
-    def __init__(self) -> None:
+    def __str__(self) -> str:
-        super().__init__()
+        ...
-        self.dump_funcs[Version] = lambda v: f'"{v}"'
 
-    def dump_sections(self, o: Dict[str, Any], sup: str) -> Any:
+
-        if not all(isinstance(a, list) for a in o.values()):
+def dump_python_configurations(inp: Dict[str, Dict[str, List[Dict[str, Printable]]]]) -> str:
-            return super().dump_sections(o, sup)
+    output = StringIO()
-        val = ""
+    for header, values in inp.items():
-        for k, v in o.items():
+        output.write(f"[{header}]\n")
-            inner = ",\n  ".join(self.dump_inline_table(d_i).strip() for d_i in v)
+        for inner_header, listing in values.items():
-            val += f"{k} = [\n  {inner},\n]\n"
+            output.write(f"{inner_header} = [\n")
-        return val, self._dict()
+            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

@@ -1,15 +1,16 @@
 import subprocess
 import sys
 import textwrap
+from collections import OrderedDict
 from pathlib import Path, PurePath
-from typing import List, NamedTuple, Set
+from typing import Iterator, List, NamedTuple, Set
 
 from .architecture import Architecture
 from .docker_container import DockerContainer
 from .logger import log
+from .options import Options
 from .typing import PathOrStr, assert_never
 from .util import (
-    BuildOptions,
     BuildSelector,
     NonPlatformWheelError,
     get_build_verbosity_extra_flags,
@@ -28,6 +29,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 +54,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, BuildStep] = OrderedDict()  # type: ignore[type-arg]
+
+    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,254 +317,39 @@ def build(options: BuildOptions) -> None:
         )
         sys.exit(2)
 
-    assert options.manylinux_images is not None
+    python_configurations = get_python_configurations(
-    assert options.musllinux_images is not None
+        options.globals.build_selector, options.globals.architectures
-    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"]),
-        ("cp", "musllinux_x86_64", options.musllinux_images["x86_64"]),
-        ("cp", "musllinux_i686", options.musllinux_images["i686"]),
-        ("cp", "musllinux_aarch64", options.musllinux_images["aarch64"]),
-        ("cp", "musllinux_ppc64le", options.musllinux_images["ppc64le"]),
-        ("cp", "musllinux_s390x", options.musllinux_images["s390x"]),
-    ]
 
     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,
+                docker_image=build_step.docker_image,
-                simulate_32_bit=platform_tag.endswith("i686"),
+                simulate_32_bit=build_step.platform_tag.endswith("i686"),
                 cwd=container_project_path,
             ) as docker:
 
-                log.step("Copying project into Docker...")
+                build_on_docker(
-                docker.copy_into(Path.cwd(), container_project_path)
+                    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}"
@@ -323,16 +365,18 @@ def _matches_prepared_command(error_cmd: List[str], command_template: str) -> bo
     return error_cmd[2].startswith(command_prefix)
 
 
-def troubleshoot(options: BuildOptions, error: Exception) -> None:
+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.repair_command)
+        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(options.package_dir.glob("**/*.so"))
+        so_files = list(options.globals.package_dir.glob("**/*.so"))
 
         if so_files:
             print(

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)]
+    return [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
 
 
 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,
+                build_options.environment,
-                options.build_frontend,
+                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:
+                if build_options.dependency_constraints:
-                    constr = options.dependency_constraints.get_for_python_version(config.version)
+                    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
@@ -41,29 +142,28 @@ def _dig_first(*pairs: Tuple[Mapping[str, Setting], str], ignore_empty: bool = F
     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_reader = OptionsReader(config_file, platform='macos')
-      >>> options('cool-color')
+      >>> 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_path: Optional[Path] = None,
-        config_file: Optional[str] = None,
         *,
-        platform: str,
+        platform: PlatformName,
         disallow: Optional[Dict[str, Set[str]]] = None,
     ) -> None:
         self.platform = platform
@@ -77,14 +177,8 @@ class ConfigOptions:
         config_options: Dict[str, Any] = {}
         config_platform_options: Dict[str, Any] = {}
 
-        if config_file is not None:
+        if config_file_path is not None:
-            config_path = Path(config_file.format(package=package_path))
+            config_options, config_platform_options = self._load_file(config_file_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)
 
         # Validate project config
         for option_name in config_options:
@@ -100,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
 
@@ -126,14 +240,31 @@ 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,
         *,
@@ -159,11 +290,15 @@ 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),
@@ -183,3 +318,278 @@ 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": " "}
+            )
+            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)
+
+            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 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
+
+                    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:
+        with (package_dir / "setup.py").open() as f2:
-            return setup_py_python_requires(f.read())
+            return setup_py_python_requires(f2.read())
     except FileNotFoundError:
         pass
 

cibuildwheel/resources/build-platforms.toml

@@ -65,9 +65,9 @@ python_configurations = [
   { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.7/python-3.9.7-macos11.pkg" },
   { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.7/python-3.9.7-macos11.pkg" },
   { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.7/python-3.9.7-macos11.pkg" },
-  { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0rc2-macos11.pkg" },
+  { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0-macos11.pkg" },
-  { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0rc2-macos11.pkg" },
+  { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0-macos11.pkg" },
-  { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0rc2-macos11.pkg" },
+  { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0-macos11.pkg" },
   { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5-osx64.tar.bz2" },
 ]
 
@@ -81,7 +81,7 @@ python_configurations = [
   { identifier = "cp38-win_amd64", version = "3.8.10", arch = "64" },
   { identifier = "cp39-win32", version = "3.9.7", arch = "32" },
   { identifier = "cp39-win_amd64", version = "3.9.7", arch = "64" },
-  { identifier = "cp310-win32", version = "3.10.0-rc2", arch = "32" },
+  { identifier = "cp310-win32", version = "3.10.0", arch = "32" },
-  { identifier = "cp310-win_amd64", version = "3.10.0-rc2", arch = "64" },
+  { identifier = "cp310-win_amd64", version = "3.10.0", arch = "64" },
   { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5-win64.zip" },
 ]

cibuildwheel/resources/constraints-python36.txt

@@ -6,11 +6,11 @@
 #
 backports.entry-points-selectable==1.1.0
     # via virtualenv
-delocate==0.9.1
+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.3.0
     # via virtualenv
 importlib-metadata==4.8.1
     # via
@@ -18,23 +18,21 @@ importlib-metadata==4.8.1
     #   virtualenv
 importlib-resources==5.2.2
     # via virtualenv
-platformdirs==2.3.0
+platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
-    # via
+    # via virtualenv
-    #   delocate
-    #   virtualenv
 typing-extensions==3.10.0.2
     # via
     #   delocate
     #   importlib-metadata
-virtualenv==20.8.0
+virtualenv==20.8.1
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.0
     # via
     #   -r cibuildwheel/resources/constraints.in
     #   delocate
-zipp==3.5.0
+zipp==3.6.0
     # via
     #   importlib-metadata
     #   importlib-resources
@@ -42,5 +40,5 @@ zipp==3.5.0
 # The following packages are considered to be unsafe in a requirements file:
 pip==21.2.4
     # via -r cibuildwheel/resources/constraints.in
-setuptools==58.0.4
+setuptools==58.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python37.txt

@@ -6,37 +6,35 @@
 #
 backports.entry-points-selectable==1.1.0
     # via virtualenv
-delocate==0.9.1
+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.3.0
     # via virtualenv
 importlib-metadata==4.8.1
     # via
     #   backports.entry-points-selectable
     #   virtualenv
-platformdirs==2.3.0
+platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
-    # via
+    # via virtualenv
-    #   delocate
-    #   virtualenv
 typing-extensions==3.10.0.2
     # via
     #   delocate
     #   importlib-metadata
-virtualenv==20.8.0
+virtualenv==20.8.1
     # via -r cibuildwheel/resources/constraints.in
 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.2.4
     # via -r cibuildwheel/resources/constraints.in
-setuptools==58.0.4
+setuptools==58.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python38.txt

@@ -6,21 +6,19 @@
 #
 backports.entry-points-selectable==1.1.0
     # via virtualenv
-delocate==0.9.1
+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.3.0
     # via virtualenv
-platformdirs==2.3.0
+platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
-    # via
+    # via virtualenv
-    #   delocate
-    #   virtualenv
 typing-extensions==3.10.0.2
     # via delocate
-virtualenv==20.8.0
+virtualenv==20.8.1
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.0
     # via
@@ -30,5 +28,5 @@ wheel==0.37.0
 # The following packages are considered to be unsafe in a requirements file:
 pip==21.2.4
     # via -r cibuildwheel/resources/constraints.in
-setuptools==58.0.4
+setuptools==58.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python39.txt

@@ -6,21 +6,19 @@
 #
 backports.entry-points-selectable==1.1.0
     # via virtualenv
-delocate==0.9.1
+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.3.0
     # via virtualenv
-platformdirs==2.3.0
+platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
-    # via
+    # via virtualenv
-    #   delocate
-    #   virtualenv
 typing-extensions==3.10.0.2
     # via delocate
-virtualenv==20.8.0
+virtualenv==20.8.1
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.0
     # via
@@ -30,5 +28,5 @@ wheel==0.37.0
 # The following packages are considered to be unsafe in a requirements file:
 pip==21.2.4
     # via -r cibuildwheel/resources/constraints.in
-setuptools==58.0.4
+setuptools==58.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints.txt

@@ -6,21 +6,19 @@
 #
 backports.entry-points-selectable==1.1.0
     # via virtualenv
-delocate==0.9.1
+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.3.0
     # via virtualenv
-platformdirs==2.3.0
+platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
-    # via
+    # via virtualenv
-    #   delocate
-    #   virtualenv
 typing-extensions==3.10.0.2
     # via delocate
-virtualenv==20.8.0
+virtualenv==20.8.1
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.0
     # via
@@ -30,5 +28,5 @@ wheel==0.37.0
 # The following packages are considered to be unsafe in a requirements file:
 pip==21.2.4
     # via -r cibuildwheel/resources/constraints.in
-setuptools==58.0.4
+setuptools==58.2.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/pinned_docker_images.cfg

@@ -1,43 +1,43 @@
 [x86_64]
-manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-09-19-4c6448f
+manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-10-10-fee0ae1
-manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-09-19-a5ef179
+manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-10-10-790306f
-manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-09-19-a5ef179
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-10-10-790306f
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-09-19-a5ef179
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-10-10-790306f
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2021-09-19-a5ef179
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2021-10-10-790306f
 
 [i686]
-manylinux1 = quay.io/pypa/manylinux1_i686:2021-09-19-4c6448f
+manylinux1 = quay.io/pypa/manylinux1_i686:2021-10-10-fee0ae1
-manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-09-19-a5ef179
+manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-10-10-790306f
-manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-09-19-a5ef179
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-10-10-790306f
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-09-19-a5ef179
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-10-10-790306f
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2021-09-19-a5ef179
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2021-10-10-790306f
 
 [pypy_x86_64]
-manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-09-19-a5ef179
+manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-10-10-790306f
-manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-09-19-a5ef179
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-10-10-790306f
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-09-19-a5ef179
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-10-10-790306f
 
 [pypy_i686]
-manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-09-19-a5ef179
+manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-10-10-790306f
-manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-09-19-a5ef179
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-10-10-790306f
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-09-19-a5ef179
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-10-10-790306f
 
 [aarch64]
-manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-09-19-a5ef179
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-10-10-790306f
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-09-19-a5ef179
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-10-10-790306f
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2021-09-19-a5ef179
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2021-10-10-790306f
 
 [ppc64le]
-manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-09-19-a5ef179
+manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-10-10-790306f
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2021-09-19-a5ef179
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2021-10-10-790306f
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2021-09-19-a5ef179
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2021-10-10-790306f
 
 [s390x]
-manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-09-19-a5ef179
+manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-10-10-790306f
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2021-09-19-a5ef179
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2021-10-10-790306f
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2021-09-19-a5ef179
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2021-10-10-790306f
 
 [pypy_aarch64]
-manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-09-19-a5ef179
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-10-10-790306f
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-09-19-a5ef179
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-10-10-790306f
 

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",
+    "PLATFORMS",
-    "Set",
-    "Union",
-    "PopenBytes",
     "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 Dict, Iterator, List, Optional
 
 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,6 +28,25 @@ 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 prepare_command(command: str, **kwargs: PathOrStr) -> str:
     """
@@ -52,11 +69,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: List[str] = patterns.split()
+    patterns_list = itertools.chain.from_iterable(bracex.expand(p) for p in patterns_list)  # type: ignore[assignment]
+    return any(fnmatch.fnmatch(string, pat) for pat in patterns_list)
+
+
 class IdentifierSelector:
     """
     This class holds a set of build/skip patterns. You call an instance with a
@@ -77,8 +109,8 @@ class IdentifierSelector:
         requires_python: Optional[SpecifierSet] = None,
         prerelease_pythons: bool = False,
     ):
-        self.build_patterns = build_config.split()
+        self.build_config = build_config
-        self.skip_patterns = skip_config.split()
+        self.skip_config = skip_config
         self.requires_python = requires_python
         self.prerelease_pythons = prerelease_pythons
 
@@ -92,30 +124,22 @@ class IdentifierSelector:
             if not self.requires_python.contains(version):
                 return False
 
-        build_patterns = itertools.chain.from_iterable(
+        # filter out the prerelease pythons if self.prerelease_pythons is False
-            bracex.expand(p) for p in self.build_patterns
+        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:
+        return should_build and not should_skip
-            # filter out the prerelease pythons, alongside the user-defined
-            # skip patterns
-            unexpanded_skip_patterns += BuildSelector.PRERELEASE_SKIP.split()
-
-        skip_patterns = itertools.chain.from_iterable(
-            bracex.expand(p) for p in unexpanded_skip_patterns
-        )
-
-        build: bool = any(fnmatch.fnmatch(build_id, pat) for pat in build_patterns)
-        skip: bool = any(fnmatch.fnmatch(build_id, pat) for pat in skip_patterns)
-        return build and not skip
 
     def __repr__(self) -> str:
-        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:
+        if self.skip_config:
-            result += f', skip_config={" ".join(self.skip_patterns)!r}'
+            result += f", skip_config={self.skip_config!r}"
         if self.prerelease_pythons:
             result += ", prerelease_pythons=True"
 
@@ -137,18 +161,18 @@ class TestSelector(IdentifierSelector):
 
 # Taken from https://stackoverflow.com/a/107717
 class Unbuffered:
-    def __init__(self, stream):  # type: ignore
+    def __init__(self, stream):  # type: ignore[no-untyped-def]
         self.stream = stream
 
-    def write(self, data):  # type: ignore
+    def write(self, data):  # type: ignore[no-untyped-def]
         self.stream.write(data)
         self.stream.flush()
 
-    def writelines(self, data):  # type: ignore
+    def writelines(self, data):  # type: ignore[no-untyped-def]
         self.stream.writelines(data)
         self.stream.flush()
 
-    def __getattr__(self, attr):  # type: ignore
+    def __getattr__(self, attr):  # type: ignore[no-untyped-def]
         return getattr(self.stream, attr)
 
 
@@ -202,28 +226,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):
+        return self.base_file_path == o.base_file_path
-    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]]
-    musllinux_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
 
 
 class NonPlatformWheelError(Exception):

cibuildwheel/windows.py

@@ -10,10 +10,10 @@ from zipfile import ZipFile
 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,
@@ -246,47 +246,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,
+                build_options.environment,
-                options.build_frontend,
+                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 +299,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 +310,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:
+                if build_options.dependency_constraints:
-                    constraints_path = options.dependency_constraints.get_for_python_version(
+                    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 +343,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 +351,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 +363,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 +374,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 +396,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:
+                if build_options.test_requires:
-                    call(["pip", "install"] + options.test_requires, env=virtualenv_env)
+                    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 +428,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,18 +2,45 @@
 title: Changelog
 ---
 
-### v2.2.0 (prerelease)
+### v2.2.2
 
-_Currently in prerelease. The below release notes will be condensed into a single entry on final release._
+_26 October 2021_
 
-_v2.2.0a1 (23 September 2021)_
+- 🐛 Fix bug in the GitHub Action step causing a syntax error (#895)
 
-- 🌟 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.
+### 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)
 
-  Musllinux builds are enabled by default. To disable them on your project, add `*-musllinux_*` to your [`CIBW_SKIP`/`skip`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip)
- option. (#768)
 - 🛠 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_

docs/contributing.md

@@ -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/data/projects.yml

@@ -390,3 +390,116 @@
   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: Pixar OpenTimelineIO
+  gh: PixarAnimationStudios/OpenTimelineIO
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: OpenColorIO
+  gh: AcademySoftwareFoundation/OpenColorIO
+  ci: [github]
+  os: [apple, linux, windows]

docs/faq.md

@@ -127,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.2.0a1
+uses: pypa/cibuildwheel@v2.2.2
 ```
 
 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.
@@ -153,7 +153,7 @@ The second option, and the only one that supports other CI systems, is using a `
 
 ```bash
 # requirements-cibw.txt
-cibuildwheel==2.2.0a1
+cibuildwheel==2.2.2
 ```
 
 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:

docs/options.md

@@ -107,6 +107,56 @@ 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 = "manylinux2010"
+
+[[tool.cibuildwheel.overrides]]
+select = "cp36-*"
+manylinux-x86_64-image = "manylinux1"
+
+[[tool.cibuildwheel.overrides]]
+select = "cp310-*"
+manylinux-x86_64-image = "manylinux2014"
+```
+
+This example will build CPython 3.6 wheels on manylinux1, CPython 3.7-3.9
+images on manylinux2010, and CPython 3.10 wheels on manylinux2014.
+
+
 ## Options summary
 
 <div class="options-toc"></div>
@@ -305,7 +355,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
 
@@ -564,6 +615,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`
 
@@ -1132,7 +1187,7 @@ Platform-specific environment variables are also available:<br/>
     ```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.
@@ -1144,6 +1199,8 @@ 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"

docs/setup.md

@@ -118,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.2.0a1
+            run: pipx run cibuildwheel==2.2.2
 
           - uses: actions/upload-artifact@v2
             with:
@@ -153,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.2.0a1
+            run: python -m pip install cibuildwheel==2.2.2
 
           - name: Build wheels
             run: python -m cibuildwheel --output-dir wheelhouse

docs/working-examples.md

@@ -9,22 +9,43 @@ title: Working examples
 | 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. |
 | [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.  |
+| [duckdb][]                        | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System |
+| [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 |
 | [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. |
+| [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. |
+| [vispy][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Main repository for Vispy |
 | [River][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python |
+| [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 |
 | [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 |
+| [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 |
+| [Pixar 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 |
@@ -32,18 +53,18 @@ title: Working examples
 | [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 |
 | [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 |
-| [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 |
-| [dd-trace-py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub |
-| [sourmash][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. |
 | [tgcalls][]                       | ![github icon][] | ![apple icon][] ![windows icon][] | Python `pybind11` binding to Telegram's WebRTC library with third party dependencies like `OpenSSL`, `MozJPEG`, `FFmpeg`, etc. |
+| [dd-trace-py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub |
+| [pybind11 python_example][]       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a Python-based build system |
+| [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. |
@@ -52,8 +73,8 @@ title: Working examples
 | [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. |
+| [iDynTree][]                      | ![github icon][] | ![linux icon][] | Uses manylinux_2_24 |
 | [pybase64][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python |
 | [TgCrypto][]                      | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
 | [etebase-py][]                    | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. |
@@ -61,10 +82,11 @@ title: Working examples
 | [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. |
-| [ninja][]                         | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
 | [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. |
-| [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 |
+| [ninja][]                         | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
 | [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 |
+| [clang-format][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic 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. |
@@ -72,22 +94,43 @@ title: Working examples
 | [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. |
 
 [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
 [websockets]: https://github.com/aaugustin/websockets
+[duckdb]: https://github.com/duckdb/duckdb
+[cvxpy]: https://github.com/cvxpy/cvxpy
+[Triton]: https://github.com/openai/triton
+[PyOxidizer]: https://github.com/indygreg/PyOxidizer
 [pyzmq]: https://github.com/zeromq/pyzmq
-[aiortc]: https://github.com/aiortc/aiortc
+[OpenSpiel]: https://github.com/deepmind/open_spiel
+[vispy]: https://github.com/vispy/vispy
 [River]: https://github.com/online-ml/river
+[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
 [numexpr]: https://github.com/pydata/numexpr
-[h5py]: https://github.com/h5py/h5py
 [Dependency Injector]: https://github.com/ets-labs/python-dependency-injector
+[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
+[Pixar OpenTimelineIO]: https://github.com/PixarAnimationStudios/OpenTimelineIO
 [ruptures]: https://github.com/deepcharles/ruptures
 [pikepdf]: https://github.com/pikepdf/pikepdf
 [aioquic]: https://github.com/aiortc/aioquic
@@ -95,18 +138,18 @@ title: Working examples
 [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
 [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
-[cyvcf2]: https://github.com/brentp/cyvcf2
-[pybind11 python_example]: https://github.com/pybind/python_example
-[dd-trace-py]: https://github.com/DataDog/dd-trace-py
-[sourmash]: https://github.com/dib-lab/sourmash
 [tgcalls]: https://github.com/MarshalX/tgcalls
+[dd-trace-py]: https://github.com/DataDog/dd-trace-py
+[pybind11 python_example]: https://github.com/pybind/python_example
+[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
@@ -115,8 +158,8 @@ title: Working examples
 [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
+[iDynTree]: https://github.com/robotology/idyntree
 [pybase64]: https://github.com/mayeut/pybase64
 [TgCrypto]: https://github.com/pyrogram/tgcrypto
 [etebase-py]: https://github.com/etesync/etebase-py
@@ -124,10 +167,11 @@ title: Working examples
 [pyjet]: https://github.com/scikit-hep/pyjet
 [numpythia]: https://github.com/scikit-hep/numpythia
 [polaroid]: https://github.com/daggy1234/polaroid
-[ninja]: https://github.com/scikit-build/ninja-python-distributions
 [Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build
-[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example
+[ninja]: https://github.com/scikit-build/ninja-python-distributions
 [GSD]: https://github.com/glotzerlab/gsd
+[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example
+[clang-format]: https://github.com/ssciwr/clang-format-wheel
 [pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext
 [xmlstarlet]: https://github.com/dimitern/xmlstarlet
 [CorrectionLib]: https://github.com/cms-nanoAOD/correctionlib
@@ -144,68 +188,90 @@ title: Working examples
 [apple icon]: data/readme_icons/apple.svg
 [linux icon]: data/readme_icons/linux.svg
 
-<!-- scikit-learn: 47240, last pushed 0 days ago -->
+<!-- scikit-learn: 47525, last pushed 0 days ago -->
-<!-- Matplotlib: 14229, last pushed 0 days ago -->
+<!-- Tornado: 20226, last pushed 9 days ago -->
-<!-- MyPy: 11299, last pushed 0 days ago -->
+<!-- Matplotlib: 14334, last pushed 0 days ago -->
-<!-- psutil: 7668, last pushed 7 days ago -->
+<!-- pytorch-fairseq: 14077, last pushed 0 days ago -->
-<!-- scikit-image: 4523, last pushed 0 days ago -->
+<!-- MyPy: 11462, last pushed 0 days ago -->
-<!-- twisted-iocpsupport: 4373, last pushed 0 days ago -->
+<!-- uvloop: 8093, last pushed 5 days ago -->
-<!-- cmake: 4161, last pushed 0 days ago -->
+<!-- pydantic: 7761, last pushed 2 days ago -->
-<!-- websockets: 3569, last pushed 0 days ago -->
+<!-- psutil: 7724, last pushed 1 days ago -->
-<!-- pyzmq: 2911, last pushed 3 days ago -->
+<!-- vaex: 6633, last pushed 1 days ago -->
-<!-- aiortc: 2575, last pushed 3 days ago -->
+<!-- Google Benchmark: 5790, last pushed 5 days ago -->
-<!-- River: 1993, last pushed 0 days ago -->
+<!-- asyncpg: 5107, last pushed 19 days ago -->
-<!-- coverage.py: 1722, last pushed 11 days ago -->
+<!-- Apache Beam: 5022, last pushed 0 days ago -->
-<!-- numexpr: 1643, last pushed 74 days ago -->
+<!-- scikit-image: 4547, last pushed 2 days ago -->
-<!-- h5py: 1585, last pushed 5 days ago -->
+<!-- twisted-iocpsupport: 4386, last pushed 5 days ago -->
-<!-- Dependency Injector: 1565, last pushed 3 days ago -->
+<!-- cmake: 4195, last pushed 0 days ago -->
-<!-- PyAV: 1344, last pushed 17 days ago -->
+<!-- websockets: 3600, last pushed 2 days ago -->
-<!-- PyTables: 1061, last pushed 18 days ago -->
+<!-- duckdb: 3568, last pushed 0 days ago -->
-<!-- ruptures: 793, last pushed 2 days ago -->
+<!-- cvxpy: 3544, last pushed 2 days ago -->
-<!-- pikepdf: 747, last pushed 4 days ago -->
+<!-- Triton: 3268, last pushed 0 days ago -->
-<!-- aioquic: 740, last pushed 12 days ago -->
+<!-- PyOxidizer: 3215, last pushed 10 days ago -->
-<!-- google neuroglancer: 685, last pushed 4 days ago -->
+<!-- pyzmq: 2930, last pushed 0 days ago -->
-<!-- DeepForest: 655, last pushed 58 days ago -->
+<!-- OpenSpiel: 2889, last pushed 4 days ago -->
-<!-- AutoPy: 572, last pushed 94 days ago -->
+<!-- vispy: 2741, last pushed 2 days ago -->
-<!-- Parselmouth: 555, last pushed 6 days ago -->
+<!-- River: 2610, last pushed 2 days ago -->
-<!-- python-rapidjson: 429, last pushed 86 days ago -->
+<!-- aiortc: 2606, last pushed 4 days ago -->
-<!-- H3-py: 428, last pushed 12 days ago -->
+<!-- Confluent client for Kafka: 2462, last pushed 3 days ago -->
-<!-- markupsafe: 424, last pushed 11 days ago -->
+<!-- tinyobjloader: 2286, last pushed 1 days ago -->
-<!-- Rtree: 420, last pushed 183 days ago -->
+<!-- coverage.py: 1752, last pushed 0 days ago -->
-<!-- python-snappy: 407, last pushed 60 days ago -->
+<!-- PyCryptodome: 1730, last pushed 0 days ago -->
-<!-- pybind11 cmake_example: 310, last pushed 5 days ago -->
+<!-- numexpr: 1657, last pushed 15 days ago -->
-<!-- KDEpy: 299, last pushed 108 days ago -->
+<!-- Dependency Injector: 1615, last pushed 4 days ago -->
-<!-- cyvcf2: 268, last pushed 19 days ago -->
+<!-- PyYAML: 1615, last pushed 0 days ago -->
-<!-- pybind11 python_example: 265, last pushed 5 days ago -->
+<!-- h5py: 1594, last pushed 2 days ago -->
-<!-- dd-trace-py: 265, last pushed 0 days ago -->
+<!-- PyAV: 1357, last pushed 14 days ago -->
-<!-- sourmash: 260, last pushed 0 days ago -->
+<!-- OpenColorIO: 1168, last pushed 1 days ago -->
-<!-- tgcalls: 248, last pushed 2 days ago -->
+<!-- PyTables: 1065, last pushed 14 days ago -->
-<!-- time-machine: 206, last pushed 5 days ago -->
+<!-- Line Profiler: 912, last pushed 3 days ago -->
-<!-- matrixprofile: 198, last pushed 86 days ago -->
+<!-- Pixar OpenTimelineIO: 907, last pushed 0 days ago -->
-<!-- CTranslate2: 188, last pushed 4 days ago -->
+<!-- ruptures: 811, last pushed 2 days ago -->
-<!-- iminuit: 184, last pushed 11 days ago -->
+<!-- pikepdf: 763, last pushed 1 days ago -->
-<!-- jq.py: 174, last pushed 48 days ago -->
+<!-- aioquic: 749, last pushed 13 days ago -->
+<!-- google neuroglancer: 689, last pushed 6 days ago -->
+<!-- DeepForest: 663, last pushed 79 days ago -->
+<!-- AutoPy: 578, last pushed 115 days ago -->
+<!-- Parselmouth: 567, last pushed 6 days ago -->
+<!-- H3-py: 436, last pushed 33 days ago -->
+<!-- python-rapidjson: 429, last pushed 107 days ago -->
+<!-- markupsafe: 426, last pushed 4 days ago -->
+<!-- Rtree: 421, last pushed 4 days ago -->
+<!-- python-snappy: 407, last pushed 81 days ago -->
+<!-- pybind11 cmake_example: 315, last pushed 4 days ago -->
+<!-- KDEpy: 302, last pushed 129 days ago -->
+<!-- tgcalls: 275, last pushed 20 days ago -->
+<!-- dd-trace-py: 272, last pushed 1 days ago -->
+<!-- pybind11 python_example: 271, last pushed 4 days ago -->
+<!-- cyvcf2: 269, last pushed 40 days ago -->
+<!-- sourmash: 262, last pushed 0 days ago -->
+<!-- time-machine: 214, last pushed 1 days ago -->
+<!-- matrixprofile: 201, last pushed 107 days ago -->
+<!-- CTranslate2: 188, last pushed 2 days ago -->
+<!-- iminuit: 185, last pushed 1 days ago -->
+<!-- jq.py: 176, last pushed 69 days ago -->
 <!-- Tokenizer: 156, last pushed 2 days ago -->
-<!-- PyGLM: 117, last pushed 5 days ago -->
+<!-- PyGLM: 119, last pushed 11 days ago -->
-<!-- bx-python: 105, last pushed 72 days ago -->
+<!-- bx-python: 106, last pushed 93 days ago -->
-<!-- iDynTree: 87, last pushed 3 days ago -->
+<!-- boost-histogram: 92, last pushed 6 days ago -->
-<!-- boost-histogram: 83, last pushed 2 days ago -->
+<!-- iDynTree: 89, last pushed 7 days ago -->
-<!-- pybase64: 73, last pushed 1 days ago -->
+<!-- pybase64: 74, last pushed 3 days ago -->
-<!-- TgCrypto: 71, last pushed 112 days ago -->
+<!-- TgCrypto: 73, last pushed 7 days ago -->
-<!-- etebase-py: 51, last pushed 258 days ago -->
+<!-- etebase-py: 52, last pushed 279 days ago -->
-<!-- fathon: 35, last pushed 109 days ago -->
+<!-- fathon: 39, last pushed 130 days ago -->
 <!-- pyjet: 31, last pushed 4 days ago -->
 <!-- numpythia: 31, last pushed 4 days ago -->
-<!-- polaroid: 24, last pushed 55 days ago -->
+<!-- polaroid: 25, last pushed 8 days ago -->
-<!-- ninja: 20, last pushed 6 days ago -->
+<!-- Imagecodecs (fork): 21, last pushed 46 days ago -->
-<!-- Imagecodecs (fork): 19, last pushed 25 days ago -->
+<!-- ninja: 19, last pushed 1 days ago -->
-<!-- pybind11 scikit_build_example: 17, last pushed 5 days ago -->
+<!-- GSD: 18, last pushed 2 days ago -->
-<!-- GSD: 17, last pushed 17 days ago -->
+<!-- pybind11 scikit_build_example: 17, last pushed 4 days ago -->
-<!-- pyinstrument_cext: 10, last pushed 33 days ago -->
+<!-- clang-format: 15, last pushed 3 days ago -->
-<!-- xmlstarlet: 7, last pushed 59 days ago -->
+<!-- pyinstrument_cext: 10, last pushed 2 days ago -->
-<!-- CorrectionLib: 6, last pushed 4 days ago -->
+<!-- xmlstarlet: 7, last pushed 80 days ago -->
-<!-- SiPM: 4, last pushed 72 days ago -->
+<!-- CorrectionLib: 7, last pushed 3 days ago -->
-<!-- pillow-heif: 2, last pushed 3 days ago -->
+<!-- SiPM: 4, last pushed 0 days ago -->
+<!-- pillow-heif: 3, last pushed 2 days ago -->
 
 <!-- END bin/projects.py -->
 

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.2.0a1
+install: python -m pip install cibuildwheel==2.2.2
 
 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.2.0a1
+        pip3 install cibuildwheel==2.2.2
       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.2.0a1
+        python3 -m pip install cibuildwheel==2.2.2
       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.2.0a1
+        pip install cibuildwheel==2.2.2
       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.2.0a1
+            pip3 install --user cibuildwheel==2.2.2
             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.2.0a1
+            pip3 install cibuildwheel==2.2.2
             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.2.0a1
+        uses: pypa/cibuildwheel@v2.2.2
         env:
           CIBW_ARCHS_MACOS: x86_64 universal2
 

examples/github-deploy.yml

@@ -27,7 +27,7 @@ jobs:
           python-version: '3.8'
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.2.0a1
+        uses: pypa/cibuildwheel@v2.2.2
 
       - 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.2.0a1
+        uses: pypa/cibuildwheel@v2.2.2
         # 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.2.0a1
+        uses: pypa/cibuildwheel@v2.2.2
         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.2.0a1
+    - python -m pip install cibuildwheel==2.2.2
     - 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.2.0a1
+  - python3 -m pip install cibuildwheel==2.2.2
 
 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.2.0a1
+  - python3 -m pip install cibuildwheel==2.2.2
 
 script:
   # build the wheels, put them into './wheelhouse'

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

@@ -57,7 +57,7 @@ jobs:
     - stage: deploy
       name: Build and deploy Linux wheels
       services: docker
-      install: python3 -m pip install cibuildwheel==2.2.0a1
+      install: python3 -m pip install cibuildwheel==2.2.2
       script: python3 -m cibuildwheel --output-dir wheelhouse
       after_success: |
         python3 -m pip install twine
@@ -67,7 +67,7 @@ jobs:
       name: Build and deploy Windows wheels
       os: windows
       language: shell
-      install: python3 -m pip install cibuildwheel==2.2.0a1
+      install: python3 -m pip install cibuildwheel==2.2.2
       script: python3 -m cibuildwheel --output-dir wheelhouse
       after_success: |
         python3 -m pip install twine

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"]
 
@@ -34,6 +34,16 @@ def lint(session: nox.Session) -> None:
     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: nox.Session) -> None:
     """

pyproject.toml

@@ -58,10 +58,27 @@ module = [
     "setuptools",
     "pytest", # ignored in pre-commit to speed up check
     "bashlex",
-    "toml.encoder", # encoder missing from stub package
     "bracex",
     "importlib_resources",
     "nox",
     "github",
 ]
 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.2.0a1
+version = 2.2.2
 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
+    tomli
+    dataclasses;python_version < '3.7'
     typing_extensions;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

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_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

@@ -132,11 +132,6 @@ def expected_wheels(
     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")]
-
     if platform == "macos" and machine_arch == "arm64":
         # currently, arm64 macs are only supported by cp39 & cp310
         python_abi_tags = ["cp39-cp39", "cp310-cp310"]

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:
+    with open(resources_dir / "build-platforms.toml") as f1:
-        txt = f.read()
+        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/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

@@ -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:
+    with DockerContainer(docker_image=DEFAULT_IMAGE) as container:
         assignment = EnvironmentAssignment("TEST=$(echo 42)")
         assert assignment.evaluated_value({}, container.environment_executor) == "42"

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):
+def fake_package_dir_autouse(fake_package_dir):
-    """
+    pass
-    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
 
 
 @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")
@@ -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 == (
+    build_options = intercepted_build_args.args[0].build_options(identifier=None)
-        "[" + test_extras + "]" if test_extras else ""
+
-    )
+    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]
+        options = intercepted_build_args.args[0]
-        assert build_options.architectures == {Architecture.ppc64le}
+        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,9 @@ 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}
     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,169 @@
+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"}
+
+
+@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/manylinux2010_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/manylinux2010_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 = "manylinux2014"
+
+# Before Python 3.10, manylinux2010 is the most compatible
+[[tool.cibuildwheel.overrides]]
+select = "cp3?-*"
+manylinux-x86_64-image = "manylinux2010"
+manylinux-i686-image = "manylinux2010"
+
+[[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/manylinux2010_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/manylinux2010_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"}}
+    assert kwargs["options"].build_options("cp37-manylinux_x86_64").before_all == ""
+
+    kwargs = build_on_docker.call_args_list[2][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 == {"cp310-manylinux_x86_64", "pp37-manylinux_x86_64"}
+
+    kwargs = build_on_docker.call_args_list[3][1]
+    assert "quay.io/pypa/manylinux2010_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,68 @@
+import platform as platform_module
+
+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"
+
+[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"]

unit_test/options_toml_test.py

@@ -1,6 +1,8 @@
+from pathlib import Path
+
 import pytest
 
-from cibuildwheel.options import ConfigOptionError, ConfigOptions, _dig_first
+from cibuildwheel.options import ConfigOptionError, OptionsReader, _dig_first
 
 PYPROJECT_1 = """
 [tool.cibuildwheel]
@@ -28,39 +30,43 @@ 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:
+    config_file_path: Path = tmp_path / fname
-        f.write(PYPROJECT_1)
+    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_reader.get("test-command") == "pyproject"
-    assert options("archs", sep=" ") == "auto"
+    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"'
+        options_reader.get("environment", table={"item": '{k}="{v}"', "sep": " "})
-    )
-    assert (
-        options("environment", sep="x", table={"item": '{k}="{v}"', "sep": " "})
         == 'THING="OTHER" FOO="BAR"'
     )
-    assert options("test-extras", sep=",") == "one,two"
+    assert (
-    assert options("test-extras", sep=",", table={"item": '{k}="{v}"', "sep": " "}) == "one,two"
+        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_reader.get("manylinux-x86_64-image") == "manylinux1"
-    assert options("manylinux-i686-image") == "manylinux2010"
+    assert options_reader.get("manylinux-i686-image") == "manylinux2010"
 
     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):
@@ -70,44 +76,46 @@ def test_envvar_override(tmp_path, platform, monkeypatch):
     monkeypatch.setenv("CIBW_TEST_REQUIRES", "docs")
     monkeypatch.setenv("CIBW_TEST_REQUIRES_LINUX", "scod")
 
-    with tmp_path.joinpath("pyproject.toml").open("w") as f:
+    config_file_path: Path = tmp_path / "pyproject.toml"
-        f.write(PYPROJECT_1)
+    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_reader.get("build", sep=" ") == "cp38*"
-    assert options("manylinux-x86_64-image") == "manylinux2014"
+    assert options_reader.get("manylinux-x86_64-image") == "manylinux2014"
-    assert options("manylinux-i686-image") == "manylinux2010"
+    assert options_reader.get("manylinux-i686-image") == "manylinux2010"
 
     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)
+    options_reader = OptionsReader(pyproject_toml, platform=platform)
-    assert options("repair-wheel-command") == "repair-project-global"
+    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)
+    options_reader = OptionsReader(platform=platform)
-    assert options("repair-wheel-command") == "repair-env-global"
+    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)
+    options_reader = OptionsReader(pyproject_toml, platform=platform)
-    assert options("repair-wheel-command") == "repair-env-global"
+    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)
+    options_reader = OptionsReader(pyproject_toml, platform=platform)
-    assert options("repair-wheel-command") == f"repair-project-{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,49 +159,53 @@ 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-x86_64-image = "manylinux1"
 """
     )
     disallow = {"windows": {"manylinux-x86_64-image"}}
-    ConfigOptions(tmp_path, platform="linux", disallow=disallow)
+    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):
-    tmp_path.joinpath("pyproject.toml").write_text(
+    pyproject_toml = tmp_path / "pyproject.toml"
+    pyproject_toml.write_text(
         """
 [tool.cibuildwheel]
 manylinux-i686-image = "manylinux1"
@@ -202,15 +216,15 @@ manylinux-x86_64-image = ""
     monkeypatch.setenv("CIBW_MANYLINUX_I686_IMAGE", "")
     monkeypatch.setenv("CIBW_MANYLINUX_AARCH64_IMAGE", "manylinux1")
 
-    options = ConfigOptions(tmp_path, platform="linux")
+    options_reader = OptionsReader(pyproject_toml, platform="linux")
 
-    assert options("manylinux-x86_64-image") == ""
+    assert options_reader.get("manylinux-x86_64-image") == ""
-    assert options("manylinux-i686-image") == ""
+    assert options_reader.get("manylinux-i686-image") == ""
-    assert options("manylinux-aarch64-image") == "manylinux1"
+    assert options_reader.get("manylinux-aarch64-image") == "manylinux1"
 
-    assert options("manylinux-x86_64-image", ignore_empty=True) == "manylinux2010"
+    assert options_reader.get("manylinux-x86_64-image", ignore_empty=True) == "manylinux2010"
-    assert options("manylinux-i686-image", ignore_empty=True) == "manylinux1"
+    assert options_reader.get("manylinux-i686-image", ignore_empty=True) == "manylinux1"
-    assert options("manylinux-aarch64-image", ignore_empty=True) == "manylinux1"
+    assert options_reader.get("manylinux-aarch64-image", ignore_empty=True) == "manylinux1"
 
 
 @pytest.mark.parametrize("ignore_empty", (True, False))
@@ -246,3 +260,53 @@ def test_dig_first(ignore_empty):
             (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