Upgrade to macos-13 for the intel runners

PyPA is now on an enterprise plan.
Let's use the new macos-13-xlarge runner in order to test on macOS arm64.

.circleci/config.yml

@@ -39,7 +39,7 @@ jobs:
 
   linux-aarch64:
     machine:
-       image: default
+       image: ubuntu-2004:2022.04.1
     resource_class: arm.medium
     environment:
       PYTHON: python3

.circleci/prepare.sh

@@ -4,9 +4,7 @@ set -o xtrace
 
 $PYTHON --version
 $PYTHON -m pip --version
-$PYTHON -m virtualenv --version
-$PYTHON -m virtualenv --no-setuptools --no-wheel -p "$PYTHON" venv
-venv/bin/python -m pip install -U pip
+$PYTHON -m virtualenv -p "$PYTHON" venv
 venv/bin/python -m pip install -e ".[dev]"
 venv/bin/python -m pip freeze
 venv/bin/python --version

.cirrus.yml

@@ -1,4 +1,4 @@
-only_if: changesInclude('.cirrus.yml') || ($CIRRUS_BRANCH == "main" && !changesIncludeOnly('docs/*', '.pre-commit-config.yaml')) || $CIRRUS_BRANCH =~ 'cirrus.*'
+only_if: changesInclude('.cirrus.yml') || ($BRANCH == "main" && !changesIncludeOnly('docs/*', '.pre-commit-config.yaml'))
 
 run_tests: &RUN_TESTS
   install_cibuildwheel_script:
@@ -50,23 +50,25 @@ windows_x86_task:
 
 macos_arm64_task:
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-sonoma-xcode
+    image: ghcr.io/cirruslabs/macos-monterey-xcode
 
   env:
-    PATH: /opt/homebrew/opt/python@3.10/libexec/bin:$PATH
+    PATH: /opt/homebrew/opt/python@3.10/bin:$PATH
   install_pre_requirements_script:
     - brew install python@3.10
+    - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python
   <<: *RUN_TESTS
 
 macos_arm64_cp38_task:
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-sonoma-xcode
+    image: ghcr.io/cirruslabs/macos-monterey-xcode
 
   env:
-    PATH: /opt/homebrew/opt/python@3.10/libexec/bin:$PATH
+    PATH: /opt/homebrew/opt/python@3.10/bin:$PATH
     PYTEST_ADDOPTS: --run-cp38-universal2 -k 'test_cp38_arm64_testing_universal2_installer or test_arch_auto'
   install_pre_requirements_script:
     - brew install python@3.10
+    - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python
     - curl -fsSLO https://www.python.org/ftp/python/3.8.10/python-3.8.10-macos11.pkg
     - sudo installer -pkg python-3.8.10-macos11.pkg -target /
     - rm python-3.8.10-macos11.pkg

.github/matchers/pylint.json

@@ -0,0 +1,32 @@
+{
+  "problemMatcher": [
+    {
+      "severity": "warning",
+      "pattern": [
+        {
+          "regexp": "^([^:]+):(\\d+):(\\d+): ([A-DF-Z]\\d+): \\033\\[[\\d;]+m([^\\033]+).*$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "code": 4,
+          "message": 5
+        }
+      ],
+      "owner": "pylint-warning"
+    },
+    {
+      "severity": "error",
+      "pattern": [
+        {
+          "regexp": "^([^:]+):(\\d+):(\\d+): (E\\d+): \\033\\[[\\d;]+m([^\\033]+).*$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "code": 4,
+          "message": 5
+        }
+      ],
+      "owner": "pylint-error"
+    }
+  ]
+}

.github/workflows/test.yml

@@ -24,22 +24,24 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: "3.x"
-    - uses: pre-commit/action@v3.0.1
+    - uses: pre-commit/action@v3.0.0
     - name: Check manifest
       run: pipx run nox -s check_manifest
     - name: PyLint checks
-      run: pipx run nox -s pylint -- --output-format=github
+      run: |
+        echo "::add-matcher::$GITHUB_WORKSPACE/.github/matchers/pylint.json"
+        pipx run nox -s pylint
 
   test:
-    name: Test cibuildwheel on ${{ matrix.os }} (${{ matrix.python_version }})
+    name: Test cibuildwheel on ${{ matrix.os }}
     needs: lint
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        os: [ubuntu-20.04, windows-latest, macos-13, macos-14]
         python_version: ['3.12']
         include:
-        - os: ubuntu-latest
+        - os: ubuntu-22.04
           python_version: '3.8'
     timeout-minutes: 180
     steps:
@@ -83,39 +85,6 @@ jobs:
       env:
         CIBW_ARCHS_MACOS: x86_64 universal2 arm64
 
-    - name: Run a sample build (GitHub Action, only)
-      uses: ./
-      with:
-        package-dir: sample_proj
-        output-dir: wheelhouse_only
-        only: cp312-${{ runner.os == 'Linux' && 'manylinux_x86_64' || (runner.os == 'Windows' && 'win_amd64' || 'macosx_x86_64') }}
-
-    - name: Create custom configuration file
-      shell: bash
-      run: |
-        cat > sample_proj/cibw.toml <<EOF
-        [tool.cibuildwheel]
-        # Only build on CPython 3.12 on native arch
-        archs = ["native"]
-        build = "cp312-*"
-        # Skip musllinux
-        skip = "*-musllinux*"
-        EOF
-
-    - name: Run a sample build (GitHub Action, config-file)
-      uses: ./
-      with:
-        package-dir: sample_proj
-        output-dir: wheelhouse_config_file
-        config-file: sample_proj/cibw.toml
-
-    - name: Check Action artefacts
-      shell: bash
-      run: |
-        test $(find wheelhouse -name '*.whl' | wc -l) -ge 1
-        test $(find wheelhouse_only -name '*.whl' | wc -l) -eq 1
-        test $(find wheelhouse_config_file -name '*.whl' | wc -l) -eq 1
-
     - uses: actions/upload-artifact@v4
       with:
         name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}

.github/workflows/update-dependencies.yml

@@ -18,13 +18,13 @@ jobs:
   update-dependencies:
     name: Update dependencies
     if: github.repository_owner == 'pypa' || github.event_name != 'schedule'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
 
-    - uses: wntrblm/nox@2024.04.15
+    - uses: wntrblm/nox@2023.04.22
       with:
-        python-versions: "3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13"
+        python-versions: "3.7, 3.8, 3.9, 3.10, 3.11, 3.12"
 
     - name: "Run update: dependencies"
       run: nox --force-color -s update_constraints
@@ -44,7 +44,7 @@ jobs:
 
     - name: Create Pull Request
       if: github.ref == 'refs/heads/main' && github.repository == 'pypa/cibuildwheel'
-      uses: peter-evans/create-pull-request@v6
+      uses: peter-evans/create-pull-request@v5
       with:
         commit-message: Update dependencies
         title: '[Bot] Update dependencies'

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v4.5.0
   hooks:
   - id: check-case-conflict
   - id: check-merge-conflict
@@ -14,14 +14,20 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.4.4
+  rev: v0.1.14
   hooks:
   - id: ruff
     args: ["--fix", "--show-fixes"]
   - id: ruff-format
 
+- repo: https://github.com/asottile/setup-cfg-fmt
+  rev: v2.5.0
+  hooks:
+  - id: setup-cfg-fmt
+    args: [--include-version-classifiers, --min-py-version=3.8, --max-py-version=3.12]
+
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.10.0
+  rev: v1.8.0
   hooks:
   - id: mypy
     name: mypy 3.8 on cibuildwheel/
@@ -48,7 +54,7 @@ repos:
     additional_dependencies: *mypy-dependencies
 
 - repo: https://github.com/shellcheck-py/shellcheck-py
-  rev: v0.10.0.1
+  rev: v0.9.0.6
   hooks:
   - id: shellcheck
 
@@ -76,7 +82,7 @@ repos:
 
 
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.28.3
+  rev: 0.27.0
   hooks:
     - id: check-dependabot
     - id: check-github-actions

.readthedocs.yml

@@ -5,11 +5,14 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.12"
-  commands:
-    - asdf plugin add uv
-    - asdf install uv latest
-    - asdf global uv latest
-    - uv venv
-    - uv pip install -e.[docs]
-    - NO_COLOR=1 .venv/bin/mkdocs build --strict --site-dir $READTHEDOCS_OUTPUT/html
+    python: "3.11"
+
+python:
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs
+
+mkdocs:
+  configuration: mkdocs.yml

.travis.yml

@@ -56,5 +56,5 @@ script: |
   (while true; do echo "travis_keep_alive"; sleep 300; done) &
   SPINNER_PID=$!
   disown
-  $PYTHON ./bin/run_tests.py --num-processes 2
+  $PYTHON ./bin/run_tests.py
   kill -9 ${SPINNER_PID}

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

@@ -2,7 +2,7 @@ cibuildwheel
 ============
 
 [![PyPI](https://img.shields.io/pypi/v/cibuildwheel.svg)](https://pypi.python.org/pypi/cibuildwheel)
-[![Documentation Status](https://readthedocs.org/projects/cibuildwheel/badge/?version=stable)](https://cibuildwheel.pypa.io/en/stable/?badge=stable)
+[![Documentation Status](https://readthedocs.org/projects/cibuildwheel/badge/?version=stable)](https://cibuildwheel.readthedocs.io/en/stable/?badge=stable)
 [![Actions Status](https://github.com/pypa/cibuildwheel/workflows/Test/badge.svg)](https://github.com/pypa/cibuildwheel/actions)
 [![Travis Status](https://img.shields.io/travis/com/pypa/cibuildwheel/main?logo=travis)](https://travis-ci.com/pypa/cibuildwheel)
 [![Appveyor status](https://ci.appveyor.com/api/projects/status/gt3vwl88yt0y3hur/branch/main?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/main)
@@ -10,7 +10,7 @@ cibuildwheel
 [![Azure Status](https://dev.azure.com/joerick0429/cibuildwheel/_apis/build/status/pypa.cibuildwheel?branchName=main)](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=4&branchName=main)
 
 
-[Documentation](https://cibuildwheel.pypa.io)
+[Documentation](https://cibuildwheel.readthedocs.org)
 
 <!--intro-start-->
 
@@ -22,7 +22,7 @@ Python wheels are great. Building them across **Mac, Linux, Windows**, on **mult
 What does it do?
 ----------------
 
-|                | macOS Intel | macOS Apple Silicon | Windows 64bit | Windows 32bit | Windows Arm64 | manylinux<br/>musllinux x86_64 | manylinux<br/>musllinux i686 | manylinux<br/>musllinux aarch64 | manylinux<br/>musllinux ppc64le | manylinux<br/>musllinux s390x |
+|   | macOS Intel | macOS Apple Silicon | Windows 64bit | Windows 32bit | Windows Arm64 | manylinux<br/>musllinux x86_64 | manylinux<br/>musllinux i686 | manylinux<br/>musllinux aarch64 | manylinux<br/>musllinux ppc64le | manylinux<br/>musllinux s390x |
 |----------------|----|-----|-----|-----|-----|----|-----|----|-----|-----|
 | CPython 3.6    | ✅ | N/A | ✅  | ✅  | N/A | ✅  | ✅  | ✅ | ✅  | ✅  |
 | CPython 3.7    | ✅ | N/A | ✅  | ✅  | N/A | ✅ | ✅  | ✅ | ✅  | ✅  |
@@ -30,8 +30,7 @@ What does it do?
 | CPython 3.9    | ✅ | ✅  | ✅  | ✅  | ✅² | ✅ | ✅ | ✅ | ✅  | ✅  |
 | CPython 3.10   | ✅ | ✅  | ✅  | ✅  | ✅² | ✅ | ✅  | ✅ | ✅  | ✅  |
 | CPython 3.11   | ✅ | ✅  | ✅  | ✅  | ✅² | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.12   | ✅ | ✅  | ✅  | ✅  | ✅² | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.13³  | ✅ | ✅  | ✅  | ✅  | ✅² | ✅ | ✅  | ✅ | ✅  | ✅  |
+| CPython 3.12  | ✅ | ✅  | ✅  | ✅  | ✅² | ✅ | ✅  | ✅ | ✅  | ✅  |
 | PyPy 3.7 v7.3  | ✅ | N/A | ✅  | N/A | N/A | ✅¹ | ✅¹  | ✅¹ | N/A | N/A |
 | PyPy 3.8 v7.3  | ✅ | ✅  | ✅  | N/A | N/A | ✅¹ | ✅¹  | ✅¹ | N/A | N/A |
 | PyPy 3.9 v7.3  | ✅ | ✅  | ✅  | N/A | N/A | ✅¹ | ✅¹  | ✅¹ | N/A | N/A |
@@ -39,14 +38,13 @@ What does it do?
 
 <sup>¹ PyPy is only supported for manylinux wheels.</sup><br>
 <sup>² Windows arm64 support is experimental.</sup><br>
-<sup>³ CPython 3.13 is available using the [CIBW_PRERELEASE_PYTHONS](https://cibuildwheel.pypa.io/en/stable/options/#prerelease-pythons) option.</sup><br>
 
 - Builds manylinux, musllinux, macOS 10.9+, and Windows wheels for CPython and PyPy
 - Works on GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, GitLab CI, and Cirrus CI
 - Bundles shared library dependencies on Linux and macOS through [auditwheel](https://github.com/pypa/auditwheel) and [delocate](https://github.com/matthew-brett/delocate)
 - Runs your library's tests against the wheel-installed version of your library
 
-See the [cibuildwheel 1 documentation](https://cibuildwheel.pypa.io/en/1.x/) if you need to build unsupported versions of Python, such as Python 2.
+See the [cibuildwheel 1 documentation](https://cibuildwheel.readthedocs.io/en/1.x/) if you need to build unsupported versions of Python, such as Python 2.
 
 Usage
 -----
@@ -63,8 +61,8 @@ Usage
 | Gitlab CI       | ✅    |       | ✅      | ✅¹       |           |             |
 | Cirrus CI       | ✅    | ✅    | ✅      | ✅        | ✅        |             |
 
-<sup>¹ [Requires emulation](https://cibuildwheel.pypa.io/en/stable/faq/#emulation), distributed separately. Other services may also support Linux ARM through emulation or third-party build hosts, but these are not tested in our CI.</sup><br>
-<sup>² [Uses cross-compilation](https://cibuildwheel.pypa.io/en/stable/faq/#windows-arm64). It is not possible to test `arm64` on this CI platform.</sup>
+<sup>¹ [Requires emulation](https://cibuildwheel.readthedocs.io/en/stable/faq/#emulation), distributed separately. Other services may also support Linux ARM through emulation or third-party build hosts, but these are not tested in our CI.</sup><br>
+<sup>² [Uses cross-compilation](https://cibuildwheel.readthedocs.io/en/stable/faq/#windows-arm64). It is not possible to test `arm64` on this CI platform.</sup>
 
 <!--intro-end-->
 
@@ -84,16 +82,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        os: [ubuntu-latest, windows-latest, macOS-12, macOS-14]
 
     steps:
       - uses: actions/checkout@v4
 
       # Used to host cibuildwheel
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v3
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.18.1
+        run: python -m pip install cibuildwheel==2.16.5
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
@@ -107,7 +105,7 @@ jobs:
           path: ./wheelhouse/*.whl
 ```
 
-For more information, including PyPI deployment, and the use of other CI services or the dedicated GitHub Action, check out the [documentation](https://cibuildwheel.pypa.io) and the [examples](https://github.com/pypa/cibuildwheel/tree/main/examples).
+For more information, including PyPI deployment, and the use of other CI services or the dedicated GitHub Action, check out the [documentation](https://cibuildwheel.readthedocs.org) and the [examples](https://github.com/pypa/cibuildwheel/tree/main/examples).
 
 How it works
 ------------
@@ -116,35 +114,35 @@ The following diagram summarises the steps that cibuildwheel takes on each platf
 
 ![](docs/data/how-it-works.png)
 
-<sup>Explore an interactive version of this diagram [in the docs](https://cibuildwheel.pypa.io/en/stable/#how-it-works).</sup>
+<sup>Explore an interactive version of this diagram [in the docs](https://cibuildwheel.readthedocs.io/en/stable/#how-it-works).</sup>
 
 Options
 -------
 
 |   | Option | Description |
 |---|--------|-------------|
-| **Build selection** | [`CIBW_PLATFORM`](https://cibuildwheel.pypa.io/en/stable/options/#platform)  | Override the auto-detected target platform |
-|   | [`CIBW_BUILD`](https://cibuildwheel.pypa.io/en/stable/options/#build-skip)  <br> [`CIBW_SKIP`](https://cibuildwheel.pypa.io/en/stable/options/#build-skip)  | Choose the Python versions to build |
-|   | [`CIBW_ARCHS`](https://cibuildwheel.pypa.io/en/stable/options/#archs)  | Change the architectures built on your machine by default. |
-|   | [`CIBW_PROJECT_REQUIRES_PYTHON`](https://cibuildwheel.pypa.io/en/stable/options/#requires-python)  | Manually set the Python compatibility of your project |
-|   | [`CIBW_PRERELEASE_PYTHONS`](https://cibuildwheel.pypa.io/en/stable/options/#prerelease-pythons)  | Enable building with pre-release versions of Python if available |
-| **Build customization** | [`CIBW_BUILD_FRONTEND`](https://cibuildwheel.pypa.io/en/stable/options/#build-frontend)  | Set the tool to use to build, either "pip" (default for now) or "build" |
-|   | [`CIBW_ENVIRONMENT`](https://cibuildwheel.pypa.io/en/stable/options/#environment)  | Set environment variables needed during the build |
-|   | [`CIBW_ENVIRONMENT_PASS_LINUX`](https://cibuildwheel.pypa.io/en/stable/options/#environment-pass)  | Set environment variables on the host to pass-through to the container during the build. |
-|   | [`CIBW_BEFORE_ALL`](https://cibuildwheel.pypa.io/en/stable/options/#before-all)  | Execute a shell command on the build system before any wheels are built. |
-|   | [`CIBW_BEFORE_BUILD`](https://cibuildwheel.pypa.io/en/stable/options/#before-build)  | Execute a shell command preparing each wheel's build |
-|   | [`CIBW_REPAIR_WHEEL_COMMAND`](https://cibuildwheel.pypa.io/en/stable/options/#repair-wheel-command)  | Execute a shell command to repair each built wheel |
-|   | [`CIBW_MANYLINUX_*_IMAGE`<br/>`CIBW_MUSLLINUX_*_IMAGE`](https://cibuildwheel.pypa.io/en/stable/options/#linux-image)  | Specify alternative manylinux / musllinux Docker images |
-|   | [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.pypa.io/en/stable/options/#container-engine)  | Specify which container engine to use when building Linux wheels |
-|   | [`CIBW_DEPENDENCY_VERSIONS`](https://cibuildwheel.pypa.io/en/stable/options/#dependency-versions)  | Specify how cibuildwheel controls the versions of the tools it uses |
-| **Testing** | [`CIBW_TEST_COMMAND`](https://cibuildwheel.pypa.io/en/stable/options/#test-command)  | Execute a shell command to test each built wheel |
-|   | [`CIBW_BEFORE_TEST`](https://cibuildwheel.pypa.io/en/stable/options/#before-test)  | Execute a shell command before testing each wheel |
-|   | [`CIBW_TEST_REQUIRES`](https://cibuildwheel.pypa.io/en/stable/options/#test-requires)  | Install Python dependencies before running the tests |
-|   | [`CIBW_TEST_EXTRAS`](https://cibuildwheel.pypa.io/en/stable/options/#test-extras)  | Install your wheel for testing using extras_require |
-|   | [`CIBW_TEST_SKIP`](https://cibuildwheel.pypa.io/en/stable/options/#test-skip)  | Skip running tests on some builds |
-| **Other** | [`CIBW_BUILD_VERBOSITY`](https://cibuildwheel.pypa.io/en/stable/options/#build-verbosity)  | Increase/decrease the output of pip wheel |
+| **Build selection** | [`CIBW_PLATFORM`](https://cibuildwheel.readthedocs.io/en/stable/options/#platform)  | Override the auto-detected target platform |
+|   | [`CIBW_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip)  <br> [`CIBW_SKIP`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip)  | Choose the Python versions to build |
+|   | [`CIBW_ARCHS`](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)  | Change the architectures built on your machine by default. |
+|   | [`CIBW_PROJECT_REQUIRES_PYTHON`](https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python)  | Manually set the Python compatibility of your project |
+|   | [`CIBW_PRERELEASE_PYTHONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#prerelease-pythons)  | Enable building with pre-release versions of Python if available |
+| **Build customization** | [`CIBW_BUILD_FRONTEND`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-frontend)  | Set the tool to use to build, either "pip" (default for now) or "build" |
+|   | [`CIBW_ENVIRONMENT`](https://cibuildwheel.readthedocs.io/en/stable/options/#environment)  | Set environment variables needed during the build |
+|   | [`CIBW_ENVIRONMENT_PASS_LINUX`](https://cibuildwheel.readthedocs.io/en/stable/options/#environment-pass)  | Set environment variables on the host to pass-through to the container during the build. |
+|   | [`CIBW_BEFORE_ALL`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-all)  | Execute a shell command on the build system before any wheels are built. |
+|   | [`CIBW_BEFORE_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-build)  | Execute a shell command preparing each wheel's build |
+|   | [`CIBW_REPAIR_WHEEL_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#repair-wheel-command)  | Execute a shell command to repair each built wheel |
+|   | [`CIBW_MANYLINUX_*_IMAGE`<br/>`CIBW_MUSLLINUX_*_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image)  | Specify alternative manylinux / musllinux Docker images |
+|   | [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.readthedocs.io/en/stable/options/#container-engine)  | Specify which container engine to use when building Linux wheels |
+|   | [`CIBW_DEPENDENCY_VERSIONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#dependency-versions)  | Specify how cibuildwheel controls the versions of the tools it uses |
+| **Testing** | [`CIBW_TEST_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-command)  | Execute a shell command to test each built wheel |
+|   | [`CIBW_BEFORE_TEST`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-test)  | Execute a shell command before testing each wheel |
+|   | [`CIBW_TEST_REQUIRES`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-requires)  | Install Python dependencies before running the tests |
+|   | [`CIBW_TEST_EXTRAS`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-extras)  | Install your wheel for testing using extras_require |
+|   | [`CIBW_TEST_SKIP`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-skip)  | Skip running tests on some builds |
+| **Other** | [`CIBW_BUILD_VERBOSITY`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-verbosity)  | Increase/decrease the output of pip wheel |
 
-These options can be specified in a pyproject.toml file, as well; see [configuration](https://cibuildwheel.pypa.io/en/stable/options/#configuration).
+These options can be specified in a pyproject.toml file, as well; see [configuration](https://cibuildwheel.readthedocs.io/en/stable/options/#configuration).
 
 Working examples
 ----------------
@@ -165,19 +163,19 @@ Here are some repos that use cibuildwheel.
 | [NCNN][]                          | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | ncnn is a high-performance neural network inference framework optimized for the mobile platform |
 | [Prophet][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Tool for producing high quality forecasts for time series data that has multiple seasonality with linear or non-linear growth. |
 | [MyPy][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | The compiled version of MyPy using MyPyC. |
-| [duckdb][]                        | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System |
 | [Kivy][]                          | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Open source UI framework written in Python, running on Windows, Linux, macOS, Android and iOS |
+| [duckdb][]                        | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System |
 
 [scikit-learn]: https://github.com/scikit-learn/scikit-learn
-[pytorch-fairseq]: https://github.com/facebookresearch/fairseq
+[pytorch-fairseq]: https://github.com/pytorch/fairseq
 [NumPy]: https://github.com/numpy/numpy
 [Tornado]: https://github.com/tornadoweb/tornado
 [Matplotlib]: https://github.com/matplotlib/matplotlib
 [NCNN]: https://github.com/Tencent/ncnn
 [Prophet]: https://github.com/facebook/prophet
 [MyPy]: https://github.com/mypyc/mypy_mypyc-wheels
-[duckdb]: https://github.com/duckdb/duckdb
 [Kivy]: https://github.com/kivy/kivy
+[duckdb]: https://github.com/duckdb/duckdb
 
 [appveyor icon]: docs/data/readme_icons/appveyor.svg
 [github icon]: docs/data/readme_icons/github.svg
@@ -192,7 +190,7 @@ Here are some repos that use cibuildwheel.
 
 <!-- END bin/projects.py -->
 
-> ℹ️ That's just a handful, there are many more! Check out the [Working Examples](https://cibuildwheel.pypa.io/en/stable/working-examples) page in the docs.
+> ℹ️ That's just a handful, there are many more! Check out the [Working Examples](https://cibuildwheel.readthedocs.io/en/stable/working-examples) page in the docs.
 
 Legal note
 ----------
@@ -210,53 +208,6 @@ Changelog
 
 <!-- this section was generated by bin/update_readme_changelog.py -- do not edit manually -->
 
-### v2.18.1
-
-- 🌟 Add free-threaded Linux and Windows builds for 3.13. New identifiers `cp313t-*`, new option `CIBW_FREE_THREADED_SUPPORT`/`tool.cibuildwheel.free-threaded-support` required to opt-in. [See the docs](https://cibuildwheel.pypa.io/en/stable/options/#free-threaded-support) for more information. (#1831)
-- ✨ The `container-engine` is now a build (non-global) option. (#1792)
-- 🛠 The build backend for cibuildwheel is now hatchling. (#1297)
-- 🛠 Significant improvements and modernization to our noxfile. (#1823)
-- 🛠 Use pylint's new GitHub Actions reporter instead of a custom matcher. (#1823)
-- 🛠 Unpin virtualenv updates for Python 3.7+ (#1830)
-- 🐛 Fix running linux tests from Windows or macOS ARM. (#1788)
-- 📚 Fix our documentation build. (#1821)
-
-
-### v2.18.0
-
-_12 May 2024_
-
-- ✨ Adds CPython 3.13 support, under the prerelease flag [CIBW_PRERELEASE_PYTHONS](https://cibuildwheel.pypa.io/en/stable/options/#prerelease-pythons). This version of cibuildwheel uses 3.13.0b1. Free-threading mode is not available yet (#1657), waiting on official binaries (planned for beta 2) and pip support.
-
-    _While CPython is in beta, the ABI can change, so your wheels might not be compatible with the final release. For this reason, we don't recommend distributing wheels until RC1, at which point 3.13 will be available in cibuildwheel without the flag._ (#1815)
-
-- ✨ Musllinux now defaults to `musllinux_1_2`. You can set the older `musllinux_1_1` via config if needed. (#1817)
-- 🛠 No longer pre-seed setuptools/wheel in virtual environments (#1819)
-- 🛠 Respect the constraints file when building with pip, matching build (#1818)
-- 🛠 Use uv to compile our pinned dependencies, 10x faster and doesn't require special setup (#1778)
-- 🐛 Fix an issue with the schema (#1788)
-- 📚 Document the new delocate error checking macOS versions (#1766)
-- 📚 Document Rust builds (#1816)
-- 📚 Speed up our readthedocs builds with uv, 26 seconds -> 6 seconds to install dependencies (#1816)
-
-
-### v2.17.0
-
-_11 March 2024_
-
-- 🌟 Adds the ability to inherit configuration in TOML overrides. This makes certain configurations much simpler. If you're overriding an option like `before-build` or `environment`, and you just want to add an  extra command or environment variable, you can just append (or prepend) to the previous config. See [the docs](https://cibuildwheel.pypa.io/en/stable/options/#inherit) for more information. (#1730)
-- 🌟 Adds official support for native `arm64` macOS GitHub runners. To use them, just specify `macos-14` as an `os` of your job in your workflow file. You can also keep `macos-13` in your build matrix to build `x86_64`. Check out the new [GitHub Actions example config](https://cibuildwheel.pypa.io/en/stable/setup/#github-actions).
-- ✨ You no longer need to specify `--platform` to run cibuildwheel locally! Instead it will detect your platform automatically. This was a safety feature, no longer necessary. (#1727)
-- 🛠 Removed setuptools and wheel pinned versions. This only affects old-style projects without a `pyproject.toml`, projects with `pyproject.toml` are already getting fresh versions of their `build-system.requires` installed into an isolated environment. (#1725)
-- 🛠 Improve how the GitHub Action passes arguments (#1757)
-- 🛠 Remove a system-wide install of pipx in the GitHub Action (#1745)
-- 🐛 No longer will cibuildwheel override the `PIP_CONSTRAINT` environment variable when using the `build` frontend. Instead it will be extended. (#1675)
-- 🐛 Fix a bug where building and testing both `x86_86` and `arm64` wheels on the same runner caused the wrong architectures in the test environment (#1750)
-- 🐛 Fix a bug that prevented testing a CPython 3.8 wheel targeting macOS 11+ on `x86_64` (#1768)
-- 📚 Moved the docs onto the official PyPA domain - they're now available at https://cibuildwheel.pypa.io . (#1775)
-- 📚 Docs and examples improvements (#1762, #1734)
-
-
 ### v2.16.5
 
 _30 January 2024_
@@ -270,20 +221,46 @@ _28 January 2024_
 
 - 🛠 Update manylinux pins to upgrade from a problematic PyPy version. (#1737)
 
+### v2.16.3
+
+_26 January 2024_
+
+- 🐛 Fix a bug when building from sdist, where relative paths to files in the package didn't work because the working directory was wrong (#1687)
+- 🛠 Adds the ability to disable mounting the host filesystem in containers to `/host`, through the `disable_host_mount` suboption on [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.readthedocs.io/en/stable/options/#container-engine).
+- 📚 A lot of docs improvements! (#1708, #1705, #1686, #1679, #1667, #1665)
+
+### v2.16.2
+
+_3 October 2023_
+
+- 🛠 Updates CPython 3.12 version to 3.12.0, final release (#1635)
+- ✨ Adds a debug option [`CIBW_DEBUG_KEEP_CONTAINER`](https://cibuildwheel.readthedocs.io/en/stable/options/#cibw_debug_keep_container) to stop cibuildwheel deleting build containers after the build finishes. (#1620)
+- 📚 Adds support for `[tool.cibuildwheel]` checking by adding a schema compatible with the [validate-pyproject](https://github.com/abravalheri/validate-pyproject/) tool (#1622, #1628, #1629)
+- 🐛 Fix parsing of `CIBW_CONTAINER_ENGINE` and `CIBW_BUILD_FRONTEND` options to not break arguments on `:` characters (#1621)
+- 🐛 Fix the evaluation order of `CIBW_ENVIRONMENT` and `CIBW_ENVIRONMENT_PASS` so that `CIBW_ENVIRONMENT` assignments can reference environment variables passed through from the host machine. (#1617)
+- 🛠 Supports manylinux images' deferred installation of interpreters through the `manylinux-interpreters` tool (#1630)
+
+### v2.16.1
+
+_26 September 2023_
+
+- 🛠 Updates the prerelease CPython 3.12 version to 3.12.0rc3 (#1625)
+- 🛠 Only calls `linux32` in containers when necessary (#1599)
+
 <!-- END bin/update_readme_changelog.py -->
 
 ---
 
 That's the last few versions.
 
-ℹ️ **Want more changelog? Head over to [the changelog page in the docs](https://cibuildwheel.pypa.io/en/stable/changelog/).**
+ℹ️ **Want more changelog? Head over to [the changelog page in the docs](https://cibuildwheel.readthedocs.io/en/stable/changelog/).**
 
 ---
 
 Contributing
 ============
 
-For more info on how to contribute to cibuildwheel, see the [docs](https://cibuildwheel.pypa.io/en/latest/contributing/).
+For more info on how to contribute to cibuildwheel, see the [docs](https://cibuildwheel.readthedocs.io/en/latest/contributing/).
 
 Everyone interacting with the cibuildwheel project via codebase, issue tracker, chat rooms, or otherwise is expected to follow the [PSF Code of Conduct](https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md).
 
@@ -318,4 +295,4 @@ See also
 
 Another very similar tool to consider is [matthew-brett/multibuild](http://github.com/matthew-brett/multibuild). `multibuild` is a shell script toolbox for building a wheel on various platforms. It is used as a basis to build some of the big data science tools, like SciPy.
 
-If you are building Rust wheels, you can get by without some of the tricks required to make GLIBC work via manylinux; this is especially relevant for cross-compiling, which is easy with Rust. See [maturin-action](https://github.com/PyO3/maturin-action) for a tool that is optimized for building Rust wheels and cross-compiling.
+If you are building Rust wheels, you can get by without some of the tricks required to make GLIBC work via manylinux; this is especially relevant for cross-compiling, which is easy with Rust. See [maturin-action](https://github.com/messense/maturin-action) for a tool that is optimized for building Rust wheels and cross-compiling.

action.yml

@@ -31,62 +31,38 @@ runs:
         python-version: "3.8 - 3.12"
         update-environment: false
 
-    - id: cibw
-      run: |
-        # Install cibuildwheel
-        "${{ steps.python.outputs.python-path }}" -u << "EOF"
-        import os
-        import shutil
-        import sys
-        import venv
-
-        from pathlib import Path
-        from subprocess import run
-
-
-        class EnvBuilder(venv.EnvBuilder):
-            def __init__(self):
-                super().__init__()
-
-            def setup_scripts(self, context):
-                pass
-
-            def post_setup(self, context):
-                super().post_setup(context)
-                self.bin_path = Path(context.env_exe).parent
-                run([sys.executable, "-m", "pip", "--python", context.env_exe, "install", r"${{ github.action_path }}"], check=True)
-
-
-        print("::group::Install cibuildwheel")
-        venv_path = Path(r"${{ runner.temp }}") / "cibw"
-        if venv_path.exists():
-            shutil.rmtree(venv_path)
-        builder = EnvBuilder()
-        builder.create(venv_path)
-        cibw_path = [path for path in builder.bin_path.glob("cibuildwheel*") if path.stem == "cibuildwheel"][0]
-        with open(os.environ["GITHUB_OUTPUT"], "at") as f:
-            f.write(f"cibw-path={cibw_path}\n")
-        print("::endgroup::")
-        EOF
+    # macos-14 (M1) may be missing pipx (due to it not having CPython)
+    - run: |
+        "${{ steps.python.outputs.python-path }}" -m pip install pipx
       shell: bash
 
     # Redirecting stderr to stdout to fix interleaving issue in Actions.
     - run: >
-        "${{ steps.cibw.outputs.cibw-path }}"
+        "${{ steps.python.outputs.python-path }}" -m pipx run
+        --spec '${{ github.action_path }}'
+        cibuildwheel
         "${{ inputs.package-dir }}"
-        ${{ inputs.output-dir != ''  && format('--output-dir "{0}"', inputs.output-dir) || ''}}
-        ${{ inputs.config-file != '' && format('--config-file "{0}"', inputs.config-file) || ''}}
-        ${{ inputs.only != ''        && format('--only "{0}"', inputs.only) || ''}}
+        --output-dir "${{ inputs.output-dir }}"
+        --config-file "${{ inputs.config-file }}"
+        --only "${{ inputs.only }}"
         2>&1
       shell: bash
       if: runner.os != 'Windows'
 
     # Windows needs powershell to interact nicely with Meson
+    # $PSNativeCommandArgumentPassing was introduced in pwsh 7.3 and the
+    # legacy behaviour is needed for backwards compatibility with how this
+    # was called in the past.
     - run: >
-        & "${{ steps.cibw.outputs.cibw-path }}"
+        if ($PSNativeCommandArgumentPassing) {
+            $PSNativeCommandArgumentPassing = 'Legacy'
+        };
+        & "${{ steps.python.outputs.python-path }}" -m pipx run
+        --spec "${{ github.action_path }}"
+        cibuildwheel
         "${{ inputs.package-dir }}"
-        ${{ inputs.output-dir != ''  && format('--output-dir "{0}"', inputs.output-dir) || ''}}
-        ${{ inputs.config-file != '' && format('--config-file "{0}"', inputs.config-file) || ''}}
-        ${{ inputs.only != ''        && format('--only "{0}"', inputs.only) || ''}}
+        --output-dir '"${{ inputs.output-dir }}"'
+        --config-file '"${{ inputs.config-file }}"'
+        --only '"${{ inputs.only }}"'
       shell: pwsh
       if: runner.os == 'Windows'

azure-pipelines.yml

@@ -24,7 +24,7 @@ jobs:
         versionSpec: '3.8'
     - bash: |
         python -m pip install -e ".[dev]"
-        python ./bin/run_tests.py --num-processes 2
+        python ./bin/run_tests.py
 
 - job: windows_38
   pool: {vmImage: 'windows-2019'}

bin/bump_version.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python3
 
-# /// script
-# dependencies = ["click", "packaging", "tomli; python_version<'3.11'"]
-# ///
-
 
 from __future__ import annotations
 
@@ -17,14 +13,10 @@ from pathlib import Path
 import click
 from packaging.version import InvalidVersion, Version
 
-if sys.version_info < (3, 11):
-    import tomli as tomllib
-else:
-    import tomllib
+import cibuildwheel
 
 config = [
     # file path, version find/replace format
-    ("pyproject.toml", 'version = "{}"'),
     ("README.md", "cibuildwheel=={}"),
     ("cibuildwheel/__init__.py", '__version__ = "{}"'),
     ("docs/faq.md", "cibuildwheel=={}"),
@@ -32,6 +24,7 @@ config = [
     ("docs/setup.md", "cibuildwheel=={}"),
     ("examples/*", "cibuildwheel=={}"),
     ("examples/*", "cibuildwheel@v{}"),
+    ("setup.cfg", "version = {}"),
 ]
 
 RED = "\u001b[31m"
@@ -41,8 +34,7 @@ OFF = "\u001b[0m"
 
 @click.command()
 def bump_version() -> None:
-    with open("pyproject.toml", "rb") as f:
-        current_version = tomllib.load(f)["project"]["version"]
+    current_version = cibuildwheel.__version__
 
     try:
         commit_date_str = subprocess.run(
@@ -189,7 +181,7 @@ def bump_version() -> None:
     print()
 
     print("Push the new version to GitHub with:")
-    print(f"    git push && git push origin v{new_version}")
+    print("    git push && git push --tags")
     print()
 
     release_url = "https://github.com/pypa/cibuildwheel/releases/new?" + urllib.parse.urlencode(

bin/dev_run_test

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+CIBW_PLATFORM=linux pytest "$@"

bin/generate_schema.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 
-# /// script
-# dependencies = ["pyyaml"]
-# ///
-
 import argparse
 import copy
 import json
@@ -16,16 +12,8 @@ parser.add_argument("--schemastore", action="store_true", help="Generate schema_
 args = parser.parse_args()
 
 starter = """
-$schema: http://json-schema.org/draft-07/schema
 $id: https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/resources/cibuildwheel.schema.json
-$defs:
-  inherit:
-    enum:
-      - none
-      - prepend
-      - append
-    default: none
-    description: How to inherit the parent's value.
+$schema: http://json-schema.org/draft-07/schema
 additionalProperties: false
 description: cibuildwheel's settings.
 type: object
@@ -104,10 +92,6 @@ properties:
     description: Set environment variables on the host to pass-through to the container
       during the build.
     type: string_array
-  free-threaded-support:
-    type: boolean
-    default: false
-    description: The project supports free-threaded builds of Python (PEP703)
   manylinux-aarch64-image:
     type: string
     description: Specify alternative manylinux / musllinux container images
@@ -169,6 +153,9 @@ properties:
 
 schema = yaml.safe_load(starter)
 
+if args.schemastore:
+    schema["$id"] += "#"
+
 string_array = yaml.safe_load(
     """
 - type: string
@@ -227,32 +214,23 @@ items:
   additionalProperties: false
   properties:
     select: {}
-    inherit:
-      type: object
-      additionalProperties: false
-      properties:
-        before-all: {"$ref": "#/$defs/inherit"}
-        before-build: {"$ref": "#/$defs/inherit"}
-        before-test: {"$ref": "#/$defs/inherit"}
-        config-settings: {"$ref": "#/$defs/inherit"}
-        container-engine: {"$ref": "#/$defs/inherit"}
-        environment: {"$ref": "#/$defs/inherit"}
-        environment-pass: {"$ref": "#/$defs/inherit"}
-        repair-wheel-command: {"$ref": "#/$defs/inherit"}
-        test-command: {"$ref": "#/$defs/inherit"}
-        test-extras: {"$ref": "#/$defs/inherit"}
-        test-requires: {"$ref": "#/$defs/inherit"}
 """
 )
 
 for key, value in schema["properties"].items():
     value["title"] = f'CIBW_{key.replace("-", "_").upper()}'
 
-non_global_options = {k: {"$ref": f"#/properties/{k}"} for k in schema["properties"]}
+if args.schemastore:
+    non_global_options = {
+        k: {"$ref": f"#/properties/tool/properties/cibuildwheel/properties/{k}"}
+        for k in schema["properties"]
+    }
+else:
+    non_global_options = {k: {"$ref": f"#/properties/{k}"} for k in schema["properties"]}
 del non_global_options["build"]
 del non_global_options["skip"]
+del non_global_options["container-engine"]
 del non_global_options["test-skip"]
-del non_global_options["free-threaded-support"]
 
 overrides["items"]["properties"]["select"]["oneOf"] = string_array
 overrides["items"]["properties"] |= non_global_options.copy()
@@ -262,7 +240,6 @@ del overrides["items"]["properties"]["archs"]
 not_linux = non_global_options.copy()
 
 del not_linux["environment-pass"]
-del not_linux["container-engine"]
 for key in list(not_linux):
     if "linux-" in key:
         del not_linux[key]
@@ -296,11 +273,27 @@ del oses["linux"]["properties"]["dependency-versions"]
 schema["properties"]["overrides"] = overrides
 schema["properties"] |= oses
 
-if args.schemastore:
-    schema["$id"] = "https://json.schemastore.org/partial-cibuildwheel.json"
-    schema["$schema"] = "http://json-schema.org/draft-07/schema#"
-    schema["description"] = (
-        "cibuildwheel's toml file, generated with ./bin/generate_schema.py --schemastore from cibuildwheel."
-    )
+if not args.schemastore:
+    print(json.dumps(schema, indent=2))
+    raise SystemExit(0)
 
-print(json.dumps(schema, indent=2))
+schema_store_txt = """
+$id: https://json.schemastore.org/cibuildwheel.json
+$schema: http://json-schema.org/draft-07/schema#
+additionalProperties: false
+description: cibuildwheel's toml file, generated with ./bin/generate_schema.py --schemastore from cibuildwheel.
+type: object
+properties:
+    tool:
+        type: object
+        properties:
+            cibuildwheel:
+                type: object
+"""
+schema_store = yaml.safe_load(schema_store_txt)
+
+schema_store["properties"]["tool"]["properties"]["cibuildwheel"]["properties"] = schema[
+    "properties"
+]
+
+print(json.dumps(schema_store, indent=2))

bin/inspect_all_known_projects.py

@@ -11,6 +11,7 @@ This will cache the results to all_known_setup.yaml; you can reprint
 the results without the `--online` setting.
 """
 
+
 from __future__ import annotations
 
 import ast

bin/projects.py

@@ -1,13 +1,5 @@
 #!/usr/bin/env python3
 
-# /// script
-# dependencies = [
-#   "click",
-#   "pyyaml",
-#   "pygithub",
-# ]
-# ///
-
 """
 Convert a yaml project list into a nice table.
 

bin/run_tests.py

@@ -9,17 +9,10 @@ import sys
 from pathlib import Path
 
 if __name__ == "__main__":
-    default_cpu_count = os.cpu_count() or 2
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "--run-podman", action="store_true", default=False, help="run podman tests (linux only)"
     )
-    parser.add_argument(
-        "--num-processes",
-        action="store",
-        default=default_cpu_count,
-        help="number of processes to use for testing",
-    )
     args = parser.parse_args()
 
     # move cwd to the project root
@@ -42,7 +35,7 @@ if __name__ == "__main__":
         sys.executable,
         "-m",
         "pytest",
-        f"--numprocesses={args.num_processes}",
+        "--numprocesses=2",
         "-x",
         "--durations",
         "0",

bin/update_pythons.py

@@ -58,7 +58,7 @@ AnyConfig = Union[ConfigWinCP, ConfigWinPP, ConfigMacOS]
 
 
 class WindowsVersions:
-    def __init__(self, arch_str: ArchStr, free_threaded: bool) -> None:
+    def __init__(self, arch_str: ArchStr) -> None:
         response = requests.get("https://api.nuget.org/v3/index.json")
         response.raise_for_status()
         api_info = response.json()
@@ -72,11 +72,7 @@ class WindowsVersions:
 
         self.arch_str = arch_str
         self.arch = ARCH_DICT[arch_str]
-        self.free_threaded = free_threaded
-
         package = PACKAGE_DICT[arch_str]
-        if free_threaded:
-            package = f"{package}-freethreaded"
 
         response = requests.get(f"{endpoint}{package}/index.json")
         response.raise_for_status()
@@ -96,9 +92,8 @@ class WindowsVersions:
         if not versions:
             return None
 
-        flags = "t" if self.free_threaded else ""
         version = versions[0]
-        identifier = f"cp{version.major}{version.minor}{flags}-{self.arch}"
+        identifier = f"cp{version.major}{version.minor}-{self.arch}"
         return ConfigWinCP(
             identifier=identifier,
             version=self.version_dict[version],
@@ -238,12 +233,9 @@ class CPythonVersions:
 
 class AllVersions:
     def __init__(self) -> None:
-        self.windows_32 = WindowsVersions("32", False)
-        self.windows_t_32 = WindowsVersions("32", True)
-        self.windows_64 = WindowsVersions("64", False)
-        self.windows_t_64 = WindowsVersions("64", True)
-        self.windows_arm64 = WindowsVersions("ARM64", False)
-        self.windows_t_arm64 = WindowsVersions("ARM64", True)
+        self.windows_32 = WindowsVersions("32")
+        self.windows_64 = WindowsVersions("64")
+        self.windows_arm64 = WindowsVersions("ARM64")
         self.windows_pypy_64 = PyPyVersions("64")
 
         self.macos_cpython = CPythonVersions()
@@ -267,19 +259,14 @@ class AllVersions:
                     config_update = self.macos_pypy.update_version_macos(spec)
                 elif "macosx_arm64" in identifier:
                     config_update = self.macos_pypy_arm64.update_version_macos(spec)
-        elif "t-win32" in identifier and identifier.startswith("cp"):
-            config_update = self.windows_t_32.update_version_windows(spec)
-        elif "win32" in identifier and identifier.startswith("cp"):
-            config_update = self.windows_32.update_version_windows(spec)
-        elif "t-win_amd64" in identifier and identifier.startswith("cp"):
-            config_update = self.windows_t_64.update_version_windows(spec)
+        elif "win32" in identifier:
+            if identifier.startswith("cp"):
+                config_update = self.windows_32.update_version_windows(spec)
         elif "win_amd64" in identifier:
             if identifier.startswith("cp"):
                 config_update = self.windows_64.update_version_windows(spec)
             elif identifier.startswith("pp"):
                 config_update = self.windows_pypy_64.update_version_windows(spec)
-        elif "t-win_arm64" in identifier and identifier.startswith("cp"):
-            config_update = self.windows_t_arm64.update_version_windows(spec)
         elif "win_arm64" in identifier and identifier.startswith("cp"):
             config_update = self.windows_arm64.update_version_windows(spec)
 

bin/update_virtualenv.py

@@ -25,9 +25,9 @@ DIR: Final[Path] = Path(__file__).parent.parent.resolve()
 RESOURCES_DIR: Final[Path] = DIR / "cibuildwheel/resources"
 
 GET_VIRTUALENV_GITHUB: Final[str] = "https://github.com/pypa/get-virtualenv"
-GET_VIRTUALENV_URL_TEMPLATE: Final[str] = (
-    f"{GET_VIRTUALENV_GITHUB}/blob/{{version}}/public/virtualenv.pyz?raw=true"
-)
+GET_VIRTUALENV_URL_TEMPLATE: Final[
+    str
+] = f"{GET_VIRTUALENV_GITHUB}/blob/{{version}}/public/virtualenv.pyz?raw=true"
 
 
 @dataclass(frozen=True, order=True)
@@ -53,6 +53,10 @@ def git_ls_remote_versions(url) -> list[VersionTuple]:
             if version.is_prerelease:
                 log.info("Ignoring pre-release %r", str(version))
                 continue
+            # Do not upgrade past 20.22.0 to keep python 3.6 compat
+            if version >= Version("20.22.0"):
+                log.info("Ignoring %r which is not compatible with python 3.6", str(version))
+                continue
             versions.append(VersionTuple(version, version_string))
         except InvalidVersion:
             log.warning("Ignoring ref %r", ref)
@@ -78,20 +82,15 @@ def update_virtualenv(force: bool, level: str) -> None:
 
     original_toml = toml_file_path.read_text()
     with toml_file_path.open("rb") as f:
-        configurations = tomllib.load(f)
-    default = configurations.pop("default")
-    version = str(default["version"])
+        loaded_file = tomllib.load(f)
+    version = str(loaded_file["version"])
     versions = git_ls_remote_versions(GET_VIRTUALENV_GITHUB)
     if versions[0].version > Version(version):
         version = versions[0].version_string
 
-    configurations["default"] = {
-        "version": version,
-        "url": GET_VIRTUALENV_URL_TEMPLATE.format(version=version),
-    }
-    result_toml = "".join(
-        f'{key} = {{ version = "{value["version"]}", url = "{value["url"]}" }}\n'
-        for key, value in configurations.items()
+    result_toml = (
+        f'version = "{version}"\n'
+        f'url = "{GET_VIRTUALENV_URL_TEMPLATE.format(version=version)}"\n'
     )
 
     rich.print()  # spacer

cibuildwheel/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "2.18.1"
+__version__ = "2.16.5"

cibuildwheel/__main__.py

@@ -49,9 +49,10 @@ def main() -> None:
         default=None,
         help="""
             Platform to build for. Use this option to override the
-            auto-detected platform. Specifying "macos" or "windows" only works
-            on that operating system, but "linux" works on all three, as long
-            as Docker/Podman is installed. Default: auto.
+            auto-detected platform or to run cibuildwheel on your development
+            machine. Specifying "macos" or "windows" only works on that
+            operating system, but "linux" works on all three, as long as
+            Docker/Podman is installed. Default: auto.
         """,
     )
 
@@ -183,7 +184,20 @@ def _compute_platform_only(only: str) -> PlatformName:
     sys.exit(2)
 
 
-def _compute_platform_auto() -> PlatformName:
+def _compute_platform_ci() -> PlatformName:
+    if detect_ci_provider() is None:
+        print(
+            textwrap.dedent(
+                """
+                cibuildwheel: Unable to detect platform. cibuildwheel should run on your CI server;
+                Travis CI, AppVeyor, Azure Pipelines, GitHub Actions, CircleCI, Gitlab, and Cirrus CI
+                are supported. You can run on your development machine or other CI providers
+                using the --platform argument. Check --help output for more information.
+                """
+            ),
+            file=sys.stderr,
+        )
+        sys.exit(2)
     if sys.platform.startswith("linux"):
         return "linux"
     elif sys.platform == "darwin":
@@ -192,9 +206,8 @@ def _compute_platform_auto() -> PlatformName:
         return "windows"
     else:
         print(
-            'cibuildwheel: Unable to detect platform from "sys.platform". cibuildwheel doesn\'t '
-            "support building wheels for this platform. You might be able to build for a different "
-            "platform using the --platform argument. Check --help output for more information.",
+            'cibuildwheel: Unable to detect platform from "sys.platform" in a CI environment. You can run '
+            "cibuildwheel using the --platform argument. Check --help output for more information.",
             file=sys.stderr,
         )
         sys.exit(2)
@@ -225,7 +238,7 @@ def _compute_platform(args: CommandLineArguments) -> PlatformName:
     elif platform_option_value != "auto":
         return typing.cast(PlatformName, platform_option_value)
 
-    return _compute_platform_auto()
+    return _compute_platform_ci()
 
 
 class PlatformModule(Protocol):
@@ -233,9 +246,11 @@ class PlatformModule(Protocol):
     # is applied to a module
     def get_python_configurations(
         self, build_selector: BuildSelector, architectures: Set[Architecture]
-    ) -> Sequence[GenericPythonConfiguration]: ...
+    ) -> Sequence[GenericPythonConfiguration]:
+        ...
 
-    def build(self, options: Options, tmp_path: Path) -> None: ...
+    def build(self, options: Options, tmp_path: Path) -> None:
+        ...
 
 
 # pylint: disable-next=inconsistent-return-statements
@@ -277,9 +292,7 @@ def build_in_directory(args: CommandLineArguments) -> None:
     # Add CIBUILDWHEEL environment variable
     os.environ["CIBUILDWHEEL"] = "1"
 
-    # Python is buffering by default when running on the CI platforms, giving
-    # problems interleaving subprocess call output with unflushed calls to
-    # 'print'
+    # 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[assignment]
 
     # create the cache dir before it gets printed & builds performed

cibuildwheel/extra.py

@@ -12,7 +12,8 @@ __all__ = ("Printable", "dump_python_configurations")
 
 
 class Printable(Protocol):
-    def __str__(self) -> str: ...
+    def __str__(self) -> str:
+        ...
 
 
 def dump_python_configurations(

cibuildwheel/linux.py

@@ -11,8 +11,8 @@ from typing import OrderedDict, Tuple
 from ._compat.typing import assert_never
 from .architecture import Architecture
 from .logger import log
-from .oci_container import OCIContainer, OCIContainerEngineConfig
-from .options import BuildOptions, Options
+from .oci_container import OCIContainer
+from .options import Options
 from .typing import PathOrStr
 from .util import (
     AlreadyBuiltWheelError,
@@ -44,7 +44,6 @@ class PythonConfiguration:
 class BuildStep:
     platform_configs: list[PythonConfiguration]
     platform_tag: str
-    container_engine: OCIContainerEngineConfig
     container_image: str
 
 
@@ -66,9 +65,8 @@ def get_python_configurations(
     ]
 
 
-def container_image_for_python_configuration(
-    config: PythonConfiguration, build_options: BuildOptions
-) -> str:
+def container_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'
@@ -93,18 +91,15 @@ def get_build_steps(
     Groups PythonConfigurations into BuildSteps. Each BuildStep represents a
     separate container instance.
     """
-    steps = OrderedDict[Tuple[str, str, str, OCIContainerEngineConfig], BuildStep]()
+    steps = OrderedDict[Tuple[str, str, str], BuildStep]()
 
     for config in python_configurations:
         _, platform_tag = config.identifier.split("-", 1)
 
-        build_options = options.build_options(config.identifier)
+        before_all = options.build_options(config.identifier).before_all
+        container_image = container_image_for_python_configuration(config, options)
 
-        before_all = build_options.before_all
-        container_image = container_image_for_python_configuration(config, build_options)
-        container_engine = build_options.container_engine
-
-        step_key = (platform_tag, container_image, before_all, container_engine)
+        step_key = (platform_tag, container_image, before_all)
 
         if step_key in steps:
             steps[step_key].platform_configs.append(config)
@@ -112,7 +107,6 @@ def get_build_steps(
             steps[step_key] = BuildStep(
                 platform_configs=[config],
                 platform_tag=platform_tag,
-                container_engine=container_engine,
                 container_image=container_image,
             )
 
@@ -337,10 +331,6 @@ def build_in_container(
             virtualenv_env = env.copy()
             virtualenv_env["PATH"] = f"{venv_dir / 'bin'}:{virtualenv_env['PATH']}"
 
-            # TODO remove me once virtualenv provides pip>=24.1b1
-            if config.version == "3.13":
-                container.call(["pip", "install", "pip>=24.1b1"], env=virtualenv_env)
-
             if build_options.before_test:
                 before_test_prepared = prepare_command(
                     build_options.before_test,
@@ -398,6 +388,29 @@ def build_in_container(
 
 
 def build(options: Options, tmp_path: Path) -> None:  # noqa: ARG001
+    try:
+        # check the container engine is installed
+        subprocess.run(
+            [options.globals.container_engine.name, "--version"],
+            check=True,
+            stdout=subprocess.DEVNULL,
+        )
+    except subprocess.CalledProcessError:
+        print(
+            unwrap(
+                f"""
+                cibuildwheel: {options.globals.container_engine} not found. An
+                OCI exe like Docker or Podman is required to run Linux builds.
+                If you're building on Travis CI, add `services: [docker]` to
+                your .travis.yml. If you're building on Circle CI in Linux,
+                add a `setup_remote_docker` step to your .circleci/config.yml.
+                If you're building on Cirrus CI, use `docker_builder` task.
+                """
+            ),
+            file=sys.stderr,
+        )
+        sys.exit(2)
+
     python_configurations = get_python_configurations(
         options.globals.build_selector, options.globals.architectures
     )
@@ -412,29 +425,6 @@ def build(options: Options, tmp_path: Path) -> None:  # noqa: ARG001
     container_package_dir = container_project_path / abs_package_dir.relative_to(cwd)
 
     for build_step in get_build_steps(options, python_configurations):
-        try:
-            # check the container engine is installed
-            subprocess.run(
-                [build_step.container_engine.name, "--version"],
-                check=True,
-                stdout=subprocess.DEVNULL,
-            )
-        except subprocess.CalledProcessError:
-            print(
-                unwrap(
-                    f"""
-                    cibuildwheel: {build_step.container_engine.name} not found. An
-                    OCI exe like Docker or Podman is required to run Linux builds.
-                    If you're building on Travis CI, add `services: [docker]` to
-                    your .travis.yml. If you're building on Circle CI in Linux,
-                    add a `setup_remote_docker` step to your .circleci/config.yml.
-                    If you're building on Cirrus CI, use `docker_builder` task.
-                    """
-                ),
-                file=sys.stderr,
-            )
-            sys.exit(2)
-
         try:
             ids_to_build = [x.identifier for x in build_step.platform_configs]
             log.step(f"Starting container image {build_step.container_image}...")
@@ -445,7 +435,7 @@ def build(options: Options, tmp_path: Path) -> None:  # noqa: ARG001
                 image=build_step.container_image,
                 enforce_32_bit=build_step.platform_tag.endswith("i686"),
                 cwd=container_project_path,
-                engine=build_step.container_engine,
+                engine=options.globals.container_engine,
             ) as container:
                 build_in_container(
                     options=options,

cibuildwheel/macos.py

@@ -181,9 +181,7 @@ def setup_python(
 
     log.step("Setting up build environment...")
     venv_path = tmp / "venv"
-    env = virtualenv(
-        python_configuration.version, base_python, venv_path, dependency_constraint_flags
-    )
+    env = virtualenv(base_python, venv_path, dependency_constraint_flags)
     venv_bin_path = venv_path / "bin"
     assert venv_bin_path.exists()
     # Fix issue with site.py setting the wrong `sys.prefix`, `sys.exec_prefix`,
@@ -289,6 +287,8 @@ def setup_python(
             "pip",
             "install",
             "--upgrade",
+            "setuptools",
+            "wheel",
             "delocate",
             *dependency_constraint_flags,
             env=env,
@@ -383,18 +383,6 @@ def build(options: Options, tmp_path: Path) -> None:
                 )
                 extra_flags += build_frontend.args
 
-                build_env = env.copy()
-                build_env["VIRTUALENV_PIP"] = get_pip_version(env)
-                if build_options.dependency_constraints:
-                    constraint_path = build_options.dependency_constraints.get_for_python_version(
-                        config.version
-                    )
-                    user_constraints = build_env.get("PIP_CONSTRAINT")
-                    our_constraints = constraint_path.as_uri()
-                    build_env["PIP_CONSTRAINT"] = " ".join(
-                        c for c in [user_constraints, our_constraints] if c
-                    )
-
                 if build_frontend.name == "pip":
                     extra_flags += get_build_verbosity_extra_flags(build_options.build_verbosity)
                     # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org
@@ -408,12 +396,21 @@ def build(options: Options, tmp_path: Path) -> None:
                         f"--wheel-dir={built_wheel_dir}",
                         "--no-deps",
                         *extra_flags,
-                        env=build_env,
+                        env=env,
                     )
                 elif build_frontend.name == "build":
                     if not 0 <= build_options.build_verbosity < 2:
                         msg = f"build_verbosity {build_options.build_verbosity} is not supported for build frontend. Ignoring."
                         log.warning(msg)
+                    build_env = env.copy()
+                    if build_options.dependency_constraints:
+                        constraint_path = (
+                            build_options.dependency_constraints.get_for_python_version(
+                                config.version
+                            )
+                        )
+                        build_env["PIP_CONSTRAINT"] = constraint_path.as_uri()
+                    build_env["VIRTUALENV_PIP"] = get_pip_version(env)
                     call(
                         "python",
                         "-m",
@@ -545,7 +542,7 @@ def build(options: Options, tmp_path: Path) -> None:
                     # there are no dependencies that were pulled in at build time.
                     call("pip", "install", "virtualenv", *dependency_constraint_flags, env=env)
 
-                    venv_dir = identifier_tmp_dir / f"venv-test-{testing_arch}"
+                    venv_dir = identifier_tmp_dir / "venv-test"
 
                     arch_prefix = []
                     if testing_arch != machine_arch:
@@ -575,10 +572,6 @@ def build(options: Options, tmp_path: Path) -> None:
                     # check that we are using the Python from the virtual environment
                     call_with_arch("which", "python", env=virtualenv_env)
 
-                    # TODO remove me once virtualenv provides pip>=24.1b1
-                    if config.version == "3.13":
-                        call("python", "-m", "pip", "install", "pip>=24.1b1", env=virtualenv_env)
-
                     if build_options.before_test:
                         before_test_prepared = prepare_command(
                             build_options.before_test,
@@ -588,37 +581,17 @@ def build(options: Options, tmp_path: Path) -> None:
                         shell_with_arch(before_test_prepared, env=virtualenv_env)
 
                     # install the wheel
-                    if is_cp38 and python_arch == "x86_64":
-                        virtualenv_env_install_wheel = virtualenv_env.copy()
-                        virtualenv_env_install_wheel["SYSTEM_VERSION_COMPAT"] = "0"
-                        log.notice(
-                            unwrap(
-                                """
-                                Setting SYSTEM_VERSION_COMPAT=0 to ensure CPython 3.8 can get
-                                correct macOS version and allow installation of wheels with
-                                MACOSX_DEPLOYMENT_TARGET >= 11.0.
-                                See https://github.com/pypa/cibuildwheel/issues/1767 for the
-                                details.
-                                """
-                            )
-                        )
-                    else:
-                        virtualenv_env_install_wheel = virtualenv_env
-
                     call_with_arch(
                         "pip",
                         "install",
                         f"{repaired_wheel}{build_options.test_extras}",
-                        env=virtualenv_env_install_wheel,
+                        env=virtualenv_env,
                     )
 
                     # test the wheel
                     if build_options.test_requires:
                         call_with_arch(
-                            "pip",
-                            "install",
-                            *build_options.test_requires,
-                            env=virtualenv_env_install_wheel,
+                            "pip", "install", *build_options.test_requires, env=virtualenv_env
                         )
 
                     # run the tests from a temp dir, with an absolute path in the command

cibuildwheel/oci_container.py

@@ -11,7 +11,7 @@ import sys
 import typing
 import uuid
 from collections.abc import Mapping, Sequence
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from pathlib import Path, PurePath, PurePosixPath
 from types import TracebackType
 from typing import IO, Dict, Literal
@@ -32,7 +32,7 @@ ContainerEngineName = Literal["docker", "podman"]
 @dataclass(frozen=True)
 class OCIContainerEngineConfig:
     name: ContainerEngineName
-    create_args: tuple[str, ...] = field(default_factory=tuple)
+    create_args: Sequence[str] = ()
     disable_host_mount: bool = False
 
     @staticmethod
@@ -58,7 +58,7 @@ class OCIContainerEngineConfig:
         )
 
         return OCIContainerEngineConfig(
-            name=name, create_args=tuple(create_args), disable_host_mount=disable_host_mount
+            name=name, create_args=create_args, disable_host_mount=disable_host_mount
         )
 
     def options_summary(self) -> str | dict[str, str]:

cibuildwheel/options.py

@@ -5,20 +5,19 @@ import configparser
 import contextlib
 import dataclasses
 import difflib
-import enum
 import functools
 import shlex
 import sys
 import textwrap
 import traceback
-from collections.abc import Callable, Generator, Iterable, Iterator, Set
+from collections.abc import Callable, Generator, Iterable, Iterator, Mapping, Set
 from pathlib import Path
-from typing import Any, Literal, Mapping, Sequence, TypedDict, Union  # noqa: TID251
+from typing import Any, Dict, List, Literal, TypedDict, Union
 
 from packaging.specifiers import SpecifierSet
 
 from ._compat import tomllib
-from ._compat.typing import NotRequired, assert_never
+from ._compat.typing import NotRequired
 from .architecture import Architecture
 from .environment import EnvironmentParseError, ParsedEnvironment, parse_environment
 from .logger import log
@@ -75,6 +74,7 @@ class GlobalOptions:
     build_selector: BuildSelector
     test_selector: TestSelector
     architectures: set[Architecture]
+    container_engine: OCIContainerEngineConfig
 
 
 @dataclasses.dataclass(frozen=True)
@@ -94,7 +94,6 @@ class BuildOptions:
     build_verbosity: int
     build_frontend: BuildFrontendConfig | None
     config_settings: str
-    container_engine: OCIContainerEngineConfig
 
     @property
     def package_dir(self) -> Path:
@@ -117,14 +116,13 @@ class BuildOptions:
         return self.globals.architectures
 
 
-Setting = Union[Mapping[str, str], Sequence[str], str, int, bool]
+Setting = Union[Dict[str, str], List[str], str, int]
 
 
 @dataclasses.dataclass(frozen=True)
 class Override:
     select_pattern: str
     options: dict[str, Setting]
-    inherit: dict[str, InheritRule]
 
 
 MANYLINUX_OPTIONS = {f"manylinux-{build_platform}-image" for build_platform in MANYLINUX_ARCHS}
@@ -152,116 +150,28 @@ class ConfigOptionError(KeyError):
     pass
 
 
-class InheritRule(enum.Enum):
-    NONE = enum.auto()
-    APPEND = enum.auto()
-    PREPEND = enum.auto()
-
-
-def _resolve_cascade(
-    *pairs: tuple[Setting | None, InheritRule],
-    ignore_empty: bool = False,
-    list_sep: str | None = None,
-    table_format: TableFmt | None = None,
-) -> str:
+def _dig_first(*pairs: tuple[Mapping[str, Setting], str], ignore_empty: bool = False) -> Setting:
     """
-    Given a cascade of values with inherit rules, resolve them into a single
-    value.
+    Return the first dict item that matches from pairs of dicts and keys.
+    Will throw a KeyError if missing.
 
-    'None' values mean that the option was not set at that level, and are
-    ignored. If `ignore_empty` is True, empty values are ignored too.
-
-    Values start with defaults, followed by more specific rules. If rules are
-    NONE, the last non-null value is returned. If a rule is APPEND or PREPEND,
-    the value is concatenated with the previous value.
-
-    The following idiom can be used to get the first matching value:
-
-        _resolve_cascade(("value1", Inherit.NONE), ("value2", Inherit.NONE), ...)))
+    _dig_first((dict1, "key1"), (dict2, "key2"), ...)
     """
     if not pairs:
         msg = "pairs cannot be empty"
         raise ValueError(msg)
 
-    result: str | None = None
+    for dict_like, key in pairs:
+        if key in dict_like:
+            value = dict_like[key]
 
-    if table_format is not None:
-        merge_sep = table_format["sep"]
-    elif list_sep is not None:
-        merge_sep = list_sep
-    else:
-        merge_sep = None
+            if ignore_empty and value == "":
+                continue
 
-    for value, rule in pairs:
-        if value is None:
-            continue
+            return value
 
-        if ignore_empty and not value and value is not False:
-            continue
-
-        value_string = _stringify_setting(value, list_sep, table_format)
-
-        result = _merge_values(
-            result,
-            value_string,
-            rule=rule,
-            merge_sep=merge_sep,
-        )
-
-    if result is None:
-        msg = "a setting should at least have a default value"
-        raise ValueError(msg)
-
-    return result
-
-
-# pylint: disable-next=inconsistent-return-statements
-def _merge_values(before: str | None, after: str, rule: InheritRule, merge_sep: str | None) -> str:
-    if rule == InheritRule.NONE:
-        return after
-
-    if not before:
-        # if before is None, we can just return after
-        # if before is an empty string, we shouldn't add any separator
-        return after
-
-    if not after:
-        # if after is an empty string, we shouldn't add any separator
-        return before
-
-    if not merge_sep:
-        msg = f"Don't know how to merge {before!r} and {after!r} with {rule}"
-        raise ConfigOptionError(msg)
-
-    if rule == InheritRule.APPEND:
-        return f"{before}{merge_sep}{after}"
-    elif rule == InheritRule.PREPEND:
-        return f"{after}{merge_sep}{before}"
-    else:
-        assert_never(rule)
-
-
-def _stringify_setting(
-    setting: Setting, list_sep: str | None, table_format: TableFmt | None
-) -> str:
-    if isinstance(setting, Mapping):
-        if table_format is None:
-            msg = f"Error converting {setting!r} to a string: this setting doesn't accept a table"
-            raise ConfigOptionError(msg)
-        return table_format["sep"].join(
-            item for k, v in setting.items() for item in _inner_fmt(k, v, table_format)
-        )
-
-    if not isinstance(setting, str) and isinstance(setting, Sequence):
-        if list_sep is None:
-            msg = f"Error converting {setting!r} to a string: this setting doesn't accept a list"
-            raise ConfigOptionError(msg)
-        return list_sep.join(setting)
-
-    if isinstance(setting, (bool, int)):
-        return str(setting)
-
-    return setting
+    last_key = pairs[-1][1]
+    raise KeyError(last_key)
 
 
 class OptionsReader:
@@ -334,16 +244,7 @@ class OptionsReader:
                 if isinstance(select, list):
                     select = " ".join(select)
 
-                inherit = config_override.pop("inherit", {})
-                if not isinstance(inherit, dict) or not all(
-                    i in {"none", "append", "prepend"} for i in inherit.values()
-                ):
-                    msg = "'inherit' must be a dict containing only {'none', 'append', 'prepend'} values"
-                    raise ConfigOptionError(msg)
-
-                inherit_enum = {k: InheritRule[v.upper()] for k, v in inherit.items()}
-
-                self.overrides.append(Override(select, config_override, inherit_enum))
+                self.overrides.append(Override(select, config_override))
 
     def _validate_global_option(self, name: str) -> None:
         """
@@ -411,8 +312,8 @@ class OptionsReader:
         name: str,
         *,
         env_plat: bool = True,
-        list_sep: str | None = None,
-        table_format: TableFmt | None = None,
+        sep: str | None = None,
+        table: TableFmt | None = None,
         ignore_empty: bool = False,
     ) -> str:
         """
@@ -434,24 +335,41 @@ class OptionsReader:
         envvar = f"CIBW_{name.upper().replace('-', '_')}"
         plat_envvar = f"{envvar}_{self.platform.upper()}"
 
-        # get the option from the default, then the config file, then finally the environment.
+        # 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.
-        return _resolve_cascade(
-            (self.default_options.get(name), InheritRule.NONE),
-            (self.default_platform_options.get(name), InheritRule.NONE),
-            (self.config_options.get(name), InheritRule.NONE),
-            (self.config_platform_options.get(name), InheritRule.NONE),
-            *[
-                (o.options.get(name), o.inherit.get(name, InheritRule.NONE))
-                for o in self.active_config_overrides
-            ],
-            (self.env.get(envvar), InheritRule.NONE),
-            (self.env.get(plat_envvar) if env_plat else None, InheritRule.NONE),
+        result = _dig_first(
+            (self.env if env_plat else {}, plat_envvar),
+            (self.env, envvar),
+            *[(o.options, name) for o in active_config_overrides],
+            (self.config_platform_options, name),
+            (self.config_options, name),
+            (self.default_platform_options, name),
+            (self.default_options, name),
             ignore_empty=ignore_empty,
-            list_sep=list_sep,
-            table_format=table_format,
         )
 
+        if isinstance(result, dict):
+            if table is None:
+                msg = f"{name!r} does not accept a table"
+                raise ConfigOptionError(msg)
+            return table["sep"].join(
+                item for k, v in result.items() for item in _inner_fmt(k, v, table)
+            )
+
+        if isinstance(result, list):
+            if sep is None:
+                msg = f"{name!r} does not accept a list"
+                raise ConfigOptionError(msg)
+            return sep.join(result)
+
+        if isinstance(result, int):
+            return str(result)
+
+        return result
+
 
 def _inner_fmt(k: str, v: Any, table: TableFmt) -> Iterator[str]:
     quote_function = table.get("quote", lambda a: a)
@@ -512,13 +430,9 @@ class Options:
         package_dir = args.package_dir
         output_dir = args.output_dir
 
-        build_config = self.reader.get("build", env_plat=False, list_sep=" ") or "*"
-        skip_config = self.reader.get("skip", env_plat=False, list_sep=" ")
-        test_skip = self.reader.get("test-skip", env_plat=False, list_sep=" ")
-
-        free_threaded_support = strtobool(
-            self.reader.get("free-threaded-support", env_plat=False, ignore_empty=True)
-        )
+        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(
             self.env.get("CIBW_PRERELEASE_PYTHONS", "0")
@@ -531,7 +445,7 @@ class Options:
         )
         requires_python = None if requires_python_str is None else SpecifierSet(requires_python_str)
 
-        archs_config_str = args.archs or self.reader.get("archs", list_sep=" ")
+        archs_config_str = args.archs or self.reader.get("archs", sep=" ")
         architectures = Architecture.parse_config(archs_config_str, platform=self.platform)
 
         # Process `--only`
@@ -540,23 +454,33 @@ class Options:
             skip_config = ""
             architectures = Architecture.all_archs(self.platform)
             prerelease_pythons = True
-            free_threaded_support = True
 
         build_selector = BuildSelector(
             build_config=build_config,
             skip_config=skip_config,
             requires_python=requires_python,
             prerelease_pythons=prerelease_pythons,
-            free_threaded_support=free_threaded_support,
         )
         test_selector = TestSelector(skip_config=test_skip)
 
+        container_engine_str = self.reader.get(
+            "container-engine", table={"item": "{k}:{v}", "sep": "; ", "quote": shlex.quote}
+        )
+
+        try:
+            container_engine = OCIContainerEngineConfig.from_config_string(container_engine_str)
+        except ValueError as e:
+            msg = f"cibuildwheel: Failed to parse container config. {e}"
+            print(msg, file=sys.stderr)
+            sys.exit(2)
+
         return GlobalOptions(
             package_dir=package_dir,
             output_dir=output_dir,
             build_selector=build_selector,
             test_selector=test_selector,
             architectures=architectures,
+            container_engine=container_engine,
         )
 
     def build_options(self, identifier: str | None) -> BuildOptions:
@@ -565,30 +489,29 @@ class Options:
         """
 
         with self.reader.identifier(identifier):
-            before_all = self.reader.get("before-all", list_sep=" && ")
+            before_all = self.reader.get("before-all", sep=" && ")
 
             environment_config = self.reader.get(
-                "environment", table_format={"item": '{k}="{v}"', "sep": " "}
+                "environment", table={"item": '{k}="{v}"', "sep": " "}
             )
-            environment_pass = self.reader.get("environment-pass", list_sep=" ").split()
-            before_build = self.reader.get("before-build", list_sep=" && ")
-            repair_command = self.reader.get("repair-wheel-command", list_sep=" && ")
+            environment_pass = self.reader.get("environment-pass", sep=" ").split()
+            before_build = self.reader.get("before-build", sep=" && ")
+            repair_command = self.reader.get("repair-wheel-command", sep=" && ")
             config_settings = self.reader.get(
-                "config-settings",
-                table_format={"item": "{k}={v}", "sep": " ", "quote": shlex.quote},
+                "config-settings", table={"item": "{k}={v}", "sep": " ", "quote": shlex.quote}
             )
 
             dependency_versions = self.reader.get("dependency-versions")
-            test_command = self.reader.get("test-command", list_sep=" && ")
-            before_test = self.reader.get("before-test", list_sep=" && ")
-            test_requires = self.reader.get("test-requires", list_sep=" ").split()
-            test_extras = self.reader.get("test-extras", list_sep=",")
+            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_str = self.reader.get(
                 "build-frontend",
                 env_plat=False,
-                table_format={"item": "{k}:{v}", "sep": "; ", "quote": shlex.quote},
+                table={"item": "{k}:{v}", "sep": "; ", "quote": shlex.quote},
             )
             build_frontend: BuildFrontendConfig | None
             if not build_frontend_str or build_frontend_str == "default":
@@ -636,8 +559,6 @@ class Options:
 
             manylinux_images: dict[str, str] = {}
             musllinux_images: dict[str, str] = {}
-            container_engine: OCIContainerEngineConfig | None = None
-
             if self.platform == "linux":
                 all_pinned_container_images = _get_pinned_container_images()
 
@@ -664,7 +585,7 @@ class Options:
                     config_value = self.reader.get(f"musllinux-{build_platform}-image")
 
                     if not config_value:
-                        image = pinned_images["musllinux_1_2"]
+                        image = pinned_images["musllinux_1_1"]
                     elif config_value in pinned_images:
                         image = pinned_images[config_value]
                     else:
@@ -672,18 +593,6 @@ class Options:
 
                     musllinux_images[build_platform] = image
 
-            container_engine_str = self.reader.get(
-                "container-engine",
-                table_format={"item": "{k}:{v}", "sep": "; ", "quote": shlex.quote},
-            )
-
-            try:
-                container_engine = OCIContainerEngineConfig.from_config_string(container_engine_str)
-            except ValueError as e:
-                msg = f"cibuildwheel: Failed to parse container config. {e}"
-                print(msg, file=sys.stderr)
-                sys.exit(2)
-
             return BuildOptions(
                 globals=self.globals,
                 test_command=test_command,
@@ -700,7 +609,6 @@ class Options:
                 musllinux_images=musllinux_images or None,
                 build_frontend=build_frontend,
                 config_settings=config_settings,
-                container_engine=container_engine,
             )
 
     def check_for_invalid_configuration(self, identifiers: Iterable[str]) -> None:

cibuildwheel/resources/build-platforms.toml

@@ -7,8 +7,6 @@ python_configurations = [
   { identifier = "cp310-manylinux_x86_64", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { identifier = "cp311-manylinux_x86_64", version = "3.11", path_str = "/opt/python/cp311-cp311" },
   { identifier = "cp312-manylinux_x86_64", version = "3.12", path_str = "/opt/python/cp312-cp312" },
-  { identifier = "cp313-manylinux_x86_64", version = "3.13", path_str = "/opt/python/cp313-cp313" },
-  { identifier = "cp313t-manylinux_x86_64", version = "3.13", path_str = "/opt/python/cp313-cp313t" },
   { identifier = "cp36-manylinux_i686", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-manylinux_i686", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-manylinux_i686", version = "3.8", path_str = "/opt/python/cp38-cp38" },
@@ -16,8 +14,6 @@ python_configurations = [
   { identifier = "cp310-manylinux_i686", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { identifier = "cp311-manylinux_i686", version = "3.11", path_str = "/opt/python/cp311-cp311" },
   { identifier = "cp312-manylinux_i686", version = "3.12", path_str = "/opt/python/cp312-cp312" },
-  { identifier = "cp313-manylinux_i686", version = "3.13", path_str = "/opt/python/cp313-cp313" },
-  { identifier = "cp313t-manylinux_i686", version = "3.13", path_str = "/opt/python/cp313-cp313t" },
   { identifier = "pp37-manylinux_x86_64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
   { identifier = "pp38-manylinux_x86_64", version = "3.8", path_str = "/opt/python/pp38-pypy38_pp73" },
   { identifier = "pp39-manylinux_x86_64", version = "3.9", path_str = "/opt/python/pp39-pypy39_pp73" },
@@ -29,8 +25,6 @@ python_configurations = [
   { identifier = "cp310-manylinux_aarch64", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { identifier = "cp311-manylinux_aarch64", version = "3.11", path_str = "/opt/python/cp311-cp311" },
   { identifier = "cp312-manylinux_aarch64", version = "3.12", path_str = "/opt/python/cp312-cp312" },
-  { identifier = "cp313-manylinux_aarch64", version = "3.13", path_str = "/opt/python/cp313-cp313" },
-  { identifier = "cp313t-manylinux_aarch64", version = "3.13", path_str = "/opt/python/cp313-cp313t" },
   { identifier = "cp36-manylinux_ppc64le", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-manylinux_ppc64le", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-manylinux_ppc64le", version = "3.8", path_str = "/opt/python/cp38-cp38" },
@@ -38,8 +32,6 @@ python_configurations = [
   { identifier = "cp310-manylinux_ppc64le", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { identifier = "cp311-manylinux_ppc64le", version = "3.11", path_str = "/opt/python/cp311-cp311" },
   { identifier = "cp312-manylinux_ppc64le", version = "3.12", path_str = "/opt/python/cp312-cp312" },
-  { identifier = "cp313-manylinux_ppc64le", version = "3.13", path_str = "/opt/python/cp313-cp313" },
-  { identifier = "cp313t-manylinux_ppc64le", version = "3.13", path_str = "/opt/python/cp313-cp313t" },
   { identifier = "cp36-manylinux_s390x", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-manylinux_s390x", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-manylinux_s390x", version = "3.8", path_str = "/opt/python/cp38-cp38" },
@@ -47,8 +39,6 @@ python_configurations = [
   { identifier = "cp310-manylinux_s390x", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { identifier = "cp311-manylinux_s390x", version = "3.11", path_str = "/opt/python/cp311-cp311" },
   { identifier = "cp312-manylinux_s390x", version = "3.12", path_str = "/opt/python/cp312-cp312" },
-  { identifier = "cp313-manylinux_s390x", version = "3.13", path_str = "/opt/python/cp313-cp313" },
-  { identifier = "cp313t-manylinux_s390x", version = "3.13", path_str = "/opt/python/cp313-cp313t" },
   { identifier = "pp37-manylinux_aarch64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
   { identifier = "pp38-manylinux_aarch64", version = "3.8", path_str = "/opt/python/pp38-pypy38_pp73" },
   { identifier = "pp39-manylinux_aarch64", version = "3.9", path_str = "/opt/python/pp39-pypy39_pp73" },
@@ -64,8 +54,6 @@ python_configurations = [
   { identifier = "cp310-musllinux_x86_64", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { identifier = "cp311-musllinux_x86_64", version = "3.11", path_str = "/opt/python/cp311-cp311" },
   { identifier = "cp312-musllinux_x86_64", version = "3.12", path_str = "/opt/python/cp312-cp312" },
-  { identifier = "cp313-musllinux_x86_64", version = "3.13", path_str = "/opt/python/cp313-cp313" },
-  { identifier = "cp313t-musllinux_x86_64", version = "3.13", path_str = "/opt/python/cp313-cp313t" },
   { identifier = "cp36-musllinux_i686", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-musllinux_i686", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-musllinux_i686", version = "3.8", path_str = "/opt/python/cp38-cp38" },
@@ -73,8 +61,6 @@ python_configurations = [
   { identifier = "cp310-musllinux_i686", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { identifier = "cp311-musllinux_i686", version = "3.11", path_str = "/opt/python/cp311-cp311" },
   { identifier = "cp312-musllinux_i686", version = "3.12", path_str = "/opt/python/cp312-cp312" },
-  { identifier = "cp313-musllinux_i686", version = "3.13", path_str = "/opt/python/cp313-cp313" },
-  { identifier = "cp313t-musllinux_i686", version = "3.13", path_str = "/opt/python/cp313-cp313t" },
   { identifier = "cp36-musllinux_aarch64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-musllinux_aarch64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-musllinux_aarch64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
@@ -82,8 +68,6 @@ python_configurations = [
   { identifier = "cp310-musllinux_aarch64", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { identifier = "cp311-musllinux_aarch64", version = "3.11", path_str = "/opt/python/cp311-cp311" },
   { identifier = "cp312-musllinux_aarch64", version = "3.12", path_str = "/opt/python/cp312-cp312" },
-  { identifier = "cp313-musllinux_aarch64", version = "3.13", path_str = "/opt/python/cp313-cp313" },
-  { identifier = "cp313t-musllinux_aarch64", version = "3.13", path_str = "/opt/python/cp313-cp313t" },
   { identifier = "cp36-musllinux_ppc64le", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-musllinux_ppc64le", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-musllinux_ppc64le", version = "3.8", path_str = "/opt/python/cp38-cp38" },
@@ -91,8 +75,6 @@ python_configurations = [
   { identifier = "cp310-musllinux_ppc64le", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { identifier = "cp311-musllinux_ppc64le", version = "3.11", path_str = "/opt/python/cp311-cp311" },
   { identifier = "cp312-musllinux_ppc64le", version = "3.12", path_str = "/opt/python/cp312-cp312" },
-  { identifier = "cp313-musllinux_ppc64le", version = "3.13", path_str = "/opt/python/cp313-cp313" },
-  { identifier = "cp313t-musllinux_ppc64le", version = "3.13", path_str = "/opt/python/cp313-cp313t" },
   { identifier = "cp36-musllinux_s390x", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-musllinux_s390x", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-musllinux_s390x", version = "3.8", path_str = "/opt/python/cp38-cp38" },
@@ -100,8 +82,6 @@ python_configurations = [
   { identifier = "cp310-musllinux_s390x", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { identifier = "cp311-musllinux_s390x", version = "3.11", path_str = "/opt/python/cp311-cp311" },
   { identifier = "cp312-musllinux_s390x", version = "3.12", path_str = "/opt/python/cp312-cp312" },
-  { identifier = "cp313-musllinux_s390x", version = "3.13", path_str = "/opt/python/cp313-cp313" },
-  { identifier = "cp313t-musllinux_s390x", version = "3.13", path_str = "/opt/python/cp313-cp313t" },
 ]
 
 [macos]
@@ -117,22 +97,19 @@ python_configurations = [
   { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg" },
   { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg" },
   { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg" },
-  { identifier = "cp311-macosx_x86_64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.9/python-3.11.9-macos11.pkg" },
-  { identifier = "cp311-macosx_arm64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.9/python-3.11.9-macos11.pkg" },
-  { identifier = "cp311-macosx_universal2", version = "3.11", url = "https://www.python.org/ftp/python/3.11.9/python-3.11.9-macos11.pkg" },
-  { identifier = "cp312-macosx_x86_64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.3/python-3.12.3-macos11.pkg" },
-  { identifier = "cp312-macosx_arm64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.3/python-3.12.3-macos11.pkg" },
-  { identifier = "cp312-macosx_universal2", version = "3.12", url = "https://www.python.org/ftp/python/3.12.3/python-3.12.3-macos11.pkg" },
-  { identifier = "cp313-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0b1-macos11.pkg" },
-  { identifier = "cp313-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0b1-macos11.pkg" },
-  { identifier = "cp313-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0b1-macos11.pkg" },
+  { identifier = "cp311-macosx_x86_64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.7/python-3.11.7-macos11.pkg" },
+  { identifier = "cp311-macosx_arm64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.7/python-3.11.7-macos11.pkg" },
+  { identifier = "cp311-macosx_universal2", version = "3.11", url = "https://www.python.org/ftp/python/3.11.7/python-3.11.7-macos11.pkg" },
+  { identifier = "cp312-macosx_x86_64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.1/python-3.12.1-macos11.pkg" },
+  { identifier = "cp312-macosx_arm64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.1/python-3.12.1-macos11.pkg" },
+  { identifier = "cp312-macosx_universal2", version = "3.12", url = "https://www.python.org/ftp/python/3.12.1/python-3.12.1-macos11.pkg" },
   { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.9-osx64.tar.bz2" },
   { identifier = "pp38-macosx_x86_64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.11-macos_x86_64.tar.bz2" },
   { identifier = "pp38-macosx_arm64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.11-macos_arm64.tar.bz2" },
-  { identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.16-macos_x86_64.tar.bz2" },
-  { identifier = "pp39-macosx_arm64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.16-macos_arm64.tar.bz2" },
-  { identifier = "pp310-macosx_x86_64", version = "3.10", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.16-macos_x86_64.tar.bz2" },
-  { identifier = "pp310-macosx_arm64", version = "3.10", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.16-macos_arm64.tar.bz2" },
+  { identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.15-macos_x86_64.tar.bz2" },
+  { identifier = "pp39-macosx_arm64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.15-macos_arm64.tar.bz2" },
+  { identifier = "pp310-macosx_x86_64", version = "3.10", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.15-macos_x86_64.tar.bz2" },
+  { identifier = "pp310-macosx_arm64", version = "3.10", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.15-macos_arm64.tar.bz2" },
 ]
 
 [windows]
@@ -147,22 +124,16 @@ python_configurations = [
   { identifier = "cp39-win_amd64", version = "3.9.13", arch = "64" },
   { identifier = "cp310-win32", version = "3.10.11", arch = "32" },
   { identifier = "cp310-win_amd64", version = "3.10.11", arch = "64" },
-  { identifier = "cp311-win32", version = "3.11.9", arch = "32" },
-  { identifier = "cp311-win_amd64", version = "3.11.9", arch = "64" },
-  { identifier = "cp312-win32", version = "3.12.3", arch = "32" },
-  { identifier = "cp312-win_amd64", version = "3.12.3", arch = "64" },
-  { identifier = "cp313-win32", version = "3.13.0-b1", arch = "32" },
-  { identifier = "cp313t-win32", version = "3.13.0-b1", arch = "32" },
-  { identifier = "cp313-win_amd64", version = "3.13.0-b1", arch = "64" },
-  { identifier = "cp313t-win_amd64", version = "3.13.0-b1", arch = "64" },
+  { identifier = "cp311-win32", version = "3.11.7", arch = "32" },
+  { identifier = "cp311-win_amd64", version = "3.11.7", arch = "64" },
+  { identifier = "cp312-win32", version = "3.12.1", arch = "32" },
+  { identifier = "cp312-win_amd64", version = "3.12.1", arch = "64" },
   { identifier = "cp39-win_arm64", version = "3.9.10", arch = "ARM64" },
   { identifier = "cp310-win_arm64", version = "3.10.11", arch = "ARM64" },
-  { identifier = "cp311-win_arm64", version = "3.11.9", arch = "ARM64" },
-  { identifier = "cp312-win_arm64", version = "3.12.3", arch = "ARM64" },
-  { identifier = "cp313-win_arm64", version = "3.13.0-b1", arch = "ARM64" },
-  { identifier = "cp313t-win_arm64", version = "3.13.0-b1", arch = "ARM64" },
+  { identifier = "cp311-win_arm64", version = "3.11.7", arch = "ARM64" },
+  { identifier = "cp312-win_arm64", version = "3.12.1", arch = "ARM64" },
   { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.9-win64.zip" },
   { identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.11-win64.zip" },
-  { identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.16-win64.zip" },
-  { identifier = "pp310-win_amd64", version = "3.10", arch = "64", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.16-win64.zip" },
+  { identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.15-win64.zip" },
+  { identifier = "pp310-win_amd64", version = "3.10", arch = "64", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.15-win64.zip" },
 ]

cibuildwheel/resources/cibuildwheel.schema.json

@@ -1,17 +1,6 @@
 {
-  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/resources/cibuildwheel.schema.json",
-  "$defs": {
-    "inherit": {
-      "enum": [
-        "none",
-        "prepend",
-        "append"
-      ],
-      "default": "none",
-      "description": "How to inherit the parent's value."
-    }
-  },
+  "$schema": "http://json-schema.org/draft-07/schema",
   "additionalProperties": false,
   "description": "cibuildwheel's settings.",
   "type": "object",
@@ -255,12 +244,6 @@
       ],
       "title": "CIBW_ENVIRONMENT_PASS"
     },
-    "free-threaded-support": {
-      "type": "boolean",
-      "default": false,
-      "description": "The project supports free-threaded builds of Python (PEP703)",
-      "title": "CIBW_FREE_THREADED_SUPPORT"
-    },
     "manylinux-aarch64-image": {
       "type": "string",
       "description": "Specify alternative manylinux / musllinux container images",
@@ -440,45 +423,6 @@
               }
             ]
           },
-          "inherit": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-              "before-all": {
-                "$ref": "#/$defs/inherit"
-              },
-              "before-build": {
-                "$ref": "#/$defs/inherit"
-              },
-              "before-test": {
-                "$ref": "#/$defs/inherit"
-              },
-              "config-settings": {
-                "$ref": "#/$defs/inherit"
-              },
-              "container-engine": {
-                "$ref": "#/$defs/inherit"
-              },
-              "environment": {
-                "$ref": "#/$defs/inherit"
-              },
-              "environment-pass": {
-                "$ref": "#/$defs/inherit"
-              },
-              "repair-wheel-command": {
-                "$ref": "#/$defs/inherit"
-              },
-              "test-command": {
-                "$ref": "#/$defs/inherit"
-              },
-              "test-extras": {
-                "$ref": "#/$defs/inherit"
-              },
-              "test-requires": {
-                "$ref": "#/$defs/inherit"
-              }
-            }
-          },
           "before-all": {
             "$ref": "#/properties/before-all"
           },
@@ -497,9 +441,6 @@
           "config-settings": {
             "$ref": "#/properties/config-settings"
           },
-          "container-engine": {
-            "$ref": "#/properties/container-engine"
-          },
           "dependency-versions": {
             "$ref": "#/properties/dependency-versions"
           },
@@ -588,9 +529,6 @@
         "config-settings": {
           "$ref": "#/properties/config-settings"
         },
-        "container-engine": {
-          "$ref": "#/properties/container-engine"
-        },
         "environment": {
           "$ref": "#/properties/environment"
         },

cibuildwheel/resources/constraints-python310.txt

@@ -1,34 +1,28 @@
-# This file was autogenerated by uv via the following command:
-#    nox -s update_constraints
-altgraph==0.17.4
-    # via macholib
-build==1.2.1
-    # via -r cibuildwheel/resources/constraints.in
-delocate==0.11.0
+#
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
+#
+#    nox -s update_constraints-3.10
+#
+delocate==0.10.7
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.8
     # via virtualenv
-filelock==3.14.0
+filelock==3.13.1
     # via virtualenv
-importlib-metadata==7.1.0
-    # via build
-macholib==1.16.3
+packaging==23.2
     # via delocate
-packaging==24.0
-    # via
-    #   build
-    #   delocate
-pip==24.0
-    # via -r cibuildwheel/resources/constraints.in
-platformdirs==4.2.2
+platformdirs==4.1.0
     # via virtualenv
-pyproject-hooks==1.1.0
-    # via build
-tomli==2.0.1
-    # via build
-typing-extensions==4.11.0
+typing-extensions==4.9.0
     # via delocate
-virtualenv==20.26.2
+virtualenv==20.25.0
+    # via -r cibuildwheel/resources/constraints.in
+wheel==0.42.0
+    # via -r cibuildwheel/resources/constraints.in
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==23.3.2
+    # via -r cibuildwheel/resources/constraints.in
+setuptools==69.0.3
     # via -r cibuildwheel/resources/constraints.in
-zipp==3.18.2
-    # via importlib-metadata

cibuildwheel/resources/constraints-python311.txt

@@ -1,28 +1,28 @@
-# This file was autogenerated by uv via the following command:
-#    nox -s update_constraints
-altgraph==0.17.4
-    # via macholib
-build==1.2.1
-    # via -r cibuildwheel/resources/constraints.in
-delocate==0.11.0
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    nox -s update_constraints-3.11
+#
+delocate==0.10.7
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.8
     # via virtualenv
-filelock==3.14.0
+filelock==3.13.1
     # via virtualenv
-macholib==1.16.3
+packaging==23.2
     # via delocate
-packaging==24.0
-    # via
-    #   build
-    #   delocate
-pip==24.0
-    # via -r cibuildwheel/resources/constraints.in
-platformdirs==4.2.2
+platformdirs==4.1.0
     # via virtualenv
-pyproject-hooks==1.1.0
-    # via build
-typing-extensions==4.11.0
+typing-extensions==4.9.0
     # via delocate
-virtualenv==20.26.2
+virtualenv==20.25.0
+    # via -r cibuildwheel/resources/constraints.in
+wheel==0.42.0
+    # via -r cibuildwheel/resources/constraints.in
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==23.3.2
+    # via -r cibuildwheel/resources/constraints.in
+setuptools==69.0.3
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python312.txt

@@ -1,28 +1,28 @@
-# This file was autogenerated by uv via the following command:
-#    nox -s update_constraints
-altgraph==0.17.4
-    # via macholib
-build==1.2.1
-    # via -r cibuildwheel/resources/constraints.in
-delocate==0.11.0
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    nox -s update_constraints-3.12
+#
+delocate==0.10.7
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.8
     # via virtualenv
-filelock==3.14.0
+filelock==3.13.1
     # via virtualenv
-macholib==1.16.3
+packaging==23.2
     # via delocate
-packaging==24.0
-    # via
-    #   build
-    #   delocate
-pip==24.0
-    # via -r cibuildwheel/resources/constraints.in
-platformdirs==4.2.2
+platformdirs==4.1.0
     # via virtualenv
-pyproject-hooks==1.1.0
-    # via build
-typing-extensions==4.11.0
+typing-extensions==4.9.0
     # via delocate
-virtualenv==20.26.2
+virtualenv==20.25.0
+    # via -r cibuildwheel/resources/constraints.in
+wheel==0.42.0
+    # via -r cibuildwheel/resources/constraints.in
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==23.3.2
+    # via -r cibuildwheel/resources/constraints.in
+setuptools==69.0.3
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python313.txt

@@ -1,28 +0,0 @@
-# This file was autogenerated by uv via the following command:
-#    nox -s update_constraints
-altgraph==0.17.4
-    # via macholib
-build==1.2.1
-    # via -r cibuildwheel/resources/constraints.in
-delocate==0.11.0
-    # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.8
-    # via virtualenv
-filelock==3.14.0
-    # via virtualenv
-macholib==1.16.3
-    # via delocate
-packaging==24.0
-    # via
-    #   build
-    #   delocate
-pip==24.1b1
-    # via -r cibuildwheel/resources/constraints.in
-platformdirs==4.2.2
-    # via virtualenv
-pyproject-hooks==1.1.0
-    # via build
-typing-extensions==4.11.0
-    # via delocate
-virtualenv==20.26.2
-    # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python36.txt

@@ -4,33 +4,18 @@
 #
 #    nox -s update_constraints-3.6
 #
-build==0.9.0
-    # via -r cibuildwheel/resources/constraints.in
 delocate==0.10.2
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.8
+distlib==0.3.6
     # via virtualenv
 filelock==3.4.1
     # via virtualenv
 importlib-metadata==4.8.3
-    # via
-    #   build
-    #   pep517
-    #   virtualenv
+    # via virtualenv
 importlib-resources==5.4.0
     # via virtualenv
-packaging==21.3
-    # via build
-pep517==0.13.1
-    # via build
 platformdirs==2.4.0
     # via virtualenv
-pyparsing==3.1.1
-    # via packaging
-tomli==1.2.3
-    # via
-    #   build
-    #   pep517
 typing-extensions==4.1.1
     # via
     #   delocate
@@ -38,12 +23,13 @@ typing-extensions==4.1.1
 virtualenv==20.17.1
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.1
-    # via delocate
+    # via
+    #   -r cibuildwheel/resources/constraints.in
+    #   delocate
 zipp==3.6.0
     # via
     #   importlib-metadata
     #   importlib-resources
-    #   pep517
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==21.3.1

cibuildwheel/resources/constraints-python37.txt

@@ -1,39 +1,35 @@
-# This file was autogenerated by uv via the following command:
-#    nox -s update_constraints
-altgraph==0.17.4
-    # via macholib
-build==1.1.1
-    # via -r cibuildwheel/resources/constraints.in
-delocate==0.11.0
+#
+# This file is autogenerated by pip-compile with Python 3.7
+# by the following command:
+#
+#    nox -s update_constraints-3.7
+#
+delocate==0.10.7
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.8
     # via virtualenv
 filelock==3.12.2
     # via virtualenv
 importlib-metadata==6.7.0
-    # via
-    #   build
-    #   virtualenv
-macholib==1.16.3
+    # via virtualenv
+packaging==23.2
     # via delocate
-packaging==24.0
-    # via
-    #   build
-    #   delocate
-pip==24.0
-    # via -r cibuildwheel/resources/constraints.in
 platformdirs==4.0.0
     # via virtualenv
-pyproject-hooks==1.1.0
-    # via build
-tomli==2.0.1
-    # via build
 typing-extensions==4.7.1
     # via
     #   delocate
     #   importlib-metadata
     #   platformdirs
-virtualenv==20.26.2
+virtualenv==20.25.0
+    # via -r cibuildwheel/resources/constraints.in
+wheel==0.42.0
     # via -r cibuildwheel/resources/constraints.in
 zipp==3.15.0
     # via importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==23.3.2
+    # via -r cibuildwheel/resources/constraints.in
+setuptools==68.0.0
+    # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python38.txt

@@ -1,34 +1,28 @@
-# This file was autogenerated by uv via the following command:
-#    nox -s update_constraints
-altgraph==0.17.4
-    # via macholib
-build==1.2.1
-    # via -r cibuildwheel/resources/constraints.in
-delocate==0.11.0
+#
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
+#
+#    nox -s update_constraints-3.8
+#
+delocate==0.10.7
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.8
     # via virtualenv
-filelock==3.14.0
+filelock==3.13.1
     # via virtualenv
-importlib-metadata==7.1.0
-    # via build
-macholib==1.16.3
+packaging==23.2
     # via delocate
-packaging==24.0
-    # via
-    #   build
-    #   delocate
-pip==24.0
-    # via -r cibuildwheel/resources/constraints.in
-platformdirs==4.2.2
+platformdirs==4.1.0
     # via virtualenv
-pyproject-hooks==1.1.0
-    # via build
-tomli==2.0.1
-    # via build
-typing-extensions==4.11.0
+typing-extensions==4.9.0
     # via delocate
-virtualenv==20.26.2
+virtualenv==20.25.0
+    # via -r cibuildwheel/resources/constraints.in
+wheel==0.42.0
+    # via -r cibuildwheel/resources/constraints.in
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==23.3.2
+    # via -r cibuildwheel/resources/constraints.in
+setuptools==69.0.3
     # via -r cibuildwheel/resources/constraints.in
-zipp==3.18.2
-    # via importlib-metadata

cibuildwheel/resources/constraints-python39.txt

@@ -1,34 +1,28 @@
-# This file was autogenerated by uv via the following command:
-#    nox -s update_constraints
-altgraph==0.17.4
-    # via macholib
-build==1.2.1
-    # via -r cibuildwheel/resources/constraints.in
-delocate==0.11.0
+#
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
+#
+#    nox -s update_constraints-3.9
+#
+delocate==0.10.7
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.8
     # via virtualenv
-filelock==3.14.0
+filelock==3.13.1
     # via virtualenv
-importlib-metadata==7.1.0
-    # via build
-macholib==1.16.3
+packaging==23.2
     # via delocate
-packaging==24.0
-    # via
-    #   build
-    #   delocate
-pip==24.0
-    # via -r cibuildwheel/resources/constraints.in
-platformdirs==4.2.2
+platformdirs==4.1.0
     # via virtualenv
-pyproject-hooks==1.1.0
-    # via build
-tomli==2.0.1
-    # via build
-typing-extensions==4.11.0
+typing-extensions==4.9.0
     # via delocate
-virtualenv==20.26.2
+virtualenv==20.25.0
+    # via -r cibuildwheel/resources/constraints.in
+wheel==0.42.0
+    # via -r cibuildwheel/resources/constraints.in
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==23.3.2
+    # via -r cibuildwheel/resources/constraints.in
+setuptools==69.0.3
     # via -r cibuildwheel/resources/constraints.in
-zipp==3.18.2
-    # via importlib-metadata

cibuildwheel/resources/constraints.in

@@ -1,5 +1,5 @@
-pip>=24.1b1 ; python_version >= '3.13'
-pip ; python_version < '3.13'
-build
+pip
+setuptools
+wheel
 delocate
 virtualenv

cibuildwheel/resources/constraints.txt

@@ -1,28 +1,28 @@
-# This file was autogenerated by uv via the following command:
-#    nox -s update_constraints
-altgraph==0.17.4
-    # via macholib
-build==1.2.1
-    # via -r cibuildwheel/resources/constraints.in
-delocate==0.11.0
+#
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
+#
+#    nox -s update_constraints-3.12
+#
+delocate==0.10.7
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.8
     # via virtualenv
-filelock==3.14.0
+filelock==3.13.1
     # via virtualenv
-macholib==1.16.3
+packaging==23.2
     # via delocate
-packaging==24.0
-    # via
-    #   build
-    #   delocate
-pip==24.0
-    # via -r cibuildwheel/resources/constraints.in
-platformdirs==4.2.2
+platformdirs==4.1.0
     # via virtualenv
-pyproject-hooks==1.1.0
-    # via build
-typing-extensions==4.11.0
+typing-extensions==4.9.0
     # via delocate
-virtualenv==20.26.2
+virtualenv==20.25.0
+    # via -r cibuildwheel/resources/constraints.in
+wheel==0.42.0
+    # via -r cibuildwheel/resources/constraints.in
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==23.3.2
+    # via -r cibuildwheel/resources/constraints.in
+setuptools==69.0.3
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/defaults.toml

@@ -2,7 +2,6 @@
 build = "*"
 skip = ""
 test-skip = ""
-free-threaded-support = false
 
 archs = ["auto"]
 build-frontend = "default"
@@ -32,11 +31,11 @@ manylinux-pypy_x86_64-image = "manylinux2014"
 manylinux-pypy_i686-image = "manylinux2014"
 manylinux-pypy_aarch64-image = "manylinux2014"
 
-musllinux-x86_64-image = "musllinux_1_2"
-musllinux-i686-image = "musllinux_1_2"
-musllinux-aarch64-image = "musllinux_1_2"
-musllinux-ppc64le-image = "musllinux_1_2"
-musllinux-s390x-image = "musllinux_1_2"
+musllinux-x86_64-image = "musllinux_1_1"
+musllinux-i686-image = "musllinux_1_1"
+musllinux-aarch64-image = "musllinux_1_1"
+musllinux-ppc64le-image = "musllinux_1_1"
+musllinux-s390x-image = "musllinux_1_1"
 
 
 [tool.cibuildwheel.linux]

cibuildwheel/resources/pinned_docker_images.cfg

@@ -1,54 +1,54 @@
 [x86_64]
-manylinux1 = quay.io/pypa/manylinux1_x86_64:2024-04-29-76807b8
+manylinux1 = quay.io/pypa/manylinux1_x86_64:2024-01-28-7b6687a
 manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177
-manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2024-05-13-0983f6f
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2024-01-23-12ffabc
 manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-12-26-0d38463
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2024-05-13-0983f6f
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2024-05-13-0983f6f
-musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2024-05-13-0983f6f
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2024-01-23-12ffabc
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2024-01-23-12ffabc
+musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2024-01-23-12ffabc
 
 [i686]
-manylinux1 = quay.io/pypa/manylinux1_i686:2024-04-29-76807b8
+manylinux1 = quay.io/pypa/manylinux1_i686:2024-01-28-7b6687a
 manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-08-05-4535177
-manylinux2014 = quay.io/pypa/manylinux2014_i686:2024-05-13-0983f6f
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2024-01-23-12ffabc
 manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-12-26-0d38463
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2024-05-13-0983f6f
-musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2024-05-13-0983f6f
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2024-01-23-12ffabc
+musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2024-01-23-12ffabc
 
 [pypy_x86_64]
 manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177
-manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2024-05-13-0983f6f
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2024-01-23-12ffabc
 manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-12-26-0d38463
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2024-05-13-0983f6f
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2024-01-23-12ffabc
 
 [pypy_i686]
 manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-08-05-4535177
-manylinux2014 = quay.io/pypa/manylinux2014_i686:2024-05-13-0983f6f
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2024-01-23-12ffabc
 manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-12-26-0d38463
 
 [aarch64]
-manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2024-05-13-0983f6f
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2024-01-23-12ffabc
 manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-12-26-0d38463
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2024-05-13-0983f6f
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2024-05-13-0983f6f
-musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2024-05-13-0983f6f
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2024-01-23-12ffabc
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2024-01-23-12ffabc
+musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2024-01-23-12ffabc
 
 [ppc64le]
-manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2024-05-13-0983f6f
+manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2024-01-23-12ffabc
 manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-12-26-0d38463
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2024-05-13-0983f6f
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2024-05-13-0983f6f
-musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2024-05-13-0983f6f
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2024-01-23-12ffabc
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2024-01-23-12ffabc
+musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2024-01-23-12ffabc
 
 [s390x]
-manylinux2014 = quay.io/pypa/manylinux2014_s390x:2024-05-13-0983f6f
+manylinux2014 = quay.io/pypa/manylinux2014_s390x:2024-01-23-12ffabc
 manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-12-26-0d38463
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2024-05-13-0983f6f
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2024-05-13-0983f6f
-musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2024-05-13-0983f6f
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2024-01-23-12ffabc
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2024-01-23-12ffabc
+musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2024-01-23-12ffabc
 
 [pypy_aarch64]
-manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2024-05-13-0983f6f
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2024-01-23-12ffabc
 manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-12-26-0d38463
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2024-05-13-0983f6f
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2024-01-23-12ffabc
 

cibuildwheel/resources/virtualenv.toml

@@ -1,2 +1,2 @@
-py36 = { version = "20.21.1", url = "https://github.com/pypa/get-virtualenv/blob/20.21.1/public/virtualenv.pyz?raw=true" }
-default = { version = "20.26.2", url = "https://github.com/pypa/get-virtualenv/blob/20.26.2/public/virtualenv.pyz?raw=true" }
+version = "20.21.1"
+url = "https://github.com/pypa/get-virtualenv/blob/20.21.1/public/virtualenv.pyz?raw=true"

cibuildwheel/typing.py

@@ -28,4 +28,5 @@ PLATFORMS: Final[set[PlatformName]] = {"linux", "macos", "windows"}
 
 class GenericPythonConfiguration(Protocol):
     @property
-    def identifier(self) -> str: ...
+    def identifier(self) -> str:
+        ...

cibuildwheel/util.py

@@ -91,7 +91,8 @@ def call(
     env: Mapping[str, str] | None = None,
     cwd: PathOrStr | None = None,
     capture_stdout: Literal[False] = ...,
-) -> None: ...
+) -> None:
+    ...
 
 
 @typing.overload
@@ -100,7 +101,8 @@ def call(
     env: Mapping[str, str] | None = None,
     cwd: PathOrStr | None = None,
     capture_stdout: Literal[True],
-) -> str: ...
+) -> str:
+    ...
 
 
 def call(
@@ -238,17 +240,13 @@ class BuildSelector:
     requires_python: SpecifierSet | None = None
 
     # a pattern that skips prerelease versions, when include_prereleases is False.
-    PRERELEASE_SKIP: ClassVar[str] = "cp313-* cp313t-*"
+    PRERELEASE_SKIP: ClassVar[str] = ""
     prerelease_pythons: bool = False
 
-    free_threaded_support: bool = False
-
     def __call__(self, build_id: str) -> bool:
         # Filter build selectors by python_requires if set
         if self.requires_python is not None:
             py_ver_str = build_id.split("-")[0]
-            if py_ver_str.endswith("t"):
-                py_ver_str = py_ver_str[:-1]
             major = int(py_ver_str[2])
             minor = int(py_ver_str[3:])
             version = Version(f"{major}.{minor}.99")
@@ -259,10 +257,6 @@ class BuildSelector:
         if not self.prerelease_pythons and selector_matches(self.PRERELEASE_SKIP, build_id):
             return False
 
-        # filter out free threaded pythons if self.free_threaded_support is False
-        if not self.free_threaded_support and selector_matches("*t-*", build_id):
-            return False
-
         should_build = selector_matches(self.build_config, build_id)
         should_skip = selector_matches(self.skip_config, build_id)
 
@@ -274,7 +268,6 @@ class BuildSelector:
             "skip_config": self.skip_config,
             "requires_python": str(self.requires_python),
             "prerelease_pythons": self.prerelease_pythons,
-            "free_threaded_support": self.free_threaded_support,
         }
 
 
@@ -535,15 +528,12 @@ def get_pip_version(env: Mapping[str, str]) -> str:
 
 
 @lru_cache(maxsize=None)
-def _ensure_virtualenv(version: str) -> Path:
-    version_parts = version.split(".")
-    key = f"py{version_parts[0]}{version_parts[1]}"
+def _ensure_virtualenv() -> Path:
     input_file = resources_dir / "virtualenv.toml"
     with input_file.open("rb") as f:
         loaded_file = tomllib.load(f)
-    configuration = loaded_file.get(key, loaded_file["default"])
-    version = str(configuration["version"])
-    url = str(configuration["url"])
+    version = str(loaded_file["version"])
+    url = str(loaded_file["url"])
     path = CIBW_CACHE_PATH / f"virtualenv-{version}.pyz"
     with FileLock(str(path) + ".lock"):
         if not path.exists():
@@ -552,7 +542,6 @@ def _ensure_virtualenv(version: str) -> Path:
 
 
 def _parse_constraints_for_virtualenv(
-    seed_packages: list[str],
     dependency_constraint_flags: Sequence[PathOrStr],
 ) -> dict[str, str]:
     """
@@ -565,8 +554,8 @@ def _parse_constraints_for_virtualenv(
     {macos|windows}.setup_python function.
     """
     assert len(dependency_constraint_flags) in {0, 2}
-    # only seed pip if other seed packages do not appear in a constraint file
-    constraints_dict = {"pip": "embed"}
+    packages = ["pip", "setuptools", "wheel"]
+    constraints_dict = {package: "embed" for package in packages}
     if len(dependency_constraint_flags) == 2:
         assert dependency_constraint_flags[0] == "-c"
         constraint_path = Path(dependency_constraint_flags[1])
@@ -582,7 +571,7 @@ def _parse_constraints_for_virtualenv(
                     requirement = Requirement(line)
                     package = requirement.name
                     if (
-                        package not in seed_packages
+                        package not in packages
                         or requirement.url is not None
                         or requirement.marker is not None
                         or len(requirement.extras) != 0
@@ -599,20 +588,12 @@ def _parse_constraints_for_virtualenv(
 
 
 def virtualenv(
-    version: str, python: Path, venv_path: Path, dependency_constraint_flags: Sequence[PathOrStr]
+    python: Path, venv_path: Path, dependency_constraint_flags: Sequence[PathOrStr]
 ) -> dict[str, str]:
     assert python.exists()
-    virtualenv_app = _ensure_virtualenv(version)
-    allowed_seed_packages = ["pip", "setuptools", "wheel"]
-    constraints = _parse_constraints_for_virtualenv(
-        allowed_seed_packages, dependency_constraint_flags
-    )
-    additional_flags: list[str] = []
-    for package in allowed_seed_packages:
-        if package in constraints:
-            additional_flags.append(f"--{package}={constraints[package]}")
-        else:
-            additional_flags.append(f"--no-{package}")
+    virtualenv_app = _ensure_virtualenv()
+    constraints = _parse_constraints_for_virtualenv(dependency_constraint_flags)
+    additional_flags = [f"--{package}={version}" for package, version in constraints.items()]
 
     # Using symlinks to pre-installed seed packages is really the fastest way to get a virtual
     # environment. The initial cost is a bit higher but reusing is much faster.
@@ -654,13 +635,10 @@ def find_compatible_wheel(wheels: Sequence[T], identifier: str) -> T | None:
     """
 
     interpreter, platform = identifier.split("-")
-    free_threaded = interpreter.endswith("t")
-    if free_threaded:
-        interpreter = interpreter[:-1]
     for wheel in wheels:
         _, _, _, tags = parse_wheel_filename(wheel.name)
         for tag in tags:
-            if tag.abi == "abi3" and not free_threaded:
+            if tag.abi == "abi3":
                 # ABI3 wheels must start with cp3 for impl and tag
                 if not (interpreter.startswith("cp3") and tag.interpreter.startswith("cp3")):
                     continue

cibuildwheel/windows.py

@@ -44,9 +44,7 @@ from .util import (
 )
 
 
-def get_nuget_args(
-    version: str, arch: str, free_threaded: bool, output_directory: Path
-) -> list[str]:
+def get_nuget_args(version: str, arch: str, output_directory: Path) -> list[str]:
     package_name = {
         "32": "pythonx86",
         "64": "python",
@@ -55,8 +53,6 @@ def get_nuget_args(
         "x86": "pythonx86",
         "AMD64": "python",
     }[arch]
-    if free_threaded:
-        package_name = f"{package_name}-freethreaded"
     return [
         package_name,
         "-Version",
@@ -110,16 +106,11 @@ def _ensure_nuget() -> Path:
     return nuget
 
 
-def install_cpython(configuration: PythonConfiguration, arch: str | None = None) -> Path:
-    version = configuration.version
-    free_threaded = "t-" in configuration.identifier
-    if arch is None:
-        arch = configuration.arch
+def install_cpython(version: str, arch: str) -> Path:
     base_output_dir = CIBW_CACHE_PATH / "nuget-cpython"
-    nuget_args = get_nuget_args(version, arch, free_threaded, base_output_dir)
+    nuget_args = get_nuget_args(version, arch, base_output_dir)
     installation_path = base_output_dir / (nuget_args[0] + "." + version) / "tools"
-    free_threaded_str = "-freethreaded" if free_threaded else ""
-    with FileLock(str(base_output_dir) + f"-{version}{free_threaded_str}-{arch}.lock"):
+    with FileLock(str(base_output_dir) + f"-{version}-{arch}.lock"):
         if not installation_path.exists():
             nuget = _ensure_nuget()
             call(nuget, "install", *nuget_args)
@@ -233,14 +224,18 @@ def setup_python(
     log.step(f"Installing Python {implementation_id}...")
     if implementation_id.startswith("cp"):
         native_arch = platform_module.machine()
-        base_python = install_cpython(python_configuration)
         if python_configuration.arch == "ARM64" != native_arch:
             # To cross-compile for ARM64, we need a native CPython to run the
             # build, and a copy of the ARM64 import libraries ('.\libs\*.lib')
             # for any extension modules.
-            python_libs_base = base_python.parent / "libs"
+            python_libs_base = install_cpython(
+                python_configuration.version, python_configuration.arch
+            )
+            python_libs_base = python_libs_base.parent / "libs"
             log.step(f"Installing native Python {native_arch} for cross-compilation...")
-            base_python = install_cpython(python_configuration, arch=native_arch)
+            base_python = install_cpython(python_configuration.version, native_arch)
+        else:
+            base_python = install_cpython(python_configuration.version, python_configuration.arch)
     elif implementation_id.startswith("pp"):
         assert python_configuration.url is not None
         base_python = install_pypy(tmp, python_configuration.arch, python_configuration.url)
@@ -251,9 +246,7 @@ def setup_python(
 
     log.step("Setting up build environment...")
     venv_path = tmp / "venv"
-    env = virtualenv(
-        python_configuration.version, base_python, venv_path, dependency_constraint_flags
-    )
+    env = virtualenv(base_python, venv_path, dependency_constraint_flags)
 
     # set up environment variables for run_with_env
     env["PYTHON_VERSION"] = python_configuration.version
@@ -322,7 +315,17 @@ def setup_python(
     call("pip", "--version", env=env)
 
     log.step("Installing build tools...")
-    if build_frontend == "build":
+    if build_frontend == "pip":
+        call(
+            "pip",
+            "install",
+            "--upgrade",
+            "setuptools",
+            "wheel",
+            *dependency_constraint_flags,
+            env=env,
+        )
+    elif build_frontend == "build":
         call(
             "pip",
             "install",
@@ -331,6 +334,8 @@ def setup_python(
             *dependency_constraint_flags,
             env=env,
         )
+    else:
+        assert_never(build_frontend)
 
     if python_libs_base:
         # Set up the environment for various backends to enable cross-compilation
@@ -414,28 +419,6 @@ def build(options: Options, tmp_path: Path) -> None:
                 )
                 extra_flags += build_frontend.args
 
-                build_env = env.copy()
-                build_env["VIRTUALENV_PIP"] = get_pip_version(env)
-                if build_options.dependency_constraints:
-                    constraints_path = build_options.dependency_constraints.get_for_python_version(
-                        config.version
-                    )
-                    # Bug in pip <= 21.1.3 - we can't have a space in the
-                    # constraints file, and pip doesn't support drive letters
-                    # in uhi.  After probably pip 21.2, we can use uri. For
-                    # now, use a temporary file.
-                    if " " in str(constraints_path):
-                        assert " " not in str(identifier_tmp_dir)
-                        tmp_file = identifier_tmp_dir / "constraints.txt"
-                        tmp_file.write_bytes(constraints_path.read_bytes())
-                        constraints_path = tmp_file
-
-                    our_constraints = str(constraints_path)
-                    user_constraints = build_env.get("PIP_CONSTRAINT")
-                    build_env["PIP_CONSTRAINT"] = " ".join(
-                        c for c in [our_constraints, user_constraints] if c
-                    )
-
                 if build_frontend.name == "pip":
                     extra_flags += get_build_verbosity_extra_flags(build_options.build_verbosity)
                     # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org
@@ -449,22 +432,41 @@ def build(options: Options, tmp_path: Path) -> None:
                         f"--wheel-dir={built_wheel_dir}",
                         "--no-deps",
                         *extra_flags,
-                        env=build_env,
+                        env=env,
                     )
                 elif build_frontend.name == "build":
                     if not 0 <= build_options.build_verbosity < 2:
                         msg = f"build_verbosity {build_options.build_verbosity} is not supported for build frontend. Ignoring."
                         log.warning(msg)
-                    call(
-                        "python",
-                        "-m",
-                        "build",
-                        build_options.package_dir,
-                        "--wheel",
-                        f"--outdir={built_wheel_dir}",
-                        *extra_flags,
-                        env=build_env,
-                    )
+                    build_env = env.copy()
+                    if build_options.dependency_constraints:
+                        constraints_path = (
+                            build_options.dependency_constraints.get_for_python_version(
+                                config.version
+                            )
+                        )
+                        # Bug in pip <= 21.1.3 - we can't have a space in the
+                        # constraints file, and pip doesn't support drive letters
+                        # in uhi.  After probably pip 21.2, we can use uri. For
+                        # now, use a temporary file.
+                        if " " in str(constraints_path):
+                            assert " " not in str(identifier_tmp_dir)
+                            tmp_file = identifier_tmp_dir / "constraints.txt"
+                            tmp_file.write_bytes(constraints_path.read_bytes())
+                            constraints_path = tmp_file
+
+                        build_env["PIP_CONSTRAINT"] = str(constraints_path)
+                        build_env["VIRTUALENV_PIP"] = get_pip_version(env)
+                        call(
+                            "python",
+                            "-m",
+                            "build",
+                            build_options.package_dir,
+                            "--wheel",
+                            f"--outdir={built_wheel_dir}",
+                            *extra_flags,
+                            env=build_env,
+                        )
                 else:
                     assert_never(build_frontend)
 
@@ -526,10 +528,6 @@ def build(options: Options, tmp_path: Path) -> None:
                 # check that we are using the Python from the virtual environment
                 call("where", "python", env=virtualenv_env)
 
-                # TODO remove me once virtualenv provides pip>=24.1b1
-                if config.version.startswith("3.13."):
-                    call("python", "-m", "pip", "install", "--pre", "-U", "pip", env=virtualenv_env)
-
                 if build_options.before_test:
                     before_test_prepared = prepare_command(
                         build_options.before_test,

docs/changelog.md

@@ -4,53 +4,6 @@ title: Changelog
 
 # Changelog
 
-### v2.18.1
-
-- 🌟 Add free-threaded Linux and Windows builds for 3.13. New identifiers `cp313t-*`, new option `CIBW_FREE_THREADED_SUPPORT`/`tool.cibuildwheel.free-threaded-support` required to opt-in. [See the docs](https://cibuildwheel.pypa.io/en/stable/options/#free-threaded-support) for more information. (#1831)
-- ✨ The `container-engine` is now a build (non-global) option. (#1792)
-- 🛠 The build backend for cibuildwheel is now hatchling. (#1297)
-- 🛠 Significant improvements and modernization to our noxfile. (#1823)
-- 🛠 Use pylint's new GitHub Actions reporter instead of a custom matcher. (#1823)
-- 🛠 Unpin virtualenv updates for Python 3.7+ (#1830)
-- 🐛 Fix running linux tests from Windows or macOS ARM. (#1788)
-- 📚 Fix our documentation build. (#1821)
-
-
-### v2.18.0
-
-_12 May 2024_
-
-- ✨ Adds CPython 3.13 support, under the prerelease flag [CIBW_PRERELEASE_PYTHONS](https://cibuildwheel.pypa.io/en/stable/options/#prerelease-pythons). This version of cibuildwheel uses 3.13.0b1. Free-threading mode is not available yet (#1657), waiting on official binaries (planned for beta 2) and pip support.
-
-    _While CPython is in beta, the ABI can change, so your wheels might not be compatible with the final release. For this reason, we don't recommend distributing wheels until RC1, at which point 3.13 will be available in cibuildwheel without the flag._ (#1815)
-
-- ✨ Musllinux now defaults to `musllinux_1_2`. You can set the older `musllinux_1_1` via config if needed. (#1817)
-- 🛠 No longer pre-seed setuptools/wheel in virtual environments (#1819)
-- 🛠 Respect the constraints file when building with pip, matching build (#1818)
-- 🛠 Use uv to compile our pinned dependencies, 10x faster and doesn't require special setup (#1778)
-- 🐛 Fix an issue with the schema (#1788)
-- 📚 Document the new delocate error checking macOS versions (#1766)
-- 📚 Document Rust builds (#1816)
-- 📚 Speed up our readthedocs builds with uv, 26 seconds -> 6 seconds to install dependencies (#1816)
-
-
-### v2.17.0
-
-_11 March 2024_
-
-- 🌟 Adds the ability to inherit configuration in TOML overrides. This makes certain configurations much simpler. If you're overriding an option like `before-build` or `environment`, and you just want to add an  extra command or environment variable, you can just append (or prepend) to the previous config. See [the docs](https://cibuildwheel.pypa.io/en/stable/options/#inherit) for more information. (#1730)
-- 🌟 Adds official support for native `arm64` macOS GitHub runners. To use them, just specify `macos-14` as an `os` of your job in your workflow file. You can also keep `macos-13` in your build matrix to build `x86_64`. Check out the new [GitHub Actions example config](https://cibuildwheel.pypa.io/en/stable/setup/#github-actions).
-- ✨ You no longer need to specify `--platform` to run cibuildwheel locally! Instead it will detect your platform automatically. This was a safety feature, no longer necessary. (#1727)
-- 🛠 Removed setuptools and wheel pinned versions. This only affects old-style projects without a `pyproject.toml`, projects with `pyproject.toml` are already getting fresh versions of their `build-system.requires` installed into an isolated environment. (#1725)
-- 🛠 Improve how the GitHub Action passes arguments (#1757)
-- 🛠 Remove a system-wide install of pipx in the GitHub Action (#1745)
-- 🐛 No longer will cibuildwheel override the `PIP_CONSTRAINT` environment variable when using the `build` frontend. Instead it will be extended. (#1675)
-- 🐛 Fix a bug where building and testing both `x86_86` and `arm64` wheels on the same runner caused the wrong architectures in the test environment (#1750)
-- 🐛 Fix a bug that prevented testing a CPython 3.8 wheel targeting macOS 11+ on `x86_64` (#1768)
-- 📚 Moved the docs onto the official PyPA domain - they're now available at https://cibuildwheel.pypa.io . (#1775)
-- 📚 Docs and examples improvements (#1762, #1734)
-
-
 ### v2.16.5
 
 _30 January 2024_
@@ -69,7 +22,7 @@ _28 January 2024_
 _26 January 2024_
 
 - 🐛 Fix a bug when building from sdist, where relative paths to files in the package didn't work because the working directory was wrong (#1687)
-- 🛠 Adds the ability to disable mounting the host filesystem in containers to `/host`, through the `disable_host_mount` suboption on [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.pypa.io/en/stable/options/#container-engine).
+- 🛠 Adds the ability to disable mounting the host filesystem in containers to `/host`, through the `disable_host_mount` suboption on [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.readthedocs.io/en/stable/options/#container-engine).
 - 📚 A lot of docs improvements! (#1708, #1705, #1686, #1679, #1667, #1665)
 
 ### v2.16.2
@@ -77,7 +30,7 @@ _26 January 2024_
 _3 October 2023_
 
 - 🛠 Updates CPython 3.12 version to 3.12.0, final release (#1635)
-- ✨ Adds a debug option [`CIBW_DEBUG_KEEP_CONTAINER`](https://cibuildwheel.pypa.io/en/stable/options/#cibw_debug_keep_container) to stop cibuildwheel deleting build containers after the build finishes. (#1620)
+- ✨ Adds a debug option [`CIBW_DEBUG_KEEP_CONTAINER`](https://cibuildwheel.readthedocs.io/en/stable/options/#cibw_debug_keep_container) to stop cibuildwheel deleting build containers after the build finishes. (#1620)
 - 📚 Adds support for `[tool.cibuildwheel]` checking by adding a schema compatible with the [validate-pyproject](https://github.com/abravalheri/validate-pyproject/) tool (#1622, #1628, #1629)
 - 🐛 Fix parsing of `CIBW_CONTAINER_ENGINE` and `CIBW_BUILD_FRONTEND` options to not break arguments on `:` characters (#1621)
 - 🐛 Fix the evaluation order of `CIBW_ENVIRONMENT` and `CIBW_ENVIRONMENT_PASS` so that `CIBW_ENVIRONMENT` assignments can reference environment variables passed through from the host machine. (#1617)
@@ -94,7 +47,7 @@ _26 September 2023_
 
 _18 September 2023_
 
-- ✨ Add the ability to pass additional flags to a build frontend through the [CIBW_BUILD_FRONTEND](https://cibuildwheel.pypa.io/en/stable/options/#build-frontend) option (#1588).
+- ✨ Add the ability to pass additional flags to a build frontend through the [CIBW_BUILD_FRONTEND](https://cibuildwheel.readthedocs.io/en/stable/options/#build-frontend) option (#1588).
 - ✨ The environment variable SOURCE_DATE_EPOCH is now automatically passed through to container Linux builds (useful for [reproducible builds](https://reproducible-builds.org/docs/source-date-epoch/)!) (#1589)
 - 🛠 Updates the prerelease CPython 3.12 version to 3.12.0rc2 (#1604)
 - 🐛 Fix `requires_python` auto-detection from setup.py when the call to `setup()` is within an `if __name__ == "__main__"` block (#1613)
@@ -123,7 +76,7 @@ _10 July 2023_
 - 🛠 Updates the prerelease CPython 3.12 version to 3.12.0b3.
 - ✨ Allow the use of the `{wheel}` placeholder in CIBW_TEST_COMMAND (#1533)
 - 📚 Docs & examples updates (#1532, #1416)
-- ⚠️  Removed support for running cibuildwheel in Python 3.7. Python 3.7 is EOL. However, cibuildwheel continues to build Python 3.7 wheels for the moment. (#1175)
+- ⚠️ Removed support for running cibuildwheel in Python 3.7. Python 3.7 is EOL. However, cibuildwheel continues to build Python 3.7 wheels for the moment. (#1175)
 
 ### v2.13.1
 
@@ -136,11 +89,11 @@ _10 June 2023_
 
 _28 May 2023_
 
-- ✨ Adds CPython 3.12 support, under the prerelease flag [CIBW_PRERELEASE_PYTHONS](https://cibuildwheel.pypa.io/en/stable/options/#prerelease-pythons). This version of cibuildwheel uses 3.12.0b1.
+- ✨ Adds CPython 3.12 support, under the prerelease flag [CIBW_PRERELEASE_PYTHONS](https://cibuildwheel.readthedocs.io/en/stable/options/#prerelease-pythons). This version of cibuildwheel uses 3.12.0b1.
 
     While CPython is in beta, the ABI can change, so your wheels might not be compatible with the final release. For this reason, we don't recommend distributing wheels until RC1, at which point 3.12 will be available in cibuildwheel without the flag. (#1507)
 
-- ✨ Adds the ability to pass arguments to the container engine when the container is created, using the [CIBW_CONTAINER_ENGINE](https://cibuildwheel.pypa.io/en/stable/options/#container-engine) option. (#1499)
+- ✨ Adds the ability to pass arguments to the container engine when the container is created, using the [CIBW_CONTAINER_ENGINE](https://cibuildwheel.readthedocs.io/en/stable/options/#container-engine) option. (#1499)
 
 ### v2.12.3
 
@@ -195,7 +148,7 @@ _26 October 2022_
 - 🛠 Fix the default `MACOSX_DEPLOYMENT_TARGET` on arm64 (#1312)
 - 🛠 Hide irrelevant pip warnings on linux (#1311)
 - 🐛 Fix a bug that caused the stdout and stderr of commands in containers to be in the wrong order Previously, stdout could appear after stderr. (#1324)
-- 📚 Added [a FAQ entry](https://cibuildwheel.pypa.io/en/stable/faq/#macos-building-cpython-38-wheels-on-arm64) describing how to perform native builds of CPython 3.8 wheels on Apple Silicon. (#1323)
+- 📚 Added [a FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#macos-building-cpython-38-wheels-on-arm64) describing how to perform native builds of CPython 3.8 wheels on Apple Silicon. (#1323)
 - 📚 Other docs improvements
 
 ### v2.11.1
@@ -208,7 +161,7 @@ _13 October 2022_
 
 _13 October 2022_
 
-- 🌟 Adds support for cross-compiling Windows ARM64 wheels. To use this feature, add `ARM64` to the [CIBW_ARCHS](https://cibuildwheel.pypa.io/en/stable/options/#archs) option on a Windows Intel runner. (#1144)
+- 🌟 Adds support for cross-compiling Windows ARM64 wheels. To use this feature, add `ARM64` to the [CIBW_ARCHS](https://cibuildwheel.readthedocs.io/en/stable/options/#archs) option on a Windows Intel runner. (#1144)
 - ✨ Adds support for building Linux aarch64 wheels on Circle CI. (#1307)
 - ✨ Adds support for building Windows wheels on Gitlab CI. (#1295)
 - ✨ Adds support for building Linux aarch64 wheels under emulation on Gitlab CI. (#1295)
@@ -235,10 +188,10 @@ _18 September 2022_
 
 _13 September 2022_
 
-- 🌟 Adds support for [building wheels on Cirrus CI](https://cibuildwheel.pypa.io/en/stable/setup/#cirrus-ci). This is exciting for us, as it's the first public CI platform that natively supports macOS Apple Silicon (aka. M1, `arm64`) runners. As such, it's the first platform that you can natively build _and test_ macOS `arm64` wheels. It also has native Linux ARM (aarch64) runners, for fast, native builds there. (#1191)
+- 🌟 Adds support for [building wheels on Cirrus CI](https://cibuildwheel.readthedocs.io/en/stable/setup/#cirrus-ci). This is exciting for us, as it's the first public CI platform that natively supports macOS Apple Silicon (aka. M1, `arm64`) runners. As such, it's the first platform that you can natively build _and test_ macOS `arm64` wheels. It also has native Linux ARM (aarch64) runners, for fast, native builds there. (#1191)
 - 🌟 Adds support for running cibuildwheel on Apple Silicon machines. For a while, we've supported cross-compilation of Apple Silicon wheels on `x86_64`, but now that we have Cirrus CI we can run our test suite and officially support running cibuildwheel on `arm64`. (#1191)
-- ✨ Adds the `--only` [command line option](https://cibuildwheel.pypa.io/en/stable/options/#command-line), to specify a single build to run. Previously, it could be cumbersome to set all the build selection options to target a specific build - for example, you might have to run something like `CIBW_BUILD=cp39-manylinux_x86_64 cibuildwheel --platform linux --archs x86_64`. The new `--only` option overrides all the build selection options to simplify running a single build, which now looks like `cibuildwheel --only cp39-manylinux_x86_64`. (#1098)
-- ✨ Adds the [`CIBW_CONFIG_SETTINGS`](https://cibuildwheel.pypa.io/en/stable/options/#config-settings) option, so you can pass arguments to your package's build backend (#1244)
+- ✨ Adds the `--only` [command line option](https://cibuildwheel.readthedocs.io/en/stable/options/#command-line), to specify a single build to run. Previously, it could be cumbersome to set all the build selection options to target a specific build - for example, you might have to run something like `CIBW_BUILD=cp39-manylinux_x86_64 cibuildwheel --platform linux --archs x86_64`. The new `--only` option overrides all the build selection options to simplify running a single build, which now looks like `cibuildwheel --only cp39-manylinux_x86_64`. (#1098)
+- ✨ Adds the [`CIBW_CONFIG_SETTINGS`](https://cibuildwheel.readthedocs.io/en/stable/options/#config-settings) option, so you can pass arguments to your package's build backend (#1244)
 - 🛠 Updates the CPython 3.11 version to the latest release candidate - v3.11.0rc2. (#1265)
 - 🐛 Fix a bug that can cause a RecursionError on Windows when building from an sdist. (#1253)
 - 🛠 Add support for the s390x architecture on manylinux_2_28 (#1255)
@@ -265,7 +218,7 @@ _18 July 2022_
 
 _5 July 2022_
 
-- ✨ You can now run cibuildwheel on Podman, as an alternate container engine to Docker (which remains the default). This is useful in environments where a Docker daemon isn't available, for example, it can be run inside a Docker container, or without root access. To use Podman, set the [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.pypa.io/en/stable/options/#container-engine) option. (#966)
+- ✨ You can now run cibuildwheel on Podman, as an alternate container engine to Docker (which remains the default). This is useful in environments where a Docker daemon isn't available, for example, it can be run inside a Docker container, or without root access. To use Podman, set the [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.readthedocs.io/en/stable/options/#container-engine) option. (#966)
 - ✨ Adds support for building `py3-none-{platform}` wheels. This works the same as ABI3 - wheels won't be rebuilt, but tests will still be run across all selected versions of Python.
 
     These wheels contain native extension code, but don't use the Python APIs. Typically, they're bridged to Python using a FFI module like [ctypes](https://docs.python.org/3/library/ctypes.html) or [cffi](https://cffi.readthedocs.io/en/latest/). Because they don't use Python ABI, the wheels are more compatible - they work across many Python versions.
@@ -279,7 +232,7 @@ _5 July 2022_
 
 _17 June 2022_
 
-- 🌟 Added support for the new `manylinux_2_28` images. These new images are based on AlmaLinux, the community-driven successor to CentOS, unlike manylinux_2_24, which was based on Debian. To build on these images, set your [`CIBW_MANYLINUX_*_IMAGE`](https://cibuildwheel.pypa.io/en/stable/options/#linux-image) option to `manylinux_2_28`. (#1026)
+- 🌟 Added support for the new `manylinux_2_28` images. These new images are based on AlmaLinux, the community-driven successor to CentOS, unlike manylinux_2_24, which was based on Debian. To build on these images, set your [`CIBW_MANYLINUX_*_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image) option to `manylinux_2_28`. (#1026)
 - 🐛 Fix a bug where tests were not being run on CPython 3.11 (when CIBW_PRERELEASE_PYTHONS was set) (#1138)
 - ✨ You can now build Linux wheels on Windows, as long as you have Docker installed and set to 'Linux containers' (#1117)
 - 🐛 Fix a bug on macOS that caused cibuildwheel to crash trying to overwrite a previously-built wheel of the same name. (#1129)
@@ -294,15 +247,15 @@ _7 June 2022_
 
 _25 May 2022_
 
-- 🌟 Added the ability to test building wheels on CPython 3.11! Because CPython 3.11 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.pypa.io/en/stable/options/#prerelease-pythons) to test. This version of cibuildwheel includes CPython 3.11.0b1. (#1109)
-- 📚 Added an interactive diagram showing how cibuildwheel works to the [docs](https://cibuildwheel.pypa.io/en/stable/#how-it-works) (#1100)
+- 🌟 Added the ability to test building wheels on CPython 3.11! Because CPython 3.11 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. This version of cibuildwheel includes CPython 3.11.0b1. (#1109)
+- 📚 Added an interactive diagram showing how cibuildwheel works to the [docs](https://cibuildwheel.readthedocs.io/en/stable/#how-it-works) (#1100)
 
 ### v2.5.0
 
 _29 April 2022_
 
-- ✨ Added support for building ABI3 wheels. cibuildwheel will now recognise when an ABI3 wheel was produced, and skip subsequent build steps where the previously built wheel is compatible. Tests still will run on all selected versions of Python, using the ABI3 wheel. Check [this entry](https://cibuildwheel.pypa.io/en/stable/faq/#abi3) in the docs for more info. (#1091)
-- ✨ You can now build wheels directly from sdist archives, in addition to source directories. Just call cibuildwheel with an sdist argument on the command line, like `cibuildwheel mypackage-1.0.0.tar.gz`. For more details, check the [`--help` output](https://cibuildwheel.pypa.io/en/stable/options/#command-line) (#1096)
+- ✨ Added support for building ABI3 wheels. cibuildwheel will now recognise when an ABI3 wheel was produced, and skip subsequent build steps where the previously built wheel is compatible. Tests still will run on all selected versions of Python, using the ABI3 wheel. Check [this entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#abi3) in the docs for more info. (#1091)
+- ✨ You can now build wheels directly from sdist archives, in addition to source directories. Just call cibuildwheel with an sdist argument on the command line, like `cibuildwheel mypackage-1.0.0.tar.gz`. For more details, check the [`--help` output](https://cibuildwheel.readthedocs.io/en/stable/options/#command-line) (#1096)
 - 🐛 Fix a bug where cibuildwheel would crash when no builds are selected and `--allow-empty` is passed (#1086)
 - 🐛 Workaround a permissions issue on Linux relating to newer versions of git and setuptools_scm (#1095)
 - 📚 Minor docs improvements
@@ -311,7 +264,7 @@ _29 April 2022_
 
 _2 April 2022_
 
-- ✨ cibuildwheel now supports running locally on Windows and macOS (as well as Linux). On macOS, you'll have to install the versions of Pythons that you want to use from Python.org, and cibuildwheel will use them. On Windows, cibuildwheel will install it's own versions of Python. Check out [the documentation](https://cibuildwheel.pypa.io/en/stable/setup/#local) for instructions. (#974)
+- ✨ cibuildwheel now supports running locally on Windows and macOS (as well as Linux). On macOS, you'll have to install the versions of Pythons that you want to use from Python.org, and cibuildwheel will use them. On Windows, cibuildwheel will install it's own versions of Python. Check out [the documentation](https://cibuildwheel.readthedocs.io/en/stable/setup/#local) for instructions. (#974)
 - ✨ Added support for building PyPy 3.9 wheels. (#1031)
 - ✨ Listing at the end of the build now displays the size of each wheel (#975)
 - 🐛 Workaround a connection timeout bug on Travis CI ppc64le runners (#906)
@@ -331,12 +284,12 @@ _14 December 2021_
 
 _26 November 2021_
 
-- 📈 cibuildwheel now defaults to manylinux2014 image for linux builds, rather than manylinux2010. If you want to stick with manylinux2010, it's simple to set this using [the image options](https://cibuildwheel.pypa.io/en/stable/options/#linux-image). (#926)
-- ✨ You can now pass environment variables from the host machine into the Docker container during a Linux build. Check out [the docs for `CIBW_ENVIRONMENT_PASS_LINUX `](https://cibuildwheel.pypa.io/en/latest/options/#environment-pass) for the details. (#914)
+- 📈 cibuildwheel now defaults to manylinux2014 image for linux builds, rather than manylinux2010. If you want to stick with manylinux2010, it's simple to set this using [the image options](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image). (#926)
+- ✨ You can now pass environment variables from the host machine into the Docker container during a Linux build. Check out [the docs for `CIBW_ENVIRONMENT_PASS_LINUX `](https://cibuildwheel.readthedocs.io/en/latest/options/#environment-pass) for the details. (#914)
 - ✨ Added support for building PyPy 3.8 wheels. (#881)
 - ✨ Added support for building Windows arm64 CPython wheels on a Windows arm64 runner. We can't test this in CI yet, so for now, this is experimental. (#920)
 - 📚 Improved the deployment documentation (#911)
-- 🛠 Changed the escaping behaviour inside cibuildwheel's  option placeholders e.g. `{project}` in `before_build` or `{dest_dir}` in `repair_wheel_command`. This allows bash syntax like `${SOME_VAR}` to passthrough without being interpreted as a placeholder by cibuildwheel. See [this section](https://cibuildwheel.pypa.io/en/stable/options/#placeholders) in the docs for more info. (#889)
+- 🛠 Changed the escaping behaviour inside cibuildwheel's  option placeholders e.g. `{project}` in `before_build` or `{dest_dir}` in `repair_wheel_command`. This allows bash syntax like `${SOME_VAR}` to passthrough without being interpreted as a placeholder by cibuildwheel. See [this section](https://cibuildwheel.readthedocs.io/en/stable/options/#placeholders) in the docs for more info. (#889)
 - 🛠 Pip updated to 21.3, meaning it now defaults to in-tree builds again. If this causes an issue with your project, setting environment variable `PIP_USE_DEPRECATED=out-of-tree-build` is available as a temporary flag to restore the old behaviour. However, be aware that this flag will probably be removed soon. (#881)
 - 🐛 You can now access the current Python interpreter using `python3` within a build on Windows (#917)
 
@@ -359,15 +312,15 @@ _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.pypa.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...
+  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.pypa.io/en/latest/options/#overrides) for more info on the specifics.
+  You can now set build options for any subset of your builds using a match pattern. So, for example, you can customise CPython 3.8 builds with an override on `cp38-*` or musllinux builds by selecting `*musllinux*`. Check out [the docs](https://cibuildwheel.readthedocs.io/en/latest/options/#overrides) for more info on the specifics.
 
 - 🛠 Added support for building PyPy wheels on macOS 11 CI runners. (#875)
 
-- 🛠 Setting an empty string for the [`CIBW_*_IMAGE`](https://cibuildwheel.pypa.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 matrices. (#829)
+- 🛠 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 matrices. (#829)
 
 - 🛠 Support for TOML 1.0 when reading config files, via the `tomli` package. (#876)
 
@@ -406,9 +359,9 @@ _25 July 2021_
 
 _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.pypa.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.pypa.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.pypa.io/en/stable/options/#prerelease-pythons) to test. (#675) This version of cibuildwheel includes CPython 3.10.0b4.
+- 🌟 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)
@@ -435,7 +388,7 @@ _1 May 2021_
 
 - 📚 Lots of docs improvements! (#650, #623, #616, #609, #606)
 - 🐛 Fix nuget "Package is not found" error on Windows. (#653)
-- ⚠️ cibuildwheel will no longer build Windows 2.7 wheels, unless you specify a custom toolchain using `DISTUTILS_USE_SDK=1` and `MSSdk=1`. This is because Microsoft have stopped distributing Visual C++ Compiler for Python 2.7. See [this FAQ entry](https://cibuildwheel.pypa.io/en/stable/faq/#windows-and-python-27) for more details. (#649)
+- ⚠️ cibuildwheel will no longer build Windows 2.7 wheels, unless you specify a custom toolchain using `DISTUTILS_USE_SDK=1` and `MSSdk=1`. This is because Microsoft have stopped distributing Visual C++ Compiler for Python 2.7. See [this FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#windows-and-python-27) for more details. (#649)
 - 🐛 Fix crash on Windows due to missing `which` command (#641).
 
 ### v1.10.0
@@ -443,7 +396,7 @@ _1 May 2021_
 _22 Feb 2021_
 
 - ✨ Added `manylinux_2_24` support. To use these new Debian-based manylinux
-  images, set your [manylinux image](https://cibuildwheel.pypa.io/en/stable/options/#linux-image)
+  images, set your [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image)
   options to `manylinux_2_24`.
 - 🛠 On macOS, we now set `MACOSX_DEPLOYMENT_TARGET` in before running
   `CIBW_BEFORE_ALL`. This is useful when using `CIBW_BEFORE_ALL` to build a
@@ -460,10 +413,10 @@ _5 February 2021_
 - 🌟 Added support for Apple Silicon wheels on macOS! You can now
   cross-compile `universal2` and `arm64` wheels on your existing macOS Intel
   runners, by setting
-  [CIBW_ARCHS_MACOS](https://cibuildwheel.pypa.io/en/stable/options/#archs).
+  [CIBW_ARCHS_MACOS](https://cibuildwheel.readthedocs.io/en/stable/options/#archs).
   Xcode 12.2 or later is required, but you don't need macOS 11.0 - you can
   still build on macOS 10.15. See
-  [this FAQ entry](https://cibuildwheel.pypa.io/en/stable/faq/#apple-silicon)
+  [this FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#apple-silicon)
   for more information. (#484)
 - 🌟 Added auto-detection of your package's Python compatibility, via declared
    [`requires-python`](https://www.python.org/dev/peps/pep-0621/#requires-python)
@@ -473,7 +426,7 @@ _5 February 2021_
   will automatically skip builds on versions of Python that your package
   doesn't support. Hopefully this makes the first-run experience of
   cibuildwheel a bit easier. If you need to override this for any reason,
-  look at [`CIBW_PROJECT_REQUIRES_PYTHON`](https://cibuildwheel.pypa.io/en/stable/options/#requires-python).
+  look at [`CIBW_PROJECT_REQUIRES_PYTHON`](https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python).
   (#536)
 - 🌟 cibuildwheel can now be invoked as a native GitHub Action! You can now
   invoke cibuildwheel in a GHA build step like:
@@ -488,10 +441,10 @@ _5 February 2021_
   ```
 
   This saves a bit of boilerplate, and you can [use Dependabot to keep the
-  pinned version up-to-date](https://cibuildwheel.pypa.io/en/stable/faq/#automatic-updates).
+  pinned version up-to-date](https://cibuildwheel.readthedocs.io/en/stable/faq/#automatic-updates).
 
 - ✨ Added `auto64` and `auto32` shortcuts to the
-  [CIBW_ARCHS](https://cibuildwheel.pypa.io/en/stable/options/#archs)
+  [CIBW_ARCHS](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)
   option. (#553)
 - ✨ cibuildwheel now prints a list of the wheels built at the end of each
   run. (#570)
@@ -504,9 +457,9 @@ _22 January 2021_
 - 🌟 Added support for emulated builds! You can now build manylinux wheels on
   ARM64`aarch64`, as well as `ppc64le` and 's390x'. To build under emulation,
   register QEMU via binfmt_misc and set the
-  [`CIBW_ARCHS_LINUX`](https://cibuildwheel.pypa.io/en/stable/options/#archs)
+  [`CIBW_ARCHS_LINUX`](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)
   option to the architectures you want to run. See
-  [this FAQ entry](https://cibuildwheel.pypa.io/en/stable/faq/#emulation)
+  [this FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#emulation)
   for more information. (#482)
 - ✨ Added `CIBW_TEST_SKIP` option. This allows you to choose certain builds
   whose tests you'd like to skip. This might be useful when running a slow
@@ -532,7 +485,7 @@ _1 January 2021_
   in a virtualenv. (#502)
 - 🛠 Some preparatory work towards using cibuildwheel as a GitHub Action.
   Check out
-  [the FAQ](https://cibuildwheel.pypa.io/en/stable/faq/#option-1-github-action)
+  [the FAQ](https://cibuildwheel.readthedocs.io/en/stable/faq/#option-1-github-action)
   for information on how to use it. We'll be fully updating the docs to this
   approach in a subsequent release (#494)
 
@@ -654,7 +607,7 @@ _25 June 2020_
 
 _24 June 2020_
 
-- 🌟 Add [`CIBW_BEFORE_ALL`](https://cibuildwheel.pypa.io/en/stable/options/#before-all)
+- 🌟 Add [`CIBW_BEFORE_ALL`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-all)
   option, which lets you run a command on the build machine before any wheels
   are built. This is especially useful when building on Linux, to `make`
   something external to Python, or to `yum install` a dependency. (#342)
@@ -697,15 +650,15 @@ _2 May 2020_
   environment on macOS and Windows, where the version of Xcode and Visual
   Studio can still effect things.
 
-  This can be controlled using the [CIBW_DEPENDENCY_VERSIONS](https://cibuildwheel.pypa.io/en/stable/options/#dependency-versions)
-  and [manylinux image](https://cibuildwheel.pypa.io/en/stable/options/#linux-image)
+  This can be controlled using the [CIBW_DEPENDENCY_VERSIONS](https://cibuildwheel.readthedocs.io/en/stable/options/#dependency-versions)
+  and [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image)
   options - if you always want to use the latest toolchain, you can still do
   that, or you can specify your own pip constraints file and manylinux image.
   (#256)
 
 - ✨ Added `package_dir` command line option, meaning we now support building
   a package that lives in a subdirectory and pulls in files from the wider
-  project. See [the `package_dir` option help](https://cibuildwheel.pypa.io/en/stable/options/#command-line-options)
+  project. See [the `package_dir` option help](https://cibuildwheel.readthedocs.io/en/stable/options/#command-line-options)
   for more information.
 
   Note that this change makes the working directory (where you call
@@ -723,7 +676,7 @@ _2 May 2020_
 _12 March 2020_
 
 - 🌟 Add support for building on GitHub Actions! Check out the
-  [docs](https://cibuildwheel.pypa.io/en/stable/setup/#github-actions)
+  [docs](https://cibuildwheel.readthedocs.io/en/stable/setup/#github-actions)
   for information on how to set it up. (#194)
 - ✨ Add the `CIBW_BEFORE_TEST` option, which lets you run a command to
   prepare the environment before your tests are run. (#242)
@@ -773,9 +726,9 @@ _10 November 2019_
   build using the manylinux2010 images by default. If your project is still
   manylinux1 compatible, you should get both manylinux1 and manylinux2010
   wheels - you can upload both to PyPI. If you always require manylinux1 wheels, you can
-  build using the old manylinux1 image using the [manylinux image](https://cibuildwheel.pypa.io/en/stable/options/#linux-image) option.
+  build using the old manylinux1 image using the [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image) option.
   (#155)
-- 📚 Documentation is now on its [own mini-site](https://cibuildwheel.pypa.io),
+- 📚 Documentation is now on its [own mini-site](https://cibuildwheel.readthedocs.io),
    rather than on the README (#169)
 - ✨ Add support for building Windows wheels on Travis CI. (#160)
 - 🛠 If you set `CIBW_TEST_COMMAND`, your tests now run in a virtualenv. (#164)

docs/contributing.md

@@ -12,7 +12,8 @@ If you have an idea for a modification or feature, it's probably best to raise a
 
 Everyone contributing to the cibuildwheel project is expected to follow the [PSF Code of Conduct](https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md).
 
-## Design Goals
+Design Goals
+------------
 
 - `cibuildwheel` should wrap the complexity of wheel building.
 - The user interface to `cibuildwheel` is the build script (e.g. `.travis.yml`). Feature additions should not increase the complexity of this script.
@@ -32,85 +33,22 @@ We're not responsible for errors in those tools, for fixing errors/crashes there
 
 So, if we can, I'd like to improve the experience on errors as well. In [this](https://github.com/pypa/cibuildwheel/issues/139) case, it takes a bit of knowledge to understand that the Linux builds are happening in a different OS via Docker, that the linked symbols won't match, that auditwheel will fail because of this. A problem with how the tools fit together, instead of the tools themselves.
 
-## Development
+Maintainer notes
+----------------
 
-### Running the tests
-
-When making a change to the codebase, you can run tests locally for quicker feedback than the CI runs on a PR. You can [run them directly](#making-a-venv), but the easiest way to run tests is using [nox](https://nox.thea.codes/).
-
-You can run all the tests locally by doing:
-
-```bash
-nox -s tests
-```
-
-However, because this takes a while, you might prefer to be more specific.
-
-#### Unit tests
-
-To run the project's unit tests, do:
-
-```bash
-nox -s tests -- unit_test
-```
-
-There are a few custom options to enable different parts of the test suite - check `nox -s tests -- unit_test --help` for details.
-
-If you're calling this a lot, you might consider using the `-r` or `-R` arguments to nox to make it a bit faster. This calls pytest under the hood, so to target a specific test, use pytest's `-k` option after the `--` above to select a specific test.
-
-#### Integration tests
-
-To run the project's integration tests, do:
-
-```bash
-nox -s tests -- test
-```
-
-The integration test suite is big - it can take more than 30 minutes to run the whole thing.
-
-Because it takes such a long time, normally you'd choose specific tests to run locally, and rely on the project's CI for the rest. Use pytest's `-k` option to choose specific tests. You can pass a test name or a filename, it'll run everything that matches.
-
-```bash
-nox -s tests -- test -k <test_name_or_filename>
-# e.g.
-nox -s tests -- test -k before_build
-```
-
-A few notes-
-
-- Because they run inside a container, Linux tests can run on all platforms where Docker is installed, so they're convenient for running integration tests locally. Set CIBW_PLATFORM to do this: `CIBW_PLATFORM=linux nox -s tests -- test`.
-
-- Running the macOS integration tests requires _system installs_ of Python from python.org for all the versions that are tested. We won't attempt to install these when running locally, but you can do so manually using the URL in the error message that is printed when the install is not found.
-
-#### Making a venv
-
-More advanced users might prefer to invoke pytest directly-
-
-```bash
-python3 -m venv .venv
-source .venv/bin/activate
-pip install -e .[dev]
-# run the unit tests
-pytest unit_test
-# run the whole integration test suite
-pytest test
-# run a specific integration test
-pytest test -k test_build_frontend_args
-# run a specific integration test on a different platform
-CIBW_PLATFORM=linux pytest test -k test_build_frontend_args
-```
-
-### Linting, docs
+### Nox support
 
 Most developer tasks have a nox interface. This allows you to very simply run tasks without worrying about setting up a development environment (as shown below). This is a slower than setting up a development environment and reusing it, but has the (important) benefit of being highly reproducible; an earlier run does not affect a current run, or anything else on your machine.
 
+Install [nox](https://nox.thea.codes); homebrew is recommend on macOS, otherwise, pipx is a great choice - in fact, you can use `pipx run nox` and avoid installing completely.
+
 You can see a list of sessions by typing `nox -l`; here are a few common ones:
 
 ```console
-nox -s lint                    # Run the linters (default)
-nox -s tests [-- PYTEST-ARGS]  # Run the tests   (default)
-nox -s docs -- serve           # Build and serve the documentation
-nox -s build                   # Make SDist and wheel
+nox -s lint          # Run the linters (default)
+nox -s tests         # Run the tests   (default)
+nox -s docs -- serve # Build and serve the documentation
+nox -s build         # Make SDist and wheel
 ```
 
 More advanced users can run the update scripts. `update_pins` should work directly, but `update_constraints` needs all versions of Python installed. If you don't want to do that locally, a fast way to run it to use docker to run nox:
@@ -119,7 +57,17 @@ More advanced users can run the update scripts. `update_pins` should work direct
 docker run --rm -itv $PWD:/src -w /src quay.io/pypa/manylinux_2_24_x86_64:latest pipx run nox -s update_constraints
 ```
 
-## Maintainer notes
+### Local testing
+
+You should run:
+
+```console
+python3 -m venv venv
+. venv/bin/activate
+pip install -e .[dev]
+```
+
+To prepare a development environment.
 
 ### Testing sample configs
 

docs/data/projects.yml

@@ -26,7 +26,7 @@
   notes: A simple C extension, without external dependencies
 
 - name: websockets
-  gh: python-websockets/websockets
+  gh: aaugustin/websockets
   ci: [travisci]
   ci_config: .travis.yml
   os: [apple, linux]
@@ -325,12 +325,12 @@
   notes: Full range of wheels for setuptools rust, with auto release and PyPI deploy.
 
 - name: python-snappy
-  gh: intake/python-snappy
+  gh: andrix/python-snappy
   ci: [github]
   os: [apple, linux, windows]
 
 - name: sourmash
-  gh: sourmash-bio/sourmash
+  gh: dib-lab/sourmash
   ci: [github]
   os: [apple, linux, windows]
 
@@ -418,7 +418,7 @@
   notes: Tornado is a Python web framework and asynchronous networking library. Uses stable ABI for a small C extension.
 
 - name: pytorch-fairseq
-  gh: facebookresearch/fairseq
+  gh: pytorch/fairseq
   ci: [github]
   os: [apple, linux]
 
@@ -475,7 +475,7 @@
   os: [apple, linux, windows]
 
 - name: OpenSpiel
-  gh: google-deepmind/open_spiel
+  gh: deepmind/open_spiel
   ci: [github]
   os: [apple, linux]
 
@@ -505,7 +505,7 @@
   os: [apple, linux, windows]
 
 - name: OpenTimelineIO
-  gh: AcademySoftwareFoundation/OpenTimelineIO
+  gh: PixarAnimationStudios/OpenTimelineIO
   ci: [github]
   os: [apple, linux, windows]
 
@@ -584,7 +584,7 @@
   notes: Includes GPU support for linux wheels
 
 - name: power-grid-model
-  gh: PowerGridModel/power-grid-model
+  gh: alliander-opensource/power-grid-model
   ci: [github]
   os: [windows, apple, linux]
   notes: Python/C++ library for distribution power system analysis
@@ -645,15 +645,3 @@
   os: [linux, apple]
   pypi: keyvi
   notes: FST based key value index highly optimized for size and lookup performance, utilizes ccache action for improved runtime
-
-- name: pedalboard
-  gh: spotify/pedalboard
-  ci: [github]
-  os: [windows, linux, apple]
-  pypi: pedalboard
-  notes: >
-      A Python library for working with audio data and audio plugins
-      by wrapping the [JUCE](https://github.com/juce-framework/JUCE/)
-      C++ framework. Uses cibuildwheel to deploy on as many operating
-      systems and Python versions as possible with only one dependency
-      (any NumPy).

docs/faq.md

@@ -10,7 +10,7 @@ title: Tips and tricks
 
 Linux wheels are built in [`manylinux`/`musllinux` containers](https://github.com/pypa/manylinux) to provide binary compatible wheels on Linux, according to [PEP 600](https://www.python.org/dev/peps/pep-0600/) / [PEP 656](https://www.python.org/dev/peps/pep-0656/). Because of this, when building with `cibuildwheel` on Linux, a few things should be taken into account:
 
--   Programs and libraries are not installed on the CI runner host, but rather should be installed inside the container - using `yum` for `manylinux2010` or `manylinux2014`, `apt-get` for `manylinux_2_24`, `dnf` for `manylinux_2_28` and `apk` for `musllinux_1_1` or `musllinux_1_2`, or manually. The same goes for environment variables that are potentially needed to customize the wheel building.
+-   Programs and libraries are not installed on the CI runner host, but rather should be installed inside the container - using `yum` for `manylinux2010` or `manylinux2014`, `apt-get` for `manylinux_2_24` and `apk` for `musllinux_1_1`, or manually. The same goes for environment variables that are potentially needed to customize the wheel building.
 
     `cibuildwheel` supports this by providing the [`CIBW_ENVIRONMENT`](options.md#environment) and [`CIBW_BEFORE_ALL`](options.md#before-all) options to setup the build environment inside the running container.
 
@@ -80,7 +80,7 @@ If your CI provider doesn't offer arm64 runners yet, or you want to create `univ
 
 Regarding testing,
 
-- On an arm64 runner, it is possible to test x86_64 wheels and both parts of a universal2 wheel using Rosetta 2 emulation.
+- On an arm64 runner, it is possible to test x86_64 wheels an and both parts of a universal2 wheel using Rosetta 2 emulation.
 - On an x86_64 runner, arm64 code can be compiled but it can't be tested. `cibuildwheel` will raise a warning to notify you of this - these warnings can be silenced by skipping testing on these platforms: `CIBW_TEST_SKIP: "*_arm64 *_universal2:arm64"`.
 
 !!! note
@@ -142,7 +142,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.18.1
+uses: pypa/cibuildwheel@v2.16.5
 ```
 
 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.
@@ -164,7 +164,7 @@ The second option, and the only one that supports other CI systems, is using a `
 
 ```bash
 # requirements-cibw.txt
-cibuildwheel==2.18.1
+cibuildwheel==2.16.5
 ```
 
 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:
@@ -249,7 +249,7 @@ Consider incorporating these into your package, for example, in `setup.py` using
 
 ### Python 2.7 / PyPy2 wheels
 
-See the [cibuildwheel version 1 docs](https://cibuildwheel.pypa.io/en/1.x/) for information about building Python 2.7 or PyPy2 wheels. There are lots of tricks and workaround there that are no longer required for Python 3 in cibuildwheel 2.
+See the [cibuildwheel version 1 docs](https://cibuildwheel.readthedocs.io/en/1.x/) for information about building Python 2.7 or PyPy2 wheels. There are lots of tricks and workaround there that are no longer required for Python 3 in cibuildwheel 2.
 
 ## Troubleshooting
 
@@ -282,27 +282,6 @@ For these reasons, it's strongly recommended to not use brew for native library
 [Homebrew]: https://brew.sh/
 [delocate]: https://github.com/matthew-brett/delocate
 
-### Building Rust wheels
-
-If you build Rust wheels, you need to download the Rust compilers in manylinux.
-If you support 32-bit Windows, you need to add this as a potential target. You
-can do this on GitHub Actions, for example, with:
-
-```yaml
-CIBW_BEFORE_ALL_LINUX: curl -sSf https://sh.rustup.rs | sh -s -- -y
-CIBW_BEFORE_ALL_WINDOWS: rustup target add i686-pc-windows-msvc
-CIBW_ENVIRONMENT_LINUX: "PATH=$HOME/.cargo/bin:$PATH"
-```
-
-Rust does not provide Cargo for musllinux 32-bit, so that needs to be skipped:
-
-```toml
-[tool.cibuildwheel]
-skip = ["*-musllinux_i686"]
-```
-
-Also see [maturin-action](https://github.com/PyO3/maturin-action) which is optimized for Rust wheels, builds the non-Python Rust modules once, and can cross-compile (and can build 32-bit musl, for example).
-
 ### macOS: ModuleNotFoundError
 
 Calling cibuildwheel from a python3 script and getting a `ModuleNotFoundError`? Due to a (fixed) [bug](https://bugs.python.org/issue22490) in CPython, you'll need to [unset the `__PYVENV_LAUNCHER__` variable](https://github.com/pypa/cibuildwheel/issues/133#issuecomment-478288597) before activating a venv.
@@ -328,7 +307,7 @@ Solutions to this vary, but the simplest is to use pipx:
 # most runners have pipx preinstalled, but in case you don't
 python3 -m pip install pipx
 
-pipx run cibuildwheel==2.18.1 --output-dir wheelhouse
+pipx run cibuildwheel==2.16.5 --output-dir wheelhouse
 pipx run twine upload wheelhouse/*.whl
 ```
 
@@ -336,7 +315,7 @@ pipx run twine upload wheelhouse/*.whl
 
 macOS has built-in [System Integrity protections](https://developer.apple.com/library/archive/documentation/Security/Conceptual/System_Integrity_Protection_Guide/RuntimeProtections/RuntimeProtections.html) which limits the use of `DYLD_LIBRARY_PATH` and `LD_LIBRARY_PATH` so that it does not automatically pass to children processes. This means if you set `DYLD_LIBRARY_PATH` before running cibuildwheel, or even set it in `CIBW_ENVIRONMENT`, it will be stripped out of the environment before delocate is called.
 
-To work around this, use a different environment variable such as `REPAIR_LIBRARY_PATH` to store the library path, and set `DYLD_LIBRARY_PATH` in [`CIBW_REPAIR_WHEEL_COMMAND_MACOS`](https://cibuildwheel.pypa.io/en/stable/options/#repair-wheel-command), like this:
+To work around this, use a different environment variable such as `REPAIR_LIBRARY_PATH` to store the library path, and set `DYLD_LIBRARY_PATH` in [`CIBW_REPAIR_WHEEL_COMMAND_MACOS`](https://cibuildwheel.readthedocs.io/en/stable/options/#repair-wheel-command), like this:
 
 !!! tab examples "Environment variables"
 
@@ -376,13 +355,6 @@ sh "/Applications/Python 3.8/Install Certificates.command"
 
 Then cibuildwheel will detect that it's installed and use it instead. However, you probably don't want to build x86_64 wheels on this Python, unless you're happy with them only supporting macOS 11+.
 
-### macOS: Library dependencies do not satisfy target MacOS
-
-Since delocate 0.11.0 there is added verification that the library binary dependencies match the target macOS version. This is to prevent the situation where a wheel platform tag is lower than the actual minimum macOS version required by the library. To resolve this error you need to build the library to the same macOS version as the target wheel (for example using `MACOSX_DEPLOYMENT_TARGET` environment variable).
-Alternatively, you could set `MACOSX_DEPLOYMENT_TARGET` in `CIBW_ENVIRONMENT` to correctly label the wheel as incompatible with older macOS versions.
-
-This error may happen when you install a library using a package manager like Homebrew, which compiles the library for the macOS version of the build machine. This is not suitable for wheels, as the library will only work on the same macOS version as the build machine. You should compile the library yourself, or use a precompiled binary that matches the target macOS version.
-
 ### Windows: 'ImportError: DLL load failed: The specific module could not be found'
 
 Visual Studio and MSVC link the compiled binary wheels to the Microsoft Visual C++ Runtime. Normally, the C parts of the runtime are included with Python, but the C++ components are not. When compiling modules using C++, it is possible users will run into problems on systems that do not have the full set of runtime libraries installed. The solution is to ask users to download the corresponding Visual C++ Redistributable from the [Microsoft website](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) and install it.

docs/main.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-import os
 import subprocess
-import sysconfig
 from typing import Any
 
+# Requires Python 3.7+
+
 
 def define_env(env: Any) -> None:
     "Hook function for mkdocs-macros"
@@ -12,7 +12,4 @@ def define_env(env: Any) -> None:
     @env.macro
     def subprocess_run(*args: str) -> str:
         "Run a subprocess and return the stdout"
-        env = os.environ.copy()
-        scripts = sysconfig.get_path("scripts")
-        env["PATH"] = f"{scripts}{os.pathsep}{env.get('PATH', '')}"
-        return subprocess.run(args, check=True, capture_output=True, text=True, env=env).stdout
+        return subprocess.run(args, check=True, capture_output=True, text=True).stdout

docs/options.md

@@ -135,10 +135,6 @@ trigger new containers, one per image. Some commands are not supported;
 `output-dir`, build/skip/test_skip selectors, and architectures cannot be
 overridden.
 
-You can specify a table of overrides in `inherit={}`, any list or table in this
-list will inherit from previous overrides or the main configuration. The valid
-options are `"none"` (the default), `"append"`, and `"prepend"`.
-
 ##### Examples:
 
 ```toml
@@ -173,69 +169,6 @@ This example will build CPython 3.6 wheels on manylinux1, CPython 3.7-3.9
 wheels on manylinux2010, and manylinux2014 wheels for any newer Python
 (like 3.10).
 
-```toml
-[tool.cibuildwheel]
-environment = {FOO="BAR", "HAM"="EGGS"}
-test-command = ["pyproject"]
-
-[[tool.cibuildwheel.overrides]]
-select = "cp311*"
-
-inherit.test-command = "prepend"
-test-command = ["pyproject-before"]
-
-inherit.environment="append"
-environment = {FOO="BAZ", "PYTHON"="MONTY"}
-
-[[tool.cibuildwheel.overrides]]
-select = "cp311*"
-inherit.test-command = "append"
-test-command = ["pyproject-after"]
-```
-
-This example will provide the command `"pyproject-before && pyproject && pyproject-after"`
-on Python 3.11, and will have `environment = {FOO="BAZ", "PYTHON"="MONTY", "HAM"="EGGS"}`.
-
-
-### Extending existing options {: #inherit }
-
-In the TOML configuration, you can choose how tables and lists are inherited.
-By default, all values are overridden completely (`"none"`) but sometimes you'd
-rather `"append"` or `"prepend"` to an existing list or table. You can do this
-with the `inherit` table in overrides.  For example, if you want to add an environment
-variable for CPython 3.11, without `inherit` you'd have to repeat all the
-original environment variables in the override. With `inherit`, it's just:
-
-```toml
-[[tool.cibuildwheel.overrides]]
-select = "cp311*"
-inherit.environment = "append"
-environment.NEWVAR = "Added!"
-```
-
-For a table, `"append"` will replace a key if it exists, while `"prepend"` will
-only add a new key, older keys take precedence.
-
-Lists are also supported (and keep in mind that commands are lists). For
-example, you can print a message before and after a wheel is repaired:
-
-```toml
-[[tool.cibuildwheel.overrides]]
-select = "*"
-inherit.repair-wheel-command = "prepend"
-repair-wheel-command = "echo 'Before repair'"
-
-[[tool.cibuildwheel.overrides]]
-select = "*"
-inherit.repair-wheel-command = "append"
-repair-wheel-command = "echo 'After repair'"
-```
-
-As seen in this example, you can have multiple overrides match - they match top
-to bottom, with the config being accumulated. If you need platform-specific
-inheritance, you can use `select = "*-????linux_*"` for Linux, `select =
-"*-win_*"` for Windows, and `select = "*-macosx_*"` for macOS. As always,
-environment variables will completely override any TOML configuration.
 
 ## Options summary
 
@@ -251,7 +184,7 @@ Options: `auto` `linux` `macos` `windows`
 
 Default: `auto`
 
-`auto` will build wheels for the current platform.
+`auto` will auto-detect platform using environment variables, such as `TRAVIS_OS_NAME`/`APPVEYOR`/`CIRCLECI`.
 
 - For `linux`, you need [Docker or Podman](#container-engine) running, on Linux, macOS, or Windows.
 - For `macos` and `windows`, you need to be running on the respective system, with a working compiler toolchain installed - Xcode Command Line tools for macOS, and MSVC for Windows.
@@ -259,7 +192,7 @@ Default: `auto`
 This option can also be set using the [command-line option](#command-line) `--platform`. This option is not available in the `pyproject.toml` config.
 
 !!! tip
-    You can use this option to locally debug your cibuildwheel config on Linux, instead of pushing to CI to test every change. For example:
+    You can use this option to locally debug your cibuildwheel config, instead of pushing to CI to test every change. For example:
 
     ```bash
     export CIBW_BUILD='cp37-*'
@@ -267,8 +200,6 @@ This option can also be set using the [command-line option](#command-line) `--pl
     cibuildwheel --platform linux .
     ```
 
-    Linux builds are the easiest to test locally, because all the build tools are supplied in the container, and they run exactly the same locally as in CI.
-
     This is even more convenient if you store your cibuildwheel config in [`pyproject.toml`](#configuration-file).
 
     You can also run a single identifier with `--only <identifier>`. This will
@@ -296,7 +227,6 @@ When setting the options, you can use shell-style globbing syntax, as per [fnmat
 | Python 3.10   | cp310-macosx_x86_64<br/>cp310-macosx_universal2<br/>cp310-macosx_arm64 | cp310-win_amd64<br/>cp310-win32<br/>cp310-win_arm64 | cp310-manylinux_x86_64<br/>cp310-manylinux_i686<br/>cp310-musllinux_x86_64<br/>cp310-musllinux_i686 | cp310-manylinux_aarch64<br/>cp310-manylinux_ppc64le<br/>cp310-manylinux_s390x<br/>cp310-musllinux_aarch64<br/>cp310-musllinux_ppc64le<br/>cp310-musllinux_s390x |
 | Python 3.11   | cp311-macosx_x86_64<br/>cp311-macosx_universal2<br/>cp311-macosx_arm64 | cp311-win_amd64<br/>cp311-win32<br/>cp311-win_arm64 | cp311-manylinux_x86_64<br/>cp311-manylinux_i686<br/>cp311-musllinux_x86_64<br/>cp311-musllinux_i686 | cp311-manylinux_aarch64<br/>cp311-manylinux_ppc64le<br/>cp311-manylinux_s390x<br/>cp311-musllinux_aarch64<br/>cp311-musllinux_ppc64le<br/>cp311-musllinux_s390x |
 | Python 3.12   | cp312-macosx_x86_64<br/>cp312-macosx_universal2<br/>cp312-macosx_arm64 | cp312-win_amd64<br/>cp312-win32<br/>cp312-win_arm64 | cp312-manylinux_x86_64<br/>cp312-manylinux_i686<br/>cp312-musllinux_x86_64<br/>cp312-musllinux_i686 | cp312-manylinux_aarch64<br/>cp312-manylinux_ppc64le<br/>cp312-manylinux_s390x<br/>cp312-musllinux_aarch64<br/>cp312-musllinux_ppc64le<br/>cp312-musllinux_s390x |
-| Python 3.13   | cp313-macosx_x86_64<br/>cp313-macosx_universal2<br/>cp313-macosx_arm64 | cp313-win_amd64<br/>cp313-win32<br/>cp313-win_arm64 | cp313-manylinux_x86_64<br/>cp313-manylinux_i686<br/>cp313-musllinux_x86_64<br/>cp313-musllinux_i686 | cp313-manylinux_aarch64<br/>cp313-manylinux_ppc64le<br/>cp313-manylinux_s390x<br/>cp313-musllinux_aarch64<br/>cp313-musllinux_ppc64le<br/>cp313-musllinux_s390x |
 | PyPy3.7 v7.3  | pp37-macosx_x86_64                                                     | pp37-win_amd64                                      | pp37-manylinux_x86_64<br/>pp37-manylinux_i686                                                       | pp37-manylinux_aarch64                                                                                                                                          |
 | PyPy3.8 v7.3  | pp38-macosx_x86_64<br/>pp38-macosx_arm64                               | pp38-win_amd64                                      | pp38-manylinux_x86_64<br/>pp38-manylinux_i686                                                       | pp38-manylinux_aarch64                                                                                                                                          |
 | PyPy3.9 v7.3  | pp39-macosx_x86_64<br/>pp39-macosx_arm64                               | pp39-win_amd64                                      | pp39-manylinux_x86_64<br/>pp39-manylinux_i686                                                       | pp39-manylinux_aarch64                                                                                                                                          |
@@ -309,7 +239,7 @@ For CPython, the minimally supported macOS version is 10.9; for PyPy 3.7, macOS
 
 Windows arm64 platform support is experimental.
 
-See the [cibuildwheel 1 documentation](https://cibuildwheel.pypa.io/en/1.x/) for past end-of-life versions of Python, and PyPy2.7.
+See the [cibuildwheel 1 documentation](https://cibuildwheel.readthedocs.io/en/1.x/) for past end-of-life versions of Python, and PyPy2.7.
 
 #### Examples
 
@@ -408,53 +338,6 @@ See the [cibuildwheel 1 documentation](https://cibuildwheel.pypa.io/en/1.x/) for
   }
 </style>
 
-### `CIBW_FREE_THREADED_SUPPORT` {: #free-threaded-support}
-
-> Choose whether free-threaded variants should be built
-
-[PEP 703](https://www.python.org/dev/peps/pep-0703) introduced variants of CPython that can be built without the Global Interpreter Lock (GIL).
-Those variants are also known as free-threaded / no-gil.
-
-Building for free-threaded variants is disabled by default.
-
-Building can be enabled by setting this option to `true`. The free-threaded compatible wheels will be built in addition to the standard wheels.
-
-This option doesn't support overrides.
-If you need to enable/disable it per platform or python version, set this option to `true` and use [`CIBW_BUILD`](#build-skip)/[`CIBW_SKIP`](#build-skip) options to filter the builds.
-
-The build identifiers for those variants have a `t` suffix in their `python_tag` (e.g. `cp313t-manylinux_x86_64`)
-
-!!! note
-    This feature is experimental: [What’s New In Python 3.13](https://docs.python.org/3.13/whatsnew/3.13.html#free-threaded-cpython)
-
-#### Examples
-
-!!! tab examples "Environment variables"
-
-    ```yaml
-    # Enable free-threaded support
-    CIBW_FREE_THREADED_SUPPORT: 1
-
-    # Skip building free-threaded compatible wheels on Windows
-    CIBW_FREE_THREADED_SUPPORT: 1
-    CIBW_SKIP: *t-win*
-    ```
-
-    It is generally recommended to use `free-threaded-support` in a config file as you can statically declare that you
-    support free-threaded builds.
-
-!!! tab examples "pyproject.toml"
-
-    ```toml
-    [tool.cibuildwheel]
-    # Enable free-threaded support
-    free-threaded-support = true
-
-    # Skip building free-threaded compatible wheels on Windows
-    free-threaded-support = true
-    skip = "*t-win*"
-    ```
-
 ### `CIBW_ARCHS` {: #archs}
 > Change the architectures built on your machine by default.
 
@@ -791,7 +674,7 @@ Platform-specific environment variables are also available:<br/>
     cibuildwheel always defines the environment variable `CIBUILDWHEEL=1`. This can be useful for [building wheels with optional extensions](faq.md#building-packages-with-optional-c-extensions).
 
 !!! note
-    To do its work, cibuildwheel sets the variables `VIRTUALENV_PIP`, `DIST_EXTRA_CONFIG`, `SETUPTOOLS_EXT_SUFFIX`, `PIP_DISABLE_PIP_VERSION_CHECK`, `PIP_ROOT_USER_ACTION`, and it extends the variables `PATH` and `PIP_CONSTRAINT`. Your assignments to these options might be replaced or extended.
+    To do its work, cibuildwheel internally sets the options `PIP_CONSTRAINT`, `VIRTUALENV_PIP`, `DIST_EXTRA_CONFIG`, `SETUPTOOLS_EXT_SUFFIX`, `PIP_DISABLE_PIP_VERSION_CHECK`, `PIP_ROOT_USER_ACTION`. Your assignments to these options might be overridden.
 
 ### `CIBW_ENVIRONMENT_PASS_LINUX` {: #environment-pass}
 > Set environment variables on the host to pass-through to the container.
@@ -1104,11 +987,11 @@ The available options are (default value):
 - `CIBW_MANYLINUX_S390X_IMAGE` ([`quay.io/pypa/manylinux2014_s390x`](https://quay.io/pypa/manylinux2014_s390x))
 - `CIBW_MANYLINUX_PYPY_AARCH64_IMAGE` ([`quay.io/pypa/manylinux2014_aarch64`](https://quay.io/pypa/manylinux2014_aarch64))
 - `CIBW_MANYLINUX_PYPY_I686_IMAGE` ([`quay.io/pypa/manylinux2014_i686`](https://quay.io/pypa/manylinux2014_i686))
-- `CIBW_MUSLLINUX_X86_64_IMAGE` ([`quay.io/pypa/musllinux_1_2_x86_64`](https://quay.io/pypa/musllinux_1_2_x86_64))
-- `CIBW_MUSLLINUX_I686_IMAGE` ([`quay.io/pypa/musllinux_1_2_i686`](https://quay.io/pypa/musllinux_1_2_i686))
-- `CIBW_MUSLLINUX_AARCH64_IMAGE` ([`quay.io/pypa/musllinux_1_2_aarch64`](https://quay.io/pypa/musllinux_1_2_aarch64))
-- `CIBW_MUSLLINUX_PPC64LE_IMAGE` ([`quay.io/pypa/musllinux_1_2_ppc64le`](https://quay.io/pypa/musllinux_1_2_ppc64le))
-- `CIBW_MUSLLINUX_S390X_IMAGE` ([`quay.io/pypa/musllinux_1_2_s390x`](https://quay.io/pypa/musllinux_1_2_s390x))
+- `CIBW_MUSLLINUX_X86_64_IMAGE` ([`quay.io/pypa/musllinux_1_1_x86_64`](https://quay.io/pypa/musllinux_1_1_x86_64))
+- `CIBW_MUSLLINUX_I686_IMAGE` ([`quay.io/pypa/musllinux_1_1_i686`](https://quay.io/pypa/musllinux_1_1_i686))
+- `CIBW_MUSLLINUX_AARCH64_IMAGE` ([`quay.io/pypa/musllinux_1_1_aarch64`](https://quay.io/pypa/musllinux_1_1_aarch64))
+- `CIBW_MUSLLINUX_PPC64LE_IMAGE` ([`quay.io/pypa/musllinux_1_1_ppc64le`](https://quay.io/pypa/musllinux_1_1_ppc64le))
+- `CIBW_MUSLLINUX_S390X_IMAGE` ([`quay.io/pypa/musllinux_1_1_s390x`](https://quay.io/pypa/musllinux_1_1_s390x))
 
 Set an alternative Docker image to be used for building [manylinux / musllinux](https://github.com/pypa/manylinux) wheels.
 
@@ -1119,7 +1002,7 @@ For `CIBW_MUSLLINUX_*_IMAGE`, the value of this option can either be set to `mus
 
 If this option is blank, it will fall though to the next available definition (environment variable -> pyproject.toml -> default).
 
-If setting a custom image, you'll need to make sure it can be used in the same way as the default images: all necessary Python and pip versions need to be present in `/opt/python/`, and the auditwheel tool needs to be present for cibuildwheel to work. Apart from that, the architecture and relevant shared system libraries need to be compatible to the relevant standard to produce valid manylinux1/manylinux2010/manylinux2014/manylinux_2_24/manylinux_2_28/musllinux_1_1/musllinux_1_2 wheels (see [pypa/manylinux on GitHub](https://github.com/pypa/manylinux), [PEP 513](https://www.python.org/dev/peps/pep-0513/), [PEP 571](https://www.python.org/dev/peps/pep-0571/), [PEP 599](https://www.python.org/dev/peps/pep-0599/), [PEP 600](https://www.python.org/dev/peps/pep-0600/) and [PEP 656](https://www.python.org/dev/peps/pep-0656/) for more details).
+If setting a custom image, you'll need to make sure it can be used in the same way as the default images: all necessary Python and pip versions need to be present in `/opt/python/`, and the auditwheel tool needs to be present for cibuildwheel to work. Apart from that, the architecture and relevant shared system libraries need to be compatible to the relevant standard to produce valid manylinux1/manylinux2010/manylinux2014/manylinux_2_24/manylinux_2_28/musllinux_1_1 wheels (see [pypa/manylinux on GitHub](https://github.com/pypa/manylinux), [PEP 513](https://www.python.org/dev/peps/pep-0513/), [PEP 571](https://www.python.org/dev/peps/pep-0571/), [PEP 599](https://www.python.org/dev/peps/pep-0599/), [PEP 600](https://www.python.org/dev/peps/pep-0600/) and [PEP 656](https://www.python.org/dev/peps/pep-0656/) for more details).
 
 Auditwheel detects the version of the manylinux / musllinux standard in the image through the `AUDITWHEEL_PLAT` environment variable, as cibuildwheel has no way of detecting the correct `--plat` command line argument to pass to auditwheel for a custom image. If a custom image does not correctly set this `AUDITWHEEL_PLAT` environment variable, the `CIBW_ENVIRONMENT` option can be used to do so (e.g., `CIBW_ENVIRONMENT='AUDITWHEEL_PLAT="manylinux2010_$(uname -m)"'`).
 
@@ -1150,10 +1033,6 @@ Auditwheel detects the version of the manylinux / musllinux standard in the imag
     # Build using a different image from the docker registry
     CIBW_MANYLINUX_X86_64_IMAGE: dockcross/manylinux-x64
     CIBW_MANYLINUX_I686_IMAGE: dockcross/manylinux-x86
-
-    # Build musllinux wheels using the musllinux_1_1 image
-    CIBW_MUSLLINUX_X86_64_IMAGE: musllinux_1_1
-    CIBW_MUSLLINUX_I686_IMAGE: musllinux_1_1
     ```
 
 !!! tab examples "pyproject.toml"
@@ -1181,10 +1060,6 @@ Auditwheel detects the version of the manylinux / musllinux standard in the imag
     # Build using a different image from the docker registry
     manylinux-x86_64-image = "dockcross/manylinux-x64"
     manylinux-i686-image = "dockcross/manylinux-x86"
-
-    # Build musllinux wheels using the musllinux_1_1 image
-    musllinux-x86_64-image = "musllinux_1_1"
-    musllinux-i686-image = "musllinux_1_1"
     ```
 
     Like any other option, these can be placed in `[tool.cibuildwheel.linux]`
@@ -1722,7 +1597,7 @@ Some options support placeholders, like `{project}`, `{package}` or `{wheel}`, t
         }
 
         var optionNames = option.name.trim().split(', ')
-        var url = 'https://cibuildwheel.pypa.io/en/stable/options/#'+option.id;
+        var url = 'https://cibuildwheel.readthedocs.io/en/stable/options/#'+option.id;
         var namesMarkdown = $.map(optionNames, function(n) {
           return '[`'+n+'`]('+url+') '
         }).join(' <br> ')

docs/setup.md

@@ -11,14 +11,45 @@ locally to quickly iterate and track down issues without even touching CI.
 
 Install cibuildwheel and run a build like this:
 
-```sh
-# using pipx (https://github.com/pypa/pipx)
-pipx run cibuildwheel
+!!! tab "Linux"
 
-# or,
-pip install cibuildwheel
-cibuildwheel
-```
+    Using [pipx](https://github.com/pypa/pipx):
+    ```sh
+    pipx run cibuildwheel --platform linux
+    ```
+
+    Or,
+    ```sh
+    pip install cibuildwheel
+    cibuildwheel --platform linux
+    ```
+
+!!! tab "macOS"
+
+    Using [pipx](https://github.com/pypa/pipx):
+    ```sh
+    pipx run cibuildwheel --platform macos
+    ```
+
+    Or,
+    ```sh
+    pip install cibuildwheel
+    cibuildwheel --platform macos
+    ```
+
+
+!!! tab "Windows"
+
+    Using [pipx](https://github.com/pypa/pipx):
+    ```bat
+    pipx run cibuildwheel --platform windows
+    ```
+
+    Or,
+    ```bat
+    pip install cibuildwheel
+    cibuildwheel --platform windows
+    ```
 
 You should see the builds taking place. You can experiment with options using environment variables or pyproject.toml.
 
@@ -32,7 +63,7 @@ You should see the builds taking place. You can experiment with options using en
     # run a command to set up the build system
     export CIBW_BEFORE_ALL='uname -a'
 
-    cibuildwheel
+    cibuildwheel --platform linux
     ```
 
     > CMD (Windows)
@@ -40,7 +71,7 @@ You should see the builds taking place. You can experiment with options using en
     ```bat
     set CIBW_BEFORE_ALL='uname -a'
 
-    cibuildwheel
+    cibuildwheel --platform linux
     ```
 
 !!! tab "pyproject.toml"
@@ -57,7 +88,7 @@ You should see the builds taking place. You can experiment with options using en
     Then invoke cibuildwheel, like:
 
     ```console
-    cibuildwheel
+    cibuildwheel --platform linux
     ```
 
 ### Linux builds
@@ -148,13 +179,13 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/
         strategy:
           matrix:
             # macos-13 is an intel runner, macos-14 is apple silicon
-            os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+            os: [ubuntu-20.04, windows-2019, macos-13, macos-14]
 
         steps:
           - uses: actions/checkout@v4
 
           - name: Build wheels
-            run: pipx run cibuildwheel==2.18.1
+            run: pipx run cibuildwheel==2.16.5
 
           - uses: actions/upload-artifact@v4
             with:
@@ -182,16 +213,16 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/
         strategy:
           matrix:
             # macos-13 is an intel runner, macos-14 is apple silicon
-            os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+            os: [ubuntu-20.04, windows-2019, macos-13, macos-14]
 
         steps:
           - uses: actions/checkout@v4
 
           # Used to host cibuildwheel
-          - uses: actions/setup-python@v5
+          - uses: actions/setup-python@v3
 
           - name: Install cibuildwheel
-            run: python -m pip install cibuildwheel==2.18.1
+            run: python -m pip install cibuildwheel==2.16.5
 
           - name: Build wheels
             run: python -m cibuildwheel --output-dir wheelhouse

docs/working-examples.md

@@ -16,12 +16,12 @@ title: Working examples
 | [NCNN][]                          | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | ncnn is a high-performance neural network inference framework optimized for the mobile platform |
 | [Prophet][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Tool for producing high quality forecasts for time series data that has multiple seasonality with linear or non-linear growth. |
 | [MyPy][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | The compiled version of MyPy using MyPyC. |
-| [duckdb][]                        | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System |
 | [Kivy][]                          | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Open source UI framework written in Python, running on Windows, Linux, macOS, Android and iOS |
+| [duckdb][]                        | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System |
 | [MemRay][]                        | ![github icon][] | ![linux icon][] | Memray is a memory profiler for Python |
-| [Triton][]                        | ![github icon][] | ![linux icon][] | Self hosted runners |
 | [uvloop][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | Ultra fast asyncio event loop. |
 | [psutil][]                        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python |
+| [Triton][]                        | ![github icon][] | ![linux icon][] | Self hosted runners |
 | [Google Benchmark][]              | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A microbenchmark support library |
 | [vaex][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Out-of-Core hybrid Apache Arrow/NumPy DataFrame for Python, ML, visualization and exploration of big tabular data at a billion rows per second 🚀 |
 | [Apache Beam][]                   | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Apache Beam is a unified programming model for Batch and Streaming data processing. |
@@ -33,76 +33,74 @@ title: Working examples
 | [PyOxidizer][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A modern Python application packaging and distribution tool |
 | [cvxpy][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A Python-embedded modeling language for convex optimization problems. |
 | [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.  |
-| [pedalboard][]                    | ![github icon][] | ![windows icon][] ![linux icon][] ![apple icon][] | A Python library for working with audio data and audio plugins by wrapping the [JUCE](https://github.com/juce-framework/JUCE/) C++ framework. Uses cibuildwheel to deploy on as many operating systems and Python versions as possible with only one dependency (any NumPy).  |
 | [River][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python |
 | [UltraJSON][]                     | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Ultra fast JSON decoder and encoder written in C with Python bindings |
 | [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. |
 | [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` |
-| [Dependency Injector][]           | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI |
 | [pyzmq][]                         | ![github icon][] ![circleci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython on CPython and CFFI on PyPy. ARM wheels for linux are built natively on CircleCI.  |
+| [Dependency Injector][]           | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI |
 | [Implicit][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes GPU support for linux wheels |
 | [vispy][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Main repository for Vispy |
 | [tinyobjloader][]                 | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Tiny but powerful single file wavefront obj loader |
-| [CTranslate2][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit.html) and CUDA kernels compiled for multiple GPU architectures. |
 | [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 |
-| [Line Profiler][]                 | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Line-by-line profiling for Python |
+| [CTranslate2][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit.html) and CUDA kernels compiled for multiple GPU architectures. |
 | [PyYAML][]                        | ![github icon][] | ![apple icon][] | Canonical source repository for PyYAML |
+| [Line Profiler][]                 | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Line-by-line profiling for Python |
 | [PyAV][]                          | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Pythonic bindings for FFmpeg's libraries. |
 | [numexpr][]                       | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, Pandas, PyTables and more |
-| [pikepdf][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by QPDF |
 | [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. |
+| [pikepdf][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by QPDF |
 | [Wrapt][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python module for decorators, wrappers and monkey patching. |
-| [envd][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A machine learning development environment build tool |
+| [envd][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | 🏕️ Reproducible development environment |
 | [OpenColorIO][]                   | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A color management framework for visual effects and animation. |
 | [SimpleJSON][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | simplejson is a simple, fast, extensible JSON encoder/decoder for Python  |
 | [aioquic][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python |
-| [Psycopg 3][]                     | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A modern implementation of a PostgreSQL adapter for Python |
 | [ruptures][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. |
+| [Psycopg 3][]                     | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A modern implementation of a PostgreSQL adapter for Python |
 | [OpenTimelineIO][]                | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Open Source API and interchange format for editorial timeline information. |
 | [PyTables][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data |
 | [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. |
-| [google neuroglancer][]           | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data |
 | [DeepForest][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) |
+| [google neuroglancer][]           | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data |
 | [AutoPy][]                        | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
 | [H3-py][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system |
-| [mosec][]                         | ![github icon][] | ![linux icon][] ![apple icon][] | A machine learning model serving framework powered by Rust |
+| [mosec][]                         | ![github icon][] | ![linux icon][] ![apple icon][] | A high-performance ML model serving framework, offers dynamic batching and CPU/GPU pipelines to fully exploit your compute machine |
 | [Picologging][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A high-performance logging library for Python. |
-| [time-machine][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. |
-| [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 |
+| [markupsafe][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. |
+| [time-machine][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. |
 | [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 |
-| [dd-trace-py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub |
 | [python-rapidjson][]              | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson |
-| [tgcalls][]                       | ![github icon][] | ![apple icon][] ![windows icon][] | Python `pybind11` binding to Telegram's WebRTC library with third party dependencies like `OpenSSL`, `MozJPEG`, `FFmpeg`, etc. |
 | [python-snappy][]                 | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for the snappy google library |
+| [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 |
-| [abess][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A fast best-subset selection library. It uses cibuildwheel to build a large project with C++ extensions. |
 | [sourmash][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. |
-| [cyvcf2][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing |
+| [abess][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A fast best-subset selection library. It uses cibuildwheel to build a large project with C++ extensions. |
 | [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. |
+| [cyvcf2][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing |
 | [jq.py][]                         | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq |
 | [iminuit][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 |
 | [Tokenizer][]                     | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support |
-| [keyvi][]                         | ![github icon][] | ![linux icon][] ![apple icon][] | FST based key value index highly optimized for size and lookup performance, utilizes ccache action for improved runtime |
 | [PyGLM][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Fast OpenGL Mathematics (GLM) for Python |
 | [pillow-heif][]                   | ![github icon][] ![cirrusci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Bindings to libheif library with third party dependencies. Fully automated CI for tests and publishing including Apple Silicon builds. |
 | [TgCrypto][]                      | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
-| [iDynTree][]                      | ![github icon][] | ![linux icon][] | Uses manylinux_2_24 |
 | [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. |
 | [Python-WebRTC][]                 | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | a Python extension that provides bindings to WebRTC M92 |
-| [power-grid-model][]              | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python/C++ library for distribution power system analysis |
 | [pybase64][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python |
+| [power-grid-model][]              | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python/C++ library for distribution power system analysis |
 | [fathon][]                        | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms |
-| [Imagecodecs (fork)][]            | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. |
 | [Arbor][]                         | ![github icon][] | ![apple icon][] ![linux icon][] | Arbor is a multi-compartment neuron simulation library; compatible with next-generation accelerators; best-practices applied to research software; focused on community-driven development. Includes a [small script](https://github.com/arbor-sim/arbor/blob/master/scripts/patchwheel.py) patching `rpath` in bundled libraries.  |
+| [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 |
 | [polaroid][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. |
-| [clang-format][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. |
 | [etebase-py][]                    | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. |
+| [clang-format][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. |
 | [cf-units][]                      | ![github icon][] | ![apple icon][] ![linux icon][] | Units of measure as required by the Climate and Forecast (CF) Metadata Conventions |
 | [ninja][]                         | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
 | [numpythia][]                     | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy |
@@ -110,27 +108,27 @@ title: Working examples
 | [ril][]                           | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A python binding to Rust Imaging library using maturin and Pyo3, utilizes Github Action cache to improve speed. Builds abi3 wheels. |
 | [GSD][]                           | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Cython and NumPy project with 64-bit wheels. |
 | [SiPM][]                          | ![github icon][] | ![apple icon][] ![linux icon][] | High performance library for SiPM detectors simulation using C++17, OpenMP and AVX2 intrinsics. |
+| [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. |
 | [aalink][]                        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Async Python interface for Ableton Link. |
-| [xmlstarlet][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. |
 | [pyinstrument_cext][]             | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies |
 | [werpy][]                         | ![github icon][] | ![windows icon][] ![linux icon][] ![apple icon][] | An ultra-fast python package using optimized dynamic programming to compute the Word Error Rate (WER). |
 | [pybind11 cross build example][]  | ![github icon][] ![gitlab icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Same as pybind11 cmake_example but used to demo Linux ARM + Windows + macOS builds on GitLab |
 
 [scikit-learn]: https://github.com/scikit-learn/scikit-learn
-[pytorch-fairseq]: https://github.com/facebookresearch/fairseq
+[pytorch-fairseq]: https://github.com/pytorch/fairseq
 [NumPy]: https://github.com/numpy/numpy
 [Tornado]: https://github.com/tornadoweb/tornado
 [Matplotlib]: https://github.com/matplotlib/matplotlib
 [NCNN]: https://github.com/Tencent/ncnn
 [Prophet]: https://github.com/facebook/prophet
 [MyPy]: https://github.com/mypyc/mypy_mypyc-wheels
-[duckdb]: https://github.com/duckdb/duckdb
 [Kivy]: https://github.com/kivy/kivy
+[duckdb]: https://github.com/duckdb/duckdb
 [MemRay]: https://github.com/bloomberg/memray
-[Triton]: https://github.com/openai/triton
 [uvloop]: https://github.com/MagicStack/uvloop
 [psutil]: https://github.com/giampaolo/psutil
+[Triton]: https://github.com/openai/triton
 [Google Benchmark]: https://github.com/google/benchmark
 [vaex]: https://github.com/vaexio/vaex
 [Apache Beam]: https://github.com/apache/beam
@@ -141,77 +139,75 @@ title: Working examples
 [twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport
 [PyOxidizer]: https://github.com/indygreg/PyOxidizer
 [cvxpy]: https://github.com/cvxpy/cvxpy
-[websockets]: https://github.com/python-websockets/websockets
-[pedalboard]: https://github.com/spotify/pedalboard
+[websockets]: https://github.com/aaugustin/websockets
 [River]: https://github.com/online-ml/river
 [UltraJSON]: https://github.com/ultrajson/ultrajson
-[OpenSpiel]: https://github.com/google-deepmind/open_spiel
+[OpenSpiel]: https://github.com/deepmind/open_spiel
 [aiortc]: https://github.com/aiortc/aiortc
 [Confluent client for Kafka]: https://github.com/confluentinc/confluent-kafka-python
-[Dependency Injector]: https://github.com/ets-labs/python-dependency-injector
 [pyzmq]: https://github.com/zeromq/pyzmq
+[Dependency Injector]: https://github.com/ets-labs/python-dependency-injector
 [Implicit]: https://github.com/benfred/implicit
 [vispy]: https://github.com/vispy/vispy
 [tinyobjloader]: https://github.com/tinyobjloader/tinyobjloader
-[CTranslate2]: https://github.com/OpenNMT/CTranslate2
 [coverage.py]: https://github.com/nedbat/coveragepy
 [PyCryptodome]: https://github.com/Legrandin/pycryptodome
-[Line Profiler]: https://github.com/pyutils/line_profiler
+[CTranslate2]: https://github.com/OpenNMT/CTranslate2
 [PyYAML]: https://github.com/yaml/pyyaml
+[Line Profiler]: https://github.com/pyutils/line_profiler
 [PyAV]: https://github.com/PyAV-Org/PyAV
 [numexpr]: https://github.com/pydata/numexpr
-[pikepdf]: https://github.com/pikepdf/pikepdf
 [h5py]: https://github.com/h5py/h5py
+[pikepdf]: https://github.com/pikepdf/pikepdf
 [Wrapt]: https://github.com/GrahamDumpleton/wrapt
 [envd]: https://github.com/tensorchord/envd
 [OpenColorIO]: https://github.com/AcademySoftwareFoundation/OpenColorIO
 [SimpleJSON]: https://github.com/simplejson/simplejson
 [aioquic]: https://github.com/aiortc/aioquic
-[Psycopg 3]: https://github.com/psycopg/psycopg
 [ruptures]: https://github.com/deepcharles/ruptures
-[OpenTimelineIO]: https://github.com/AcademySoftwareFoundation/OpenTimelineIO
+[Psycopg 3]: https://github.com/psycopg/psycopg
+[OpenTimelineIO]: https://github.com/PixarAnimationStudios/OpenTimelineIO
 [PyTables]: https://github.com/PyTables/PyTables
 [Parselmouth]: https://github.com/YannickJadoul/Parselmouth
-[google neuroglancer]: https://github.com/google/neuroglancer
 [DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest
+[google neuroglancer]: https://github.com/google/neuroglancer
 [AutoPy]: https://github.com/autopilot-rs/autopy
 [H3-py]: https://github.com/uber/h3-py
 [mosec]: https://github.com/mosecorg/mosec
 [Picologging]: https://github.com/microsoft/picologging
-[time-machine]: https://github.com/adamchainz/time-machine
-[markupsafe]: https://github.com/pallets/markupsafe
 [Rtree]: https://github.com/Toblerity/rtree
+[markupsafe]: https://github.com/pallets/markupsafe
+[time-machine]: https://github.com/adamchainz/time-machine
 [pybind11 cmake_example]: https://github.com/pybind/cmake_example
 [KDEpy]: https://github.com/tommyod/KDEpy
-[dd-trace-py]: https://github.com/DataDog/dd-trace-py
 [python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson
+[python-snappy]: https://github.com/andrix/python-snappy
 [tgcalls]: https://github.com/MarshalX/tgcalls
-[python-snappy]: https://github.com/intake/python-snappy
+[dd-trace-py]: https://github.com/DataDog/dd-trace-py
 [pybind11 python_example]: https://github.com/pybind/python_example
+[sourmash]: https://github.com/dib-lab/sourmash
 [abess]: https://github.com/abess-team/abess
-[sourmash]: https://github.com/sourmash-bio/sourmash
-[cyvcf2]: https://github.com/brentp/cyvcf2
 [matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile
+[cyvcf2]: https://github.com/brentp/cyvcf2
 [jq.py]: https://github.com/mwilliamson/jq.py
 [iminuit]: https://github.com/scikit-hep/iminuit
 [Tokenizer]: https://github.com/OpenNMT/Tokenizer
-[keyvi]: https://github.com/KeyviDev/keyvi
 [PyGLM]: https://github.com/Zuzu-Typ/PyGLM
 [pillow-heif]: https://github.com/bigcat88/pillow_heif
 [TgCrypto]: https://github.com/pyrogram/tgcrypto
-[iDynTree]: https://github.com/robotology/idyntree
 [bx-python]: https://github.com/bxlab/bx-python
+[iDynTree]: https://github.com/robotology/idyntree
 [boost-histogram]: https://github.com/scikit-hep/boost-histogram
 [Python-WebRTC]: https://github.com/MarshalX/python-webrtc
-[power-grid-model]: https://github.com/PowerGridModel/power-grid-model
 [pybase64]: https://github.com/mayeut/pybase64
+[power-grid-model]: https://github.com/alliander-opensource/power-grid-model
 [fathon]: https://github.com/stfbnc/fathon
-[Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build
 [Arbor]: https://github.com/arbor-sim/arbor
+[Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build
 [pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example
 [polaroid]: https://github.com/daggy1234/polaroid
-[clang-format]: https://github.com/ssciwr/clang-format-wheel
 [etebase-py]: https://github.com/etesync/etebase-py
+[clang-format]: https://github.com/ssciwr/clang-format-wheel
 [cf-units]: https://github.com/SciTools/cf-units
 [ninja]: https://github.com/scikit-build/ninja-python-distributions
 [numpythia]: https://github.com/scikit-hep/numpythia
@@ -219,9 +215,9 @@ title: Working examples
 [ril]: https://github.com/Cryptex-github/ril-py
 [GSD]: https://github.com/glotzerlab/gsd
 [SiPM]: https://github.com/EdoPro98/SimSiPM
+[xmlstarlet]: https://github.com/dimitern/xmlstarlet
 [CorrectionLib]: https://github.com/cms-nanoAOD/correctionlib
 [aalink]: https://github.com/artfwo/aalink
-[xmlstarlet]: https://github.com/dimitern/xmlstarlet
 [pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext
 [werpy]: https://github.com/analyticsinmotion/werpy
 [pybind11 cross build example]: https://github.com/wbarnha/pybind_cmake_example_crossbuild

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.18.1
+install: python -m pip install cibuildwheel==2.16.5
 
 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.18.1
+        pip3 install cibuildwheel==2.16.5
       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.18.1
+        python3 -m pip install cibuildwheel==2.16.5
       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.18.1
+        pip install cibuildwheel==2.16.5
       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.18.1
+            pip3 install --user cibuildwheel==2.16.5
             cibuildwheel --output-dir wheelhouse
       - store_artifacts:
           path: wheelhouse/
@@ -19,7 +19,7 @@ jobs:
   linux-aarch64-wheels:
     working_directory: ~/linux-aarch64-wheels
     machine:
-      image: default
+      image: ubuntu-2004:2022.04.1
     # resource_class is what tells CircleCI to use an ARM worker for native arm builds
     # https://circleci.com/product/features/resource-classes/
     resource_class: arm.medium
@@ -28,7 +28,7 @@ jobs:
       - run:
           name: Build the Linux aarch64 wheels.
           command: |
-            python3 -m pip install --user cibuildwheel==2.18.1
+            python3 -m pip install --user cibuildwheel==2.16.5
             python3 -m cibuildwheel --output-dir wheelhouse
       - store_artifacts:
           path: wheelhouse/
@@ -42,7 +42,7 @@ jobs:
       - run:
           name: Build the OS X wheels.
           command: |
-            pip3 install cibuildwheel==2.18.1
+            pip3 install cibuildwheel==2.16.5
             cibuildwheel --output-dir wheelhouse
       - store_artifacts:
           path: wheelhouse/

examples/cirrus-ci-intel-mac.yml

@@ -1,6 +1,6 @@
 build_and_store_wheels: &BUILD_AND_STORE_WHEELS
   install_cibuildwheel_script:
-    - python -m pip install cibuildwheel==2.18.1
+    - python -m pip install cibuildwheel==2.16.5
   run_cibuildwheel_script:
     - cibuildwheel
   wheels_artifacts:
@@ -10,11 +10,12 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS
 macos_task:
   name: Build macOS x86_64 and arm64 wheels.
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-sonoma-xcode
+    image: ghcr.io/cirruslabs/macos-monterey-xcode
 
   env:
-    PATH: /opt/homebrew/opt/python@3.10/libexec/bin:$PATH
+    PATH: /opt/homebrew/opt/python@3.10/bin:$PATH
     CIBW_ARCHS_MACOS: x86_64 arm64
   install_pre_requirements_script:
     - brew install python@3.10
+    - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python
   <<: *BUILD_AND_STORE_WHEELS

examples/cirrus-ci-minimal.yml

@@ -1,6 +1,6 @@
 build_and_store_wheels: &BUILD_AND_STORE_WHEELS
   install_cibuildwheel_script:
-    - python -m pip install cibuildwheel==2.18.1
+    - python -m pip install cibuildwheel==2.16.5
   run_cibuildwheel_script:
     - cibuildwheel
   wheels_artifacts:
@@ -50,10 +50,11 @@ windows_x86_task:
 macos_arm64_task:
   name: Build macOS arm64 wheels.
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-sonoma-xcode
+    image: ghcr.io/cirruslabs/macos-monterey-xcode
 
   env:
-    PATH: /opt/homebrew/opt/python@3.10/libexec/bin:$PATH
+    PATH: /opt/homebrew/opt/python@3.10/bin:$PATH
   install_pre_requirements_script:
     - brew install python@3.10
+    - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python
   <<: *BUILD_AND_STORE_WHEELS

examples/github-deploy.yml

@@ -17,13 +17,13 @@ jobs:
     strategy:
       matrix:
         # macos-13 is an intel runner, macos-14 is apple silicon
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        os: [ubuntu-22.04, windows-2022, macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.18.1
+        uses: pypa/cibuildwheel@v2.16.5
 
       - uses: actions/upload-artifact@v4
         with:

examples/github-minimal.yml

@@ -9,13 +9,13 @@ jobs:
     strategy:
       matrix:
         # macos-13 is an intel runner, macos-14 is apple silicon
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        os: [ubuntu-20.04, windows-2019, macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.18.1
+        uses: pypa/cibuildwheel@v2.16.5
         # env:
         #   CIBW_SOME_OPTION: value
         #    ...

examples/github-with-qemu.yml

@@ -8,8 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # macos-13 is an intel runner, macos-14 is apple silicon
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        os: [ubuntu-20.04, windows-2019, macos-12, macos-14]
 
     steps:
       - uses: actions/checkout@v4
@@ -21,7 +20,7 @@ jobs:
           platforms: all
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.18.1
+        uses: pypa/cibuildwheel@v2.16.5
         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.18.1
+    - python -m pip install cibuildwheel==2.16.5
     - cibuildwheel --output-dir wheelhouse
   artifacts:
     paths:
@@ -23,7 +23,7 @@ windows:
   before_script:
     - choco install python -y --version 3.8.6
     - choco install git.install -y
-    - py -m pip install cibuildwheel==2.18.1
+    - py -m pip install cibuildwheel==2.16.5
   script:
     - py -m cibuildwheel --output-dir wheelhouse --platform windows
   artifacts:

examples/gitlab-with-qemu.yml

@@ -14,7 +14,7 @@ linux:
     - curl -sSL https://get.docker.com/ | sh
     # Warning: This is extremely slow, be careful with how many wheels you build
     - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-    - python -m pip install cibuildwheel==2.18.1
+    - python -m pip install cibuildwheel==2.16.5
     # Assuming your CI runner's default architecture is x86_64...
     - cibuildwheel --output-dir wheelhouse --platform linux --archs aarch64
   artifacts:

examples/travis-ci-deploy.yml

@@ -20,7 +20,7 @@ jobs:
         - ln -s /c/Python38/python.exe /c/Python38/python3.exe
 
 install:
-  - python3 -m pip install cibuildwheel==2.18.1
+  - python3 -m pip install cibuildwheel==2.16.5
 
 script:
   # build the wheels, put them into './dist'

examples/travis-ci-minimal.yml

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

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

@@ -54,7 +54,7 @@ jobs:
     - stage: deploy
       name: Build and deploy Linux wheels
       services: docker
-      install: python3 -m pip install cibuildwheel==2.18.1 twine
+      install: python3 -m pip install cibuildwheel==2.16.5 twine
       script: python3 -m cibuildwheel --output-dir wheelhouse
       after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl
     # Deploy on windows
@@ -62,7 +62,7 @@ jobs:
       name: Build and deploy Windows wheels
       os: windows
       language: shell
-      install: python3 -m pip install cibuildwheel==2.18.1 twine
+      install: python3 -m pip install cibuildwheel==2.16.5 twine
       script: python3 -m cibuildwheel --output-dir wheelhouse
       after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl
 

mkdocs.yml

@@ -49,5 +49,3 @@ plugins:
       module_name: docs/main
       j2_variable_start_string: «
       j2_variable_end_string: »
-      on_error_fail: true
-      on_undefined: strict

noxfile.py

@@ -4,21 +4,17 @@ import os
 import shutil
 import sys
 from pathlib import Path
-from typing import Any
 
 import nox
 
-nox.needs_version = ">=2024.4.15"
 nox.options.sessions = ["lint", "pylint", "check_manifest", "tests"]
-nox.options.default_venv_backend = "uv|virtualenv"
+
+PYTHON_ALL_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
 
 DIR = Path(__file__).parent.resolve()
 
-
-def install_and_run(session: nox.Session, script: str, *args: str, **kwargs: Any) -> str | None:
-    deps = nox.project.load_toml(script)["dependencies"]
-    session.install(*deps)
-    return session.run("python", script, *args, **kwargs)
+if os.environ.get("CI", None):
+    nox.options.error_on_missing_interpreters = True
 
 
 @nox.session
@@ -26,11 +22,11 @@ def tests(session: nox.Session) -> None:
     """
     Run the unit and regular tests.
     """
-    session.install("-e.[test]")
+    unit_test_args = ["--run-docker"] if sys.platform.startswith("linux") else []
+    session.install("-e", ".[test]")
     if session.posargs:
         session.run("pytest", *session.posargs)
     else:
-        unit_test_args = ["--run-docker"] if sys.platform.startswith("linux") else []
         session.run("pytest", "unit_test", *unit_test_args)
         session.run("pytest", "test", "-x", "--durations", "0", "--timeout=2400", "test")
 
@@ -50,7 +46,7 @@ def pylint(session: nox.Session) -> None:
     Run pylint.
     """
 
-    session.install("pylint>=3.2", "-e.")
+    session.install("pylint", ".")
     session.run("pylint", "cibuildwheel", *session.posargs)
 
 
@@ -64,36 +60,32 @@ def check_manifest(session: nox.Session) -> None:
     session.run("check-manifest", *session.posargs)
 
 
-@nox.session
+@nox.session(python=PYTHON_ALL_VERSIONS)
 def update_constraints(session: nox.Session) -> None:
     """
     Update the dependencies inplace.
     """
-
-    if session.venv_backend != "uv":
-        session.install("uv>=0.1.23")
-
-    for minor_version in range(7, 14):
-        python_version = f"3.{minor_version}"
-        env = os.environ.copy()
-        # CUSTOM_COMPILE_COMMAND is a pip-compile option that tells users how to
-        # regenerate the constraints files
-        env["UV_CUSTOM_COMPILE_COMMAND"] = f"nox -s {session.name}"
-        session.run(
-            "uv",
-            "pip",
-            "compile",
-            f"--python-version={python_version}",
-            "--upgrade",
-            "cibuildwheel/resources/constraints.in",
-            f"--output-file=cibuildwheel/resources/constraints-python{python_version.replace('.', '')}.txt",
-            env=env,
-        )
-    RESOURCES = DIR / "cibuildwheel" / "resources"
-    shutil.copyfile(
-        RESOURCES / "constraints-python312.txt",
-        RESOURCES / "constraints.txt",
+    session.install("pip-tools")
+    assert isinstance(session.python, str)
+    python_version = session.python.replace(".", "")
+    env = os.environ.copy()
+    # CUSTOM_COMPILE_COMMAND is a pip-compile option that tells users how to
+    # regenerate the constraints files
+    env["CUSTOM_COMPILE_COMMAND"] = f"nox -s {session.name}"
+    session.run(
+        "pip-compile",
+        "--allow-unsafe",
+        "--upgrade",
+        "cibuildwheel/resources/constraints.in",
+        f"--output-file=cibuildwheel/resources/constraints-python{python_version}.txt",
+        env=env,
     )
+    if session.python == PYTHON_ALL_VERSIONS[-1]:
+        RESOURCES = DIR / "cibuildwheel" / "resources"
+        shutil.copyfile(
+            RESOURCES / f"constraints-python{python_version}.txt",
+            RESOURCES / "constraints.txt",
+        )
 
 
 @nox.session
@@ -101,19 +93,20 @@ def update_pins(session: nox.Session) -> None:
     """
     Update the python, docker and virtualenv pins version inplace.
     """
-    session.install("-e.[bin]")
+    session.install("-e", ".[bin]")
     session.run("python", "bin/update_pythons.py", "--force")
     session.run("python", "bin/update_docker.py")
     session.run("python", "bin/update_virtualenv.py", "--force")
 
 
-@nox.session(reuse_venv=True)
+@nox.session
 def update_proj(session: nox.Session) -> None:
     """
     Update the README inplace.
     """
-    install_and_run(
-        session,
+    session.install("-e", ".[bin]")
+    session.run(
+        "python",
         "bin/projects.py",
         "docs/data/projects.yml",
         *session.posargs,
@@ -125,26 +118,27 @@ def generate_schema(session: nox.Session) -> None:
     """
     Generate the cibuildwheel.schema.json file.
     """
-    output = install_and_run(session, "bin/generate_schema.py", silent=True)
+    session.install("pyyaml")
+    output = session.run("python", "bin/generate_schema.py", silent=True)
     assert isinstance(output, str)
     DIR.joinpath("cibuildwheel/resources/cibuildwheel.schema.json").write_text(output)
 
 
-@nox.session(reuse_venv=True)
-def bump_version(session: nox.Session) -> None:
-    """
-    Bump cibuildwheel's version. Interactive.
-    """
-    install_and_run(session, "bin/bump_version.py")
-
-
-@nox.session(python="3.12")
+@nox.session(python="3.9")
 def docs(session: nox.Session) -> None:
     """
-    Build the docs. Will serve unless --non-interactive
+    Build the docs.
     """
-    session.install("-e.[docs]")
-    session.run("mkdocs", "serve" if session.interactive else "build", "--strict", *session.posargs)
+    session.install("-e", ".[docs]")
+    session.run("pip", "list")
+
+    if session.posargs:
+        if "serve" in session.posargs:
+            session.run("mkdocs", "serve")
+        else:
+            session.error("Unrecognized args, use 'serve'")
+    else:
+        session.run("mkdocs", "build")
 
 
 @nox.session

pyproject.toml

@@ -1,94 +1,9 @@
 [build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
+requires = [
+    "setuptools>=42",
+]
+build-backend = "setuptools.build_meta"
 
-[project]
-name = "cibuildwheel"
-version = "2.18.1"
-description = "Build Python wheels on CI with minimal configuration."
-readme = "README.md"
-license = "BSD-2-Clause"
-requires-python = ">=3.8"
-authors = [
-    { name = "Joe Rickerby", email = "joerick@mac.com" },
-]
-keywords = [
-    "appveyor",
-    "ci",
-    "linux",
-    "macos",
-    "packaging",
-    "pypi",
-    "travis",
-    "wheel",
-    "windows",
-]
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: BSD License",
-    "Natural Language :: English",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: Implementation :: CPython",
-    "Topic :: Software Development :: Build Tools",
-]
-dependencies = [
-    "bashlex!=0.13",
-    "bracex",
-    "certifi",
-    "filelock",
-    "packaging>=20.9",
-    "platformdirs",
-    "tomli;python_version < '3.11'",
-    "typing-extensions>=4.1.0;python_version < '3.11'",
-]
-
-[project.optional-dependencies]
-bin = [
-    "click",
-    "packaging>=21.0",
-    "pip-tools",
-    "pygithub",
-    "pyyaml",
-    "requests",
-    "rich>=9.6",
-]
-dev = [
-    "cibuildwheel[test,bin]",
-]
-docs = [
-    "jinja2>=3.1.2",
-    "mkdocs-include-markdown-plugin==2.8.0",
-    "mkdocs-macros-plugin",
-    "mkdocs==1.3.1",
-    "pymdown-extensions",
-]
-test = [
-    "build",
-    "jinja2",
-    "pytest-timeout",
-    "pytest-xdist",
-    "pytest>=6",
-    "tomli_w",
-    "validate-pyproject",
-]
-
-[project.scripts]
-cibuildwheel = "cibuildwheel.__main__:main"
-
-[project.entry-points."validate_pyproject.tool_schema"]
-cibuildwheel = "cibuildwheel.schema:get_schema"
-
-[project.urls]
-Changelog = "https://github.com/pypa/cibuildwheel#changelog"
-Documentation = "https://cibuildwheel.pypa.io"
-Homepage = "https://github.com/pypa/cibuildwheel"
 
 [tool.pytest.ini_options]
 minversion = "6.0"
@@ -100,7 +15,7 @@ log_cli_level = "info"
 
 
 [tool.mypy]
-python_version = "3.8"
+python_version = 3.8
 files = [
     "cibuildwheel/*.py",
     "test/**/*.py",
@@ -109,6 +24,7 @@ files = [
     "noxfile.py",
 ]
 warn_unused_configs = true
+show_error_codes = true
 
 warn_redundant_casts = true
 no_implicit_reexport = true
@@ -142,6 +58,21 @@ module = [
 ignore_missing_imports = 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",
+]
+
 [tool.pylint]
 py-version = "3.8"
 jobs = "0"
@@ -232,7 +163,3 @@ flake8-unused-arguments.ignore-variadic-names = true
 [tool.ruff.lint.per-file-ignores]
 "unit_test/*" = ["PLC1901"]
 "cibuildwheel/_compat/**.py" = ["TID251"]
-"bin/*" = ["TID251"]
-
-[tool.repo-review]
-ignore = ["PC170", "PP303"]

setup.cfg

@@ -0,0 +1,57 @@
+[metadata]
+name = cibuildwheel
+version = 2.16.5
+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-2-Clause
+license_files = LICENSE
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    License :: OSI Approved :: BSD License
+    Natural Language :: English
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
+    Programming Language :: Python :: Implementation :: CPython
+    Topic :: Software Development :: Build Tools
+keywords = ci,wheel,packaging,pypi,travis,appveyor,macos,linux,windows
+project_urls =
+    Changelog=https://github.com/pypa/cibuildwheel#changelog
+    Documentation=https://cibuildwheel.readthedocs.io/
+
+[options]
+packages = find:
+install_requires =
+    bashlex!=0.13
+    bracex
+    certifi
+    filelock
+    packaging>=20.9
+    platformdirs
+    tomli;python_version < '3.11'
+    typing-extensions>=4.1.0;python_version < '3.11'
+python_requires = >=3.8
+include_package_data = True
+zip_safe = False
+
+[options.packages.find]
+include =
+    cibuildwheel
+
+[options.entry_points]
+console_scripts =
+    cibuildwheel = cibuildwheel.__main__:main
+validate_pyproject.tool_schema =
+    cibuildwheel = cibuildwheel.schema:get_schema
+
+[options.package_data]
+cibuildwheel = resources/*

setup.py

@@ -0,0 +1,38 @@
+from __future__ import annotations
+
+from setuptools import setup
+
+extras = {
+    "docs": [
+        "mkdocs-include-markdown-plugin==2.8.0",
+        "mkdocs==1.3.1",
+        "jinja2>=3.1.2",
+        "pymdown-extensions",
+        "mkdocs-macros-plugin",
+    ],
+    "test": [
+        "jinja2",
+        "pytest>=6",
+        "pytest-timeout",
+        "pytest-xdist",
+        "build",
+        "tomli_w",
+        "validate-pyproject",
+    ],
+    "bin": [
+        "click",
+        "pip-tools",
+        "pygithub",
+        "pyyaml",
+        "requests",
+        "rich>=9.6",
+        "packaging>=21.0",
+    ],
+}
+
+extras["dev"] = [
+    *extras["test"],
+    *extras["bin"],
+]
+
+setup(extras_require=extras)

test/test_abi_variants.py

@@ -4,23 +4,12 @@ import textwrap
 
 from . import test_projects, utils
 
-pyproject_toml = r"""
-[build-system]
-requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta"
-"""
-
 limited_api_project = test_projects.new_c_project(
     setup_py_add=textwrap.dedent(
         r"""
-        import sysconfig
-
-        IS_CPYTHON = sys.implementation.name == "cpython"
-        Py_GIL_DISABLED = sysconfig.get_config_var("Py_GIL_DISABLED")
-        CAN_USE_ABI3 = IS_CPYTHON and not Py_GIL_DISABLED
         cmdclass = {}
         extension_kwargs = {}
-        if CAN_USE_ABI3 and sys.version_info[:2] >= (3, 8):
+        if sys.version_info[:2] >= (3, 8):
             from wheel.bdist_wheel import bdist_wheel as _bdist_wheel
 
             class bdist_wheel_abi3(_bdist_wheel):
@@ -41,8 +30,6 @@ limited_api_project = test_projects.new_c_project(
     setup_py_setup_args_add="cmdclass=cmdclass",
 )
 
-limited_api_project.files["pyproject.toml"] = pyproject_toml
-
 
 def test_abi3(tmp_path):
     project_dir = tmp_path / "project"
@@ -52,8 +39,7 @@ def test_abi3(tmp_path):
     actual_wheels = utils.cibuildwheel_run(
         project_dir,
         add_env={
-            # free_threaded and PyPy do not have a Py_LIMITED_API equivalent, just build one of those
-            "CIBW_BUILD": "cp3?-* cp31?-* cp313t-* pp310-*"
+            "CIBW_SKIP": "pp* ",  # PyPy does not have a Py_LIMITED_API equivalent
         },
     )
 
@@ -61,9 +47,7 @@ def test_abi3(tmp_path):
     expected_wheels = [
         w.replace("cp38-cp38", "cp38-abi3")
         for w in utils.expected_wheels("spam", "0.1.0")
-        if ("-pp310" in w or "-pp" not in w)
-        and "-cp39" not in w
-        and ("-cp313t" in w or "-cp31" not in w)
+        if "-pp" not in w and "-cp39" not in w and "-cp31" not in w
     ]
     assert set(actual_wheels) == set(expected_wheels)
 
@@ -171,8 +155,6 @@ ctypes_project.files["test/add_test.py"] = textwrap.dedent(
     """
 )
 
-ctypes_project.files["pyproject.toml"] = pyproject_toml
-
 
 def test_abi_none(tmp_path, capfd):
     project_dir = tmp_path / "project"
@@ -185,7 +167,7 @@ def test_abi_none(tmp_path, capfd):
             "CIBW_TEST_REQUIRES": "pytest",
             "CIBW_TEST_COMMAND": "pytest {project}/test",
             # limit the number of builds for test performance reasons
-            "CIBW_BUILD": "cp38-* cp310-* cp313t-* pp310-*",
+            "CIBW_BUILD": "cp38-* cp310-* pp39-*",
         },
     )
 

test/test_before_build.py

@@ -12,9 +12,9 @@ project_with_before_build_asserts = test_projects.new_c_project(
         r"""
         import os
 
-        # assert that the Python version as written to pythonversion_bb.txt in the CIBW_BEFORE_BUILD step
+        # assert that the Python version as written to pythonversion.txt in the CIBW_BEFORE_BUILD step
         # is the same one as is currently running.
-        version_file = 'c:\\pythonversion_bb.txt' if sys.platform == 'win32' else '/tmp/pythonversion_bb.txt'
+        version_file = 'c:\\pythonversion.txt' if sys.platform == 'win32' else '/tmp/pythonversion.txt'
         with open(version_file) as f:
             stored_version = f.read()
         print('stored_version', stored_version)
@@ -22,7 +22,7 @@ project_with_before_build_asserts = test_projects.new_c_project(
         assert stored_version == sys.version
 
         # check that the executable also was written
-        executable_file = 'c:\\pythonexecutable_bb.txt' if sys.platform == 'win32' else '/tmp/pythonexecutable_bb.txt'
+        executable_file = 'c:\\pythonexecutable.txt' if sys.platform == 'win32' else '/tmp/pythonexecutable.txt'
         with open(executable_file) as f:
             stored_executable = f.read()
         print('stored_executable', stored_executable)
@@ -44,8 +44,8 @@ def test(tmp_path):
     project_with_before_build_asserts.generate(project_dir)
 
     before_build = (
-        """python -c "import sys; open('{output_dir}pythonversion_bb.txt', 'w').write(sys.version)" && """
-        '''python -c "import sys; open('{output_dir}pythonexecutable_bb.txt', 'w').write(sys.executable)"'''
+        """python -c "import sys; open('{output_dir}pythonversion.txt', 'w').write(sys.version)" && """
+        '''python -c "import sys; open('{output_dir}pythonexecutable.txt', 'w').write(sys.executable)"'''
     )
 
     # build the wheels

test/test_before_test.py

@@ -11,10 +11,10 @@ from unittest import TestCase
 
 class TestBeforeTest(TestCase):
     def test_version(self):
-        # assert that the Python version as written to pythonversion_bt.txt in the CIBW_BEFORE_TEST step
+        # assert that the Python version as written to pythonversion.txt in the CIBW_BEFORE_TEST step
         # is the same one as is currently running.
         # because of use symlinks in MacOS run this test is also need
-        version_file = 'c:\\pythonversion_bt.txt' if sys.platform == 'win32' else '/tmp/pythonversion_bt.txt'
+        version_file = 'c:\\pythonversion.txt' if sys.platform == 'win32' else '/tmp/pythonversion.txt'
         with open(version_file) as f:
             stored_version = f.read()
         print('stored_version', stored_version)
@@ -23,7 +23,7 @@ class TestBeforeTest(TestCase):
 
     def test_prefix(self):
         # check that the prefix also was written
-        prefix_file = 'c:\\pythonprefix_bt.txt' if sys.platform == 'win32' else '/tmp/pythonprefix_bt.txt'
+        prefix_file = 'c:\\pythonprefix.txt' if sys.platform == 'win32' else '/tmp/pythonprefix.txt'
         with open(prefix_file) as f:
             stored_prefix = f.read()
         print('stored_prefix', stored_prefix)
@@ -47,8 +47,8 @@ def test(tmp_path):
         add_env={
             # write python version information to a temporary file, this is
             # checked in setup.py
-            "CIBW_BEFORE_TEST": """python -c "import sys; open('/tmp/pythonversion_bt.txt', 'w').write(sys.version)" && python -c "import sys; open('/tmp/pythonprefix_bt.txt', 'w').write(sys.prefix)" && python -m pip install {project}/dependency""",
-            "CIBW_BEFORE_TEST_WINDOWS": """python -c "import sys; open('c:\\pythonversion_bt.txt', 'w').write(sys.version)" && python -c "import sys; open('c:\\pythonprefix_bt.txt', 'w').write(sys.prefix)" && python -m pip install {project}/dependency""",
+            "CIBW_BEFORE_TEST": """python -c "import sys; open('/tmp/pythonversion.txt', 'w').write(sys.version)" && python -c "import sys; open('/tmp/pythonprefix.txt', 'w').write(sys.prefix)" && python -m pip install {project}/dependency""",
+            "CIBW_BEFORE_TEST_WINDOWS": """python -c "import sys; open('c:\\pythonversion.txt', 'w').write(sys.version)" && python -c "import sys; open('c:\\pythonprefix.txt', 'w').write(sys.prefix)" && python -m pip install {project}/dependency""",
             "CIBW_TEST_REQUIRES": "pytest",
             # the 'false ||' bit is to ensure this command runs in a shell on
             # mac/linux.

test/test_dependency_versions.py

@@ -15,10 +15,9 @@ project_with_expected_version_checks = test_projects.new_c_project(
         r"""
         import subprocess
         import os
-        import sys
 
         versions_output_text = subprocess.check_output(
-            [sys.executable, '-m', 'pip', 'freeze', '--all', '-qq'],
+            ['pip', 'freeze', '--all', '-qq'],
             universal_newlines=True,
         )
         versions = versions_output_text.strip().splitlines()
@@ -28,20 +27,17 @@ project_with_expected_version_checks = test_projects.new_c_project(
 
         print('Gathered versions', versions)
 
-        expected_version = os.environ['EXPECTED_PIP_VERSION']
+        for package_name in ['pip', 'setuptools', 'wheel']:
+            env_name = 'EXPECTED_{}_VERSION'.format(package_name.upper())
+            expected_version = os.environ[env_name]
 
-        assert f'pip=={expected_version}' in versions, (
-            f'error: pip version should equal {expected_version}'
-        )
+            assert '{}=={}'.format(package_name, expected_version) in versions, (
+                'error: {} version should equal {}'.format(package_name, expected_version)
+            )
         """
     )
 )
 
-project_with_expected_version_checks.files["pyproject.toml"] = r"""
-[build-system]
-requires = ["setuptools", "pip"]
-build-backend = "setuptools.build_meta"
-"""
 
 VERSION_REGEX = r"([\w-]+)==([^\s]+)"
 
@@ -52,24 +48,37 @@ def get_versions_from_constraint_file(constraint_file):
     return dict(re.findall(VERSION_REGEX, constraint_file_text))
 
 
-@pytest.mark.parametrize("python_version", ["3.6", "3.8", "3.10"])
+@pytest.mark.parametrize("python_version", ["3.6", "3.8", "3.9"])
 def test_pinned_versions(tmp_path, python_version, build_frontend_env):
     if utils.platform == "linux":
         pytest.skip("linux doesn't pin individual tool versions, it pins manylinux images instead")
-    if python_version == "3.6" and utils.platform == "macos" and platform.machine() == "arm64":
-        pytest.skip("macOS arm64 does not support Python 3.6")
 
     project_dir = tmp_path / "project"
     project_with_expected_version_checks.generate(project_dir)
 
-    version_no_dot = python_version.replace(".", "")
     build_environment = {}
-    build_pattern = f"[cp]p{version_no_dot}-*"
-    constraint_filename = f"constraints-python{version_no_dot}.txt"
+
+    if python_version == "3.6":
+        if utils.platform == "macos" and platform.machine() == "arm64":
+            pytest.skip("macOS arm64 does not support Python 3.6")
+        constraint_filename = "constraints-python36.txt"
+        build_pattern = "[cp]p36-*"
+    elif python_version == "3.7":
+        constraint_filename = "constraints-python37.txt"
+        build_pattern = "[cp]p37-*"
+    elif python_version == "3.8":
+        constraint_filename = "constraints-python38.txt"
+        build_pattern = "[cp]p38-*"
+    else:
+        constraint_filename = "constraints.txt"
+        build_pattern = "[cp]p39-*"
+
     constraint_file = cibuildwheel.util.resources_dir / constraint_filename
     constraint_versions = get_versions_from_constraint_file(constraint_file)
 
-    build_environment["EXPECTED_PIP_VERSION"] = constraint_versions["pip"]
+    for package in ["pip", "setuptools", "wheel", "virtualenv"]:
+        env_name = f"EXPECTED_{package.upper()}_VERSION"
+        build_environment[env_name] = constraint_versions[package]
 
     cibw_environment_option = " ".join(f"{k}={v}" for k, v in build_environment.items())
 
@@ -84,11 +93,21 @@ def test_pinned_versions(tmp_path, python_version, build_frontend_env):
     )
 
     # also check that we got the right wheels
-    expected_wheels = [
-        w
-        for w in utils.expected_wheels("spam", "0.1.0")
-        if f"-cp{version_no_dot}" in w or f"-pp{version_no_dot}" in w
-    ]
+    if python_version == "3.6":
+        expected_wheels = [
+            w for w in utils.expected_wheels("spam", "0.1.0") if "-cp36" in w or "-pp36" in w
+        ]
+    elif python_version == "3.8":
+        expected_wheels = [
+            w for w in utils.expected_wheels("spam", "0.1.0") if "-cp38" in w or "-pp38" in w
+        ]
+    elif python_version == "3.9":
+        expected_wheels = [
+            w for w in utils.expected_wheels("spam", "0.1.0") if "-cp39" in w or "-pp39" in w
+        ]
+    else:
+        msg = "unhandled python version"
+        raise ValueError(msg)
 
     assert set(actual_wheels) == set(expected_wheels)
 
@@ -102,7 +121,9 @@ def test_dependency_constraints_file(tmp_path, build_frontend_env):
 
     tool_versions = {
         "pip": "23.1.2",
-        "delocate": "0.10.3",
+        "setuptools": "67.7.2",
+        "wheel": "0.38.3",
+        "virtualenv": "20.23.0",
     }
 
     constraints_file = tmp_path / "constraints file.txt"
@@ -110,7 +131,10 @@ def test_dependency_constraints_file(tmp_path, build_frontend_env):
         textwrap.dedent(
             """
             pip=={pip}
-            delocate=={delocate}
+            setuptools=={setuptools}
+            wheel=={wheel}
+            virtualenv=={virtualenv}
+            importlib-metadata<3,>=0.12; python_version < "3.8"
             """.format(**tool_versions)
         )
     )

test/test_environment.py

@@ -93,52 +93,3 @@ def test_overridden_path(tmp_path, capfd):
     assert len(os.listdir(output_dir)) == 0
     captured = capfd.readouterr()
     assert "python available on PATH doesn't match our installed instance" in captured.err
-
-
-@pytest.mark.parametrize("build_frontend", ["pip", "build"])
-def test_overridden_pip_constraint(tmp_path, build_frontend):
-    """
-    Verify that users can use PIP_CONSTRAINT to specify a specific version of
-    a build-system.requires dependency, by asserting the version of pytz in the
-    setup.py.
-    """
-    project_dir = tmp_path / "project"
-
-    project = test_projects.new_c_project(
-        setup_py_add=textwrap.dedent(
-            """
-            import pytz
-            assert pytz.__version__ == "2022.4"
-        """
-        )
-    )
-    project.files["pyproject.toml"] = textwrap.dedent(
-        """
-        [build-system]
-        requires = ["setuptools", "pytz"]
-        build-backend = "setuptools.build_meta"
-    """
-    )
-    project.generate(project_dir)
-
-    if utils.platform == "linux":
-        # put the constraints file in the project directory, so it's available
-        # in the docker container
-        constraints_file = project_dir / "constraints.txt"
-    else:
-        constraints_file = tmp_path / "constraints.txt"
-
-    constraints_file.write_text("pytz==2022.4")
-
-    actual_wheels = utils.cibuildwheel_run(
-        project_dir,
-        add_env={
-            "CIBW_BUILD": "cp312-*",
-            "CIBW_BUILD_FRONTEND": build_frontend,
-            "PIP_CONSTRAINT": str(constraints_file),
-            "CIBW_ENVIRONMENT_LINUX": "PIP_CONSTRAINT=./constraints.txt",
-        },
-    )
-
-    expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp312" in w]
-    assert set(actual_wheels) == set(expected_wheels)

test/test_from_sdist.py

@@ -69,7 +69,7 @@ def test_simple(tmp_path):
         assert os.path.exists('{package}/setup.py')
         """,
     )
-    setup_py_assertion_cmd = f'python -c "{setup_py_assertion_snippet !s}"'
+    setup_py_assertion_cmd = f'python3 -c "{setup_py_assertion_snippet !s}"'
 
     # build the wheels from sdist
     actual_wheels = cibuildwheel_from_sdist_run(

test/test_macos_archs.py

@@ -135,7 +135,7 @@ def test_deployment_target_warning_is_firing(tmp_path, capfd):
 
 
 @pytest.mark.parametrize("skip_arm64_test", [False, True])
-def test_universal2_testing_on_x86_64(tmp_path, capfd, skip_arm64_test):
+def test_universal2_testing(tmp_path, capfd, skip_arm64_test):
     if utils.platform != "macos":
         pytest.skip("this test is only relevant to macos")
     if get_xcode_version() < (12, 2):
@@ -173,44 +173,13 @@ def test_universal2_testing_on_x86_64(tmp_path, capfd, skip_arm64_test):
     assert set(actual_wheels) == set(expected_wheels)
 
 
-def test_universal2_testing_on_arm64(tmp_path, capfd):
-    # cibuildwheel should test the universal2 wheel on both x86_64 and arm64, when run on arm64
-    if utils.platform != "macos":
-        pytest.skip("this test is only relevant to macos")
-    if platform.machine() != "arm64":
-        pytest.skip("this test only works on arm64")
-
-    project_dir = tmp_path / "project"
-    basic_project.generate(project_dir)
-
-    actual_wheels = utils.cibuildwheel_run(
-        project_dir,
-        add_env={
-            "CIBW_BUILD": "cp39-*",
-            "CIBW_ARCHS": "universal2",
-            # check that a native dependency is correctly installed, once per each testing arch
-            "CIBW_TEST_REQUIRES": "numpy",
-            "CIBW_TEST_COMMAND": '''python -c "import numpy, platform; print(f'running tests on {platform.machine()} with numpy {numpy.__version__}')"''',
-        },
-    )
-
-    captured = capfd.readouterr()
-    assert "running tests on arm64" in captured.out
-    assert "running tests on x86_64" in captured.out
-
-    expected_wheels = [w for w in ALL_MACOS_WHEELS if "cp39" in w and "universal2" in w]
-    assert set(actual_wheels) == set(expected_wheels)
-
-
-def test_cp38_arm64_testing(tmp_path, capfd, request):
+def test_cp38_arm64_testing(tmp_path, capfd):
     if utils.platform != "macos":
         pytest.skip("this test is only relevant to macos")
     if get_xcode_version() < (12, 2):
         pytest.skip("this test only works with Xcode 12.2 or greater")
     if platform.machine() != "arm64":
         pytest.skip("this test only works on arm64")
-    if request.config.getoption("--run-cp38-universal2"):
-        pytest.skip("--run-cp38-universal2 option skips this test")
 
     project_dir = tmp_path / "project"
     basic_project.generate(project_dir)

test/test_manylinuxXXXX_only.py

@@ -86,10 +86,10 @@ def test(manylinux_image, tmp_path):
         add_env["CIBW_SKIP"] = "pp* cp31*"
     if manylinux_image in {"manylinux2010"}:
         # We don't have a manylinux2010 image for PyPy 3.9+, CPython 3.11+
-        add_env["CIBW_SKIP"] = "pp39* pp31* cp311* cp312* cp313*"
+        add_env["CIBW_SKIP"] = "pp39* pp31* cp311* cp312*"
     if manylinux_image in {"manylinux_2_24"}:
         # We don't have a manylinux_2_24 image for PyPy 3.10+, CPython 3.12+
-        add_env["CIBW_SKIP"] = "pp31* cp312* cp313*"
+        add_env["CIBW_SKIP"] = "pp31* cp312*"
     if manylinux_image == "manylinux_2_28" and platform.machine() == "x86_64":
         # We don't have a manylinux_2_28 image for i686
         add_env["CIBW_ARCHS"] = "x86_64"
@@ -116,20 +116,12 @@ def test(manylinux_image, tmp_path):
         expected_wheels = [
             w
             for w in expected_wheels
-            if "-pp39" not in w
-            and "-pp31" not in w
-            and "-cp311" not in w
-            and "-cp312" not in w
-            and "-cp313" not in w
+            if "-pp39" not in w and "-pp31" not in w and "-cp311" not in w and "-cp312" not in w
         ]
 
     if manylinux_image in {"manylinux_2_24"}:
         # remove PyPy 3.10+ & CPython 3.11 and above
-        expected_wheels = [
-            w
-            for w in expected_wheels
-            if "-pp31" not in w and "-cp312" not in w and "-cp313" not in w
-        ]
+        expected_wheels = [w for w in expected_wheels if "-pp31" not in w and "-cp312" not in w]
 
     if manylinux_image == "manylinux_2_28" and platform.machine() == "x86_64":
         # We don't have a manylinux_2_28 image for i686

test/utils.py

@@ -37,9 +37,6 @@ def cibuildwheel_get_build_identifiers(project_path, env=None, *, prerelease_pyt
     cmd = [sys.executable, "-m", "cibuildwheel", "--print-build-identifiers", str(project_path)]
     if prerelease_pythons:
         cmd.append("--prerelease-pythons")
-    if env is None:
-        env = os.environ.copy()
-    env.setdefault("CIBW_FREE_THREADED_SUPPORT", "1")
 
     cmd_output = subprocess.run(
         cmd,
@@ -97,8 +94,6 @@ def cibuildwheel_run(
 
     _update_pip_cache_dir(env)
 
-    env.setdefault("CIBW_FREE_THREADED_SUPPORT", "1")
-
     with TemporaryDirectory() as tmp_output_dir:
         subprocess.run(
             [
@@ -152,9 +147,6 @@ def expected_wheels(
 
     if machine_arch is None:
         machine_arch = pm.machine()
-        if platform == "linux" and machine_arch.lower() == "arm64":
-            # we're running linux tests from macOS/Windows arm64, override platform
-            machine_arch = "aarch64"
 
     if manylinux_versions is None:
         if machine_arch == "x86_64":
@@ -168,7 +160,7 @@ def expected_wheels(
             manylinux_versions = ["manylinux_2_17", "manylinux2014"]
 
     if musllinux_versions is None:
-        musllinux_versions = ["musllinux_1_2"]
+        musllinux_versions = ["musllinux_1_1"]
 
     if python_abi_tags is None:
         python_abi_tags = [
@@ -179,10 +171,7 @@ def expected_wheels(
             "cp310-cp310",
             "cp311-cp311",
             "cp312-cp312",
-            "cp313-cp313",
         ]
-        if platform != "macos":
-            python_abi_tags.append("cp313-cp313t")
 
         if machine_arch in ["x86_64", "AMD64", "x86", "aarch64"]:
             python_abi_tags += [
@@ -200,7 +189,6 @@ def expected_wheels(
                 "cp310-cp310",
                 "cp311-cp311",
                 "cp312-cp312",
-                "cp313-cp313",
                 "pp38-pypy38_pp73",
                 "pp39-pypy39_pp73",
                 "pp310-pypy310_pp73",

unit_test/build_selector_test.py

@@ -13,7 +13,6 @@ def test_build():
     assert build_selector("cp310-manylinux_x86_64")
     assert build_selector("cp311-manylinux_x86_64")
     assert build_selector("cp312-manylinux_x86_64")
-    assert not build_selector("cp313-manylinux_x86_64")
     assert build_selector("pp36-manylinux_x86_64")
     assert build_selector("pp37-manylinux_x86_64")
     assert build_selector("cp36-manylinux_i686")
@@ -34,7 +33,6 @@ def test_build():
     assert build_selector("cp310-win_amd64")
     assert build_selector("cp311-win_amd64")
     assert build_selector("cp312-win_amd64")
-    assert not build_selector("cp313-win_amd64")
     assert not build_selector("pp36-win_amd64")
     assert not build_selector("pp37-win_amd64")
 
@@ -47,10 +45,9 @@ def test_build_filter_pre():
     )
 
     assert build_selector("cp37-manylinux_x86_64")
-    assert build_selector("cp313-manylinux_x86_64")
+    assert build_selector("cp312-manylinux_x86_64")
     assert build_selector("cp37-win_amd64")
-    assert build_selector("cp313-win_amd64")
-    assert not build_selector("cp313t-manylinux_x86_64")
+    assert build_selector("cp312-win_amd64")
 
 
 def test_skip():
@@ -145,14 +142,6 @@ def test_build_limited_python_patch():
     assert build_selector("cp37-manylinux_x86_64")
 
 
-def test_build_free_threaded_python():
-    build_selector = BuildSelector(
-        build_config="*", skip_config="", prerelease_pythons=True, free_threaded_support=True
-    )
-
-    assert build_selector("cp313t-manylinux_x86_64")
-
-
 def test_testing_selector():
     # local import to avoid pytest trying to collect this as a test class!
     from cibuildwheel.util import TestSelector

unit_test/linux_build_steps_test.py

@@ -5,13 +5,13 @@ from pathlib import Path
 from pprint import pprint
 
 import cibuildwheel.linux
-from cibuildwheel.oci_container import OCIContainerEngineConfig
+import cibuildwheel.oci_container
 from cibuildwheel.options import CommandLineArguments, Options
 
 
 def test_linux_container_split(tmp_path: Path, monkeypatch):
     """
-    Tests splitting linux builds by container image, container engine, and before_all
+    Tests splitting linux builds by container image and before_all
     """
 
     args = CommandLineArguments.defaults()
@@ -28,17 +28,13 @@ def test_linux_container_split(tmp_path: Path, monkeypatch):
                 archs = "x86_64 i686"
 
                 [[tool.cibuildwheel.overrides]]
-                select = "cp{37,38,39,310}-*"
+                select = "cp{38,39,310}-*"
                 manylinux-x86_64-image = "other_container_image"
                 manylinux-i686-image = "other_container_image"
 
                 [[tool.cibuildwheel.overrides]]
                 select = "cp39-*"
                 before-all = "echo 'a cp39-only command'"
-
-                [[tool.cibuildwheel.overrides]]
-                select = "cp310-*"
-                container-engine = "docker; create_args: --privileged"
             """
         )
     )
@@ -59,35 +55,21 @@ def test_linux_container_split(tmp_path: Path, monkeypatch):
     def before_alls(step):
         return [options.build_options(c.identifier).before_all for c in step.platform_configs]
 
-    def container_engines(step):
-        return [options.build_options(c.identifier).container_engine for c in step.platform_configs]
-
     pprint(build_steps)
 
-    default_container_engine = OCIContainerEngineConfig(name="docker")
-
     assert build_steps[0].container_image == "normal_container_image"
     assert identifiers(build_steps[0]) == [
         "cp36-manylinux_x86_64",
+        "cp37-manylinux_x86_64",
         "cp311-manylinux_x86_64",
         "cp312-manylinux_x86_64",
     ]
-    assert before_alls(build_steps[0]) == [""] * 3
-    assert container_engines(build_steps[0]) == [default_container_engine] * 3
+    assert before_alls(build_steps[0]) == ["", "", "", ""]
 
     assert build_steps[1].container_image == "other_container_image"
-    assert identifiers(build_steps[1]) == ["cp37-manylinux_x86_64", "cp38-manylinux_x86_64"]
-    assert before_alls(build_steps[1]) == [""] * 2
-    assert container_engines(build_steps[1]) == [default_container_engine] * 2
+    assert identifiers(build_steps[1]) == ["cp38-manylinux_x86_64", "cp310-manylinux_x86_64"]
+    assert before_alls(build_steps[1]) == ["", ""]
 
     assert build_steps[2].container_image == "other_container_image"
     assert identifiers(build_steps[2]) == ["cp39-manylinux_x86_64"]
     assert before_alls(build_steps[2]) == ["echo 'a cp39-only command'"]
-    assert container_engines(build_steps[2]) == [default_container_engine]
-
-    assert build_steps[3].container_image == "other_container_image"
-    assert identifiers(build_steps[3]) == ["cp310-manylinux_x86_64"]
-    assert before_alls(build_steps[3]) == [""]
-    assert container_engines(build_steps[3]) == [
-        OCIContainerEngineConfig(name="docker", create_args=("--privileged",))
-    ]

unit_test/main_tests/main_platform_test.py

@@ -10,26 +10,25 @@ from cibuildwheel.architecture import Architecture
 from ..conftest import MOCK_PACKAGE_DIR
 
 
-@pytest.mark.parametrize("option_value", [None, "auto"])
-def test_platform_unset_or_auto(monkeypatch, intercepted_build_args, option_value):
-    if option_value is None:
-        monkeypatch.delenv("CIBW_PLATFORM", raising=False)
-    else:
-        monkeypatch.setenv("CIBW_PLATFORM", option_value)
+def test_unknown_platform_non_ci(monkeypatch, capsys):
+    monkeypatch.delenv("CI", raising=False)
+    monkeypatch.delenv("BITRISE_BUILD_NUMBER", raising=False)
+    monkeypatch.delenv("AZURE_HTTP_USER_AGENT", raising=False)
+    monkeypatch.delenv("TRAVIS", raising=False)
+    monkeypatch.delenv("APPVEYOR", raising=False)
+    monkeypatch.delenv("GITHUB_ACTIONS", raising=False)
+    monkeypatch.delenv("GITLAB_CI", raising=False)
+    monkeypatch.delenv("CIRCLECI", raising=False)
+    monkeypatch.delenv("CIRRUS_CI", raising=False)
+    monkeypatch.delenv("CIBW_PLATFORM", raising=False)
 
-    main()
+    with pytest.raises(SystemExit) as exit:
+        main()
+    assert exit.value.code == 2
+    _, err = capsys.readouterr()
 
-    options = intercepted_build_args.args[0]
-
-    # check that the platform was auto detected to build for the current system
-    if sys.platform.startswith("linux"):
-        assert options.platform == "linux"
-    elif sys.platform == "darwin":
-        assert options.platform == "macos"
-    elif sys.platform == "win32":
-        assert options.platform == "windows"
-    else:
-        pytest.fail(f"Unknown platform: {sys.platform}")
+    assert "cibuildwheel: Unable to detect platform." in err
+    assert "cibuildwheel should run on your CI server" in err
 
 
 def test_unknown_platform_on_ci(monkeypatch, capsys):

unit_test/oci_container_test.py

@@ -340,7 +340,7 @@ def test_create_args_volume(tmp_path: Path, container_engine):
     test_mount_dir.mkdir()
     (test_mount_dir / "test_file.txt").write_text("1234")
     container_engine = OCIContainerEngineConfig(
-        name="docker", create_args=(f"--volume={test_mount_dir}:/test_mount",)
+        name="docker", create_args=[f"--volume={test_mount_dir}:/test_mount"]
     )
 
     with OCIContainer(
@@ -356,37 +356,37 @@ def test_create_args_volume(tmp_path: Path, container_engine):
         (
             "docker",
             "docker",
-            (),
+            [],
         ),
         (
             "docker;create_args:",
             "docker",
-            (),
+            [],
         ),
         (
             "docker;create_args:--abc --def",
             "docker",
-            ("--abc", "--def"),
+            ["--abc", "--def"],
         ),
         (
             "docker; create_args: --abc --def",
             "docker",
-            ("--abc", "--def"),
+            ["--abc", "--def"],
         ),
         (
             "name:docker; create_args: --abc --def",
             "docker",
-            ("--abc", "--def"),
+            ["--abc", "--def"],
         ),
         (
             'docker; create_args: --some-option="value with spaces"',
             "docker",
-            ("--some-option=value with spaces",),
+            ["--some-option=value with spaces"],
         ),
         (
             'docker; create_args: --some-option="value; with; semicolons" --another-option',
             "docker",
-            ("--some-option=value; with; semicolons", "--another-option"),
+            ["--some-option=value; with; semicolons", "--another-option"],
         ),
     ],
 )

unit_test/option_prepare_test.py

@@ -86,7 +86,7 @@ def test_build_default_launches(monkeypatch):
     assert identifiers == {f"{x}-manylinux_i686" for x in ALL_IDS}
 
     kwargs = build_in_container.call_args_list[2][1]
-    assert "quay.io/pypa/musllinux_1_2_x86_64" in kwargs["container"]["image"]
+    assert "quay.io/pypa/musllinux_1_1_x86_64" in kwargs["container"]["image"]
     assert kwargs["container"]["cwd"] == PurePosixPath("/project")
     assert not kwargs["container"]["enforce_32_bit"]
 
@@ -96,7 +96,7 @@ def test_build_default_launches(monkeypatch):
     }
 
     kwargs = build_in_container.call_args_list[3][1]
-    assert "quay.io/pypa/musllinux_1_2_i686" in kwargs["container"]["image"]
+    assert "quay.io/pypa/musllinux_1_1_i686" in kwargs["container"]["image"]
     assert kwargs["container"]["cwd"] == PurePosixPath("/project")
     assert kwargs["container"]["enforce_32_bit"]
 
@@ -197,7 +197,7 @@ before-all = "true"
     }
 
     kwargs = build_in_container.call_args_list[6][1]
-    assert "quay.io/pypa/musllinux_1_2_i686" in kwargs["container"]["image"]
+    assert "quay.io/pypa/musllinux_1_1_i686" in kwargs["container"]["image"]
     assert kwargs["container"]["cwd"] == PurePosixPath("/project")
     assert kwargs["container"]["enforce_32_bit"]
 

unit_test/options_test.py

@@ -206,49 +206,49 @@ def test_toml_environment_quoting(tmp_path: Path, toml_assignment, result_value)
         (
             'container-engine = "podman"',
             "podman",
-            (),
+            [],
             False,
         ),
         (
             'container-engine = {name = "podman"}',
             "podman",
-            (),
+            [],
             False,
         ),
         (
             'container-engine = "docker; create_args: --some-option"',
             "docker",
-            ("--some-option",),
+            ["--some-option"],
             False,
         ),
         (
             'container-engine = {name = "docker", create-args = ["--some-option"]}',
             "docker",
-            ("--some-option",),
+            ["--some-option"],
             False,
         ),
         (
             'container-engine = {name = "docker", create-args = ["--some-option", "value that contains spaces"]}',
             "docker",
-            ("--some-option", "value that contains spaces"),
+            ["--some-option", "value that contains spaces"],
             False,
         ),
         (
             'container-engine = {name = "docker", create-args = ["--some-option", "value;that;contains;semicolons"]}',
             "docker",
-            ("--some-option", "value;that;contains;semicolons"),
+            ["--some-option", "value;that;contains;semicolons"],
             False,
         ),
         (
             'container-engine = {name = "docker", disable-host-mount = true}',
             "docker",
-            (),
+            [],
             True,
         ),
         (
             'container-engine = {name = "docker", disable_host_mount = true}',
             "docker",
-            (),
+            [],
             True,
         ),
     ],
@@ -269,7 +269,7 @@ def test_container_engine_option(
     )
 
     options = Options(platform="linux", command_line_arguments=args, env={})
-    parsed_container_engine = options.build_options(None).container_engine
+    parsed_container_engine = options.globals.container_engine
 
     assert parsed_container_engine.name == result_name
     assert parsed_container_engine.create_args == result_create_args
@@ -347,104 +347,3 @@ def test_build_frontend_option(tmp_path: Path, toml_assignment, result_name, res
         assert parsed_build_frontend.args == result_args
     else:
         assert parsed_build_frontend is None
-
-
-def test_override_inherit_environment(tmp_path: Path):
-    args = CommandLineArguments.defaults()
-    args.package_dir = tmp_path
-
-    pyproject_toml: Path = tmp_path / "pyproject.toml"
-    pyproject_toml.write_text(
-        textwrap.dedent(
-            """\
-            [tool.cibuildwheel]
-            environment = {FOO="BAR", "HAM"="EGGS"}
-
-            [[tool.cibuildwheel.overrides]]
-            select = "cp37*"
-            inherit.environment = "append"
-            environment = {FOO="BAZ", "PYTHON"="MONTY"}
-            """
-        )
-    )
-
-    options = Options(platform="linux", command_line_arguments=args, env={})
-    parsed_environment = options.build_options(identifier=None).environment
-    assert parsed_environment.as_dictionary(prev_environment={}) == {
-        "FOO": "BAR",
-        "HAM": "EGGS",
-    }
-
-    assert options.build_options("cp37-manylinux_x86_64").environment.as_dictionary(
-        prev_environment={}
-    ) == {
-        "FOO": "BAZ",
-        "HAM": "EGGS",
-        "PYTHON": "MONTY",
-    }
-
-
-def test_override_inherit_environment_with_references(tmp_path: Path):
-    args = CommandLineArguments.defaults()
-    args.package_dir = tmp_path
-
-    pyproject_toml: Path = tmp_path / "pyproject.toml"
-    pyproject_toml.write_text(
-        textwrap.dedent(
-            """\
-            [tool.cibuildwheel]
-            environment = {PATH="/opt/bin:$PATH"}
-
-            [[tool.cibuildwheel.overrides]]
-            select = "cp37*"
-            inherit.environment = "append"
-            environment = {PATH="/opt/local/bin:$PATH"}
-            """
-        )
-    )
-
-    options = Options(platform="linux", command_line_arguments=args, env={"MONTY": "PYTHON"})
-    parsed_environment = options.build_options(identifier=None).environment
-    prev_environment = {"PATH": "/usr/bin:/bin"}
-    assert parsed_environment.as_dictionary(prev_environment=prev_environment) == {
-        "PATH": "/opt/bin:/usr/bin:/bin",
-    }
-
-    assert options.build_options("cp37-manylinux_x86_64").environment.as_dictionary(
-        prev_environment=prev_environment
-    ) == {
-        "PATH": "/opt/local/bin:/opt/bin:/usr/bin:/bin",
-    }
-
-
-@pytest.mark.parametrize(
-    ("toml_assignment", "env", "expected_result"),
-    [
-        ("", {}, False),
-        ("free-threaded-support = true", {}, True),
-        ("free-threaded-support = false", {}, False),
-        ("", {"CIBW_FREE_THREADED_SUPPORT": "0"}, False),
-        ("", {"CIBW_FREE_THREADED_SUPPORT": "1"}, True),
-        ("free-threaded-support = false", {"CIBW_FREE_THREADED_SUPPORT": "1"}, True),
-        ("free-threaded-support = true", {"CIBW_FREE_THREADED_SUPPORT": "0"}, False),
-        ("free-threaded-support = true", {"CIBW_FREE_THREADED_SUPPORT": ""}, True),
-        ("free-threaded-support = false", {"CIBW_FREE_THREADED_SUPPORT": ""}, False),
-    ],
-)
-def test_free_threaded_support(
-    tmp_path: Path, toml_assignment: str, env: dict[str, str], expected_result: bool
-):
-    args = CommandLineArguments.defaults()
-    args.package_dir = tmp_path
-
-    pyproject_toml: Path = tmp_path / "pyproject.toml"
-    pyproject_toml.write_text(
-        textwrap.dedent(
-            f"""\
-            [tool.cibuildwheel]
-            {toml_assignment}
-            """
-        )
-    )
-    options = Options(platform="linux", command_line_arguments=args, env=env)
-    assert options.globals.build_selector.free_threaded_support is expected_result

unit_test/options_toml_test.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 import pytest
 
-from cibuildwheel.options import ConfigOptionError, InheritRule, OptionsReader, _resolve_cascade
+from cibuildwheel.options import ConfigOptionError, OptionsReader, _dig_first
 
 PYPROJECT_1 = """
 [tool.cibuildwheel]
@@ -37,31 +37,27 @@ def test_simple_settings(tmp_path, platform, fname):
 
     options_reader = OptionsReader(config_file_path, platform=platform, env={})
 
-    assert options_reader.get("build", env_plat=False, list_sep=" ") == "cp39*"
+    assert options_reader.get("build", env_plat=False, sep=" ") == "cp39*"
 
     assert options_reader.get("test-command") == "pyproject"
-    assert options_reader.get("archs", list_sep=" ") == "auto"
+    assert options_reader.get("archs", sep=" ") == "auto"
     assert (
-        options_reader.get("test-requires", list_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_reader.get("environment", table_format={"item": '{k}="{v}"', "sep": " "})
+        options_reader.get("environment", table={"item": '{k}="{v}"', "sep": " "})
         == 'THING="OTHER" FOO="BAR"'
     )
     assert (
-        options_reader.get(
-            "environment", list_sep="x", table_format={"item": '{k}="{v}"', "sep": " "}
-        )
+        options_reader.get("environment", sep="x", table={"item": '{k}="{v}"', "sep": " "})
         == 'THING="OTHER" FOO="BAR"'
     )
-    assert options_reader.get("test-extras", list_sep=",") == "one,two"
+    assert options_reader.get("test-extras", sep=",") == "one,two"
     assert (
-        options_reader.get(
-            "test-extras", list_sep=",", table_format={"item": '{k}="{v}"', "sep": " "}
-        )
+        options_reader.get("test-extras", sep=",", table={"item": '{k}="{v}"', "sep": " "})
         == "one,two"
     )
 
@@ -69,10 +65,10 @@ def test_simple_settings(tmp_path, platform, fname):
     assert options_reader.get("manylinux-i686-image") == "manylinux2014"
 
     with pytest.raises(ConfigOptionError):
-        options_reader.get("environment", list_sep=" ")
+        options_reader.get("environment", sep=" ")
 
     with pytest.raises(ConfigOptionError):
-        options_reader.get("test-extras", table_format={"item": '{k}="{v}"', "sep": " "})
+        options_reader.get("test-extras", table={"item": '{k}="{v}"', "sep": " "})
 
 
 def test_envvar_override(tmp_path, platform):
@@ -91,14 +87,14 @@ def test_envvar_override(tmp_path, platform):
         },
     )
 
-    assert options_reader.get("archs", list_sep=" ") == "auto"
+    assert options_reader.get("archs", sep=" ") == "auto"
 
-    assert options_reader.get("build", list_sep=" ") == "cp38*"
+    assert options_reader.get("build", sep=" ") == "cp38*"
     assert options_reader.get("manylinux-x86_64-image") == "manylinux_2_24"
     assert options_reader.get("manylinux-i686-image") == "manylinux2014"
 
     assert (
-        options_reader.get("test-requires", list_sep=" ")
+        options_reader.get("test-requires", sep=" ")
         == {"windows": "docs", "macos": "docs", "linux": "scod"}[platform]
     )
     assert options_reader.get("test-command") == "mytest"
@@ -219,7 +215,7 @@ build = ["1", "2"]
     )
     options_reader = OptionsReader(pyproject_toml, platform="linux", env={})
 
-    assert options_reader.get("build", list_sep=", ") == "1, 2"
+    assert options_reader.get("build", sep=", ") == "1, 2"
     with pytest.raises(ConfigOptionError):
         options_reader.get("build")
 
@@ -266,92 +262,47 @@ manylinux-x86_64-image = ""
     assert options_reader.get("manylinux-aarch64-image", ignore_empty=True) == "manylinux1"
 
 
-@pytest.mark.parametrize("ignore_empty", [True, False], ids=["ignore_empty", "no_ignore_empty"])
-def test_resolve_cascade(ignore_empty):
-    answer = _resolve_cascade(
-        ("not", InheritRule.NONE),
-        (None, InheritRule.NONE),
-        ("", InheritRule.NONE),
-        (None, InheritRule.NONE),
+@pytest.mark.parametrize("ignore_empty", [True, False])
+def test_dig_first(ignore_empty):
+    d1 = {"random": "thing"}
+    d2 = {"this": "that", "empty": ""}
+    d3 = {"other": "hi"}
+    d4 = {"this": "d4", "empty": "not"}
+
+    answer = _dig_first(
+        (d1, "empty"),
+        (d2, "empty"),
+        (d3, "empty"),
+        (d4, "empty"),
         ignore_empty=ignore_empty,
     )
     assert answer == ("not" if ignore_empty else "")
 
-    answer = _resolve_cascade(
-        ("d4", InheritRule.NONE),
-        (None, InheritRule.NONE),
-        ("that", InheritRule.NONE),
-        (None, InheritRule.NONE),
+    answer = _dig_first(
+        (d1, "this"),
+        (d2, "this"),
+        (d3, "this"),
+        (d4, "this"),
         ignore_empty=ignore_empty,
     )
     assert answer == "that"
 
-    with pytest.raises(ValueError, match="a setting should at least have a default value"):
-        _resolve_cascade(
-            (None, InheritRule.NONE),
-            (None, InheritRule.NONE),
-            (None, InheritRule.NONE),
-            (None, InheritRule.NONE),
+    with pytest.raises(KeyError):
+        _dig_first(
+            (d1, "this"),
+            (d2, "other"),
+            (d3, "this"),
+            (d4, "other"),
             ignore_empty=ignore_empty,
         )
 
 
-@pytest.mark.parametrize("ignore_empty", [True, False], ids=["ignore_empty", "no_ignore_empty"])
-@pytest.mark.parametrize("rule", [InheritRule.PREPEND, InheritRule.NONE, InheritRule.APPEND])
-def test_resolve_cascade_merge_list(ignore_empty, rule):
-    answer = _resolve_cascade(
-        (["a1", "a2"], InheritRule.NONE),
-        ([], InheritRule.NONE),
-        (["b1", "b2"], rule),
-        (None, InheritRule.NONE),
-        ignore_empty=ignore_empty,
-        list_sep=" ",
-    )
-
-    if not ignore_empty:
-        assert answer == "b1 b2"
-    else:
-        if rule == InheritRule.PREPEND:
-            assert answer == "b1 b2 a1 a2"
-        elif rule == InheritRule.NONE:
-            assert answer == "b1 b2"
-        elif rule == InheritRule.APPEND:
-            assert answer == "a1 a2 b1 b2"
-
-
-@pytest.mark.parametrize("rule", [InheritRule.PREPEND, InheritRule.NONE, InheritRule.APPEND])
-def test_resolve_cascade_merge_dict(rule):
-    answer = _resolve_cascade(
-        ({"value": "a1", "base": "b1"}, InheritRule.NONE),
-        (None, InheritRule.NONE),
-        ({"value": "override"}, rule),
-        (None, InheritRule.NONE),
-        table_format={"item": "{k}={v}", "sep": " "},
-    )
-
-    if rule == InheritRule.PREPEND:
-        assert answer == "value=override value=a1 base=b1"
-    elif rule == InheritRule.NONE:
-        assert answer == "value=override"
-    elif rule == InheritRule.APPEND:
-        assert answer == "value=a1 base=b1 value=override"
-
-
-def test_resolve_cascade_merge_different_types():
-    answer = _resolve_cascade(
-        ({"value": "a1", "base": "b1"}, InheritRule.NONE),
-        ({"value": "override"}, InheritRule.APPEND),
-        table_format={"item": "{k}={v}", "sep": " "},
-    )
-    assert answer == "value=a1 base=b1 value=override"
-
-
 PYPROJECT_2 = """
 [tool.cibuildwheel]
 build = ["cp38*", "cp37*"]
-environment = {FOO="BAR", "HAM"="EGGS"}
+environment = {FOO="BAR"}
 
-test-command = ["pyproject"]
+test-command = "pyproject"
 
 manylinux-x86_64-image = "manylinux1"
 
@@ -360,25 +311,8 @@ test-requires = "else"
 
 [[tool.cibuildwheel.overrides]]
 select = "cp37*"
-inherit = {test-command="prepend", environment="append"}
-test-command = ["pyproject-override", "override2"]
+test-command = "pyproject-override"
 manylinux-x86_64-image = "manylinux2014"
-environment = {FOO="BAZ", "PYTHON"="MONTY"}
-
-[[tool.cibuildwheel.overrides]]
-select = "*-final"
-inherit = {test-command="append"}
-test-command = ["pyproject-finalize", "finalize2"]
-
-[[tool.cibuildwheel.overrides]]
-select = "*-final"
-inherit = {test-command="append"}
-test-command = ["extra-finalize"]
-
-[[tool.cibuildwheel.overrides]]
-select = "*-final"
-inherit = {test-command="prepend"}
-test-command = ["extra-prepend"]
 """
 
 
@@ -387,30 +321,13 @@ def test_pyproject_2(tmp_path, platform):
     pyproject_toml.write_text(PYPROJECT_2)
 
     options_reader = OptionsReader(config_file_path=pyproject_toml, platform=platform, env={})
-    assert options_reader.get("test-command", list_sep=" && ") == "pyproject"
+    assert options_reader.get("test-command") == "pyproject"
 
     with options_reader.identifier("random"):
-        assert options_reader.get("test-command", list_sep=" && ") == "pyproject"
+        assert options_reader.get("test-command") == "pyproject"
 
     with options_reader.identifier("cp37-something"):
-        assert (
-            options_reader.get("test-command", list_sep=" && ")
-            == "pyproject-override && override2 && pyproject"
-        )
-        assert (
-            options_reader.get("environment", table_format={"item": '{k}="{v}"', "sep": " "})
-            == 'FOO="BAR" HAM="EGGS" FOO="BAZ" PYTHON="MONTY"'
-        )
-
-    with options_reader.identifier("cp37-final"):
-        assert (
-            options_reader.get("test-command", list_sep=" && ")
-            == "extra-prepend && pyproject-override && override2 && pyproject && pyproject-finalize && finalize2 && extra-finalize"
-        )
-        assert (
-            options_reader.get("environment", table_format={"item": '{k}="{v}"', "sep": " "})
-            == 'FOO="BAR" HAM="EGGS" FOO="BAZ" PYTHON="MONTY"'
-        )
+        assert options_reader.get("test-command") == "pyproject-override"
 
 
 def test_overrides_not_a_list(tmp_path, platform):
@@ -442,7 +359,7 @@ other = ["two", "three"]
 
     options_reader = OptionsReader(config_file_path=pyproject_toml, platform="linux", env={})
     assert (
-        options_reader.get("config-settings", table_format={"item": '{k}="{v}"', "sep": " "})
+        options_reader.get("config-settings", table={"item": '{k}="{v}"', "sep": " "})
         == 'example="one" other="two" other="three"'
     )
 
@@ -459,36 +376,7 @@ def test_pip_config_settings(tmp_path):
     options_reader = OptionsReader(config_file_path=pyproject_toml, platform="linux", env={})
     assert (
         options_reader.get(
-            "config-settings", table_format={"item": "--config-settings='{k}=\"{v}\"'", "sep": " "}
+            "config-settings", table={"item": "--config-settings='{k}=\"{v}\"'", "sep": " "}
         )
         == "--config-settings='--build-option=\"--use-mypyc\"'"
     )
-
-
-def test_overrides_inherit(tmp_path):
-    pyproject_toml: Path = tmp_path / "pyproject.toml"
-    pyproject_toml.write_text(
-        """\
-[tool.cibuildwheel]
-before-all = ["before-all"]
-
-[[tool.cibuildwheel.overrides]]
-select = "cp37*"
-inherit.before-all = "append"
-before-all = ["override1"]
-
-[[tool.cibuildwheel.overrides]]
-select = "cp37*"
-inherit.before-all = "prepend"
-before-all = ["override2"]
-"""
-    )
-
-    options_reader = OptionsReader(config_file_path=pyproject_toml, platform="linux", env={})
-    with options_reader.identifier("cp38-something"):
-        assert options_reader.get("before-all", list_sep=" && ") == "before-all"
-    with options_reader.identifier("cp37-something"):
-        assert (
-            options_reader.get("before-all", list_sep=" && ")
-            == "override2 && before-all && override1"
-        )

unit_test/validate_schema_test.py

@@ -20,39 +20,11 @@ def test_validate_default_schema():
     assert validator(example) is not None
 
 
-def test_validate_container_engine():
-    """
-    This test checks container engine can be overridden - it used to be a
-    global option but is now a build option.
-    """
-
+def test_validate_bad_container_engine():
     example = tomllib.loads(
         """
-        [tool.cibuildwheel]
-        container-engine = "docker"
-
         [tool.cibuildwheel.linux]
         container-engine = "docker"
-
-        [[tool.cibuildwheel.overrides]]
-        select = "*_x86_64"
-        container-engine = "docker; create_args: --platform linux/arm64/v8"
-        """
-    )
-
-    validator = validate_pyproject.api.Validator()
-    assert validator(example) is not None
-
-
-@pytest.mark.parametrize("platform", ["macos", "windows"])
-def test_validate_bad_container_engine(platform: str):
-    """
-    container-engine is not a valid option for macos or windows
-    """
-    example = tomllib.loads(
-        f"""
-        [tool.cibuildwheel.{platform}]
-        container-engine = "docker"
         """
     )
 
@@ -100,50 +72,6 @@ def test_overrides_only_select():
         validator(example)
 
 
-def test_overrides_valid_inherit():
-    example = tomllib.loads(
-        """
-        [[tool.cibuildwheel.overrides]]
-        inherit.repair-wheel-command = "append"
-        select = "somestring"
-        repair-wheel-command = ["something"]
-        """
-    )
-
-    validator = validate_pyproject.api.Validator()
-    assert validator(example) is not None
-
-
-def test_overrides_invalid_inherit():
-    example = tomllib.loads(
-        """
-        [[tool.cibuildwheel.overrides]]
-        inherit.something = "append"
-        select = "somestring"
-        repair-wheel-command = "something"
-        """
-    )
-
-    validator = validate_pyproject.api.Validator()
-    with pytest.raises(validate_pyproject.error_reporting.ValidationError):
-        validator(example)
-
-
-def test_overrides_invalid_inherit_value():
-    example = tomllib.loads(
-        """
-        [[tool.cibuildwheel.overrides]]
-        inherit.repair-wheel-command = "nothing"
-        select = "somestring"
-        repair-wheel-command = "something"
-        """
-    )
-
-    validator = validate_pyproject.api.Validator()
-    with pytest.raises(validate_pyproject.error_reporting.ValidationError):
-        validator(example)
-
-
 def test_docs_examples():
     """
     Parse out all the configuration examples, build valid TOML out of them, and