Bump version: v2.2.0a1

Create a bug report issue template

.circleci/config.yml

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

.github/ISSUE_TEMPLATE/bug_report.yml

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

.github/auto-merge.yml

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

.github/dependabot.yml

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

.github/workflows/test.yml

@@ -3,7 +3,7 @@ name: Test
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     paths-ignore:
       - 'docs/**'
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
-    - uses: pre-commit/action@v2.0.0
+    - uses: pre-commit/action@v2.0.3
 
   test:
     name: Test cibuildwheel on ${{ matrix.os }}
@@ -37,14 +37,10 @@ jobs:
 
     - name: Install dependencies
       run: |
-        python -m pip install -e ".[dev]"
+        python -m pip install ".[test]"
-
-    - name: Get PR labels
-      id: pr-labels
-      uses: joerick/pr-labels-action@v1.0.6
 
     - name: Sample build
-      if: contains(steps.pr-labels.outputs.labels, ' ci-sample-build ')
+      if: "contains(github.event.pull_request.labels.*.name, 'CI: Sample build')"
       run: |
         python bin/sample_build.py
 
@@ -74,7 +70,7 @@ jobs:
     - uses: actions/setup-python@v2
     - name: Install dependencies
       run: |
-        python -m pip install -r requirements-dev.txt
+        python -m pip install ".[test]"
 
     - name: Set up QEMU
       id: qemu

.github/workflows/update-dependencies.yml

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

.gitignore

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

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.4.0
+  rev: v4.0.1
   hooks:
   - id: check-case-conflict
   - id: check-merge-conflict
@@ -13,37 +13,8 @@ repos:
   - id: mixed-line-ending
   - id: trailing-whitespace
 
-- repo: https://github.com/PyCQA/isort
-  rev: 5.8.0
-  hooks:
-  - id: isort
-
-- repo: https://github.com/psf/black
-  rev: 21.4b2
-  hooks:
-  - id: black
-
-- repo: https://github.com/asottile/setup-cfg-fmt
-  rev: v1.17.0
-  hooks:
-  - id: setup-cfg-fmt
-    stages: [manual]
-
-- repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.812
-  hooks:
-  - id: mypy
-    exclude: ^(bin/|cibuildwheel/resources/).*py$
-    additional_dependencies: [packaging]
-    args: ["--python-version=3.6", "--ignore-missing-imports", "--scripts-are-modules"]
-  - id: mypy
-    name: mypy 3.7+ on bin/
-    files: ^bin/.*py$
-    additional_dependencies: [packaging]
-    args: ["--python-version=3.7", "--ignore-missing-imports", "--scripts-are-modules"]
-
 - repo: https://github.com/asottile/pyupgrade
-  rev: v2.14.0
+  rev: v2.26.0
   hooks:
   - id: pyupgrade
     name: PyUpgrade 3.6+
@@ -54,8 +25,48 @@ repos:
     exclude: ^(cibuildwheel|unit_test|test)/
     args: ["--py37-plus"]
 
+- repo: https://github.com/PyCQA/isort
+  rev: 5.9.3
+  hooks:
+  - id: isort
+
+- repo: https://github.com/psf/black
+  rev: 21.9b0
+  hooks:
+  - id: black
+
+- repo: https://github.com/asottile/setup-cfg-fmt
+  rev: v1.17.0
+  hooks:
+  - id: setup-cfg-fmt
+    stages: [manual]
+
+- repo: https://github.com/pre-commit/mirrors-mypy
+  rev: v0.910
+  hooks:
+  - id: mypy
+    exclude: ^(bin|cibuildwheel/resources|docs)/.*py$
+    args: ["--python-version=3.6", "--scripts-are-modules"]
+    additional_dependencies:
+      - packaging
+      - types-jinja2
+      - types-certifi
+      - types-toml
+  - id: mypy
+    name: mypy 3.7+ on bin/
+    files: ^((bin|docs)/.*py|noxfile.py)$
+    args: ["--python-version=3.7", "--scripts-are-modules"]
+    additional_dependencies:
+      - packaging>=21.0
+      - rich
+      - types-jinja2
+      - types-pyyaml
+      - types-click
+      - types-requests
+      - types-toml
+
 - repo: https://github.com/PyCQA/flake8
-  rev: 3.9.1
+  rev: 3.9.2
   hooks:
   - id: flake8
     exclude: cibuildwheel/resources/
@@ -66,6 +77,17 @@ repos:
   - id: disallow-caps
     name: Disallow improper capitalization
     language: pygrep
-    entry: PyBind|Numpy|Cmake|Github
+    entry: PyBind|Numpy|Cmake|Github|PyTest
     types:
     - markdown
+  - id: update-readme-changelog
+    name: Update README changelog
+    language: python
+    entry: bin/update_readme_changelog.py
+    files: ^docs/changelog.md$
+
+- repo: https://github.com/codespell-project/codespell
+  rev: v2.1.0
+  hooks:
+  - id: codespell
+    args: ["-L", "sur"]

.travis.yml

@@ -1,36 +1,36 @@
-language: minimal
+os: linux
+dist: focal
+language: python
 
 branches:
   only:
-  - master
+  - main
 
 jobs:
   include:
     - name: Linux | x86_64 + i686 | Python 3.6
-      language: python
       python: 3.6
       services: docker
       env: PYTHON=python
 
     - name: Linux | arm64 | Python 3.6
-      language: python
       python: 3.6
       services: docker
-      arch: arm64
+      arch: arm64-graviton2
+      group: edge
+      virt: vm
       env: PYTHON=python
 
     - name: Linux | ppc64le | Python 3.6
-      language: python
       python: 3.6
       services: docker
       arch: ppc64le
-      env: PYTHON=python
+      allow_failure: True
-
-    - name: macOS | x86_64 | Python 3.x
-      os: osx
       env:
-        - PYTHON=python3
+        - PYTHON=python
-        - PYTEST_ADDOPTS='-k "unit_test or test_0_basic" --suppress-no-test-exit-code'
+        # skip test_manylinuxXXXX_only, it uses too much disk space
+        # c.f. https://travis-ci.community/t/running-out-of-disk-space-quota-when-using-docker-on-ppc64le/11634
+        - PYTEST_ADDOPTS='-k "not test_manylinuxXXXX_only"'
 
     - name: Windows | x86_64 | Python 3.6
       os: windows
@@ -42,18 +42,12 @@ jobs:
       env:
         - PYTHON=C:\\Python36\\python
 
-    - &linux_s390x_36
+    - name: Linux | s390x | Python 3.6
-      name: Linux | s390x | Python 3.6
-      language: python
       python: 3.6
       services: docker
       arch: s390x
       env: PYTHON=python
 
-  allow_failures:
-    # must repeat the s390x job above exactly to match
-    - *linux_s390x_36
-
 install: $PYTHON -m pip install -e ".[dev]" pytest-custom-exit-code
 
 script: $PYTHON ./bin/run_tests.py

CI.md

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

CODE_OF_CONDUCT.md

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

LICENSE

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

README.md

@@ -3,11 +3,11 @@ cibuildwheel
 
 [![PyPI](https://img.shields.io/pypi/v/cibuildwheel.svg)](https://pypi.python.org/pypi/cibuildwheel)
 [![Documentation Status](https://readthedocs.org/projects/cibuildwheel/badge/?version=stable)](https://cibuildwheel.readthedocs.io/en/stable/?badge=stable)
-[![Actions Status](https://github.com/joerick/cibuildwheel/workflows/Test/badge.svg)](https://github.com/joerick/cibuildwheel/actions)
+[![Actions Status](https://github.com/pypa/cibuildwheel/workflows/Test/badge.svg)](https://github.com/pypa/cibuildwheel/actions)
-[![Travis Status](https://img.shields.io/travis/joerick/cibuildwheel/master?logo=travis)](https://travis-ci.org/joerick/cibuildwheel)
+[![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/wbsgxshp05tt1tif/branch/master?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/master)
+[![Appveyor status](https://ci.appveyor.com/api/projects/status/gt3vwl88yt0y3hur/branch/main?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/main)
-[![CircleCI Status](https://img.shields.io/circleci/build/gh/joerick/cibuildwheel/master?logo=circleci)](https://circleci.com/gh/joerick/cibuildwheel)
+[![CircleCI Status](https://img.shields.io/circleci/build/gh/pypa/cibuildwheel/main?logo=circleci)](https://circleci.com/gh/pypa/cibuildwheel)
-[![Azure Status](https://dev.azure.com/joerick0429/cibuildwheel/_apis/build/status/joerick.cibuildwheel?branchName=master)](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=2&branchName=master)
+[![Azure Status](https://dev.azure.com/joerick0429/cibuildwheel/_apis/build/status/pypa.cibuildwheel?branchName=main)](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=4&branchName=main)
 
 
 [Documentation](https://cibuildwheel.readthedocs.org)
@@ -22,25 +22,24 @@ Python wheels are great. Building them across **Mac, Linux, Windows**, on **mult
 What does it do?
 ----------------
 
-|   | macOS Intel | macOS Apple Silicon | Windows 64bit | Windows 32bit | manylinux x86_64 | manylinux i686 | manylinux aarch64 | manylinux ppc64le | manylinux s390x |
+|   | macOS Intel | macOS Apple Silicon | Windows 64bit | Windows 32bit | manylinux<br/>musllinux x86_64 | manylinux<br/>musllinux i686 | manylinux<br/>musllinux aarch64 | manylinux<br/>musllinux ppc64le | manylinux<br/>musllinux s390x |
-|---|---|---|---|---|---|---|---|---|---|
+|---------------|----|-----|-----|-----|----|-----|----|-----|-----|
-| CPython 2.7     | ✅ |   | ✅¹ | ✅¹ | ✅ | ✅ |    |    |   |
+| CPython 3.6   | ✅ | N/A | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.5     | ✅ |   | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
+| CPython 3.7   | ✅ | N/A | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.6     | ✅ |   | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
+| CPython 3.8   | ✅ | ✅  | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.7     | ✅ |   | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
+| CPython 3.9   | ✅ | ✅  | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.8     | ✅ |   | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
+| CPython 3.10  | ✅ | ✅  | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.9     | ✅ | ✅ | ✅  | ✅  | ✅ | ✅ | ✅ | ✅ | ✅ |
+| PyPy 3.7 v7.3 | ✅ | N/A | ✅  | N/A | ✅¹ | ✅¹  | ✅¹ | N/A | N/A |
-| PyPy 2.7 v7.3.3 | ✅ |    |    | ✅  | ✅ |    |    |    |   |
-| PyPy 3.6 v7.3.3 | ✅ |    |    | ✅  | ✅ |    |    |    |   |
-| PyPy 3.7 (beta) v7.3.3 | ✅ | |  | ✅  | ✅ |    |    |   |    |
 
-<sup>¹ Only using a workaround with a newer compiler; Microsoft removed the 2008 compiler for Python 2.7 in April 2021.</sup><br>
+<sup>¹ PyPy is only supported for manylinux wheels.</sup><br>
 
-- Builds manylinux, macOS 10.9+, and Windows wheels for CPython and PyPy
+- Builds manylinux, musllinux, macOS 10.9+, and Windows wheels for CPython and PyPy
 - Works on GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, and GitLab CI
 - Bundles shared library dependencies on Linux and macOS through [auditwheel](https://github.com/pypa/auditwheel) and [delocate](https://github.com/matthew-brett/delocate)
 - Runs your library's tests against the wheel-installed version of your library
 
+See the [cibuildwheel 1 documentation](https://cibuildwheel.readthedocs.io/en/1.x/) if you need to build unsupported versions of Python, such as Python 2.
+
 Usage
 -----
 
@@ -48,9 +47,9 @@ Usage
 
 |                 | Linux | macOS | Windows | Linux ARM |
 |-----------------|-------|-------|---------|--------------|
-| GitHub Actions  | ✅    | ✅    | ✅      | ✅¹           |
+| GitHub Actions  | ✅    | ✅    | ✅      | ✅¹          |
 | Azure Pipelines | ✅    | ✅    | ✅      |              |
-| Travis CI       | ✅    | ✅    | ✅      | ✅           |
+| Travis CI       | ✅    |       | ✅      | ✅           |
 | AppVeyor        | ✅    | ✅    | ✅      |              |
 | CircleCI        | ✅    | ✅    |         |              |
 | Gitlab CI       | ✅    |       |         |              |
@@ -64,7 +63,7 @@ Usage
 Example setup
 -------------
 
-To build manylinux, macOS, and Windows wheels on GitHub Actions, you could use this `.github/workflows/wheels.yml`:
+To build manylinux, musllinux, macOS, and Windows wheels on GitHub Actions, you could use this `.github/workflows/wheels.yml`:
 
 ```yaml
 name: Build
@@ -86,7 +85,7 @@ jobs:
       - uses: actions/setup-python@v2
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==1.11.0
+        run: python -m pip install cibuildwheel==2.2.0a1
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
@@ -99,7 +98,7 @@ jobs:
           path: ./wheelhouse/*.whl
 ```
 
-For more information, including building on Python 2, PyPI deployment, and the use of other CI services or the dedicated GitHub Action, check out the [documentation](https://cibuildwheel.readthedocs.org) and the [examples](https://github.com/joerick/cibuildwheel/tree/master/examples).
+For more information, including PyPI deployment, and the use of other CI services or the dedicated GitHub Action, check out the [documentation](https://cibuildwheel.readthedocs.org) and the [examples](https://github.com/pypa/cibuildwheel/tree/main/examples).
 
 Options
 -------
@@ -108,13 +107,15 @@ Options
 |---|--------|-------------|
 | **Build selection** | [`CIBW_PLATFORM`](https://cibuildwheel.readthedocs.io/en/stable/options/#platform)  | Override the auto-detected target platform |
 |   | [`CIBW_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip)  <br> [`CIBW_SKIP`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip)  | Choose the Python versions to build |
-|   | [`CIBW_ARCHS`](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)  | Change the architectures built on your machine by default |
+|   | [`CIBW_ARCHS`](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)  | Change the architectures built on your machine by default. |
 |   | [`CIBW_PROJECT_REQUIRES_PYTHON`](https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python)  | Manually set the Python compatibility of your project |
-| **Build customization** | [`CIBW_ENVIRONMENT`](https://cibuildwheel.readthedocs.io/en/stable/options/#environment)  | Set environment variables needed during the build |
+|   | [`CIBW_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_BEFORE_ALL`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-all)  | Execute a shell command on the build system before any wheels are built. |
 |   | [`CIBW_BEFORE_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-build)  | Execute a shell command preparing each wheel's build |
 |   | [`CIBW_REPAIR_WHEEL_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#repair-wheel-command)  | Execute a shell command to repair each (non-pure Python) built wheel |
-|   | [`CIBW_MANYLINUX_X86_64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_I686_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_PYPY_X86_64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_AARCH64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_PPC64LE_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  <br> [`CIBW_MANYLINUX_S390X_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)  | Specify alternative manylinux docker images |
+|   | [`CIBW_MANYLINUX_*_IMAGE`<br/>`CIBW_MUSLLINUX_*_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image)  | Specify alternative manylinux / musllinux Docker images |
 |   | [`CIBW_DEPENDENCY_VERSIONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#dependency-versions)  | Specify how cibuildwheel controls the versions of the tools it uses |
 | **Testing** | [`CIBW_TEST_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-command)  | Execute a shell command to test each built wheel |
 |   | [`CIBW_BEFORE_TEST`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-test)  | Execute a shell command before testing each wheel |
@@ -123,12 +124,11 @@ Options
 |   | [`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.readthedocs.io/en/stable/options/#configuration).
 
 Working examples
 ----------------
 
-<!--working-examples-start-->
-
 Here are some repos that use cibuildwheel.
 
 <!-- START bin/projects.py -->
@@ -143,51 +143,10 @@ Here are some repos that use cibuildwheel.
 | [psutil][]                        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python |
 | [scikit-image][]                  | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Image processing library. Uses cibuildwheel to build and test a project that uses Cython with platform-native code.  |
 | [twisted-iocpsupport][]           | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. |
+| [cmake][]                         | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
 | [websockets][]                    | ![travisci icon][] | ![apple icon][] ![linux icon][] | Library for building WebSocket servers and clients. Mostly written in Python, with a small C 'speedups' extension module.  |
 | [pyzmq][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython and CFFI.  |
 | [aiortc][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | WebRTC and ORTC implementation for Python using asyncio. |
-| [numexpr][]                       | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas, bcolz and more |
-| [coverage.py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python |
-| [h5py][]                          | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. |
-| [River][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python |
-| [PyAV][]                          | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Pythonic bindings for FFmpeg's libraries. |
-| [Dependency Injector][]           | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI |
-| [PyTables][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data |
-| [ruptures][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. |
-| [aioquic][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python |
-| [google neuroglancer][]           | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data |
-| [pikepdf][]                       | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by qpdf |
-| [AutoPy][]                        | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
-| [Parselmouth][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. |
-| [python-rapidjson][]              | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson |
-| [Rtree][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS ¶ |
-| [python-snappy][]                 | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for the snappy google library |
-| [markupsafe][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. |
-| [KDEpy][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Kernel Density Estimation in Python |
-| [cyvcf2][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing |
-| [pybind11 cmake_example][]        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system |
-| [pybind11 python_example][]       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a Python-based build system |
-| [sourmash][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Compute and compare MinHash signatures for DNA data sets. |
-| [dd-trace-py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub |
-| [iminuit][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 |
-| [jq.py][]                         | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq |
-| [time-machine][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. |
-| [matrixprofile][]                 | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. |
-| [CTranslate2][]                   | ![github icon][] | ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://software.intel.com/content/www/us/en/develop/tools/oneapi/base-toolkit.html). The Linux wheels also include CUDA libraries for GPU execution. |
-| [Tokenizer][]                     | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support |
-| [bx-python][]                     | ![travisci icon][] | ![apple icon][] ![linux icon][] | A library that includes Cython extensions. |
-| [boost-histogram][]               | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. |
-| [pybase64][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python |
-| [TgCrypto][]                      | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
-| [etebase-py][]                    | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. |
-| [pyjet][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy |
-| [numpythia][]                     | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy |
-| [fathon][]                        | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms |
-| [Imagecodecs (fork)][]            | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. |
-| [pyinstrument_cext][]             | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies |
-| [polaroid][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. |
-| [xmlstarlet][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. |
-| [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 |
 
 [scikit-learn]: https://github.com/scikit-learn/scikit-learn
 [Matplotlib]: https://github.com/matplotlib/matplotlib
@@ -195,51 +154,10 @@ Here are some repos that use cibuildwheel.
 [psutil]: https://github.com/giampaolo/psutil
 [scikit-image]: https://github.com/scikit-image/scikit-image
 [twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport
+[cmake]: https://github.com/scikit-build/cmake-python-distributions
 [websockets]: https://github.com/aaugustin/websockets
 [pyzmq]: https://github.com/zeromq/pyzmq
 [aiortc]: https://github.com/aiortc/aiortc
-[numexpr]: https://github.com/pydata/numexpr
-[coverage.py]: https://github.com/nedbat/coveragepy
-[h5py]: https://github.com/h5py/h5py
-[River]: https://github.com/online-ml/river
-[PyAV]: https://github.com/PyAV-Org/PyAV
-[Dependency Injector]: https://github.com/ets-labs/python-dependency-injector
-[PyTables]: https://github.com/PyTables/PyTables
-[ruptures]: https://github.com/deepcharles/ruptures
-[aioquic]: https://github.com/aiortc/aioquic
-[google neuroglancer]: https://github.com/google/neuroglancer
-[pikepdf]: https://github.com/pikepdf/pikepdf
-[AutoPy]: https://github.com/autopilot-rs/autopy
-[Parselmouth]: https://github.com/YannickJadoul/Parselmouth
-[python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson
-[Rtree]: https://github.com/Toblerity/rtree
-[python-snappy]: https://github.com/andrix/python-snappy
-[markupsafe]: https://github.com/pallets/markupsafe
-[KDEpy]: https://github.com/tommyod/KDEpy
-[cyvcf2]: https://github.com/brentp/cyvcf2
-[pybind11 cmake_example]: https://github.com/pybind/cmake_example
-[pybind11 python_example]: https://github.com/pybind/python_example
-[sourmash]: https://github.com/dib-lab/sourmash
-[dd-trace-py]: https://github.com/DataDog/dd-trace-py
-[iminuit]: https://github.com/scikit-hep/iminuit
-[jq.py]: https://github.com/mwilliamson/jq.py
-[time-machine]: https://github.com/adamchainz/time-machine
-[matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile
-[CTranslate2]: https://github.com/OpenNMT/CTranslate2
-[Tokenizer]: https://github.com/OpenNMT/Tokenizer
-[bx-python]: https://github.com/bxlab/bx-python
-[boost-histogram]: https://github.com/scikit-hep/boost-histogram
-[pybase64]: https://github.com/mayeut/pybase64
-[TgCrypto]: https://github.com/pyrogram/tgcrypto
-[etebase-py]: https://github.com/etesync/etebase-py
-[pyjet]: https://github.com/scikit-hep/pyjet
-[numpythia]: https://github.com/scikit-hep/numpythia
-[fathon]: https://github.com/stfbnc/fathon
-[Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build
-[pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext
-[polaroid]: https://github.com/daggy1234/polaroid
-[xmlstarlet]: https://github.com/dimitern/xmlstarlet
-[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example
 
 [appveyor icon]: docs/data/readme_icons/appveyor.svg
 [github icon]: docs/data/readme_icons/github.svg
@@ -251,65 +169,9 @@ Here are some repos that use cibuildwheel.
 [apple icon]: docs/data/readme_icons/apple.svg
 [linux icon]: docs/data/readme_icons/linux.svg
 
-<!-- scikit-learn: 44749, last pushed 0 days ago -->
-<!-- Matplotlib: 13218, last pushed 0 days ago -->
-<!-- MyPy: 10122, last pushed 0 days ago -->
-<!-- psutil: 7128, last pushed 7 days ago -->
-<!-- scikit-image: 4220, last pushed 0 days ago -->
-<!-- twisted-iocpsupport: 4184, last pushed 0 days ago -->
-<!-- websockets: 3217, last pushed 13 days ago -->
-<!-- pyzmq: 2707, last pushed 13 days ago -->
-<!-- aiortc: 2244, last pushed 0 days ago -->
-<!-- numexpr: 1548, last pushed 0 days ago -->
-<!-- coverage.py: 1515, last pushed 1 days ago -->
-<!-- h5py: 1485, last pushed 0 days ago -->
-<!-- River: 1428, last pushed 0 days ago -->
-<!-- PyAV: 1182, last pushed 2 days ago -->
-<!-- Dependency Injector: 1163, last pushed 0 days ago -->
-<!-- PyTables: 1005, last pushed 18 days ago -->
-<!-- ruptures: 637, last pushed 1 days ago -->
-<!-- aioquic: 587, last pushed 15 days ago -->
-<!-- google neuroglancer: 568, last pushed 5 days ago -->
-<!-- pikepdf: 548, last pushed 0 days ago -->
-<!-- AutoPy: 519, last pushed 175 days ago -->
-<!-- Parselmouth: 471, last pushed 0 days ago -->
-<!-- python-rapidjson: 415, last pushed 80 days ago -->
-<!-- Rtree: 388, last pushed 69 days ago -->
-<!-- python-snappy: 386, last pushed 6 days ago -->
-<!-- markupsafe: 365, last pushed 2 days ago -->
-<!-- KDEpy: 242, last pushed 16 days ago -->
-<!-- cyvcf2: 242, last pushed 17 days ago -->
-<!-- pybind11 cmake_example: 239, last pushed 77 days ago -->
-<!-- pybind11 python_example: 235, last pushed 22 days ago -->
-<!-- sourmash: 235, last pushed 0 days ago -->
-<!-- dd-trace-py: 217, last pushed 0 days ago -->
-<!-- iminuit: 172, last pushed 20 days ago -->
-<!-- jq.py: 147, last pushed 7 days ago -->
-<!-- time-machine: 139, last pushed 4 days ago -->
-<!-- matrixprofile: 138, last pushed 36 days ago -->
-<!-- CTranslate2: 133, last pushed 0 days ago -->
-<!-- Tokenizer: 126, last pushed 0 days ago -->
-<!-- bx-python: 97, last pushed 2 days ago -->
-<!-- boost-histogram: 69, last pushed 0 days ago -->
-<!-- pybase64: 56, last pushed 1 days ago -->
-<!-- TgCrypto: 52, last pushed 106 days ago -->
-<!-- etebase-py: 46, last pushed 58 days ago -->
-<!-- pyjet: 27, last pushed 7 days ago -->
-<!-- numpythia: 25, last pushed 7 days ago -->
-<!-- fathon: 22, last pushed 31 days ago -->
-<!-- Imagecodecs (fork): 16, last pushed 4 days ago -->
-<!-- pyinstrument_cext: 10, last pushed 19 days ago -->
-<!-- polaroid: 9, last pushed 0 days ago -->
-<!-- xmlstarlet: 7, last pushed 1 days ago -->
-<!-- pybind11 scikit_build_example: 4, last pushed 40 days ago -->
-
 <!-- END bin/projects.py -->
 
-> Add your repo here! Let us know on [GitHub Discussions](https://github.com/joerick/cibuildwheel/discussions/485), or send a PR, adding your information to `docs/data/projects.yml`.
+> ℹ️ 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.
->
-> <sup>I'd like to include notes here to indicate why an example might be interesting to cibuildwheel users - the styles/technologies/techniques used in each. Please include that in future additions!</sup>
-
-<!--working-examples-end-->
 
 Legal note
 ----------
@@ -323,542 +185,75 @@ This is similar to static linking, so it might have some licence implications. C
 Changelog
 =========
 
-<!--changelog-start-->
+<!-- START bin/update_readme_changelog.py -->
 
-### v1.11.0
+<!-- this section was generated by bin/update_readme_changelog.py -- do not edit manually -->
 
-_1 May 2021_
+### v2.2.0 (prerelease)
 
-- 📚 Lots of docs improvements! (#650, #623, #616, #609, #606)
+_Currently in prerelease. The below release notes will be condensed into a single entry on final release._
-- 🐛 Fix nuget "Package is not found" error on Windows. (#653)
-- ⚠️ cibuildwheel will no longer build Windows 2.7 wheels, unless you specify a custom toolchain using `DISTUTILS_USE_SDK=1` and `MSSdk=1`. This is because Microsoft have stopped distributing Visual C++ Compiler for Python 2.7. See [this FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#windows-and-python-27) for more details. (#649)
-- 🐛 Fix crash on Windows due to missing `which` command (#641).
 
-### v1.10.0
+_v2.2.0a1 (23 September 2021)_
 
-_22 Feb 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.
 
-- ✨ Added `manylinux_2_24` support. To use these new Debian-based manylinux
+  Musllinux builds are enabled by default. To disable them on your project, add `*-musllinux_*` to your [`CIBW_SKIP`/`skip`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip)
-  images, set your [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)
+ option. (#768)
-  options to `manylinux_2_24`.
+- 🛠 Setting an empty string for the [`CIBW_*_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) option will now fallthrough to the config file or cibuildwheel's default, rather than causing an error. This makes the option easier to use in CI build matricies. (#829)
-- 🛠 On macOS, we now set `MACOSX_DEPLOYMENT_TARGET` in before running
-  `CIBW_BEFORE_ALL`. This is useful when using `CIBW_BEFORE_ALL` to build a
-  shared library.
-- 🛠 An empty `CIBW_BUILD` option is now the same as being unset i.e, `*`.
-  This makes some build matrix configuration easier. (#588)
-- 📚 Neatened up documentation - added tabs to a few places (#576), fixed some
-  formatting issues.
 
-### v1.9.0
+### v2.1.2
 
-_5 February 2021_
+_14 September 2021_
 
-- 🌟 Added support for Apple Silicon wheels on macOS! You can now
+- 🛠 Updated CPython 3.10 to 3.10.0rc2
-  cross-compile `universal2` and `arm64` wheels on your existing macOS Intel
+- 📚 Multiple docs updates
-  runners, by setting
+- 🐛 Improved warnings when built binaries are bundled into the container on Linux. (#807)
-  [CIBW_ARCHS_MACOS](https://cibuildwheel.readthedocs.io/en/stable/options/#archs).
-  Xcode 12.2 or later is required, but you don't need macOS 11.0 - you can
-  still build on macOS 10.15. See
-  [this FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#apple-silicon)
-  for more information. (#484)
-- 🌟 Added auto-detection of your package's Python compatibility, via declared
-   [`requires-python`](https://www.python.org/dev/peps/pep-0621/#requires-python)
-  in your `pyproject.toml`, or
-  [`python_requires`](https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires)
-  in `setup.cfg` or `setup.py`. If your project has these set, cibuildwheel
-  will automatically skip builds on versions of Python that your package
-  doesn't support. Hopefully this makes the first-run experience of
-  cibuildwheel a bit easier. If you need to override this for any reason,
-  look at [`CIBW_PROJECT_REQUIRES_PYTHON`](https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python).
-  (#536)
-- 🌟 cibuildwheel can now be invoked as a native GitHub Action! You can now
-  invoke cibuildwheel in a GHA build step like:
 
-  ```yaml
+### v2.1.1
-  - name: Build wheels
-    uses: joerick/cibuildwheel@version # e.g. v1.9.0
-    with:
-      output-dir: wheelhouse
-    # env:
-    #   CIBW_SOME_OPTION: value
-  ```
 
-  This saves a bit of boilerplate, and you can [use Dependabot to keep the
+_7 August 2021_
-  pinned version up-to-date](https://cibuildwheel.readthedocs.io/en/stable/faq/#automatic-updates).
 
-- ✨ Added `auto64` and `auto32` shortcuts to the
+- ✨ Corresponding with the release of CPython 3.10.0rc1, which is ABI stable, cibuildwheel now builds CPython 3.10 by default - without the CIBW_PRERELEASE_PYTHONS flag.
-  [CIBW_ARCHS](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)
-  option. (#553)
-- ✨ cibuildwheel now prints a list of the wheels built at the end of each
-  run. (#570)
-- 📚 Lots of minor docs improvements.
 
-### 1.8.0
+<sup>Note: v2.1.0 was a bad release, it was yanked from PyPI.</sup>
 
-_22 January 2021_
+### v2.0.1
 
-- 🌟 Added support for emulated builds! You can now build manylinux wheels on
+_25 July 2021_
-  ARM64`aarch64`, as well as `ppc64le` and 's390x'. To build under emulation,
-  register QEMU via binfmt_misc and set the
-  [`CIBW_ARCHS_LINUX`](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)
-  option to the architectures you want to run. See
-  [this FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#emulation)
-  for more information. (#482)
-- ✨ Added `CIBW_TEST_SKIP` option. This allows you to choose certain builds
-  whose tests you'd like to skip. This might be useful when running a slow
-  test suite under emulation, for example. (#537)
-- ✨ Added `curly-{brace,bracket,paren}` style globbing to `CIBW_BUILD` and
-  `CIBW_SKIP`. This gives more expressivity, letting you do things like
-  `CIBW_BUILD=cp39-manylinux_{aarch64,ppc64le}`. (#527)
-- 🛠 cibuildwheel will now exit with an error if it's called with options that
-  skip all builds on a platform. This feature can be disabled by adding
-  `--allow-empty` on the command line. (#545)
 
-### 1.7.4
+- 📚 Docs improvements (#767)
+- 🛠 Dependency updates, including delocate 0.9.0.
 
-_2 January 2021_
+### v2.0.0 🎉
 
-- 🐛 Fix the PyPy virtualenv patch to work on macOS 10.14 (#506)
+_16 July 2021_
 
-### 1.7.3
+- 🌟 You can now configure cibuildwheel options inside your project's `pyproject.toml`! Environment variables still work of course. Check out the [documentation](https://cibuildwheel.readthedocs.io/en/stable/options/#setting-options) for more info.
+- 🌟 Added support for building wheels with [build](https://github.com/pypa/build), as well as pip. This feature is controlled with the [`CIBW_BUILD_FRONTEND`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-frontend) option.
+- 🌟 Added the ability to test building wheels on CPython 3.10! Because CPython 3.10 is in beta, these wheels should not be distributed, because they might not be compatible with the final release, but it's available to build for testing purposes. Use the flag [`--prerelease-pythons` or `CIBW_PRERELEASE_PYTHONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#prerelease-pythons) to test. (#675) This version of cibuildwheel includes CPython 3.10.0b4.
+- ⚠️ **Removed support for building Python 2.7 and Python 3.5 wheels**, for both CPython and PyPy. If you still need to build on these versions, please use the latest v1.x version. (#596)
+- ✨ Added the ability to build CPython 3.8 wheels for Apple Silicon. (#704)
+- 🛠 Update to the latest build dependencies, including Auditwheel 4. (#633)
+- 🛠 Use the unified pypa/manylinux images to build PyPy (#671)
+- 🐛 Numerous bug fixes & docs improvements
 
-_1 January 2021_
+<!-- END bin/update_readme_changelog.py -->
 
-- 🛠 Added a patch for Pypy to ensure header files are available for building
+---
-  in a virtualenv. (#502)
-- 🛠 Some preparatory work towards using cibuildwheel as a GitHub Action.
-  Check out
-  [the FAQ](https://cibuildwheel.readthedocs.io/en/stable/faq/#option-1-github-action)
-  for information on how to use it. We'll be fully updating the docs to this
-  approach in a subsequent release (#494)
 
-### 1.7.2
+That's the last few versions.
 
-_21 December 2020_
+ℹ️ **Want more changelog? Head over to [the changelog page in the docs](https://cibuildwheel.readthedocs.io/en/stable/changelog/).**
 
-- 🛠 Update dependencies, notably wheel==0.36.2 and pip==20.3.3, and CPython to
+---
-  their latest bugfix releases (#489)
-- 📚 Switch to a GitHub example in the README (#479)
-- 📚 Create Working Examples table, with many projects that use cibuildwheel (#474)
-- 📚 Import Working Examples table and Changelog to docs
-
-### 1.7.1
-
-_3 December 2020_
-
-- 🛠 Update manylinux2010 image to resolve issues with 'yum' repositories
-  (#472)
-
-### 1.7.0
-
-_26 November 2020_
-
-- ✨ New logging format, that uses 'fold groups' in CI services that support
-  it. (#458)
-- 🛠 Update PyPy to 7.3.3 (#460)
-- 🐛 Fix a bug where CIBW_BEFORE_ALL runs with a very old version of Python on
-  Linux. (#464)
-
-### 1.6.4
-
-_31 October 2020_
-
-- 🐛 Fix crash on Appveyor during nuget install due to old system CA
-  certificates. We now use certifi's CA certs to download files. (#455)
-
-### 1.6.3
-
-_12 October 2020_
-
-- 🐛 Fix missing SSL certificates on macOS (#447)
-- 🛠 Update OpenSSL Python 3.5 patch to 1.1.1h on macOS (#449)
-
-### 1.6.2
-
-_9 October 2020_
-
-- ✨ Python 3.9 updated to the final release version - v3.9.0 (#440)
-- 🛠 Pypy updated to v7.3.2, adding alpha support for Python 3.7 (#430)
-
-### 1.6.1
-
-_20 September 2020_
-
-- 🛠 Add PPC64LE manylinux image supporting Python 3.9. (#436)
-- 📚 Add project URLs to PyPI listing (#428)
-
-### 1.6.0
-
-_9 September 2020_
-
-- 🌟 Add Python 3.9 support! This initial support uses release candidate
-  builds. You can start publishing wheels for Python 3.9 now, ahead of
-  the official release. (#382)
-
-  Minor note - if you're building PPC64LE wheels, the manylinux image pinned
-  by this version is
-  [still on Python 3.9b3](https://github.com/pypa/manylinux/issues/758), not a
-  release candidate. We'd advise holding off on distributing 3.9 ppc64le wheels
-  until a subsequent version of cibuildwheel.
-
-- 🌟 Add Gitlab CI support. Gitlab CI can now build Linux wheels, using
-  cibuildwheel. (#419)
-- 🐛 Fix a bug that causes pyproject.toml dependencies to fail to install on
-  Windows (#420)
-- 📚 Added some information about Windows VC++ runtimes and how they relate
-  to wheels.
-
-### 1.5.5
-
-_22 July 2020_
-
-- 🐛 Fix a bug that would cause command substitutions in CIBW_ENVIRONMENT to
-  produce no output on Linux (#411)
-- 🐛 Fix regression (introduced in 1.5.3) which caused BEFORE_BUILD and
-  BEFORE_ALL to be executed in the wrong directory (#410)
-
-### 1.5.4
-
-_19 June 2020_
-
-- 🐛 Fix a bug that would cause command substitutions in CIBW_ENVIRONMENT
-  variables to not interpret quotes in commands correctly (#406, #408)
-
-### 1.5.3
-
-_19 July 2020_
-
-- 🛠 Update CPython 3.8 to 3.8.3 (#405)
-- 🛠 Internal refactoring of Linux build, to move control flow into Python (#386)
-
-### 1.5.2
-
-_8 July 2020_
-
-- 🐛 Fix an issue on Windows where pyproject.toml would cause an error when
-  some requirements formats were used. (#401)
-- 🛠 Update CPython 3.7 to 3.7.8 (#394)
-
-### 1.5.1
-
-_25 June 2020_
-
-- 🐛 Fix "OSError: [WinError 17] The system cannot move the file to a different
-  disk drive" on GitHub Actions (#388, #389)
-
-### 1.5.0
-
-_24 June 2020_
-
-- 🌟 Add [`CIBW_BEFORE_ALL`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-all)
-  option, which lets you run a command on the build machine before any wheels
-  are built. This is especially useful when building on Linux, to `make`
-  something external to Python, or to `yum install` a dependency. (#342)
-- ✨ Added support for projects using pyproject.toml instead of setup.py
-  (#360, #358)
-- ✨ Added workaround to allow Python 3.5 on Windows to pull dependencies from
-  pyproject.toml. (#358)
-- 📚 Improved GitHub Actions examples and docs (#354, #362)
-- 🐛 Ensure pip wheel uses the specified package, and doesn't build a wheel
-  from PyPI (#369)
-- 🛠 Internal changes: using pathlib.Path, precommit hooks, testing
-  improvements.
-
-### 1.4.2
-
-_25 May 2020_
-
-- 🛠 Dependency updates, including CPython 3.8.3 & manylinux images.
-- 🛠 Lots of internal updates - type annotations and checking using mypy, and
-  a new integration testing system.
-- ⚠️ Removed support for *running* cibuildwheel using Python 3.5. cibuildwheel
-  will continue to build Python 3.5 wheels until EOL.
-
-### 1.4.1
-
-_4 May 2020_
-
-- 🐛 Fix a bug causing programs running inside the i686 manylinux images to
-  think they were running x86_64 and target the wrong architecture. (#336,
-  #338)
-
-### 1.4.0
-
-_2 May 2020_
-
-- 🌟 Deterministic builds. cibuildwheel now locks the versions of the tools it
-  uses. This means that pinning your version of cibuildwheel pins the versions
-  of pip, setuptools, manylinux etc. that are used under the hood. This should
-  make things more reliable. But note that we don't control the entire build
-  environment on macOS and Windows, where the version of Xcode and Visual
-  Studio can still effect things.
-
-  This can be controlled using the [CIBW_DEPENDENCY_VERSIONS](https://cibuildwheel.readthedocs.io/en/stable/options/#dependency-versions)
-  and [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image)
-  options - if you always want to use the latest toolchain, you can still do
-  that, or you can specify your own pip constraints file and manylinux image.
-  (#256)
-
-- ✨ Added `package_dir` command line option, meaning we now support building
-  a package that lives in a subdirectory and pulls in files from the wider
-  project. See [the `package_dir` option help](https://cibuildwheel.readthedocs.io/en/stable/options/#command-line-options)
-  for more information.
-
-  Note that this change makes the working directory (where you call
-  cibuildwheel from) relevant on Linux, as it's considered the 'project' and
-  will be copied into the Docker container. If your builds are slower on this
-  version, that's likely the reason. `cd` to your project and then call
-  `cibuildwheel` from there. (#319, #295)
-
-- 🛠 On macOS, we make `MACOSX_DEPLOYMENT_TARGET` default to `10.9` if it's
-  not set. This should make things more consistent between Python versions.
-- 🛠 Dependency updates - CPython 3.7.7, CPython 2.7.18, Pypy 7.3.1.
-
-### 1.3.0
-
-_12 March 2020_
-
-- 🌟 Add support for building on GitHub Actions! Check out the
-  [docs](https://cibuildwheel.readthedocs.io/en/stable/setup/#github-actions)
-  for information on how to set it up. (#194)
-- ✨ Add the `CIBW_BEFORE_TEST` option, which lets you run a command to
-  prepare the environment before your tests are run. (#242)
-
-### 1.2.0
-
-_8 March 2020_
-
-- 🌟 Add support for building PyPy wheels, across Manylinux, macOS, and
-  Windows. (#185)
-- 🌟 Added the ability to build ARM64 (aarch64), ppc64le, and s390x wheels,
-  using manylinux2014 and Travis CI. (#273)
-- ✨ You can now build macOS wheels on Appveyor. (#230)
-- 🛠 Changed default macOS minimum target to 10.9, from 10.6. This allows the
-  use of more modern C++ libraries, among other things. (#156)
-- 🛠 Stop building universal binaries on macOS. We now only build x86_64
-  wheels on macOS. (#220)
-- ✨ Allow chaining of commands using `&&` and `||` on Windows inside
-  CIBW_BEFORE_BUILD and CIBW_TEST_COMMAND. (#293)
-- 🛠 Improved error reporting for failed Cython builds due to stale .so files
-  (#263)
-- 🛠 Update CPython from 3.7.5 to 3.7.6 and from 3.8.0 to 3.8.2 on Mac/Windows
-- 🛠 Improved error messages when a bad config breaks cibuildwheel's PATH
-  variable. (#264)
-- ⚠️ Removed support for *running* cibuildwheel on Python 2.7. cibuildwheel
-  will continue to build Python 2.7 wheels for a little while. (#265)
-
-### 1.1.0
-
-_7 December 2019_
-
-- 🌟 Add support for building manylinux2014 wheels. To use, set
-  `CIBW_MANYLINUX_X86_64_IMAGE` and CIBW_MANYLINUX_I686_IMAGE to
-  `manylinux2014`.
-- ✨ Add support for [Linux on Appveyor](https://www.appveyor.com/blog/2018/03/06/appveyor-for-linux/) (#204, #207)
-- ✨ Add `CIBW_REPAIR_WHEEL_COMMAND` env variable, for changing how
-  `auditwheel` or `delocate` are invoked, or testing an equivalent on
-  Windows. (#211)
-- 📚 Added some travis example configs - these are available in /examples. (#228)
-
-### 1.0.0
-
-_10 November 2019_
-
-- 🌟 Add support for building Python 3.8 wheels! (#180)
-- 🌟 Add support for building manylinux2010 wheels. cibuildwheel will now
-  build using the manylinux2010 images by default. If your project is still
-  manylinux1 compatible, you should get both manylinux1 and manylinux2010
-  wheels - you can upload both to PyPI. If you always require manylinux1 wheels, you can
-  build using the old manylinux1 image using the [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) option.
-  (#155)
-- 📚 Documentation is now on its [own mini-site](https://cibuildwheel.readthedocs.io),
-   rather than on the README (#169)
-- ✨ Add support for building Windows wheels on Travis CI. (#160)
-- 🛠 If you set `CIBW_TEST_COMMAND`, your tests now run in a virtualenv. (#164)
-- 🛠 Windows now uses Python as installed by nuget, rather than the versions
-  installed by the various CI providers. (#180)
-- 🛠 Update Python from 2.7.16 to 2.7.17 and 3.7.4 to 3.7.5 on macOS (#171)
-- ⚠️ Removed support for Python 3.4 (#168)
-
-### 0.12.0
-
-_29 September 2019_
-
-- ✨ Add CIBW_TEST_EXTRAS option, to allow testing using extra_require
-  options. For example, set `CIBW_TEST_EXTRAS=test,qt` to make the wheel
-  installed with `pip install <wheel_file>[test,qt]`
-- 🛠 Update Python from 3.7.2 to 3.7.4 on macOS
-- 🛠 Update OpenSSL patch to 1.0.2t on macOS
-
-### 0.11.1
-
-_28 May 2019_
-
-- 🐛 Fix missing file in the release tarball, that was causing problems with
-  Windows builds (#141)
-
-### 0.11.0
-
-_26 May 2019_
-
-- 🌟 Add support for building on Azure pipelines! This lets you build all
-  Linux, Mac and Windows wheels on one service, so it promises to be the
-  easiest to set up! Check out the quickstart in the docs, or
-  [cibuildwheel-azure-example](https://github.com/joerick/cibuildwheel-azure-example)
-  for an example project. (#126, #132)
-- 🛠 Internal change - the end-to-end test projects format was updated, so we
-  can more precisely assert what should be produced for each one. (#136, #137).
-
-### 0.10.2
-
-_10 March 2019_
-
-- 🛠 Revert temporary fix in macOS, that was working around a bug in pip 19 (#129)
-- 🛠 Update Python to 2.7.16 on macOS
-- 🛠 Update OpenSSL patch to 1.0.2r on macOS
-
-### 0.10.1
-
-_3 February 2019_
-
-- 🐛 Fix build stalling on macOS (that was introduced in pip 19) (#122)
-- 🐛 Fix "AttributeError: 'Popen' object has no attribute 'args'" on Python 2.7 for Linux builds (#108)
-- 🛠 Update Python from 3.6.7, 3.7.1 to 3.6.8, 3.7.2 on macOS
-- 🛠 Update openssl patch from 1.0.2p to 1.0.2q on macOS
-- 🛠 Sorting build options dict items when printing preamble (#114)
-
-### 0.10.0
-
-_23 September 2018_
-
-- 🌟 Add `CIBW_BUILD` option, for specifying which specific builds to perform (#101)
-- 🌟 Add support for building Mac and Linux on CircleCI (#91, #97)
-- 🛠 Improved support for building universal wheels (#95)
-- 🛠 Ensure log output is unbuffered and therefore in the correct order (#92)
-- 🛠 Improved error reporting for errors that occur inside a package's setup.py (#88)
-- ⚠️ Removed support for Python 3.3 on Windows.
-
-### 0.9.4
-
-_29 July 2018_
-
-- 🛠 CIBW_TEST_COMMAND now runs in a shell on Mac (as well as Linux) (#81)
-
-### 0.9.3
-
-_10 July 2018_
-
-- 🛠 Update to Python 3.6.6 on macOS (#82)
-- ✨ Add support for building Python 3.7 wheels on Windows (#76)
-- ⚠️ Deprecated support for Python 3.3 on Windows.
-
-### 0.9.2
-
-_1 July 2018_
-
-- 🛠  Update Python 3.7.0rc1 to 3.7.0 on macOS (#79)
-
-### 0.9.1
-
-_18 June 2018_
-
-- 🛠 Removed the need to use `{python}` and `{pip}` in `CIBW_BEFORE_BUILD` statements, by ensuring the correct version is always on the path at `python` and `pip` instead. (#60)
-- 🛠 We now patch the _ssl module on Python 3.4 and 3.5 so these versions can still make SSL web requests using TLS 1.2 while building. (#71)
-
-### 0.9.0
-
-_18 June 2018_
-
-- ✨ Add support for Python 3.7 (#73)
-
-### 0.8.0
-
-_4 May 2018_
-
-- ⚠️ Drop support for Python 3.3 on Linux (#67)
-- 🐛 Fix TLS by updating setuptools (#69)
-
-### 0.7.1
-
-_2 April 2017_
-
-- 🐛 macOS: Fix Pip bugs resulting from PyPI TLS 1.2 enforcement
-- 🐛 macOS: Fix brew Python3 version problems in the CI
-
-### 0.7.0
-
-_7 January 2018_
-
-- ✨ You can now specify a custom docker image using the `CIBW_MANYLINUX1_X86_64_IMAGE` and `CIBW_MANYLINUX1_I686_IMAGE` options. (#46)
-- 🐛 Fixed a bug where cibuildwheel would download and build a package from PyPI(!) instead of building the package on the local machine. (#51)
-
-### 0.6.0
-
-_9 October 2017_
-
-- ✨ On the Linux build, the host filesystem is now accessible via `/host` (#36)
-- 🐛 Fixed a bug where setup.py scripts would run the wrong version of Python when running subprocesses on Linux (#35)
-
-### 0.5.1
-
-_10 September 2017_
-
-- 🐛 Fixed a couple of bugs on Python 3.
-- ✨ Added experimental support for Mac builds on [Bitrise.io](https://www.bitrise.io)
-
-### 0.5.0
-
-_7 September 2017_
-
-- ✨ `CIBW_ENVIRONMENT` added. You can now set environment variables for each build, even within the Docker container on Linux. This is a big one! (#21)
-- ✨ `CIBW_BEFORE_BUILD` now runs in a system shell on all platforms. You can now do things like `CIBW_BEFORE_BUILD="cmd1 && cmd2"`. (#32)
-
-### 0.4.1
-
-_14 August 2017_
-
-- 🐛 Fixed a bug on Windows where subprocess' output was hidden (#23)
-- 🐛 Fixed a bug on AppVeyor where logs would appear in the wrong order due to output buffering (#24, thanks @YannickJadoul!)
-
-### 0.4.0
-
-_23 July 2017_
-
-- 🐛 Fixed a bug that was increasing the build time by building the wheel twice. This was a problem for large projects that have a long build time. If you're upgrading and you need the old behaviour, use `CIBW_BEFORE_BUILD={pip} install .`, or install exactly the dependencies you need in `CIBW_BEFORE_BUILD`. See #18.
-
-### 0.3.0
-
-_27 June 2017_
-
-- ⚠️ Removed Python 2.6 support on Linux (#12)
-
-### 0.2.1
-
-_11 June 2017_
-
-- 🛠 Changed the build process to install the package before building the wheel - this allows direct dependencies to be installed first (#9, thanks @tgarc!)
-- ✨ Added Python 3 support for the main process, for systems where Python 3 is the default (#8, thanks @tgarc).
-
-### 0.2.0
-
-_13 April 2017_
-
-- ✨ Added `CIBW_SKIP` option, letting users explicitly skip a build
-- ✨ Added `CIBW_BEFORE_BUILD` option, letting users run a shell command before the build starts
-
-### 0.1.3
-
-_31 March 2017_
-
-- 🌟 First public release!
-
-<!--changelog-end-->
 
 Contributing
 ============
 
 For more info on how to contribute to cibuildwheel, see the [docs](https://cibuildwheel.readthedocs.io/en/latest/contributing/).
 
+Everyone interacting with the cibuildwheel project via codebase, issue tracker, chat rooms, or otherwise is expected to follow the [PSF Code of Conduct](https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md).
+
 Maintainers
 -----------
 
@@ -878,9 +273,9 @@ Credits
 
 Massive props also to-
 
-- @zfrenchee for [help debugging many issues](https://github.com/joerick/cibuildwheel/issues/2)
+- @zfrenchee for [help debugging many issues](https://github.com/pypa/cibuildwheel/issues/2)
-- @lelit for some great bug reports and [contributions](https://github.com/joerick/cibuildwheel/pull/73)
+- @lelit for some great bug reports and [contributions](https://github.com/pypa/cibuildwheel/pull/73)
-- @mayeut for a [phenomenal PR](https://github.com/joerick/cibuildwheel/pull/71) patching Python itself for better compatibility!
+- @mayeut for a [phenomenal PR](https://github.com/pypa/cibuildwheel/pull/71) patching Python itself for better compatibility!
 - @czaki for being a super-contributor over many PRs and helping out with countless issues!
 - @mattip for his help with adding PyPy support to cibuildwheel
 

action.yml

@@ -17,12 +17,12 @@ runs:
   using: composite
   steps:
 
-    # This needs powershell-core because github.action path is a Windows-style
+    # Redirecting stderr to stdout to fix interleaving issue in Actions.
-    # path on Windows.  Powershell-core understands both types of paths.
     - run: >
         pipx run
-        --spec ${{ github.action_path }}
+        --spec '${{ github.action_path }}'
         cibuildwheel
         ${{ inputs.package-dir }}
         --output-dir ${{ inputs.output-dir }}
-      shell: pwsh
+        2>&1
+      shell: bash

appveyor.yml

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

azure-pipelines.yml

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

bin/bump_version.py

@@ -18,7 +18,7 @@ import cibuildwheel
 config = [
     # file path, version find/replace format
     ("README.md", "cibuildwheel=={}"),
-    ("cibuildwheel/__init__.py", "__version__ = '{}'"),
+    ("cibuildwheel/__init__.py", '__version__ = "{}"'),
     ("docs/faq.md", "cibuildwheel=={}"),
     ("docs/faq.md", "cibuildwheel@v{}"),
     ("docs/setup.md", "cibuildwheel=={}"),
@@ -52,7 +52,7 @@ def bump_version() -> None:
         cd_date, cd_time, cd_tz = commit_date_str.split(" ")
 
         url_opts = urllib.parse.urlencode({"q": f"is:pr merged:>{cd_date}T{cd_time}{cd_tz}"})
-        url = f"https://github.com/joerick/cibuildwheel/pulls?{url_opts}"
+        url = f"https://github.com/pypa/cibuildwheel/pulls?{url_opts}"
 
         print(f"PRs merged since last release:\n  {url}")
         print()
@@ -136,6 +136,25 @@ def bump_version() -> None:
     while input('Type "done" to continue: ').strip().lower() != "done":
         pass
 
+    # run pre-commit to update the README changelog
+    subprocess.run(
+        [
+            "pre-commit",
+            "run",
+            "--files=docs/changelog.md",
+        ]
+    )
+
+    # run pre-commit to check that no errors occurred on the second run
+    subprocess.run(
+        [
+            "pre-commit",
+            "run",
+            "--files=docs/changelog.md",
+        ],
+        check=True,
+    )
+
     subprocess.run(
         [
             "git",

bin/make_dependency_update_pr.py

@@ -40,7 +40,7 @@ def main():
     timestamp = time.strftime("%Y-%m-%dT%H-%M-%S", time.gmtime())
     branch_name = f"update-constraints-{timestamp}"
 
-    shell(f"git checkout -b {branch_name} origin/master", check=True)
+    shell(f"git checkout -b {branch_name} origin/main", check=True)
 
     try:
         shell("bin/update_dependencies.py", check=True)
@@ -62,8 +62,8 @@ def main():
                 "gh",
                 "pr",
                 "create",
-                "--repo=joerick/cibuildwheel",
+                "--repo=pypa/cibuildwheel",
-                "--base=master",
+                "--base=main",
                 "--title=Update dependencies",
                 f"--body='{body}'",
             ],

bin/projects.py

@@ -5,7 +5,7 @@ Convert a yaml project list into a nice table.
 
 Suggested usage:
 
-    ./bin/projects.py docs/data/projects.yml --online --auth $GITHUB_API_TOKEN --readme README.md
+    ./bin/projects.py docs/data/projects.yml --online --auth $GITHUB_API_TOKEN
     git diff
 """
 
@@ -62,7 +62,7 @@ class Project:
                 print(f"Broken: {self.stars_repo}")
                 raise
 
-            self.num_stars = repo.stargazers_count
+            self.num_stars: int = repo.stargazers_count
             self.pushed_at = repo.pushed_at
             if not self.notes:
                 notes = repo.description
@@ -139,28 +139,35 @@ def fetch_icon(icon_name: str) -> None:
         f.write(svgElement.toxml())
 
 
-def path_for_icon(icon_name: str) -> Path:
+def path_for_icon(icon_name: str, relative_to: Path | None = None) -> Path:
-    return Path(".") / "docs" / "data" / "readme_icons" / f"{icon_name}.svg"
+    from_path = Path.cwd() if relative_to is None else relative_to.parent
+
+    absolute_path = PROJECT_ROOT / "docs" / "data" / "readme_icons" / f"{icon_name}.svg"
+
+    return absolute_path.resolve().relative_to(from_path.resolve())
 
 
-def str_projects(
+def get_projects(
     config: list[dict[str, Any]],
     *,
     online: bool = True,
     auth: str | None = None,
-) -> str:
+) -> list[Project]:
-    io = StringIO()
-    print = functools.partial(builtins.print, file=io)
-
     if online:
         for icon in ICONS:
             fetch_icon(icon)
 
     github = Github(auth) if online else None
 
-    projects = sorted((Project(item, github) for item in config), reverse=online)
+    return sorted((Project(item, github) for item in config), reverse=online)
+
+
+def render_projects(projects: list[Project], *, dest_path: Path, include_info: bool = True):
+    io = StringIO()
+    print = functools.partial(builtins.print, file=io)
 
     print(Project.header())
+
     for project in projects:
         print(project.table_row())
 
@@ -170,42 +177,73 @@ def str_projects(
 
     print()
     for icon in ICONS:
-        print(f"[{icon} icon]: {path_for_icon(icon).as_posix()}")
+        print(f"[{icon} icon]: {path_for_icon(icon, relative_to=dest_path).as_posix()}")
 
-    print()
+    if include_info:
-    for project in projects:
+        print()
-        print(project.info())
+        for project in projects:
+            print(project.info())
 
     return io.getvalue()
 
 
-@click.command(help="Try ./bin/projects.py docs/data/projects.yml --readme README.md")
+def insert_projects_table(
+    file: Path,
+    *,
+    projects: list[Project],
+    input_filename: str,
+    include_info: bool = True,
+):
+    text = file.read_text()
+    projects_table = render_projects(projects, include_info=include_info, dest_path=file)
+
+    start_str = "<!-- START bin/projects.py -->\n"
+
+    start = text.find(start_str)
+    assert start != -1
+
+    end = text.find("<!-- END bin/projects.py -->\n")
+    assert end != -1
+
+    generated_note = f"<!-- this section is generated by bin/projects.py. Don't edit it directly, instead, edit {input_filename} -->"
+    new_text = (
+        f"{text[:start + len(start_str)]}\n{generated_note}\n\n{projects_table}\n{text[end:]}"
+    )
+
+    file.write_text(new_text)
+
+
+PROJECT_ROOT = Path(__file__).parent / ".."
+README_FILE = PROJECT_ROOT / "README.md"
+DOCS_PAGE = PROJECT_ROOT / "docs" / "working-examples.md"
+
+
+@click.command(help="Try ./bin/projects.py docs/data/projects.yml")
 @click.argument("input", type=click.File("r"))
 @click.option("--online/--no-online", default=True, help="Get info from GitHub")
 @click.option("--auth", help="GitHub authentication token")
-@click.option("--readme", type=click.File("r+"), help="Modify a readme file if given")
+@click.option(
+    "--dry-run", default=False, help="Print the output, rather than writing it to files in the repo"
+)
 def projects(
     input: TextIO,
     online: bool,
     auth: str | None,
-    readme: TextIO | None,
+    dry_run: bool,
 ) -> None:
     config = yaml.safe_load(input)
-    output = str_projects(config, online=online, auth=auth)
+    projects = get_projects(config, online=online, auth=auth)
 
-    if readme is None:
+    if dry_run:
+        output = render_projects(projects, dest_path=README_FILE)
         print(output)
     else:
-        text = readme.read()
+        insert_projects_table(
-        start_str = "<!-- START bin/projects.py -->\n"
+            README_FILE, projects=projects[:10], input_filename=input.name, include_info=False
-        start = text.find(start_str)
+        )
-        end = text.find("<!-- END bin/projects.py -->\n")
+        insert_projects_table(
-        generated_note = f"<!-- this section is generated by bin/projects.py. Don't edit it directly, instead, edit {input.name} -->"
+            DOCS_PAGE, projects=projects, input_filename=input.name, include_info=True
-        new_text = f"{text[:start + len(start_str)]}\n{generated_note}\n\n{output}\n{text[end:]}"
+        )
-
-        readme.seek(0)
-        readme.write(new_text)
-        readme.truncate()
 
 
 if __name__ == "__main__":

bin/run_example_ci_configs.py

@@ -39,7 +39,7 @@ services = [
     CIService(
         name="appveyor",
         dst_config_path="appveyor.yml",
-        badge_md="[![Build status](https://ci.appveyor.com/api/projects/status/wbsgxshp05tt1tif/branch/{branch}?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/{branch})",
+        badge_md="[![Build status](https://ci.appveyor.com/api/projects/status/wbsgxshp05tt1tif/branch/{branch}?svg=true)](https://ci.appveyor.com/project/pypa/cibuildwheel/branch/{branch})",
     ),
     CIService(
         name="azure-pipelines",
@@ -49,22 +49,22 @@ services = [
     CIService(
         name="circleci",
         dst_config_path=".circleci/config.yml",
-        badge_md="[![CircleCI](https://circleci.com/gh/joerick/cibuildwheel/tree/{branch_escaped}.svg?style=svg)](https://circleci.com/gh/joerick/cibuildwheel/tree/{branch})",
+        badge_md="[![CircleCI](https://circleci.com/gh/pypa/cibuildwheel/tree/{branch_escaped}.svg?style=svg)](https://circleci.com/gh/pypa/cibuildwheel/tree/{branch})",
     ),
     CIService(
         name="github",
         dst_config_path=".github/workflows/example.yml",
-        badge_md="[![Build](https://github.com/joerick/cibuildwheel/workflows/Build/badge.svg?branch={branch})](https://github.com/joerick/cibuildwheel/actions)",
+        badge_md="[![Build](https://github.com/pypa/cibuildwheel/workflows/Build/badge.svg?branch={branch})](https://github.com/pypa/cibuildwheel/actions)",
     ),
     CIService(
         name="travis-ci",
         dst_config_path=".travis.yml",
-        badge_md="[![Build Status](https://travis-ci.org/joerick/cibuildwheel.svg?branch={branch})](https://travis-ci.org/joerick/cibuildwheel)",
+        badge_md="[![Build Status](https://travis-ci.org/pypa/cibuildwheel.svg?branch={branch})](https://travis-ci.org/pypa/cibuildwheel)",
     ),
     CIService(
         name="gitlab",
         dst_config_path=".gitlab-ci.yml",
-        badge_md="[![Gitlab](https://gitlab.com/joerick/cibuildwheel/badges/{branch}/pipeline.svg)](https://gitlab.com/joerick/cibuildwheel/-/commits/{branch})",
+        badge_md="[![Gitlab](https://gitlab.com/pypa/cibuildwheel/badges/{branch}/pipeline.svg)](https://gitlab.com/pypa/cibuildwheel/-/commits/{branch})",
     ),
 ]
 
@@ -140,9 +140,7 @@ def run_example_ci_configs(config_files=None):
         print()
         print("> **Examples test run**")
         print("> ")
-        print(
+        print(f"> Branch: [{branch_name}](https://github.com/pypa/cibuildwheel/tree/{branch_name})")
-            f"> Branch: [{branch_name}](https://github.com/joerick/cibuildwheel/tree/{branch_name})"
-        )
         print("> ")
         print("> | Service | Config | Status |")
         print("> |---|---|---|")

bin/run_tests.py

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

bin/update_dependencies.py

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

bin/update_docker.py

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

bin/update_pythons.py

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

bin/update_readme_changelog.py

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

cibuildwheel/__init__.py

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

cibuildwheel/__main__.py

@@ -5,7 +5,7 @@ import textwrap
 import traceback
 from configparser import ConfigParser
 from pathlib import Path
-from typing import Dict, List, Optional, Set, Union, overload
+from typing import Dict, List, Optional, Set, Union
 
 from packaging.specifiers import SpecifierSet
 
@@ -16,9 +16,11 @@ import cibuildwheel.util
 import cibuildwheel.windows
 from cibuildwheel.architecture import Architecture, allowed_architectures_check
 from cibuildwheel.environment import EnvironmentParseError, parse_environment
+from cibuildwheel.options import ConfigOptions
 from cibuildwheel.projectfiles import get_requires_python_str
 from cibuildwheel.typing import PLATFORMS, PlatformName, assert_never
 from cibuildwheel.util import (
+    BuildFrontend,
     BuildOptions,
     BuildSelector,
     DependencyConstraints,
@@ -28,39 +30,24 @@ from cibuildwheel.util import (
     resources_dir,
 )
 
+MANYLINUX_ARCHS = (
+    "x86_64",
+    "i686",
+    "pypy_x86_64",
+    "aarch64",
+    "ppc64le",
+    "s390x",
+    "pypy_aarch64",
+    "pypy_i686",
+)
 
-@overload
+MUSLLINUX_ARCHS = (
-def get_option_from_environment(
+    "x86_64",
-    option_name: str, *, platform: Optional[str] = None, default: str
+    "i686",
-) -> str:
+    "aarch64",
-    ...  # noqa: E704
+    "ppc64le",
-
+    "s390x",
-
+)
-@overload
-def get_option_from_environment(
-    option_name: str, *, platform: Optional[str] = None, default: None = None
-) -> Optional[str]:
-    ...  # noqa: E704 E302
-
-
-def get_option_from_environment(
-    option_name: str, *, platform: Optional[str] = None, default: Optional[str] = None
-) -> Optional[str]:  # noqa: E302
-    """
-    Returns an option from the environment, optionally scoped by the platform.
-
-    Example:
-      get_option_from_environment('CIBW_COLOR', platform='macos')
-
-      This will return the value of CIBW_COLOR_MACOS if it exists, otherwise the value of
-      CIBW_COLOR.
-    """
-    if platform:
-        option = os.environ.get(f"{option_name}_{platform.upper()}")
-        if option is not None:
-            return option
-
-    return os.environ.get(option_name, default)
 
 
 def main() -> None:
@@ -69,8 +56,9 @@ def main() -> None:
     parser = argparse.ArgumentParser(
         description="Build wheels for all the platforms.",
         epilog="""
-            Most options are supplied via environment variables.
+            Most options are supplied via environment variables or in
-            See https://github.com/joerick/cibuildwheel#options for info.
+            --config-file (pyproject.toml usually). See
+            https://github.com/pypa/cibuildwheel#options for info.
         """,
     )
 
@@ -104,10 +92,17 @@ def main() -> None:
 
     parser.add_argument(
         "--output-dir",
-        default=os.environ.get("CIBW_OUTPUT_DIR", "wheelhouse"),
         help="Destination folder for the wheels.",
     )
 
+    parser.add_argument(
+        "--config-file",
+        help="""
+            TOML config file for cibuildwheel. Defaults to pyproject.toml, but
+            can be overridden with this option.
+        """,
+    )
+
     parser.add_argument(
         "package_dir",
         default=".",
@@ -132,9 +127,13 @@ def main() -> None:
         help="Do not report an error code if the build does not match any wheels.",
     )
 
-    args = parser.parse_args()
+    parser.add_argument(
+        "--prerelease-pythons",
+        action="store_true",
+        help="Enable pre-release Python versions if available.",
+    )
 
-    detect_obsolete_options()
+    args = parser.parse_args()
 
     if args.platform != "auto":
         platform = args.platform
@@ -172,58 +171,82 @@ def main() -> None:
         sys.exit(2)
 
     package_dir = Path(args.package_dir)
-    output_dir = Path(args.output_dir)
 
-    if platform == "linux":
+    manylinux_identifiers = {
-        repair_command_default = "auditwheel repair -w {dest_dir} {wheel}"
+        f"manylinux-{build_platform}-image" for build_platform in MANYLINUX_ARCHS
-    elif platform == "macos":
+    }
-        repair_command_default = "delocate-listdeps {wheel} && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}"
+    musllinux_identifiers = {
-    elif platform == "windows":
+        f"musllinux-{build_platform}-image" for build_platform in MUSLLINUX_ARCHS
-        repair_command_default = ""
+    }
+    disallow = {
+        "linux": {"dependency-versions"},
+        "macos": manylinux_identifiers | musllinux_identifiers,
+        "windows": manylinux_identifiers | musllinux_identifiers,
+    }
+    options = ConfigOptions(package_dir, args.config_file, platform=platform, disallow=disallow)
+    output_dir = Path(
+        args.output_dir
+        if args.output_dir is not None
+        else os.environ.get("CIBW_OUTPUT_DIR", "wheelhouse")
+    )
+
+    build_config = options("build", env_plat=False, sep=" ") or "*"
+    skip_config = options("skip", env_plat=False, sep=" ")
+    test_skip = options("test-skip", env_plat=False, sep=" ")
+
+    archs_config_str = args.archs or options("archs", sep=" ")
+
+    build_frontend_str = options("build-frontend", env_plat=False)
+    environment_config = options("environment", table={"item": '{k}="{v}"', "sep": " "})
+    before_all = options("before-all", sep=" && ")
+    before_build = options("before-build", sep=" && ")
+    repair_command = options("repair-wheel-command", sep=" && ")
+
+    dependency_versions = options("dependency-versions")
+    test_command = options("test-command", sep=" && ")
+    before_test = options("before-test", sep=" && ")
+    test_requires = options("test-requires", sep=" ").split()
+    test_extras = options("test-extras", sep=",")
+    build_verbosity_str = options("build-verbosity")
+
+    prerelease_pythons = args.prerelease_pythons or cibuildwheel.util.strtobool(
+        os.environ.get("CIBW_PRERELEASE_PYTHONS", "0")
+    )
+
+    build_frontend: BuildFrontend
+    if build_frontend_str == "build":
+        build_frontend = "build"
+    elif build_frontend_str == "pip":
+        build_frontend = "pip"
     else:
-        assert_never(platform)
+        msg = f"cibuildwheel: Unrecognised build frontend '{build_frontend}', only 'pip' and 'build' are supported"
-
+        print(msg, file=sys.stderr)
-    build_config = os.environ.get("CIBW_BUILD") or "*"
+        sys.exit(2)
-    skip_config = os.environ.get("CIBW_SKIP", "")
-    test_skip = os.environ.get("CIBW_TEST_SKIP", "")
-    environment_config = get_option_from_environment(
-        "CIBW_ENVIRONMENT", platform=platform, default=""
-    )
-    before_all = get_option_from_environment("CIBW_BEFORE_ALL", platform=platform, default="")
-    before_build = get_option_from_environment("CIBW_BEFORE_BUILD", platform=platform)
-    repair_command = get_option_from_environment(
-        "CIBW_REPAIR_WHEEL_COMMAND", platform=platform, default=repair_command_default
-    )
-    dependency_versions = get_option_from_environment(
-        "CIBW_DEPENDENCY_VERSIONS", platform=platform, default="pinned"
-    )
-    test_command = get_option_from_environment("CIBW_TEST_COMMAND", platform=platform)
-    before_test = get_option_from_environment("CIBW_BEFORE_TEST", platform=platform)
-    test_requires = get_option_from_environment(
-        "CIBW_TEST_REQUIRES", platform=platform, default=""
-    ).split()
-    test_extras = get_option_from_environment("CIBW_TEST_EXTRAS", platform=platform, default="")
-    build_verbosity_str = get_option_from_environment(
-        "CIBW_BUILD_VERBOSITY", platform=platform, default=""
-    )
 
     package_files = {"setup.py", "setup.cfg", "pyproject.toml"}
 
     if not any(package_dir.joinpath(name).exists() for name in package_files):
         names = ", ".join(sorted(package_files, reverse=True))
-        print(
+        msg = f"cibuildwheel: Could not find any of {{{names}}} at root of package"
-            f"cibuildwheel: Could not find any of {{{names}}} at root of package", file=sys.stderr
+        print(msg, file=sys.stderr)
-        )
         sys.exit(2)
 
+    # This is not supported in tool.cibuildwheel, as it comes from a standard location.
     # Passing this in as an environment variable will override pyproject.toml, setup.cfg, or setup.py
     requires_python_str: Optional[str] = os.environ.get(
         "CIBW_PROJECT_REQUIRES_PYTHON"
     ) or get_requires_python_str(package_dir)
     requires_python = None if requires_python_str is None else SpecifierSet(requires_python_str)
 
+    deprecated_selectors("CIBW_BUILD", build_config, error=True)
+    deprecated_selectors("CIBW_SKIP", skip_config)
+    deprecated_selectors("CIBW_TEST_SKIP", test_skip)
+
     build_selector = BuildSelector(
-        build_config=build_config, skip_config=skip_config, requires_python=requires_python
+        build_config=build_config,
+        skip_config=skip_config,
+        requires_python=requires_python,
+        prerelease_pythons=prerelease_pythons,
     )
     test_selector = TestSelector(skip_config=test_skip)
 
@@ -256,13 +279,6 @@ def main() -> None:
     # This needs to be passed on to the docker container in linux.py
     os.environ["CIBUILDWHEEL"] = "1"
 
-    if args.archs is not None:
-        archs_config_str = args.archs
-    else:
-        archs_config_str = get_option_from_environment(
-            "CIBW_ARCHS", platform=platform, default="auto"
-        )
-
     archs = Architecture.parse_config(archs_config_str, platform=platform)
 
     identifiers = get_build_identifiers(platform, build_selector, archs)
@@ -272,7 +288,8 @@ def main() -> None:
             print(identifier)
         sys.exit(0)
 
-    manylinux_images: Optional[Dict[str, str]] = None
+    manylinux_images: Dict[str, str] = {}
+    musllinux_images: Dict[str, str] = {}
     if platform == "linux":
         pinned_docker_images_file = resources_dir / "pinned_docker_images.cfg"
         all_pinned_docker_images = ConfigParser()
@@ -283,15 +300,12 @@ def main() -> None:
         #   'pypy_x86_64': {'manylinux2010': '...' }
         #   ... }
 
-        manylinux_images = {}
+        for build_platform in MANYLINUX_ARCHS:
-
-        for build_platform in ["x86_64", "i686", "pypy_x86_64", "aarch64", "ppc64le", "s390x"]:
             pinned_images = all_pinned_docker_images[build_platform]
 
-            config_name = f"CIBW_MANYLINUX_{build_platform.upper()}_IMAGE"
+            config_value = options(f"manylinux-{build_platform}-image", ignore_empty=True)
-            config_value = os.environ.get(config_name)
 
-            if config_value is None:
+            if not config_value:
                 # default to manylinux2010 if it's available, otherwise manylinux2014
                 image = pinned_images.get("manylinux2010") or pinned_images.get("manylinux2014")
             elif config_value in pinned_images:
@@ -301,6 +315,20 @@ def main() -> None:
 
             manylinux_images[build_platform] = image
 
+        for build_platform in MUSLLINUX_ARCHS:
+            pinned_images = all_pinned_docker_images[build_platform]
+
+            config_value = options(f"musllinux-{build_platform}-image")
+
+            if config_value is None:
+                image = pinned_images.get("musllinux_1_1")
+            elif config_value in pinned_images:
+                image = pinned_images[config_value]
+            else:
+                image = config_value
+
+            musllinux_images[build_platform] = image
+
     build_options = BuildOptions(
         architectures=archs,
         package_dir=package_dir,
@@ -317,7 +345,9 @@ def main() -> None:
         repair_command=repair_command,
         environment=environment,
         dependency_constraints=dependency_constraints,
-        manylinux_images=manylinux_images,
+        manylinux_images=manylinux_images or None,
+        musllinux_images=musllinux_images or None,
+        build_frontend=build_frontend,
     )
 
     # Python is buffering by default when running on the CI platforms, giving problems interleaving subprocess call output with unflushed calls to 'print'
@@ -352,35 +382,12 @@ def main() -> None:
             assert_never(platform)
 
 
-def detect_obsolete_options() -> None:
+def deprecated_selectors(name: str, selector: str, *, error: bool = False) -> None:
-    # Check the old 'MANYLINUX1_*_IMAGE' options
+    if "p2" in selector or "p35" in selector:
-    for (deprecated, alternative) in [
+        msg = f"cibuildwheel 2.x no longer supports Python < 3.6. Please use the 1.x series or update {name}"
-        ("CIBW_MANYLINUX1_X86_64_IMAGE", "CIBW_MANYLINUX_X86_64_IMAGE"),
+        print(msg, file=sys.stderr)
-        ("CIBW_MANYLINUX1_I686_IMAGE", "CIBW_MANYLINUX_I686_IMAGE"),
+        if error:
-    ]:
+            sys.exit(4)
-        if deprecated in os.environ:
-            print(
-                f"'{deprecated}' has been deprecated, and will be removed in a future release. Use the option '{alternative}' instead."
-            )
-            if alternative not in os.environ:
-                print(f"Using value of option '{deprecated}' as replacement for '{alternative}'")
-                os.environ[alternative] = os.environ[deprecated]
-            else:
-                print(f"Option '{alternative}' is not empty. Please unset '{deprecated}'")
-                sys.exit(2)
-
-    # Check for deprecated identifiers in 'CIBW_BUILD' and 'CIBW_SKIP' options
-    for option in ["CIBW_BUILD", "CIBW_SKIP"]:
-        for deprecated, alternative in [
-            ("manylinux1", "manylinux"),
-            ("macosx_10_6_intel", "macosx_x86_64"),
-            ("macosx_10_9_x86_64", "macosx_x86_64"),
-        ]:
-            if option in os.environ and deprecated in os.environ[option]:
-                print(
-                    f"Build identifiers with '{deprecated}' have been deprecated. Replacing all occurences of '{deprecated}' with '{alternative}' in the option '{option}'"
-                )
-                os.environ[option] = os.environ[option].replace(deprecated, alternative)
 
 
 def print_preamble(platform: str, build_options: BuildOptions) -> None:

cibuildwheel/linux.py

@@ -7,7 +7,7 @@ from typing import List, NamedTuple, Set
 from .architecture import Architecture
 from .docker_container import DockerContainer
 from .logger import log
-from .typing import PathOrStr
+from .typing import PathOrStr, assert_never
 from .util import (
     BuildOptions,
     BuildSelector,
@@ -15,7 +15,6 @@ from .util import (
     get_build_verbosity_extra_flags,
     prepare_command,
     read_python_configs,
-    resources_dir,
 )
 
 
@@ -62,6 +61,7 @@ def build(options: BuildOptions) -> None:
         sys.exit(2)
 
     assert options.manylinux_images is not None
+    assert options.musllinux_images is not None
     python_configurations = get_python_configurations(options.build_selector, options.architectures)
     platforms = [
         ("cp", "manylinux_x86_64", options.manylinux_images["x86_64"]),
@@ -70,6 +70,13 @@ def build(options: BuildOptions) -> None:
         ("cp", "manylinux_ppc64le", options.manylinux_images["ppc64le"]),
         ("cp", "manylinux_s390x", options.manylinux_images["s390x"]),
         ("pp", "manylinux_x86_64", options.manylinux_images["pypy_x86_64"]),
+        ("pp", "manylinux_aarch64", options.manylinux_images["pypy_aarch64"]),
+        ("pp", "manylinux_i686", options.manylinux_images["pypy_i686"]),
+        ("cp", "musllinux_x86_64", options.musllinux_images["x86_64"]),
+        ("cp", "musllinux_i686", options.musllinux_images["i686"]),
+        ("cp", "musllinux_aarch64", options.musllinux_images["aarch64"]),
+        ("cp", "musllinux_ppc64le", options.musllinux_images["ppc64le"]),
+        ("cp", "musllinux_s390x", options.musllinux_images["s390x"]),
     ]
 
     cwd = Path.cwd()
@@ -122,26 +129,6 @@ def build(options: BuildOptions) -> None:
                     log.build_start(config.identifier)
 
                     dependency_constraint_flags: List[PathOrStr] = []
-                    if config.identifier.startswith("pp"):
-                        # Patch PyPy to make sure headers get installed into a venv
-                        patch_version = "_27" if config.version == "2.7" else ""
-                        patch_path = resources_dir / f"pypy_venv{patch_version}.patch"
-                        patch_docker_path = PurePath("/pypy_venv.patch")
-                        docker.copy_into(patch_path, patch_docker_path)
-                        try:
-                            docker.call(
-                                [
-                                    "patch",
-                                    "--force",
-                                    "-p1",
-                                    "-d",
-                                    config.path,
-                                    "-i",
-                                    patch_docker_path,
-                                ]
-                            )
-                        except subprocess.CalledProcessError:
-                            print("PyPy patch not applied", file=sys.stderr)
 
                     if options.dependency_constraints:
                         constraints_file = options.dependency_constraints.get_for_python_version(
@@ -164,7 +151,7 @@ def build(options: BuildOptions) -> None:
                         env, executor=docker.environment_executor
                     )
 
-                    # check config python and pip are still on PATH
+                    # check config python is still on PATH
                     which_python = docker.call(
                         ["which", "python"], env=env, capture_output=True
                     ).strip()
@@ -199,18 +186,38 @@ def build(options: BuildOptions) -> None:
                     docker.call(["rm", "-rf", built_wheel_dir])
                     docker.call(["mkdir", "-p", built_wheel_dir])
 
-                    docker.call(
+                    verbosity_flags = get_build_verbosity_extra_flags(options.build_verbosity)
-                        [
+
-                            "pip",
+                    if options.build_frontend == "pip":
-                            "wheel",
+                        docker.call(
-                            container_package_dir,
+                            [
-                            "--wheel-dir",
+                                "python",
-                            built_wheel_dir,
+                                "-m",
-                            "--no-deps",
+                                "pip",
-                            *get_build_verbosity_extra_flags(options.build_verbosity),
+                                "wheel",
-                        ],
+                                container_package_dir,
-                        env=env,
+                                f"--wheel-dir={built_wheel_dir}",
-                    )
+                                "--no-deps",
+                                *verbosity_flags,
+                            ],
+                            env=env,
+                        )
+                    elif options.build_frontend == "build":
+                        config_setting = " ".join(verbosity_flags)
+                        docker.call(
+                            [
+                                "python",
+                                "-m",
+                                "build",
+                                container_package_dir,
+                                "--wheel",
+                                f"--outdir={built_wheel_dir}",
+                                f"--config-setting={config_setting}",
+                            ],
+                            env=env,
+                        )
+                    else:
+                        assert_never(options.build_frontend)
 
                     built_wheel = docker.glob(built_wheel_dir, "*.whl")[0]
 
@@ -305,15 +312,27 @@ def build(options: BuildOptions) -> None:
             log.step_end_with_error(
                 f"Command {error.cmd} failed with code {error.returncode}. {error.stdout}"
             )
-            troubleshoot(options.package_dir, error)
+            troubleshoot(options, error)
             sys.exit(1)
 
 
-def troubleshoot(package_dir: Path, error: Exception) -> None:
+def _matches_prepared_command(error_cmd: List[str], command_template: str) -> bool:
-    if isinstance(error, subprocess.CalledProcessError) and error.cmd[0:2] == ["pip", "wheel"]:
+    if len(error_cmd) < 3 or error_cmd[0:2] != ["sh", "-c"]:
-        # the 'pip wheel' step failed.
+        return False
+    command_prefix = command_template.split("{", maxsplit=1)[0].strip()
+    return error_cmd[2].startswith(command_prefix)
+
+
+def troubleshoot(options: BuildOptions, error: Exception) -> None:
+
+    if isinstance(error, subprocess.CalledProcessError) and (
+        error.cmd[0:4] == ["python", "-m", "pip", "wheel"]
+        or error.cmd[0:3] == ["python", "-m", "build"]
+        or _matches_prepared_command(error.cmd, options.repair_command)
+    ):
+        # the wheel build step failed
         print("Checking for common errors...")
-        so_files = list(package_dir.glob("**/*.so"))
+        so_files = list(options.package_dir.glob("**/*.so"))
 
         if so_files:
             print(
@@ -322,10 +341,17 @@ def troubleshoot(package_dir: Path, error: Exception) -> None:
                     NOTE: Shared object (.so) files found in this project.
 
                     These files might be built against the wrong OS, causing problems with
-                    auditwheel.
+                    auditwheel. If possible, run cibuildwheel in a clean checkout.
 
                     If you're using Cython and have previously done an in-place build,
                     remove those build files (*.so and *.c) before starting cibuildwheel.
+
+                    setuptools uses the build/ folder to store its build cache. It
+                    may be necessary to remove those build files (*.so and *.o) before
+                    starting cibuildwheel.
+
+                    Files that belong to a virtual environment are probably not an issue
+                    unless you used a custom command telling cibuildwheel to activate it.
                     """
                 ),
                 file=sys.stderr,

cibuildwheel/logger.py

@@ -20,6 +20,11 @@ PLATFORM_IDENTIFIER_DESCIPTIONS = {
     "manylinux_aarch64": "manylinux aarch64",
     "manylinux_ppc64le": "manylinux ppc64le",
     "manylinux_s390x": "manylinux s390x",
+    "musllinux_x86_64": "musllinux x86_64",
+    "musllinux_i686": "musllinux i686",
+    "musllinux_aarch64": "musllinux aarch64",
+    "musllinux_ppc64le": "musllinux ppc64le",
+    "musllinux_s390x": "manylinux s390x",
     "win32": "Windows 32bit",
     "win_amd64": "Windows 64bit",
     "macosx_x86_64": "macOS x86_64",
@@ -186,7 +191,7 @@ def build_description_from_identifier(identifier: str) -> str:
     build_description = ""
 
     python_interpreter = python_identifier[0:2]
-    python_version = python_identifier[2:4]
+    python_version = python_identifier[2:]
 
     if python_interpreter == "cp":
         build_description += "CPython"
@@ -195,7 +200,7 @@ def build_description_from_identifier(identifier: str) -> str:
     else:
         raise Exception("unknown python")
 
-    build_description += f" {python_version[0]}.{python_version[1]} "
+    build_description += f" {python_version[0]}.{python_version[1:]} "
 
     try:
         build_description += PLATFORM_IDENTIFIER_DESCIPTIONS[platform_identifier]

cibuildwheel/macos.py

@@ -12,18 +12,18 @@ from typing import Any, Dict, List, NamedTuple, Optional, Sequence, Set, Tuple,
 from .architecture import Architecture
 from .environment import ParsedEnvironment
 from .logger import log
-from .typing import Literal, PathOrStr
+from .typing import Literal, PathOrStr, assert_never
 from .util import (
+    BuildFrontend,
     BuildOptions,
     BuildSelector,
     NonPlatformWheelError,
     download,
     get_build_verbosity_extra_flags,
-    get_pip_script,
+    get_pip_version,
     install_certifi_script,
     prepare_command,
     read_python_configs,
-    resources_dir,
     unwrap,
 )
 
@@ -111,21 +111,6 @@ def get_python_configurations(
                 c for c in python_configurations if not c.identifier.startswith("pp")
             ]
 
-        if any(c.identifier.startswith("cp35") for c in python_configurations):
-            # CPython 3.5 doesn't work on macOS 11
-            log.warning(
-                unwrap(
-                    """
-                    CPython 3.5 is unsupported when building on macOS 11. To build CPython 3.5
-                    wheels, build on an older OS, such as macOS 10.15. To silence this warning,
-                    deselect CPython 3.5 by adding "cp35-macosx_x86_64" to your CIBW_SKIP option.
-                    """
-                )
-            )
-            python_configurations = [
-                c for c in python_configurations if not c.identifier.startswith("cp35")
-            ]
-
     return python_configurations
 
 
@@ -156,7 +141,7 @@ def install_cpython(version: str, url: str) -> Path:
 
     # if this version of python isn't installed, get it from python.org and install
     python_package_identifier = f"org.python.Python.PythonFramework-{version}"
-    python_executable = "python3" if version[0] == "3" else "python"
+    python_executable = "python3"
     installation_bin_path = Path(f"/Library/Frameworks/Python.framework/Versions/{version}/bin")
 
     if python_package_identifier not in installed_system_packages:
@@ -164,24 +149,9 @@ def install_cpython(version: str, url: str) -> Path:
         download(url, Path("/tmp/Python.pkg"))
         # install
         call(["sudo", "installer", "-pkg", "/tmp/Python.pkg", "-target", "/"])
-        # patch open ssl
-        if version == "3.5":
-            open_ssl_patch_url = f"https://github.com/mayeut/patch-macos-python-openssl/releases/download/v1.1.1h/patch-macos-python-{version}-openssl-v1.1.1h.tar.gz"
-            download(open_ssl_patch_url, Path("/tmp/python-patch.tar.gz"))
-            call(
-                [
-                    "sudo",
-                    "tar",
-                    "-C",
-                    f"/Library/Frameworks/Python.framework/Versions/{version}/",
-                    "-xmf",
-                    "/tmp/python-patch.tar.gz",
-                ]
-            )
-
         call(["sudo", str(installation_bin_path / python_executable), str(install_certifi_script)])
 
-    pip_executable = "pip3" if version[0] == "3" else "pip"
+    pip_executable = "pip3"
     make_symlinks(installation_bin_path, python_executable, pip_executable)
 
     return installation_bin_path
@@ -197,14 +167,10 @@ def install_pypy(version: str, url: str) -> Path:
         downloaded_tar_bz2 = Path("/tmp") / pypy_tar_bz2
         download(url, downloaded_tar_bz2)
         call(["tar", "-C", "/tmp", "-xf", downloaded_tar_bz2])
-        # Patch PyPy to make sure headers get installed into a venv
-        patch_version = "_27" if version == "2.7" else ""
-        patch_path = resources_dir / f"pypy_venv{patch_version}.patch"
-        call(["patch", "--force", "-p1", "-d", installation_path, "-i", patch_path])
 
     installation_bin_path = installation_path / "bin"
-    python_executable = "pypy3" if version[0] == "3" else "pypy"
+    python_executable = "pypy3"
-    pip_executable = "pip3" if version[0] == "3" else "pip"
+    pip_executable = "pip3"
     make_symlinks(installation_bin_path, python_executable, pip_executable)
 
     return installation_bin_path
@@ -214,7 +180,9 @@ def setup_python(
     python_configuration: PythonConfiguration,
     dependency_constraint_flags: Sequence[PathOrStr],
     environment: ParsedEnvironment,
+    build_frontend: BuildFrontend,
 ) -> Dict[str, str]:
+
     implementation_id = python_configuration.identifier.split("-")[0]
     log.step(f"Installing Python {implementation_id}...")
 
@@ -263,8 +231,29 @@ def setup_python(
         )
         sys.exit(1)
 
-    # install pip & wheel
+    # Install pip
-    call(["python", get_pip_script, *dependency_constraint_flags], env=env, cwd="/tmp")
+
+    requires_reinstall = not (installation_bin_path / "pip").exists()
+    if requires_reinstall:
+        # maybe pip isn't installed at all. ensurepip resolves that.
+        call(["python", "-m", "ensurepip"], env=env, cwd="/tmp")
+
+    # upgrade pip to the version matching our constraints
+    # if necessary, reinstall it to ensure that it's available on PATH as 'pip'
+    call(
+        [
+            "python",
+            "-m",
+            "pip",
+            "install",
+            "--force-reinstall" if requires_reinstall else "--upgrade",
+            "pip",
+            *dependency_constraint_flags,
+        ],
+        env=env,
+        cwd="/tmp",
+    )
+
     assert (installation_bin_path / "pip").exists()
     call(["which", "pip"], env=env)
     call(["pip", "--version"], env=env)
@@ -279,36 +268,26 @@ def setup_python(
         sys.exit(1)
 
     # Set MACOSX_DEPLOYMENT_TARGET to 10.9, if the user didn't set it.
-    # CPython 3.5 defaults to 10.6, and pypy defaults to 10.7, causing
+    # PyPy defaults to 10.7, causing inconsistencies if it's left unset.
-    # inconsistencies if it's left unset.
     env.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.9")
 
     config_is_arm64 = python_configuration.identifier.endswith("arm64")
     config_is_universal2 = python_configuration.identifier.endswith("universal2")
 
-    if python_configuration.version == "3.5":
+    if python_configuration.version not in {"3.6", "3.7"}:
-        # Cross-compilation platform override - CPython 3.5 has an
+        if config_is_arm64:
-        # i386/x86_64 version of Python, but we only want a x64_64 build
-        env.setdefault("_PYTHON_HOST_PLATFORM", "macosx-10.9-x86_64")
-        # https://github.com/python/cpython/blob/a5ed2fe0eedefa1649aa93ee74a0bafc8e628a10/Lib/_osx_support.py#L260
-        env.setdefault("ARCHFLAGS", "-arch x86_64")
-
-    if python_configuration.version == "3.9":
-        if python_configuration.identifier.endswith("x86_64"):
-            # even on the macos11.0 Python installer, on the x86_64 side it's
-            # compatible back to 10.9.
-            env.setdefault("_PYTHON_HOST_PLATFORM", "macosx-10.9-x86_64")
-            env.setdefault("ARCHFLAGS", "-arch x86_64")
-        elif config_is_arm64:
             # macOS 11 is the first OS with arm64 support, so the wheels
             # have that as a minimum.
             env.setdefault("_PYTHON_HOST_PLATFORM", "macosx-11.0-arm64")
             env.setdefault("ARCHFLAGS", "-arch arm64")
         elif config_is_universal2:
-            if get_macos_version() < (10, 16):
+            env.setdefault("_PYTHON_HOST_PLATFORM", "macosx-10.9-universal2")
-                # we can do universal2 builds on macos 10.15, but we need to
+            env.setdefault("ARCHFLAGS", "-arch arm64 -arch x86_64")
-                # set ARCHFLAGS otherwise CPython sets it to `-arch x86_64`
+        elif python_configuration.identifier.endswith("x86_64"):
-                env.setdefault("ARCHFLAGS", "-arch arm64 -arch x86_64")
+            # even on the macos11.0 Python installer, on the x86_64 side it's
+            # compatible back to 10.9.
+            env.setdefault("_PYTHON_HOST_PLATFORM", "macosx-10.9-x86_64")
+            env.setdefault("ARCHFLAGS", "-arch x86_64")
 
     building_arm64 = config_is_arm64 or config_is_universal2
     if building_arm64 and get_macos_version() < (10, 16) and "SDKROOT" not in env:
@@ -333,18 +312,33 @@ def setup_python(
             env.setdefault("SDKROOT", arm64_compatible_sdks[0])
 
     log.step("Installing build tools...")
-    call(
+    if build_frontend == "pip":
-        [
+        call(
-            "pip",
+            [
-            "install",
+                "pip",
-            "--upgrade",
+                "install",
-            "setuptools",
+                "--upgrade",
-            "wheel",
+                "setuptools",
-            "delocate",
+                "wheel",
-            *dependency_constraint_flags,
+                "delocate",
-        ],
+                *dependency_constraint_flags,
-        env=env,
+            ],
-    )
+            env=env,
+        )
+    elif build_frontend == "build":
+        call(
+            [
+                "pip",
+                "install",
+                "--upgrade",
+                "delocate",
+                "build[virtualenv]",
+                *dependency_constraint_flags,
+            ],
+            env=env,
+        )
+    else:
+        assert_never(build_frontend)
 
     return env
 
@@ -381,7 +375,12 @@ def build(options: BuildOptions) -> None:
                     options.dependency_constraints.get_for_python_version(config.version),
                 ]
 
-            env = setup_python(config, dependency_constraint_flags, options.environment)
+            env = setup_python(
+                config,
+                dependency_constraint_flags,
+                options.environment,
+                options.build_frontend,
+            )
 
             if options.before_build:
                 log.step("Running before_build...")
@@ -395,20 +394,45 @@ def build(options: BuildOptions) -> None:
                 shutil.rmtree(built_wheel_dir)
             built_wheel_dir.mkdir(parents=True)
 
-            # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org
+            verbosity_flags = get_build_verbosity_extra_flags(options.build_verbosity)
-            # see https://github.com/joerick/cibuildwheel/pull/369
+
-            call(
+            if options.build_frontend == "pip":
-                [
+                # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org
-                    "pip",
+                # see https://github.com/pypa/cibuildwheel/pull/369
-                    "wheel",
+                call(
-                    options.package_dir.resolve(),
+                    [
-                    "--wheel-dir",
+                        "python",
-                    built_wheel_dir,
+                        "-m",
-                    "--no-deps",
+                        "pip",
-                    *get_build_verbosity_extra_flags(options.build_verbosity),
+                        "wheel",
-                ],
+                        options.package_dir.resolve(),
-                env=env,
+                        f"--wheel-dir={built_wheel_dir}",
-            )
+                        "--no-deps",
+                        *verbosity_flags,
+                    ],
+                    env=env,
+                )
+            elif options.build_frontend == "build":
+                config_setting = " ".join(verbosity_flags)
+                build_env = env.copy()
+                if options.dependency_constraints:
+                    constr = options.dependency_constraints.get_for_python_version(config.version)
+                    build_env["PIP_CONSTRAINT"] = constr.as_uri()
+                build_env["VIRTUALENV_PIP"] = get_pip_version(env)
+                call(
+                    [
+                        "python",
+                        "-m",
+                        "build",
+                        options.package_dir,
+                        "--wheel",
+                        f"--outdir={built_wheel_dir}",
+                        f"--config-setting={config_setting}",
+                    ],
+                    env=build_env,
+                )
+            else:
+                assert_never(options.build_frontend)
 
             built_wheel = next(built_wheel_dir.glob("*.whl"))
 

cibuildwheel/options.py

@@ -0,0 +1,185 @@
+import os
+from pathlib import Path
+from typing import Any, Dict, List, Mapping, Optional, Set, Tuple, Union
+
+import toml
+
+from .typing import PLATFORMS, TypedDict
+from .util import resources_dir
+
+Setting = Union[Dict[str, str], List[str], str]
+
+
+class TableFmt(TypedDict):
+    item: str
+    sep: str
+
+
+class ConfigOptionError(KeyError):
+    pass
+
+
+def _dig_first(*pairs: Tuple[Mapping[str, Setting], str], ignore_empty: bool = False) -> Setting:
+    """
+    Return the first dict item that matches from pairs of dicts and keys.
+    Will throw a KeyError if missing.
+
+    _dig_first((dict1, "key1"), (dict2, "key2"), ...)
+    """
+    if not pairs:
+        raise ValueError("pairs cannot be empty")
+
+    for dict_like, key in pairs:
+        if key in dict_like:
+            value = dict_like[key]
+
+            if ignore_empty and value == "":
+                continue
+
+            return value
+
+    raise KeyError(key)
+
+
+class ConfigOptions:
+    """
+    Gets options from the environment, config or defaults, optionally scoped
+    by the platform.
+
+    Example:
+      >>> options = ConfigOptions(package_dir, platform='macos')
+      >>> options('cool-color')
+
+      This will return the value of CIBW_COOL_COLOR_MACOS if it exists,
+      otherwise the value of CIBW_COOL_COLOR, otherwise
+      'tool.cibuildwheel.macos.cool-color' or 'tool.cibuildwheel.cool-color'
+      from pyproject.toml, or from cibuildwheel/resources/defaults.toml. An
+      error is thrown if there are any unexpected keys or sections in
+      tool.cibuildwheel.
+    """
+
+    def __init__(
+        self,
+        package_path: Path,
+        config_file: Optional[str] = None,
+        *,
+        platform: str,
+        disallow: Optional[Dict[str, Set[str]]] = None,
+    ) -> None:
+        self.platform = platform
+        self.disallow = disallow or {}
+
+        # Open defaults.toml, loading both global and platform sections
+        defaults_path = resources_dir / "defaults.toml"
+        self.default_options, self.default_platform_options = self._load_file(defaults_path)
+
+        # Load the project config file
+        config_options: Dict[str, Any] = {}
+        config_platform_options: Dict[str, Any] = {}
+
+        if config_file is not None:
+            config_path = Path(config_file.format(package=package_path))
+            config_options, config_platform_options = self._load_file(config_path)
+        else:
+            # load pyproject.toml, if it's available
+            pyproject_toml_path = package_path / "pyproject.toml"
+            if pyproject_toml_path.exists():
+                config_options, config_platform_options = self._load_file(pyproject_toml_path)
+
+        # Validate project config
+        for option_name in config_options:
+            if not self._is_valid_global_option(option_name):
+                raise ConfigOptionError(f'Option "{option_name}" not supported in a config file')
+
+        for option_name in config_platform_options:
+            if not self._is_valid_platform_option(option_name):
+                raise ConfigOptionError(
+                    f'Option "{option_name}" not supported in the "{self.platform}" section'
+                )
+
+        self.config_options = config_options
+        self.config_platform_options = config_platform_options
+
+    def _is_valid_global_option(self, name: str) -> bool:
+        """
+        Returns True if an option with this name is allowed in the
+        [tool.cibuildwheel] section of a config file.
+        """
+        allowed_option_names = self.default_options.keys() | PLATFORMS
+
+        return name in allowed_option_names
+
+    def _is_valid_platform_option(self, name: str) -> bool:
+        """
+        Returns True if an option with this name is allowed in the
+        [tool.cibuildwheel.<current-platform>] section of a config file.
+        """
+        disallowed_platform_options = self.disallow.get(self.platform, set())
+        if name in disallowed_platform_options:
+            return False
+
+        allowed_option_names = self.default_options.keys() | self.default_platform_options.keys()
+
+        return name in allowed_option_names
+
+    def _load_file(self, filename: Path) -> Tuple[Dict[str, Any], Dict[str, Any]]:
+        """
+        Load a toml file, returns global and platform as separate dicts.
+        """
+        config = toml.load(filename)
+
+        global_options = config.get("tool", {}).get("cibuildwheel", {})
+        platform_options = global_options.get(self.platform, {})
+
+        return global_options, platform_options
+
+    def __call__(
+        self,
+        name: str,
+        *,
+        env_plat: bool = True,
+        sep: Optional[str] = None,
+        table: Optional[TableFmt] = None,
+        ignore_empty: bool = False,
+    ) -> str:
+        """
+        Get and return the value for the named option from environment,
+        configuration file, or the default. If env_plat is False, then don't
+        accept platform versions of the environment variable. If this is an
+        array it will be merged with "sep" before returning. If it is a table,
+        it will be formatted with "table['item']" using {k} and {v} and merged
+        with "table['sep']". Empty variables will not override if ignore_empty
+        is True.
+        """
+
+        if name not in self.default_options and name not in self.default_platform_options:
+            raise ConfigOptionError(f"{name} must be in cibuildwheel/resources/defaults.toml file")
+
+        # Environment variable form
+        envvar = f"CIBW_{name.upper().replace('-', '_')}"
+        plat_envvar = f"{envvar}_{self.platform.upper()}"
+
+        # get the option from the environment, then the config file, then finally the default.
+        # platform-specific options are preferred, if they're allowed.
+        result = _dig_first(
+            (os.environ if env_plat else {}, plat_envvar),  # type: ignore
+            (os.environ, envvar),
+            (self.config_platform_options, name),
+            (self.config_options, name),
+            (self.default_platform_options, name),
+            (self.default_options, name),
+            ignore_empty=ignore_empty,
+        )
+
+        if isinstance(result, dict):
+            if table is None:
+                raise ConfigOptionError(f"{name} does not accept a table")
+            return table["sep"].join(table["item"].format(k=k, v=v) for k, v in result.items())
+        elif isinstance(result, list):
+            if sep is None:
+                raise ConfigOptionError(f"{name} does not accept a list")
+            return sep.join(result)
+        elif isinstance(result, int):
+            return str(result)
+        else:
+            return result

cibuildwheel/resources/build-platforms.toml

@@ -1,69 +1,87 @@
 [linux]
 python_configurations = [
-  { identifier = "cp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/cp27-cp27m" },
-  { identifier = "cp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/cp27-cp27mu" },
-  { identifier = "cp35-manylinux_x86_64", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
   { identifier = "cp36-manylinux_x86_64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-manylinux_x86_64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-manylinux_x86_64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
   { identifier = "cp39-manylinux_x86_64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
-  { identifier = "cp27-manylinux_i686", version = "2.7", path_str = "/opt/python/cp27-cp27m" },
+  { identifier = "cp310-manylinux_x86_64", version = "3.10", path_str = "/opt/python/cp310-cp310" },
-  { identifier = "cp27-manylinux_i686", version = "2.7", path_str = "/opt/python/cp27-cp27mu" },
-  { identifier = "cp35-manylinux_i686", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
   { identifier = "cp36-manylinux_i686", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-manylinux_i686", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-manylinux_i686", version = "3.8", path_str = "/opt/python/cp38-cp38" },
   { identifier = "cp39-manylinux_i686", version = "3.9", path_str = "/opt/python/cp39-cp39" },
-  { identifier = "pp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/pp27-pypy_73" },
+  { identifier = "cp310-manylinux_i686", version = "3.10", path_str = "/opt/python/cp310-cp310" },
-  { identifier = "pp36-manylinux_x86_64", version = "3.6", path_str = "/opt/python/pp36-pypy36_pp73" },
   { identifier = "pp37-manylinux_x86_64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
-  { identifier = "cp35-manylinux_aarch64", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
   { identifier = "cp36-manylinux_aarch64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-manylinux_aarch64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-manylinux_aarch64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
   { identifier = "cp39-manylinux_aarch64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
-  { identifier = "cp35-manylinux_ppc64le", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
+  { identifier = "cp310-manylinux_aarch64", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { identifier = "cp36-manylinux_ppc64le", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-manylinux_ppc64le", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-manylinux_ppc64le", version = "3.8", path_str = "/opt/python/cp38-cp38" },
   { identifier = "cp39-manylinux_ppc64le", version = "3.9", path_str = "/opt/python/cp39-cp39" },
-  { identifier = "cp35-manylinux_s390x", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
+  { identifier = "cp310-manylinux_ppc64le", version = "3.10", path_str = "/opt/python/cp310-cp310" },
   { identifier = "cp36-manylinux_s390x", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
   { identifier = "cp37-manylinux_s390x", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
   { identifier = "cp38-manylinux_s390x", version = "3.8", path_str = "/opt/python/cp38-cp38" },
   { identifier = "cp39-manylinux_s390x", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp310-manylinux_s390x", version = "3.10", path_str = "/opt/python/cp310-cp310" },
+  { identifier = "pp37-manylinux_aarch64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
+  { identifier = "pp37-manylinux_i686", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
+  { identifier = "cp36-musllinux_x86_64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-musllinux_x86_64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-musllinux_x86_64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-musllinux_x86_64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp310-musllinux_x86_64", version = "3.10", path_str = "/opt/python/cp310-cp310" },
+  { identifier = "cp36-musllinux_i686", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-musllinux_i686", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-musllinux_i686", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-musllinux_i686", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp310-musllinux_i686", version = "3.10", path_str = "/opt/python/cp310-cp310" },
+  { identifier = "cp36-musllinux_aarch64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-musllinux_aarch64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-musllinux_aarch64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-musllinux_aarch64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp310-musllinux_aarch64", version = "3.10", path_str = "/opt/python/cp310-cp310" },
+  { identifier = "cp36-musllinux_ppc64le", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-musllinux_ppc64le", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-musllinux_ppc64le", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-musllinux_ppc64le", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp310-musllinux_ppc64le", version = "3.10", path_str = "/opt/python/cp310-cp310" },
+  { identifier = "cp36-musllinux_s390x", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
+  { identifier = "cp37-musllinux_s390x", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
+  { identifier = "cp38-musllinux_s390x", version = "3.8", path_str = "/opt/python/cp38-cp38" },
+  { identifier = "cp39-musllinux_s390x", version = "3.9", path_str = "/opt/python/cp39-cp39" },
+  { identifier = "cp310-musllinux_s390x", version = "3.10", path_str = "/opt/python/cp310-cp310" },
 ]
 
 [macos]
 python_configurations = [
-  { identifier = "cp27-macosx_x86_64", version = "2.7", url = "https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg" },
-  { identifier = "cp35-macosx_x86_64", version = "3.5", url = "https://www.python.org/ftp/python/3.5.4/python-3.5.4-macosx10.6.pkg" },
   { identifier = "cp36-macosx_x86_64", version = "3.6", url = "https://www.python.org/ftp/python/3.6.8/python-3.6.8-macosx10.9.pkg" },
   { identifier = "cp37-macosx_x86_64", version = "3.7", url = "https://www.python.org/ftp/python/3.7.9/python-3.7.9-macosx10.9.pkg" },
-  { identifier = "cp38-macosx_x86_64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.9/python-3.8.9-macosx10.9.pkg" },
+  { identifier = "cp38-macosx_x86_64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" },
-  { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.4/python-3.9.4-macos11.pkg" },
+  { identifier = "cp38-macosx_arm64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" },
-  { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.4/python-3.9.4-macos11.pkg" },
+  { identifier = "cp38-macosx_universal2", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" },
-  { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.4/python-3.9.4-macos11.pkg" },
+  { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.7/python-3.9.7-macos11.pkg" },
-  { identifier = "pp27-macosx_x86_64", version = "2.7", url = "https://downloads.python.org/pypy/pypy2.7-v7.3.3-osx64.tar.bz2" },
+  { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.7/python-3.9.7-macos11.pkg" },
-  { identifier = "pp36-macosx_x86_64", version = "3.6", url = "https://downloads.python.org/pypy/pypy3.6-v7.3.3-osx64.tar.bz2" },
+  { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.7/python-3.9.7-macos11.pkg" },
-  { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.3-osx64.tar.bz2" },
+  { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0rc2-macos11.pkg" },
+  { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0rc2-macos11.pkg" },
+  { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0rc2-macos11.pkg" },
+  { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5-osx64.tar.bz2" },
 ]
 
 [windows]
 python_configurations = [
-  { identifier = "cp27-win32", version = "2.7.18", arch = "32" },
-  { identifier = "cp27-win_amd64", version = "2.7.18", arch = "64" },
-  { identifier = "cp35-win32", version = "3.5.4", arch = "32" },
-  { identifier = "cp35-win_amd64", version = "3.5.4", arch = "64" },
   { identifier = "cp36-win32", version = "3.6.8", arch = "32" },
   { identifier = "cp36-win_amd64", version = "3.6.8", arch = "64" },
   { identifier = "cp37-win32", version = "3.7.9", arch = "32" },
   { identifier = "cp37-win_amd64", version = "3.7.9", arch = "64" },
-  { identifier = "cp38-win32", version = "3.8.9", arch = "32" },
+  { identifier = "cp38-win32", version = "3.8.10", arch = "32" },
-  { identifier = "cp38-win_amd64", version = "3.8.9", arch = "64" },
+  { identifier = "cp38-win_amd64", version = "3.8.10", arch = "64" },
-  { identifier = "cp39-win32", version = "3.9.4", arch = "32" },
+  { identifier = "cp39-win32", version = "3.9.7", arch = "32" },
-  { identifier = "cp39-win_amd64", version = "3.9.4", arch = "64" },
+  { identifier = "cp39-win_amd64", version = "3.9.7", arch = "64" },
-  { identifier = "pp27-win32", version = "2.7", arch = "32", url = "https://downloads.python.org/pypy/pypy2.7-v7.3.3-win32.zip" },
+  { identifier = "cp310-win32", version = "3.10.0-rc2", arch = "32" },
-  { identifier = "pp36-win32", version = "3.6", arch = "32", url = "https://downloads.python.org/pypy/pypy3.6-v7.3.3-win32.zip" },
+  { identifier = "cp310-win_amd64", version = "3.10.0-rc2", arch = "64" },
-  { identifier = "pp37-win32", version = "3.7", arch = "32", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.3-win32.zip" },
+  { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5-win64.zip" },
 ]

cibuildwheel/resources/constraints-python27.txt

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

cibuildwheel/resources/constraints-python35.txt

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

cibuildwheel/resources/constraints-python36.txt

@@ -1,38 +1,46 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.6
 # To update, run:
 #
 #    bin/update_dependencies.py
 #
-appdirs==1.4.4
+backports.entry-points-selectable==1.1.0
     # via virtualenv
-delocate==0.8.2
+delocate==0.9.1
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.1
+distlib==0.3.2
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
-importlib-metadata==3.10.0
+importlib-metadata==4.8.1
+    # via
+    #   backports.entry-points-selectable
+    #   virtualenv
+importlib-resources==5.2.2
     # via virtualenv
-importlib-resources==5.1.2
+platformdirs==2.3.0
     # via virtualenv
-six==1.15.0
+six==1.16.0
-    # via virtualenv
+    # via
-typing-extensions==3.7.4.3
+    #   delocate
-    # via importlib-metadata
+    #   virtualenv
-virtualenv==20.4.3
+typing-extensions==3.10.0.2
+    # via
+    #   delocate
+    #   importlib-metadata
+virtualenv==20.8.0
     # via -r cibuildwheel/resources/constraints.in
-wheel==0.36.2
+wheel==0.37.0
     # via
     #   -r cibuildwheel/resources/constraints.in
     #   delocate
-zipp==3.4.1
+zipp==3.5.0
     # via
     #   importlib-metadata
     #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.0.1
+pip==21.2.4
     # via -r cibuildwheel/resources/constraints.in
-setuptools==54.2.0
+setuptools==58.0.4
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python37.txt

@@ -1,34 +1,42 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.7
 # To update, run:
 #
 #    bin/update_dependencies.py
 #
-appdirs==1.4.4
+backports.entry-points-selectable==1.1.0
     # via virtualenv
-delocate==0.8.2
+delocate==0.9.1
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.1
+distlib==0.3.2
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
-importlib-metadata==3.10.0
+importlib-metadata==4.8.1
+    # via
+    #   backports.entry-points-selectable
+    #   virtualenv
+platformdirs==2.3.0
     # via virtualenv
-six==1.15.0
+six==1.16.0
-    # via virtualenv
+    # via
-typing-extensions==3.7.4.3
+    #   delocate
-    # via importlib-metadata
+    #   virtualenv
-virtualenv==20.4.3
+typing-extensions==3.10.0.2
+    # via
+    #   delocate
+    #   importlib-metadata
+virtualenv==20.8.0
     # via -r cibuildwheel/resources/constraints.in
-wheel==0.36.2
+wheel==0.37.0
     # via
     #   -r cibuildwheel/resources/constraints.in
     #   delocate
-zipp==3.4.1
+zipp==3.5.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.0.1
+pip==21.2.4
     # via -r cibuildwheel/resources/constraints.in
-setuptools==54.2.0
+setuptools==58.0.4
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python38.txt

@@ -1,28 +1,34 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
 #    bin/update_dependencies.py
 #
-appdirs==1.4.4
+backports.entry-points-selectable==1.1.0
     # via virtualenv
-delocate==0.8.2
+delocate==0.9.1
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.1
+distlib==0.3.2
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
-six==1.15.0
+platformdirs==2.3.0
     # via virtualenv
-virtualenv==20.4.3
+six==1.16.0
+    # via
+    #   delocate
+    #   virtualenv
+typing-extensions==3.10.0.2
+    # via delocate
+virtualenv==20.8.0
     # via -r cibuildwheel/resources/constraints.in
-wheel==0.36.2
+wheel==0.37.0
     # via
     #   -r cibuildwheel/resources/constraints.in
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.0.1
+pip==21.2.4
     # via -r cibuildwheel/resources/constraints.in
-setuptools==54.2.0
+setuptools==58.0.4
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python39.txt

@@ -1,28 +1,34 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
 #    bin/update_dependencies.py
 #
-appdirs==1.4.4
+backports.entry-points-selectable==1.1.0
     # via virtualenv
-delocate==0.8.2
+delocate==0.9.1
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.1
+distlib==0.3.2
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
-six==1.15.0
+platformdirs==2.3.0
     # via virtualenv
-virtualenv==20.4.3
+six==1.16.0
+    # via
+    #   delocate
+    #   virtualenv
+typing-extensions==3.10.0.2
+    # via delocate
+virtualenv==20.8.0
     # via -r cibuildwheel/resources/constraints.in
-wheel==0.36.2
+wheel==0.37.0
     # via
     #   -r cibuildwheel/resources/constraints.in
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.0.1
+pip==21.2.4
     # via -r cibuildwheel/resources/constraints.in
-setuptools==54.2.0
+setuptools==58.0.4
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints.txt

@@ -1,28 +1,34 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
 #    bin/update_dependencies.py
 #
-appdirs==1.4.4
+backports.entry-points-selectable==1.1.0
     # via virtualenv
-delocate==0.8.2
+delocate==0.9.1
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.1
+distlib==0.3.2
     # via virtualenv
 filelock==3.0.12
     # via virtualenv
-six==1.15.0
+platformdirs==2.3.0
     # via virtualenv
-virtualenv==20.4.3
+six==1.16.0
+    # via
+    #   delocate
+    #   virtualenv
+typing-extensions==3.10.0.2
+    # via delocate
+virtualenv==20.8.0
     # via -r cibuildwheel/resources/constraints.in
-wheel==0.36.2
+wheel==0.37.0
     # via
     #   -r cibuildwheel/resources/constraints.in
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.0.1
+pip==21.2.4
     # via -r cibuildwheel/resources/constraints.in
-setuptools==54.2.0
+setuptools==58.0.4
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/defaults.toml

@@ -0,0 +1,46 @@
+[tool.cibuildwheel]
+build = "*"
+skip = ""
+test-skip = ""
+
+archs = ["auto"]
+build-frontend = "pip"
+dependency-versions = "pinned"
+environment = {}
+build-verbosity = ""
+
+before-all = ""
+before-build = ""
+repair-wheel-command = ""
+
+test-command = ""
+before-test = ""
+test-requires = []
+test-extras = []
+
+manylinux-x86_64-image = "manylinux2010"
+manylinux-i686-image = "manylinux2010"
+manylinux-aarch64-image = "manylinux2014"
+manylinux-ppc64le-image = "manylinux2014"
+manylinux-s390x-image = "manylinux2014"
+manylinux-pypy_x86_64-image = "manylinux2010"
+manylinux-pypy_i686-image = "manylinux2010"
+manylinux-pypy_aarch64-image = "manylinux2014"
+
+musllinux-x86_64-image = "musllinux_1_1"
+musllinux-i686-image = "musllinux_1_1"
+musllinux-aarch64-image = "musllinux_1_1"
+musllinux-ppc64le-image = "musllinux_1_1"
+musllinux-s390x-image = "musllinux_1_1"
+
+
+[tool.cibuildwheel.linux]
+repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel}"
+
+[tool.cibuildwheel.macos]
+repair-wheel-command = [
+  "delocate-listdeps {wheel}",
+  "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}",
+]
+
+[tool.cibuildwheel.windows]

cibuildwheel/resources/install_certifi.py

@@ -24,9 +24,6 @@ STAT_0o775 = (
     | stat.S_IXOTH
 )
 
-if sys.version_info[0] == 2:
-    FileNotFoundError = OSError
-
 
 def main():
     openssl_dir, openssl_cafile = os.path.split(ssl.get_default_verify_paths().openssl_cafile)

cibuildwheel/resources/pinned_docker_images.cfg

@@ -1,27 +1,43 @@
 [x86_64]
-manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-04-05-14df3a6
+manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-09-19-4c6448f
-manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-02-06-3d322a5
+manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-09-19-a5ef179
-manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-04-05-b4fd19d
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-09-19-a5ef179
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-04-05-b4fd19d
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-09-19-a5ef179
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2021-09-19-a5ef179
 
 [i686]
-manylinux1 = quay.io/pypa/manylinux1_i686:2021-04-05-14df3a6
+manylinux1 = quay.io/pypa/manylinux1_i686:2021-09-19-4c6448f
-manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-02-06-3d322a5
+manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-09-19-a5ef179
-manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-04-05-b4fd19d
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-09-19-a5ef179
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-04-05-b4fd19d
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-09-19-a5ef179
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2021-09-19-a5ef179
 
 [pypy_x86_64]
-manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2020-12-11-f1e0e80
+manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-09-19-a5ef179
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-09-19-a5ef179
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-09-19-a5ef179
+
+[pypy_i686]
+manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-09-19-a5ef179
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-09-19-a5ef179
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-09-19-a5ef179
 
 [aarch64]
-manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-04-05-b4fd19d
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-09-19-a5ef179
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-04-05-b4fd19d
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-09-19-a5ef179
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2021-09-19-a5ef179
 
 [ppc64le]
-manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-04-05-b4fd19d
+manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-09-19-a5ef179
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2021-04-05-b4fd19d
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2021-09-19-a5ef179
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2021-09-19-a5ef179
 
 [s390x]
-manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-04-05-b4fd19d
+manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-09-19-a5ef179
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2021-04-05-b4fd19d
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2021-09-19-a5ef179
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2021-09-19-a5ef179
+
+[pypy_aarch64]
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-09-19-a5ef179
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-09-19-a5ef179
 

cibuildwheel/resources/pypy_venv.patch

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

cibuildwheel/resources/pypy_venv_27.patch

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

cibuildwheel/util.py

@@ -4,6 +4,8 @@ import itertools
 import os
 import re
 import ssl
+import subprocess
+import sys
 import textwrap
 import time
 import urllib.request
@@ -20,13 +22,14 @@ from packaging.version import Version
 
 from .architecture import Architecture
 from .environment import ParsedEnvironment
-from .typing import PathOrStr, PlatformName
+from .typing import Literal, PathOrStr, PlatformName
 
 resources_dir = Path(__file__).parent / "resources"
 
-get_pip_script = resources_dir / "get-pip.py"
 install_certifi_script = resources_dir / "install_certifi.py"
 
+BuildFrontend = Literal["pip", "build"]
+
 
 def prepare_command(command: str, **kwargs: PathOrStr) -> str:
     """
@@ -59,15 +62,25 @@ class IdentifierSelector:
     This class holds a set of build/skip patterns. You call an instance with a
     build identifier, and it returns True if that identifier should be
     included. Only call this on valid identifiers, ones that have at least 2
-    numeric digits before the first dash.
+    numeric digits before the first dash. If a pre-release version X.Y is present,
+    you can filter it with prerelease="XY".
     """
 
+    # a pattern that skips prerelease versions, when include_prereleases is False.
+    PRERELEASE_SKIP = ""
+
     def __init__(
-        self, *, build_config: str, skip_config: str, requires_python: Optional[SpecifierSet] = None
+        self,
+        *,
+        build_config: str,
+        skip_config: str,
+        requires_python: Optional[SpecifierSet] = None,
+        prerelease_pythons: bool = False,
     ):
         self.build_patterns = build_config.split()
         self.skip_patterns = skip_config.split()
         self.requires_python = requires_python
+        self.prerelease_pythons = prerelease_pythons
 
     def __call__(self, build_id: str) -> bool:
         # Filter build selectors by python_requires if set
@@ -82,17 +95,33 @@ class IdentifierSelector:
         build_patterns = itertools.chain.from_iterable(
             bracex.expand(p) for p in self.build_patterns
         )
-        skip_patterns = itertools.chain.from_iterable(bracex.expand(p) for p in self.skip_patterns)
+
+        unexpanded_skip_patterns = self.skip_patterns.copy()
+
+        if not self.prerelease_pythons:
+            # filter out the prerelease pythons, alongside the user-defined
+            # skip patterns
+            unexpanded_skip_patterns += BuildSelector.PRERELEASE_SKIP.split()
+
+        skip_patterns = itertools.chain.from_iterable(
+            bracex.expand(p) for p in unexpanded_skip_patterns
+        )
 
         build: bool = any(fnmatch.fnmatch(build_id, pat) for pat in build_patterns)
         skip: bool = any(fnmatch.fnmatch(build_id, pat) for pat in skip_patterns)
         return build and not skip
 
     def __repr__(self) -> str:
-        if not self.skip_patterns:
+        result = f'{self.__class__.__name__}(build_config={" ".join(self.build_patterns)!r}'
-            return f'{self.__class__.__name__}({" ".join(self.build_patterns)!r})'
+
-        else:
+        if self.skip_patterns:
-            return f'{self.__class__.__name__}({" ".join(self.build_patterns)!r} - {" ".join(self.skip_patterns)!r})'
+            result += f', skip_config={" ".join(self.skip_patterns)!r}'
+        if self.prerelease_pythons:
+            result += ", prerelease_pythons=True"
+
+        result += ")"
+
+        return result
 
 
 class BuildSelector(IdentifierSelector):
@@ -115,8 +144,8 @@ class Unbuffered:
         self.stream.write(data)
         self.stream.flush()
 
-    def writelines(self, datas):  # type: ignore
+    def writelines(self, data):  # type: ignore
-        self.stream.writelines(datas)
+        self.stream.writelines(data)
         self.stream.flush()
 
     def __getattr__(self, attr):  # type: ignore
@@ -163,7 +192,7 @@ class DependencyConstraints:
         version_parts = version.split(".")
 
         # try to find a version-specific dependency file e.g. if
-        # ./constraints.txt is the base, look for ./constraints-python27.txt
+        # ./constraints.txt is the base, look for ./constraints-python36.txt
         specific_stem = self.base_file_path.stem + f"-python{version_parts[0]}{version_parts[1]}"
         specific_name = specific_stem + self.base_file_path.suffix
         specific_file_path = self.base_file_path.with_name(specific_name)
@@ -186,6 +215,7 @@ class BuildOptions(NamedTuple):
     before_build: Optional[str]
     repair_command: str
     manylinux_images: Optional[Dict[str, str]]
+    musllinux_images: Optional[Dict[str, str]]
     dependency_constraints: Optional[DependencyConstraints]
     test_command: Optional[str]
     test_selector: TestSelector
@@ -193,6 +223,7 @@ class BuildOptions(NamedTuple):
     test_requires: List[str]
     test_extras: str
     build_verbosity: int
+    build_frontend: BuildFrontend
 
 
 class NonPlatformWheelError(Exception):
@@ -275,3 +306,18 @@ def print_new_wheels(msg: str, output_dir: Path) -> Iterator[None]:
     s = time.time() - start_time
     m = s / 60
     print(msg.format(n=n, s=s, m=m), *sorted(f"  {f.name}" for f in new_contents), sep="\n")
+
+
+def get_pip_version(env: Dict[str, str]) -> str:
+    # we use shell=True here for windows, even though we don't need a shell due to a bug
+    # https://bugs.python.org/issue8557
+    shell = sys.platform.startswith("win")
+    versions_output_text = subprocess.check_output(
+        ["python", "-m", "pip", "freeze", "--all"], universal_newlines=True, shell=shell, env=env
+    )
+    (pip_version,) = (
+        version[5:]
+        for version in versions_output_text.strip().splitlines()
+        if version.startswith("pip==")
+    )
+    return pip_version

cibuildwheel/windows.py

@@ -7,28 +7,27 @@ from pathlib import Path
 from typing import Dict, List, NamedTuple, Optional, Sequence, Set
 from zipfile import ZipFile
 
-import toml
-
 from .architecture import Architecture
 from .environment import ParsedEnvironment
 from .logger import log
-from .typing import PathOrStr
+from .typing import PathOrStr, assert_never
 from .util import (
+    BuildFrontend,
     BuildOptions,
     BuildSelector,
     NonPlatformWheelError,
     download,
     get_build_verbosity_extra_flags,
-    get_pip_script,
+    get_pip_version,
     prepare_command,
     read_python_configs,
 )
 
-IS_RUNNING_ON_AZURE = Path("C:\\hostedtoolcache").exists()
+CIBW_INSTALL_PATH = Path("C:\\cibw")
 
 
 def call(
-    args: Sequence[PathOrStr], env: Optional[Dict[str, str]] = None, cwd: Optional[str] = None
+    args: Sequence[PathOrStr], env: Optional[Dict[str, str]] = None, cwd: Optional[PathOrStr] = None
 ) -> None:
     print("+ " + " ".join(str(a) for a in args))
     # we use shell=True here, even though we don't need a shell due to a bug
@@ -36,13 +35,15 @@ def call(
     subprocess.run([str(a) for a in args], env=env, cwd=cwd, shell=True, check=True)
 
 
-def shell(command: str, env: Optional[Dict[str, str]] = None, cwd: Optional[str] = None) -> None:
+def shell(
+    command: str, env: Optional[Dict[str, str]] = None, cwd: Optional[PathOrStr] = None
+) -> None:
     print(f"+ {command}")
     subprocess.run(command, env=env, cwd=cwd, shell=True, check=True)
 
 
 def get_nuget_args(version: str, arch: str) -> List[str]:
-    python_name = "python" if version[0] == "3" else "python2"
+    python_name = "python"
     if arch == "32":
         python_name += "x86"
     return [
@@ -52,7 +53,7 @@ def get_nuget_args(version: str, arch: str) -> List[str]:
         "-FallbackSource",
         "https://api.nuget.org/v3/index.json",
         "-OutputDirectory",
-        "C:\\cibw\\python",
+        str(CIBW_INSTALL_PATH / "python"),
     ]
 
 
@@ -77,13 +78,6 @@ def get_python_configurations(
         "64": Architecture.AMD64,
     }
 
-    # Only supported with custom compiler, since MS removed the 2008 compiler download
-    custom_compiler = os.environ.get("DISTUTILS_USE_SDK") and os.environ.get("MSSdk")
-    if not custom_compiler:
-        python_configurations = [
-            c for c in python_configurations if not c.version.startswith("2.7")
-        ]
-
     # skip builds as required
     python_configurations = [
         c
@@ -107,19 +101,18 @@ def install_cpython(version: str, arch: str, nuget: Path) -> Path:
 
 
 def install_pypy(version: str, arch: str, url: str) -> Path:
-    assert arch == "32"
+    assert arch == "64" and "win64" in url
     # Inside the PyPy zip file is a directory with the same name
     zip_filename = url.rsplit("/", 1)[-1]
     extension = ".zip"
     assert zip_filename.endswith(extension)
-    installation_path = Path("C:\\cibw") / zip_filename[: -len(extension)]
+    installation_path = CIBW_INSTALL_PATH / zip_filename[: -len(extension)]
     if not installation_path.exists():
-        pypy_zip = Path("C:\\cibw") / zip_filename
+        pypy_zip = CIBW_INSTALL_PATH / zip_filename
         download(url, pypy_zip)
         # Extract to the parent directory because the zip file still contains a directory
         extract_zip(pypy_zip, installation_path.parent)
-        pypy_exe = "pypy3.exe" if version[0] == "3" else "pypy.exe"
+        (installation_path / "python.exe").symlink_to(installation_path / "pypy3.exe")
-        (installation_path / "python.exe").symlink_to(installation_path / pypy_exe)
     return installation_path
 
 
@@ -127,8 +120,10 @@ def setup_python(
     python_configuration: PythonConfiguration,
     dependency_constraint_flags: Sequence[PathOrStr],
     environment: ParsedEnvironment,
+    build_frontend: BuildFrontend,
 ) -> Dict[str, str]:
-    nuget = Path("C:\\cibw\\nuget.exe")
+
+    nuget = CIBW_INSTALL_PATH / "nuget.exe"
     if not nuget.exists():
         log.step("Downloading nuget...")
         download("https://dist.nuget.org/win-x86-commandline/latest/nuget.exe", nuget)
@@ -186,9 +181,31 @@ def setup_python(
         )
         sys.exit(1)
 
-    # make sure pip is installed
+    log.step("Installing build tools...")
-    if not (installation_path / "Scripts" / "pip.exe").exists():
+
-        call(["python", get_pip_script, *dependency_constraint_flags], env=env, cwd="C:\\cibw")
+    # Install pip
+
+    requires_reinstall = not (installation_path / "Scripts" / "pip.exe").exists()
+    if requires_reinstall:
+        # maybe pip isn't installed at all. ensurepip resolves that.
+        call(["python", "-m", "ensurepip"], env=env, cwd=CIBW_INSTALL_PATH)
+
+    # upgrade pip to the version matching our constraints
+    # if necessary, reinstall it to ensure that it's available on PATH as 'pip.exe'
+    call(
+        [
+            "python",
+            "-m",
+            "pip",
+            "install",
+            "--force-reinstall" if requires_reinstall else "--upgrade",
+            "pip",
+            *dependency_constraint_flags,
+        ],
+        env=env,
+        cwd=CIBW_INSTALL_PATH,
+    )
+
     assert (installation_path / "Scripts" / "pip.exe").exists()
     where_pip = (
         subprocess.run(
@@ -204,49 +221,31 @@ def setup_python(
         )
         sys.exit(1)
 
-    log.step("Installing build tools...")
-
-    call(
-        ["python", "-m", "pip", "install", "--upgrade", "pip", *dependency_constraint_flags],
-        env=env,
-    )
     call(["pip", "--version"], env=env)
-    call(
+
-        ["pip", "install", "--upgrade", "setuptools", "wheel", *dependency_constraint_flags],
+    if build_frontend == "pip":
-        env=env,
+        call(
-    )
+            [
+                "pip",
+                "install",
+                "--upgrade",
+                "setuptools",
+                "wheel",
+                *dependency_constraint_flags,
+            ],
+            env=env,
+        )
+    elif build_frontend == "build":
+        call(
+            ["pip", "install", "--upgrade", "build[virtualenv]", *dependency_constraint_flags],
+            env=env,
+        )
+    else:
+        assert_never(build_frontend)
 
     return env
 
 
-def pep_518_cp35_workaround(package_dir: Path, env: Dict[str, str]) -> None:
-    """
-    Python 3.5 PEP 518 hack (see https://github.com/pypa/pip/issues/8392#issuecomment-639563494)
-    Basically, nuget's Python is an embedded Python distribution, which is not supported by pip.
-    Before version 3.6, there was no way to disable the "embedded" behavior, including the ignoring
-    of environment variables, including the ones pip uses to setup PEP 518 builds.
-
-    The fix here is as suggested in that issue; we manually setup the PEP 518 requirements. Since we
-    are in a fresh environment (except for pinned cibuildweel dependencies), the build is already
-    mostly "isolated".
-    """
-
-    pyproject_path = package_dir / "pyproject.toml"
-
-    if pyproject_path.exists():
-        data = toml.load(pyproject_path)
-        requirements = data["build-system"].get("requires", []) if "build-system" in data else []
-
-        if requirements:
-            log.step("Performing PEP518 workaround...")
-            with tempfile.TemporaryDirectory() as d:
-                reqfile = Path(d) / "requirements.txt"
-                with reqfile.open("w") as f:
-                    for r in requirements:
-                        print(r, file=f)
-                call(["pip", "install", "-r", reqfile], env=env)
-
-
 def build(options: BuildOptions) -> None:
     temp_dir = Path(tempfile.mkdtemp(prefix="cibuildwheel"))
     built_wheel_dir = temp_dir / "built_wheel"
@@ -276,7 +275,12 @@ def build(options: BuildOptions) -> None:
                 ]
 
             # install Python
-            env = setup_python(config, dependency_constraint_flags, options.environment)
+            env = setup_python(
+                config,
+                dependency_constraint_flags,
+                options.environment,
+                options.build_frontend,
+            )
 
             # run the before_build command
             if options.before_build:
@@ -286,29 +290,64 @@ def build(options: BuildOptions) -> None:
                 )
                 shell(before_build_prepared, env=env)
 
-            # activate the PEP 518 patch if on Windows Python 3.5
-            # (will only have an effect if PEP 517 builds are used):
-            if config.version.startswith("3.5"):
-                pep_518_cp35_workaround(options.package_dir, env)
-
             log.step("Building wheel...")
             if built_wheel_dir.exists():
                 shutil.rmtree(built_wheel_dir)
             built_wheel_dir.mkdir(parents=True)
-            # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org
+
-            # see https://github.com/joerick/cibuildwheel/pull/369
+            verbosity_flags = get_build_verbosity_extra_flags(options.build_verbosity)
-            call(
+
-                [
+            if options.build_frontend == "pip":
-                    "pip",
+                # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org
-                    "wheel",
+                # see https://github.com/pypa/cibuildwheel/pull/369
-                    options.package_dir.resolve(),
+                call(
-                    "-w",
+                    [
-                    built_wheel_dir,
+                        "python",
-                    "--no-deps",
+                        "-m",
-                    *get_build_verbosity_extra_flags(options.build_verbosity),
+                        "pip",
-                ],
+                        "wheel",
-                env=env,
+                        options.package_dir.resolve(),
-            )
+                        f"--wheel-dir={built_wheel_dir}",
+                        "--no-deps",
+                        *get_build_verbosity_extra_flags(options.build_verbosity),
+                    ],
+                    env=env,
+                )
+            elif options.build_frontend == "build":
+                config_setting = " ".join(verbosity_flags)
+                build_env = env.copy()
+                if options.dependency_constraints:
+                    constraints_path = options.dependency_constraints.get_for_python_version(
+                        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):
+                        tmp_file = tempfile.NamedTemporaryFile(
+                            "w", suffix="constraints.txt", delete=False, dir=CIBW_INSTALL_PATH
+                        )
+                        with tmp_file as new_constraints_file, open(constraints_path) as f:
+                            new_constraints_file.write(f.read())
+                            constraints_path = Path(new_constraints_file.name)
+
+                    build_env["PIP_CONSTRAINT"] = str(constraints_path)
+                    build_env["VIRTUALENV_PIP"] = get_pip_version(env)
+                    call(
+                        [
+                            "python",
+                            "-m",
+                            "build",
+                            options.package_dir,
+                            "--wheel",
+                            f"--outdir={built_wheel_dir}",
+                            f"--config-setting={config_setting}",
+                        ],
+                        env=build_env,
+                    )
+            else:
+                assert_never(options.build_frontend)
 
             built_wheel = next(built_wheel_dir.glob("*.whl"))
 

docs/changelog.md

@@ -2,11 +2,594 @@
 title: Changelog
 ---
 
-{%
+### v2.2.0 (prerelease)
-   include-markdown "../README.md"
+
-   start="<!--changelog-start-->"
+_Currently in prerelease. The below release notes will be condensed into a single entry on final release._
-   end="<!--changelog-end-->"
+
-%}
+_v2.2.0a1 (23 September 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.
+
+  Musllinux builds are enabled by default. To disable them on your project, add `*-musllinux_*` to your [`CIBW_SKIP`/`skip`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip)
+ option. (#768)
+- 🛠 Setting an empty string for the [`CIBW_*_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) option will now fallthrough to the config file or cibuildwheel's default, rather than causing an error. This makes the option easier to use in CI build matricies. (#829)
+
+### v2.1.2
+
+_14 September 2021_
+
+- 🛠 Updated CPython 3.10 to 3.10.0rc2
+- 📚 Multiple docs updates
+- 🐛 Improved warnings when built binaries are bundled into the container on Linux. (#807)
+
+### v2.1.1
+
+_7 August 2021_
+
+- ✨ Corresponding with the release of CPython 3.10.0rc1, which is ABI stable, cibuildwheel now builds CPython 3.10 by default - without the CIBW_PRERELEASE_PYTHONS flag.
+
+<sup>Note: v2.1.0 was a bad release, it was yanked from PyPI.</sup>
+
+### v2.0.1
+
+_25 July 2021_
+
+- 📚 Docs improvements (#767)
+- 🛠 Dependency updates, including delocate 0.9.0.
+
+### v2.0.0 🎉
+
+_16 July 2021_
+
+- 🌟 You can now configure cibuildwheel options inside your project's `pyproject.toml`! Environment variables still work of course. Check out the [documentation](https://cibuildwheel.readthedocs.io/en/stable/options/#setting-options) for more info.
+- 🌟 Added support for building wheels with [build](https://github.com/pypa/build), as well as pip. This feature is controlled with the [`CIBW_BUILD_FRONTEND`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-frontend) option.
+- 🌟 Added the ability to test building wheels on CPython 3.10! Because CPython 3.10 is in beta, these wheels should not be distributed, because they might not be compatible with the final release, but it's available to build for testing purposes. Use the flag [`--prerelease-pythons` or `CIBW_PRERELEASE_PYTHONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#prerelease-pythons) to test. (#675) This version of cibuildwheel includes CPython 3.10.0b4.
+- ⚠️ **Removed support for building Python 2.7 and Python 3.5 wheels**, for both CPython and PyPy. If you still need to build on these versions, please use the latest v1.x version. (#596)
+- ✨ Added the ability to build CPython 3.8 wheels for Apple Silicon. (#704)
+- 🛠 Update to the latest build dependencies, including Auditwheel 4. (#633)
+- 🛠 Use the unified pypa/manylinux images to build PyPy (#671)
+- 🐛 Numerous bug fixes & docs improvements
+
+### v1.12.0
+
+_22 June 2021_
+
+- ✨ Adds support building macOS universal2/arm64 wheels on Python 3.8.
+
+### v1.11.1
+
+_28 May 2021_
+
+- ✨ cibuildwheel is now part of the PyPA!
+- 📚 Minor docs changes, fixing links related to the above transition
+- 🛠 Update manylinux pins to the last version containing Python 2.7 and 3.5. (#674)
+
+### v1.11.0
+
+_1 May 2021_
+
+- 📚 Lots of docs improvements! (#650, #623, #616, #609, #606)
+- 🐛 Fix nuget "Package is not found" error on Windows. (#653)
+- ⚠️ cibuildwheel will no longer build Windows 2.7 wheels, unless you specify a custom toolchain using `DISTUTILS_USE_SDK=1` and `MSSdk=1`. This is because Microsoft have stopped distributing Visual C++ Compiler for Python 2.7. See [this FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#windows-and-python-27) for more details. (#649)
+- 🐛 Fix crash on Windows due to missing `which` command (#641).
+
+### v1.10.0
+
+_22 Feb 2021_
+
+- ✨ Added `manylinux_2_24` support. To use these new Debian-based manylinux
+  images, set your [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image)
+  options to `manylinux_2_24`.
+- 🛠 On macOS, we now set `MACOSX_DEPLOYMENT_TARGET` in before running
+  `CIBW_BEFORE_ALL`. This is useful when using `CIBW_BEFORE_ALL` to build a
+  shared library.
+- 🛠 An empty `CIBW_BUILD` option is now the same as being unset i.e, `*`.
+  This makes some build matrix configuration easier. (#588)
+- 📚 Neatened up documentation - added tabs to a few places (#576), fixed some
+  formatting issues.
+
+### v1.9.0
+
+_5 February 2021_
+
+- 🌟 Added support for Apple Silicon wheels on macOS! You can now
+  cross-compile `universal2` and `arm64` wheels on your existing macOS Intel
+  runners, by setting
+  [CIBW_ARCHS_MACOS](https://cibuildwheel.readthedocs.io/en/stable/options/#archs).
+  Xcode 12.2 or later is required, but you don't need macOS 11.0 - you can
+  still build on macOS 10.15. See
+  [this FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#apple-silicon)
+  for more information. (#484)
+- 🌟 Added auto-detection of your package's Python compatibility, via declared
+   [`requires-python`](https://www.python.org/dev/peps/pep-0621/#requires-python)
+  in your `pyproject.toml`, or
+  [`python_requires`](https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires)
+  in `setup.cfg` or `setup.py`. If your project has these set, cibuildwheel
+  will automatically skip builds on versions of Python that your package
+  doesn't support. Hopefully this makes the first-run experience of
+  cibuildwheel a bit easier. If you need to override this for any reason,
+  look at [`CIBW_PROJECT_REQUIRES_PYTHON`](https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python).
+  (#536)
+- 🌟 cibuildwheel can now be invoked as a native GitHub Action! You can now
+  invoke cibuildwheel in a GHA build step like:
+
+  ```yaml
+  - name: Build wheels
+    uses: pypa/cibuildwheel@version # e.g. v1.9.0
+    with:
+      output-dir: wheelhouse
+    # env:
+    #   CIBW_SOME_OPTION: value
+  ```
+
+  This saves a bit of boilerplate, and you can [use Dependabot to keep the
+  pinned version up-to-date](https://cibuildwheel.readthedocs.io/en/stable/faq/#automatic-updates).
+
+- ✨ Added `auto64` and `auto32` shortcuts to the
+  [CIBW_ARCHS](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)
+  option. (#553)
+- ✨ cibuildwheel now prints a list of the wheels built at the end of each
+  run. (#570)
+- 📚 Lots of minor docs improvements.
+
+### 1.8.0
+
+_22 January 2021_
+
+- 🌟 Added support for emulated builds! You can now build manylinux wheels on
+  ARM64`aarch64`, as well as `ppc64le` and 's390x'. To build under emulation,
+  register QEMU via binfmt_misc and set the
+  [`CIBW_ARCHS_LINUX`](https://cibuildwheel.readthedocs.io/en/stable/options/#archs)
+  option to the architectures you want to run. See
+  [this FAQ entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#emulation)
+  for more information. (#482)
+- ✨ Added `CIBW_TEST_SKIP` option. This allows you to choose certain builds
+  whose tests you'd like to skip. This might be useful when running a slow
+  test suite under emulation, for example. (#537)
+- ✨ Added `curly-{brace,bracket,paren}` style globbing to `CIBW_BUILD` and
+  `CIBW_SKIP`. This gives more expressivity, letting you do things like
+  `CIBW_BUILD=cp39-manylinux_{aarch64,ppc64le}`. (#527)
+- 🛠 cibuildwheel will now exit with an error if it's called with options that
+  skip all builds on a platform. This feature can be disabled by adding
+  `--allow-empty` on the command line. (#545)
+
+### 1.7.4
+
+_2 January 2021_
+
+- 🐛 Fix the PyPy virtualenv patch to work on macOS 10.14 (#506)
+
+### 1.7.3
+
+_1 January 2021_
+
+- 🛠 Added a patch for Pypy to ensure header files are available for building
+  in a virtualenv. (#502)
+- 🛠 Some preparatory work towards using cibuildwheel as a GitHub Action.
+  Check out
+  [the FAQ](https://cibuildwheel.readthedocs.io/en/stable/faq/#option-1-github-action)
+  for information on how to use it. We'll be fully updating the docs to this
+  approach in a subsequent release (#494)
+
+### 1.7.2
+
+_21 December 2020_
+
+- 🛠 Update dependencies, notably wheel==0.36.2 and pip==20.3.3, and CPython to
+  their latest bugfix releases (#489)
+- 📚 Switch to a GitHub example in the README (#479)
+- 📚 Create Working Examples table, with many projects that use cibuildwheel (#474)
+- 📚 Import Working Examples table and Changelog to docs
+
+### 1.7.1
+
+_3 December 2020_
+
+- 🛠 Update manylinux2010 image to resolve issues with 'yum' repositories
+  (#472)
+
+### 1.7.0
+
+_26 November 2020_
+
+- ✨ New logging format, that uses 'fold groups' in CI services that support
+  it. (#458)
+- 🛠 Update PyPy to 7.3.3 (#460)
+- 🐛 Fix a bug where CIBW_BEFORE_ALL runs with a very old version of Python on
+  Linux. (#464)
+
+### 1.6.4
+
+_31 October 2020_
+
+- 🐛 Fix crash on Appveyor during nuget install due to old system CA
+  certificates. We now use certifi's CA certs to download files. (#455)
+
+### 1.6.3
+
+_12 October 2020_
+
+- 🐛 Fix missing SSL certificates on macOS (#447)
+- 🛠 Update OpenSSL Python 3.5 patch to 1.1.1h on macOS (#449)
+
+### 1.6.2
+
+_9 October 2020_
+
+- ✨ Python 3.9 updated to the final release version - v3.9.0 (#440)
+- 🛠 Pypy updated to v7.3.2, adding alpha support for Python 3.7 (#430)
+
+### 1.6.1
+
+_20 September 2020_
+
+- 🛠 Add PPC64LE manylinux image supporting Python 3.9. (#436)
+- 📚 Add project URLs to PyPI listing (#428)
+
+### 1.6.0
+
+_9 September 2020_
+
+- 🌟 Add Python 3.9 support! This initial support uses release candidate
+  builds. You can start publishing wheels for Python 3.9 now, ahead of
+  the official release. (#382)
+
+  Minor note - if you're building PPC64LE wheels, the manylinux image pinned
+  by this version is
+  [still on Python 3.9b3](https://github.com/pypa/manylinux/issues/758), not a
+  release candidate. We'd advise holding off on distributing 3.9 ppc64le wheels
+  until a subsequent version of cibuildwheel.
+
+- 🌟 Add Gitlab CI support. Gitlab CI can now build Linux wheels, using
+  cibuildwheel. (#419)
+- 🐛 Fix a bug that causes pyproject.toml dependencies to fail to install on
+  Windows (#420)
+- 📚 Added some information about Windows VC++ runtimes and how they relate
+  to wheels.
+
+### 1.5.5
+
+_22 July 2020_
+
+- 🐛 Fix a bug that would cause command substitutions in CIBW_ENVIRONMENT to
+  produce no output on Linux (#411)
+- 🐛 Fix regression (introduced in 1.5.3) which caused BEFORE_BUILD and
+  BEFORE_ALL to be executed in the wrong directory (#410)
+
+### 1.5.4
+
+_19 June 2020_
+
+- 🐛 Fix a bug that would cause command substitutions in CIBW_ENVIRONMENT
+  variables to not interpret quotes in commands correctly (#406, #408)
+
+### 1.5.3
+
+_19 July 2020_
+
+- 🛠 Update CPython 3.8 to 3.8.3 (#405)
+- 🛠 Internal refactoring of Linux build, to move control flow into Python (#386)
+
+### 1.5.2
+
+_8 July 2020_
+
+- 🐛 Fix an issue on Windows where pyproject.toml would cause an error when
+  some requirements formats were used. (#401)
+- 🛠 Update CPython 3.7 to 3.7.8 (#394)
+
+### 1.5.1
+
+_25 June 2020_
+
+- 🐛 Fix "OSError: [WinError 17] The system cannot move the file to a different
+  disk drive" on GitHub Actions (#388, #389)
+
+### 1.5.0
+
+_24 June 2020_
+
+- 🌟 Add [`CIBW_BEFORE_ALL`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-all)
+  option, which lets you run a command on the build machine before any wheels
+  are built. This is especially useful when building on Linux, to `make`
+  something external to Python, or to `yum install` a dependency. (#342)
+- ✨ Added support for projects using pyproject.toml instead of setup.py
+  (#360, #358)
+- ✨ Added workaround to allow Python 3.5 on Windows to pull dependencies from
+  pyproject.toml. (#358)
+- 📚 Improved GitHub Actions examples and docs (#354, #362)
+- 🐛 Ensure pip wheel uses the specified package, and doesn't build a wheel
+  from PyPI (#369)
+- 🛠 Internal changes: using pathlib.Path, precommit hooks, testing
+  improvements.
+
+### 1.4.2
+
+_25 May 2020_
+
+- 🛠 Dependency updates, including CPython 3.8.3 & manylinux images.
+- 🛠 Lots of internal updates - type annotations and checking using mypy, and
+  a new integration testing system.
+- ⚠️ Removed support for *running* cibuildwheel using Python 3.5. cibuildwheel
+  will continue to build Python 3.5 wheels until EOL.
+
+### 1.4.1
+
+_4 May 2020_
+
+- 🐛 Fix a bug causing programs running inside the i686 manylinux images to
+  think they were running x86_64 and target the wrong architecture. (#336,
+  #338)
+
+### 1.4.0
+
+_2 May 2020_
+
+- 🌟 Deterministic builds. cibuildwheel now locks the versions of the tools it
+  uses. This means that pinning your version of cibuildwheel pins the versions
+  of pip, setuptools, manylinux etc. that are used under the hood. This should
+  make things more reliable. But note that we don't control the entire build
+  environment on macOS and Windows, where the version of Xcode and Visual
+  Studio can still effect things.
+
+  This can be controlled using the [CIBW_DEPENDENCY_VERSIONS](https://cibuildwheel.readthedocs.io/en/stable/options/#dependency-versions)
+  and [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image)
+  options - if you always want to use the latest toolchain, you can still do
+  that, or you can specify your own pip constraints file and manylinux image.
+  (#256)
+
+- ✨ Added `package_dir` command line option, meaning we now support building
+  a package that lives in a subdirectory and pulls in files from the wider
+  project. See [the `package_dir` option help](https://cibuildwheel.readthedocs.io/en/stable/options/#command-line-options)
+  for more information.
+
+  Note that this change makes the working directory (where you call
+  cibuildwheel from) relevant on Linux, as it's considered the 'project' and
+  will be copied into the Docker container. If your builds are slower on this
+  version, that's likely the reason. `cd` to your project and then call
+  `cibuildwheel` from there. (#319, #295)
+
+- 🛠 On macOS, we make `MACOSX_DEPLOYMENT_TARGET` default to `10.9` if it's
+  not set. This should make things more consistent between Python versions.
+- 🛠 Dependency updates - CPython 3.7.7, CPython 2.7.18, Pypy 7.3.1.
+
+### 1.3.0
+
+_12 March 2020_
+
+- 🌟 Add support for building on GitHub Actions! Check out the
+  [docs](https://cibuildwheel.readthedocs.io/en/stable/setup/#github-actions)
+  for information on how to set it up. (#194)
+- ✨ Add the `CIBW_BEFORE_TEST` option, which lets you run a command to
+  prepare the environment before your tests are run. (#242)
+
+### 1.2.0
+
+_8 March 2020_
+
+- 🌟 Add support for building PyPy wheels, across Manylinux, macOS, and
+  Windows. (#185)
+- 🌟 Added the ability to build ARM64 (aarch64), ppc64le, and s390x wheels,
+  using manylinux2014 and Travis CI. (#273)
+- ✨ You can now build macOS wheels on Appveyor. (#230)
+- 🛠 Changed default macOS minimum target to 10.9, from 10.6. This allows the
+  use of more modern C++ libraries, among other things. (#156)
+- 🛠 Stop building universal binaries on macOS. We now only build x86_64
+  wheels on macOS. (#220)
+- ✨ Allow chaining of commands using `&&` and `||` on Windows inside
+  CIBW_BEFORE_BUILD and CIBW_TEST_COMMAND. (#293)
+- 🛠 Improved error reporting for failed Cython builds due to stale .so files
+  (#263)
+- 🛠 Update CPython from 3.7.5 to 3.7.6 and from 3.8.0 to 3.8.2 on Mac/Windows
+- 🛠 Improved error messages when a bad config breaks cibuildwheel's PATH
+  variable. (#264)
+- ⚠️ Removed support for *running* cibuildwheel on Python 2.7. cibuildwheel
+  will continue to build Python 2.7 wheels for a little while. (#265)
+
+### 1.1.0
+
+_7 December 2019_
+
+- 🌟 Add support for building manylinux2014 wheels. To use, set
+  `CIBW_MANYLINUX_X86_64_IMAGE` and CIBW_MANYLINUX_I686_IMAGE to
+  `manylinux2014`.
+- ✨ Add support for [Linux on Appveyor](https://www.appveyor.com/blog/2018/03/06/appveyor-for-linux/) (#204, #207)
+- ✨ Add `CIBW_REPAIR_WHEEL_COMMAND` env variable, for changing how
+  `auditwheel` or `delocate` are invoked, or testing an equivalent on
+  Windows. (#211)
+- 📚 Added some travis example configs - these are available in /examples. (#228)
+
+### 1.0.0
+
+_10 November 2019_
+
+- 🌟 Add support for building Python 3.8 wheels! (#180)
+- 🌟 Add support for building manylinux2010 wheels. cibuildwheel will now
+  build using the manylinux2010 images by default. If your project is still
+  manylinux1 compatible, you should get both manylinux1 and manylinux2010
+  wheels - you can upload both to PyPI. If you always require manylinux1 wheels, you can
+  build using the old manylinux1 image using the [manylinux image](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image) option.
+  (#155)
+- 📚 Documentation is now on its [own mini-site](https://cibuildwheel.readthedocs.io),
+   rather than on the README (#169)
+- ✨ Add support for building Windows wheels on Travis CI. (#160)
+- 🛠 If you set `CIBW_TEST_COMMAND`, your tests now run in a virtualenv. (#164)
+- 🛠 Windows now uses Python as installed by nuget, rather than the versions
+  installed by the various CI providers. (#180)
+- 🛠 Update Python from 2.7.16 to 2.7.17 and 3.7.4 to 3.7.5 on macOS (#171)
+- ⚠️ Removed support for Python 3.4 (#168)
+
+### 0.12.0
+
+_29 September 2019_
+
+- ✨ Add CIBW_TEST_EXTRAS option, to allow testing using extra_require
+  options. For example, set `CIBW_TEST_EXTRAS=test,qt` to make the wheel
+  installed with `pip install <wheel_file>[test,qt]`
+- 🛠 Update Python from 3.7.2 to 3.7.4 on macOS
+- 🛠 Update OpenSSL patch to 1.0.2t on macOS
+
+### 0.11.1
+
+_28 May 2019_
+
+- 🐛 Fix missing file in the release tarball, that was causing problems with
+  Windows builds (#141)
+
+### 0.11.0
+
+_26 May 2019_
+
+- 🌟 Add support for building on Azure pipelines! This lets you build all
+  Linux, Mac and Windows wheels on one service, so it promises to be the
+  easiest to set up! Check out the quickstart in the docs, or
+  [cibuildwheel-azure-example](https://github.com/pypa/cibuildwheel-azure-example)
+  for an example project. (#126, #132)
+- 🛠 Internal change - the end-to-end test projects format was updated, so we
+  can more precisely assert what should be produced for each one. (#136, #137).
+
+### 0.10.2
+
+_10 March 2019_
+
+- 🛠 Revert temporary fix in macOS, that was working around a bug in pip 19 (#129)
+- 🛠 Update Python to 2.7.16 on macOS
+- 🛠 Update OpenSSL patch to 1.0.2r on macOS
+
+### 0.10.1
+
+_3 February 2019_
+
+- 🐛 Fix build stalling on macOS (that was introduced in pip 19) (#122)
+- 🐛 Fix "AttributeError: 'Popen' object has no attribute 'args'" on Python 2.7 for Linux builds (#108)
+- 🛠 Update Python from 3.6.7, 3.7.1 to 3.6.8, 3.7.2 on macOS
+- 🛠 Update openssl patch from 1.0.2p to 1.0.2q on macOS
+- 🛠 Sorting build options dict items when printing preamble (#114)
+
+### 0.10.0
+
+_23 September 2018_
+
+- 🌟 Add `CIBW_BUILD` option, for specifying which specific builds to perform (#101)
+- 🌟 Add support for building Mac and Linux on CircleCI (#91, #97)
+- 🛠 Improved support for building universal wheels (#95)
+- 🛠 Ensure log output is unbuffered and therefore in the correct order (#92)
+- 🛠 Improved error reporting for errors that occur inside a package's setup.py (#88)
+- ⚠️ Removed support for Python 3.3 on Windows.
+
+### 0.9.4
+
+_29 July 2018_
+
+- 🛠 CIBW_TEST_COMMAND now runs in a shell on Mac (as well as Linux) (#81)
+
+### 0.9.3
+
+_10 July 2018_
+
+- 🛠 Update to Python 3.6.6 on macOS (#82)
+- ✨ Add support for building Python 3.7 wheels on Windows (#76)
+- ⚠️ Deprecated support for Python 3.3 on Windows.
+
+### 0.9.2
+
+_1 July 2018_
+
+- 🛠  Update Python 3.7.0rc1 to 3.7.0 on macOS (#79)
+
+### 0.9.1
+
+_18 June 2018_
+
+- 🛠 Removed the need to use `{python}` and `{pip}` in `CIBW_BEFORE_BUILD` statements, by ensuring the correct version is always on the path at `python` and `pip` instead. (#60)
+- 🛠 We now patch the _ssl module on Python 3.4 and 3.5 so these versions can still make SSL web requests using TLS 1.2 while building. (#71)
+
+### 0.9.0
+
+_18 June 2018_
+
+- ✨ Add support for Python 3.7 (#73)
+
+### 0.8.0
+
+_4 May 2018_
+
+- ⚠️ Drop support for Python 3.3 on Linux (#67)
+- 🐛 Fix TLS by updating setuptools (#69)
+
+### 0.7.1
+
+_2 April 2017_
+
+- 🐛 macOS: Fix Pip bugs resulting from PyPI TLS 1.2 enforcement
+- 🐛 macOS: Fix brew Python3 version problems in the CI
+
+### 0.7.0
+
+_7 January 2018_
+
+- ✨ You can now specify a custom docker image using the `CIBW_MANYLINUX1_X86_64_IMAGE` and `CIBW_MANYLINUX1_I686_IMAGE` options. (#46)
+- 🐛 Fixed a bug where cibuildwheel would download and build a package from PyPI(!) instead of building the package on the local machine. (#51)
+
+### 0.6.0
+
+_9 October 2017_
+
+- ✨ On the Linux build, the host filesystem is now accessible via `/host` (#36)
+- 🐛 Fixed a bug where setup.py scripts would run the wrong version of Python when running subprocesses on Linux (#35)
+
+### 0.5.1
+
+_10 September 2017_
+
+- 🐛 Fixed a couple of bugs on Python 3.
+- ✨ Added experimental support for Mac builds on [Bitrise.io](https://www.bitrise.io)
+
+### 0.5.0
+
+_7 September 2017_
+
+- ✨ `CIBW_ENVIRONMENT` added. You can now set environment variables for each build, even within the Docker container on Linux. This is a big one! (#21)
+- ✨ `CIBW_BEFORE_BUILD` now runs in a system shell on all platforms. You can now do things like `CIBW_BEFORE_BUILD="cmd1 && cmd2"`. (#32)
+
+### 0.4.1
+
+_14 August 2017_
+
+- 🐛 Fixed a bug on Windows where subprocess' output was hidden (#23)
+- 🐛 Fixed a bug on AppVeyor where logs would appear in the wrong order due to output buffering (#24, thanks @YannickJadoul!)
+
+### 0.4.0
+
+_23 July 2017_
+
+- 🐛 Fixed a bug that was increasing the build time by building the wheel twice. This was a problem for large projects that have a long build time. If you're upgrading and you need the old behaviour, use `CIBW_BEFORE_BUILD={pip} install .`, or install exactly the dependencies you need in `CIBW_BEFORE_BUILD`. See #18.
+
+### 0.3.0
+
+_27 June 2017_
+
+- ⚠️ Removed Python 2.6 support on Linux (#12)
+
+### 0.2.1
+
+_11 June 2017_
+
+- 🛠 Changed the build process to install the package before building the wheel - this allows direct dependencies to be installed first (#9, thanks @tgarc!)
+- ✨ Added Python 3 support for the main process, for systems where Python 3 is the default (#8, thanks @tgarc).
+
+### 0.2.0
+
+_13 April 2017_
+
+- ✨ Added `CIBW_SKIP` option, letting users explicitly skip a build
+- ✨ Added `CIBW_BEFORE_BUILD` option, letting users run a shell command before the build starts
+
+### 0.1.3
+
+_31 March 2017_
+
+- 🌟 First public release!
 
 <script>
   // undo the scrollTop that the theme did on this page, as there are loads

docs/contributing.md

@@ -8,6 +8,8 @@ If you have an idea for a modification or feature, it's probably best to raise a
 
 `cibuildwheel` is indie open source. We're not paid to work on this.
 
+Everyone contributing to the cibuildwheel project is expected to follow the [PSF Code of Conduct](https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md).
+
 Design Goals
 ------------
 
@@ -18,7 +20,7 @@ Design Goals
 
 Other notes:
 
-- The platforms are very similar, until they're not. I'd rather have straight-forward code than totally DRY code, so let's keep airy platfrom abstractions to a minimum.
+- The platforms are very similar, until they're not. I'd rather have straight-forward code than totally DRY code, so let's keep airy platform abstractions to a minimum.
 - I might want to break the options into a shared config file one day, so that config is more easily shared. That has motivated some of the design decisions.
 
 ### cibuildwheel's relationship with build errors
@@ -27,16 +29,37 @@ cibuildwheel doesn't really do anything itself - it's always deferring to other
 
 We're not responsible for errors in those tools, for fixing errors/crashes there. But cibuildwheel's job is providing users with an 'integrated' user experience across those tools. We provide an abstraction. The user says 'build me some wheels', not 'open the docker container, build a wheel with pip, fix up the symbols with auditwheel' etc.  However, errors have a habit of breaking abstractions. And this is where users get confused, because the mechanism of cibuildwheel is laid bare, and they must understand a little bit how it works to debug.
 
-So, if we can, I'd like to improve the experience on errors as well. In [this](https://github.com/joerick/cibuildwheel/issues/139) case, it takes a bit of knowledge to understand that the Linux builds are happening in a different OS via Docker, that the linked symbols won't match, that auditwheel will fail because of this. A problem with how the tools fit together, instead of the tools themselves.
+So, if we can, I'd like to improve the experience on errors as well. In [this](https://github.com/pypa/cibuildwheel/issues/139) case, it takes a bit of knowledge to understand that the Linux builds are happening in a different OS via Docker, that the linked symbols won't match, that auditwheel will fail because of this. A problem with how the tools fit together, instead of the tools themselves.
 
 Maintainer notes
 ----------------
 
+### Nox support
+
+Most developer tasks have a nox interface. This allows you to very simply run tasks without worrying about setting up a development environment (as shown below). This is a slower than setting up a development environment and reusing it, but has the (important) benefit of being highly reproducible; an earlier run does not affect a current run, or anything else on your machine.
+
+Install [nox](https://nox.thea.codes); homebrew is recommend on macOS, otherwise, pipx is a great choice - in fact, you can use `pipx run nox` and avoid installing completely.
+
+You can see a list of sessions by typing `nox -l`; here are a few common ones:
+
+```console
+nox -s lint          # Run the linters (default)
+nox -s tests         # Run the tests   (default)
+nox -s docs -- serve # Build and serve the documentation
+nox -s build         # Make SDist and wheel
+```
+
+More advanced users can run the update scripts. `update_pins` should work directly, but `update_constraints` needs all versions of Python installed. If you don't want to do that locally, a fast way to run it to use docker to run nox:
+
+```console
+docker run --rm -itv $PWD:/src -w /src quay.io/pypa/manylinux_2_24_x86_64:latest pipx run nox -s update_constraints
+```
+
 ### Local testing
 
 You should run:
 
-```python
+```console
 python3 -m venv venv
 . venv/bin/activate
 pip install -e .[dev]
@@ -71,8 +94,6 @@ This has been moved to using docker, so you only need the following instructions
 The dependency update script in the next section requires multiple python versions installed. One way to do this is to use `pyenv`:
 
 ```bash
-pyenv install 2.7.18
-pyenv install 3.5.9
 pyenv install 3.6.11
 pyenv install 3.7.8
 # Optionally add 3.8 and make it the local version;
@@ -82,9 +103,6 @@ pyenv install 3.7.8
 Then, you need to make the required virtual environments:
 
 ```bash
-$(pyenv prefix 2.7.18)/bin/python -m pip install virtualenv
-$(pyenv prefix 2.7.18)/bin/python -m virtualenv env27
-$(pyenv prefix 3.5.9)/bin/python -m venv env35
 $(pyenv prefix 3.6.11)/bin/python -m venv env36
 $(pyenv prefix 3.7.8)/bin/python -m venv env37
 ```
@@ -118,4 +136,4 @@ twine upload dist/*
 git push && git push --tags
 ```
 
-Then head to https://github.com/joerick/cibuildwheel/releases and create a GitHub release from the new tag, pasting in the changelog entry.
+Then head to https://github.com/pypa/cibuildwheel/releases and create a GitHub release from the new tag, pasting in the changelog entry.

docs/cpp_standards.md

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

docs/data/projects.yml

@@ -102,7 +102,7 @@
 
 - name: pikepdf
   gh: pikepdf/pikepdf
-  ci: [azurepipelines]
+  ci: [github]
   os: [windows, apple, linux]
 
 - name: fathon
@@ -324,3 +324,69 @@
   gh: pallets/markupsafe
   ci: [github]
   os: [apple, linux, windows]
+
+- name: SiPM
+  gh: EdoPro98/SimSiPM
+  ci: [github]
+  os: [apple, linux]
+  notes: High performance library for SiPM detectors simulation using C++17, OpenMP and AVX2 intrinsics.
+
+- name: CorrectionLib
+  gh: cms-nanoAOD/correctionlib
+  ci: [github]
+  os: [apple, linux]
+  notes: Structured JSON powered correction library for HEP, designed for the CMS experiment at CERN.
+
+- name: GSD
+  gh: glotzerlab/gsd
+  ci: [github]
+  os: [apple, linux, windows]
+  notes: Cython and NumPy project with 64-bit wheels.
+
+- name: PyGLM
+  gh: Zuzu-Typ/PyGLM
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: iDynTree
+  gh: robotology/idyntree
+  ci: [github]
+  os: [linux]
+  notes: Uses manylinux_2_24
+
+- name: H3-py
+  gh: uber/h3-py
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: DeepForest
+  gh: LAMDA-NJU/Deep-Forest
+  ci: [github]
+  os: [apple, linux, windows]
+
+- name: cmake
+  gh: scikit-build/cmake-python-distributions
+  stars: Kitware/CMake
+  ci: [github, travisci]
+  os: [apple, linux, windows]
+  notes: Multitagged binary builds for all supported platforms, using cibw 2 config configuration.
+
+- name: ninja
+  gh: scikit-build/ninja-python-distributions
+  ci: [github, travisci]
+  os: [apple, linux, windows]
+  notes: Multitagged binary builds for all supported platforms, using cibw 2 config configuration.
+
+- name: tgcalls
+  gh: MarshalX/tgcalls
+  pypi: pytgcalls
+  ci: [github]
+  os: [apple, windows]
+  notes: Python `pybind11` binding to Telegram's WebRTC library with third party dependencies like `OpenSSL`, `MozJPEG`, `FFmpeg`, etc.
+
+- name: pillow-heif
+  gh: bigcat88/pillow_heif
+  pypi: pillow-heif
+  ci: [github]
+  os: [apple, linux]
+  notes: Python CFFI binding to libheif library with third party dependencies like `libde265`, `x265`, `libaom` with test & publishing on PyPi.

docs/data/readme_icons/azurepipelines.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 24 24" width="16px" fill="#606060"><title>Azure Pipelines icon</title><path d="M1.8 18H0v6h6v-1.8H1.8zM23 0h-8.93a2 2 0 0 0-1.67.89L9 5.99H1a1 1 0 0 0-1 1v5.5l3.5 3.61 1.2-1.29 1.5 1.5L5 17.53l1.48 1.48 1.22-1.22 1.5 1.51L8 20.5l3.5 3.5H17a1 1 0 0 0 1-1v-8l5.11-3.4A2 2 0 0 0 24 9.92V1a1 1 0 0 0-1-1zm-5 9a3 3 0 1 1 0-6 3 3 0 0 1 0 6z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 24 24" width="16px" fill="#606060"><title>Azure Pipelines icon</title><path d="M1.7997 22.1998h4.2001V24H.0004v-6.0002h1.7993v4.2zM12.6229 9.8975l-7.6353 7.6353 1.4792 1.4792 7.6345-7.6362-1.4784-1.4783zM4.365 15.1793l-.391-.3908c-.5042-.5042-.5828-1.3004-.1869-1.8934l4.6036-6.8958H.9979c-.5513.0014-.9975.4487-.9975 1v5.5002l3.5021 3.6036.8625-.9238zM23.9996.9999v8.9306a2 2 0 0 1-.8893 1.6632l-12.2834 8.2005a.9999.9999 0 0 1-1.2622-.1246L8.04 18.1457c.3313-.3313 6.4656-6.4672 6.7684-6.7698l-2.1855-2.1855L5.8533 15.96l-1.5258-1.525a1.0001 1.0001 0 0 1-.1246-1.2623L12.4034.8893A2 2 0 0 1 14.0666 0h8.9331c.5522 0 .9999.4477.9999.9999zm-2.9997 5.0003c0-1.6567-1.343-2.9997-2.9997-2.9997s-2.9997 1.343-2.9997 2.9997 1.343 2.9997 2.9997 2.9997 2.9997-1.343 2.9997-2.9997zM10.272 20.4625c-.4008 0-.7776-.156-1.0609-.4392l-.368-.3679-.8435.8417 3.4996 3.4996h5.5003c.5522 0 .9999-.4477.9999-.9999v-7.3899L11.1045 20.21a1.4944 1.4944 0 0 1-.8325.2525z"/></svg>

docs/deliver-to-pypi.md

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

docs/extra.css

@@ -1,11 +1,23 @@
 
 /* Global styles */
 
+body {
+    overflow-wrap: break-word;
+}
+
 p {
     margin-bottom: 12px;
     line-height: 26px;
 }
 
+pre {
+  margin: 1em 0;
+}
+
+pre:first-child {
+  margin-top: 0;
+}
+
 code {
     font-size: 85%;
     background-color: rgba(27,31,35,.05);
@@ -18,11 +30,12 @@ code {
 
 code, pre, tt {
     font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
+    line-height: 1.4;
 }
 
-.hljs {
+pre code, pre code.hljs {
-    padding: 1em;
+  padding: 1em;
-    background-color: #f6f8fa;
+  background-color: #f6f8fa;
 }
 
 h1, h2, h3, h4, h5, h6 {
@@ -112,7 +125,21 @@ h1, h2, h3, h4, h5, h6 {
   background-color: white;
   display: flex;
   justify-content: flex-start;
-  border-bottom: 2px solid #ccc;
+  overflow-x: auto;
+  overflow-y: hidden;
+  position: relative;
+}
+.tabs-header::before {
+  position: absolute;
+  content: "";
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 2px;
+  background: #ccc;
+}
+.tabs-header > * {
+  position: relative;
 }
 
 /* Style the buttons that are used to open the tab content */
@@ -126,15 +153,13 @@ h1, h2, h3, h4, h5, h6 {
   font-size: 0.9em;
   font-weight: 600;
   padding: 8px 16px;
-  border-bottom: 2px solid transparent;
+  border-bottom: 2px solid #ccc;
-
-  /* put the border on top of the parent border */
-  margin-bottom: -2px;
 }
 
 .tabs-header button:focus-visible {
-  /* preserve an outline for accesibility purposes */
+  /* preserve an outline for accessibility purposes */
   outline: 1px solid currentColor;
+  outline-offset: -1px;
 }
 
 /* Change background color of buttons on hover */
@@ -153,4 +178,50 @@ h1, h2, h3, h4, h5, h6 {
   background-color: #f1f6fa;
   padding: 1px 1em;
   padding-top: 0.8em;
+
+  /* don't collapse inner margins */
+  overflow-y: hidden;
+}
+
+/* Examples tabs styling */
+
+.tabs.examples .tabs-header {
+  justify-content: flex-end;
+  background-color: transparent;
+  border-bottom-style: none;
+  padding: 0;
+}
+.tabs.examples .tabs-header::before {
+  height: 0;
+}
+.tabs.examples .tabs-header button {
+  padding: 6px 12px;
+  border-bottom: none;
+  color: rgba(0, 0, 0, 0.3);
+  font-size: 0.8em;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
+.tabs-header button:hover {
+  background-color: unset;
+}
+
+.tabs.examples .tabs-header button.active {
+  border-bottom-style: none;
+  background: #f6f8fa;
+  color: inherit;
+}
+.tabs.examples .tabs-content {
+  padding: 0;
+  background-color: transparent;
+  background-color: #f6f8fa;
+}
+.tabs.examples .tabs-content .tab > * {
+  padding-left: 0.8em;
+  padding-right: 0.8em;
+}
+.tabs.examples .tabs-content .tab > pre {
+  padding-left: 0;
+  padding-right: 0;
+  margin-bottom: 0.5em;
 }

docs/extra.js

@@ -20,6 +20,17 @@ while (true) {
   tabContainer.insertBefore(firstTab);
   tabContainer.append(headerContainer, contentContainer)
 
+  // add extra classes from the first tab to the container
+  const classes = Array.from(firstTab[0].classList)
+
+  for (let i = 0; i < classes.length; i++) {
+    const element = classes[i];
+    if (element == 'tab' || element == 'admonition') {
+      continue
+    }
+    tabContainer.addClass(element)
+  }
+
   const selectTab = function (index) {
     headerContainer.children().removeClass('active')
     headerContainer.children().eq(index).addClass('active')

docs/faq.md

@@ -2,31 +2,23 @@
 title: Tips and tricks
 ---
 
-### Troubleshooting
+## Tips
-
-If your wheel didn't compile, check the list below for some debugging tips.
-
-- A mistake in your config. To quickly test your config without doing a git push and waiting for your code to build on CI, you can test the Linux build in a Docker container. On Mac or Linux, with Docker running, try `cibuildwheel --platform linux`. You'll have to bring your config into the current environment first.
-
-- Missing dependency. You might need to install something on the build machine. You can do this in `.travis.yml`, `appveyor.yml`, or `.circleci/config.yml`, with apt-get, brew or choco. Given how the Linux build works, you'll need to use the [`CIBW_BEFORE_BUILD`](options.md#before-build) option.
-
-- Windows: missing C feature. The Windows C compiler doesn't support C language features invented after 1990, so you'll have to backport your C code to C90. For me, this mostly involved putting my variable declarations at the top of the function like an animal.
-
-- MacOS: calling cibuildwheel from a python3 script and getting a `ModuleNotFoundError`? Due to a (fixed) [bug](https://bugs.python.org/issue22490) in CPython, you'll need to [unset the `__PYVENV_LAUNCHER__` variable](https://github.com/joerick/cibuildwheel/issues/133#issuecomment-478288597) before activating a venv.
 
 ### Linux builds on Docker
 
-Linux wheels are built in the [`manylinux` docker images](https://github.com/pypa/manylinux) to provide binary compatible wheels on Linux, according to [PEP 571](https://www.python.org/dev/peps/pep-0571/). Because of this, when building with `cibuildwheel` on Linux, a few things should be taken into account:
+Linux wheels are built in the [`manylinux`/`musllinux` docker images](https://github.com/pypa/manylinux) to provide binary compatible wheels on Linux, according to [PEP 600](https://www.python.org/dev/peps/pep-0600/) / [PEP 656](https://www.python.org/dev/peps/pep-0656/). Because of this, when building with `cibuildwheel` on Linux, a few things should be taken into account:
 
-- Programs and libraries are not installed on the Travis CI Ubuntu host, but rather should be installed inside of the Docker image (using `yum` for `manylinux2010` or `manylinux2014`, and `apt-get` for `manylinux_2_24`) or manually. The same goes for environment variables that are potentially needed to customize the wheel building. `cibuildwheel` supports this by providing the `CIBW_ENVIRONMENT` and `CIBW_BEFORE_BUILD` options to setup the build environment inside the running Docker image. See [the options docs](options.md#build-environment) for details on these options.
+-   Programs and libraries are not installed on the CI runner host, but rather should be installed inside of the Docker image - using `yum` for `manylinux2010` or `manylinux2014`, `apt-get` for `manylinux_2_24` and `apk` for `musllinux_1_1`, or manually. The same goes for environment variables that are potentially needed to customize the wheel building.
 
-- The project directory is mounted in the running Docker instance as `/project`, the output directory for the wheels as `/output`. In general, this is handled transparently by `cibuildwheel`. For a more finegrained level of control however, the root of the host file system is mounted as `/host`, allowing for example to access shared files, caches, etc. on the host file system.  Note that this is not available on CircleCI due to their Docker policies.
+    `cibuildwheel` supports this by providing the [`CIBW_ENVIRONMENT`](options.md#environment) and [`CIBW_BEFORE_ALL`](options.md#before-all) options to setup the build environment inside the running Docker image.
 
-- Alternative dockers images can be specified with the `CIBW_MANYLINUX_X86_64_IMAGE`, `CIBW_MANYLINUX_I686_IMAGE`, and `CIBW_MANYLINUX_PYPY_X86_64_IMAGE` options to allow for a custom, preconfigured build environment for the Linux builds. See [options](options.md#manylinux-image) for more details.
+-   The project directory is mounted in the running Docker instance as `/project`, the output directory for the wheels as `/output`. In general, this is handled transparently by `cibuildwheel`. For a more finegrained level of control however, the root of the host file system is mounted as `/host`, allowing for example to access shared files, caches, etc. on the host file system.  Note that `/host` is not available on CircleCI due to their Docker policies.
+
+-   Alternative Docker images can be specified with the `CIBW_MANYLINUX_*_IMAGE`/`CIBW_MUSLLINUX_*_IMAGE` options to allow for a custom, preconfigured build environment for the Linux builds. See [options](options.md#linux-image) for more details.
 
 ### Building macOS wheels for Apple Silicon {: #apple-silicon}
 
-`cibuildwheel` supports cross-compiling `universal2` and `arm64` wheels on `x86_64` runners. With the introduction of Apple Silicon, you now have several choices for wheels for Python 3.9+:
+`cibuildwheel` supports cross-compiling `universal2` and `arm64` wheels on `x86_64` runners. With the introduction of Apple Silicon, you now have several choices for wheels for Python 3.8+:
 
 #### `x86_64`
 
@@ -80,11 +72,12 @@ by default, and require opt-in by setting `CIBW_ARCHS_MACOS`.
 !!! note
     Your runner needs Xcode Command Line Tools 12.2 or later to build `universal2` or `arm64`.
 
-    So far, only CPython 3.9 supports `universal2` and `arm64` wheels.
+    Only CPython 3.8 and newer support `universal2` and `arm64` wheels.
 
 Here's an example GitHub Actions workflow with a job that builds for Apple Silicon:
 
 > .github/workflows/build_macos.yml
+
 ```yml
 {% include "../examples/github-apple-silicon.yml" %}
 ```
@@ -110,62 +103,6 @@ Linux), and the other architectures are emulated automatically.
 {% include "../examples/github-with-qemu.yml" %}
 ```
 
-### Building Apple Silicon wheels on Intel {: #apple-silicon}
-
-`cibuildwheel` supports cross-compiling `universal2` and `arm64` wheels on `x86_64` runners.
-
-These wheels are not built by default, but can be enabled by setting the [`CIBW_ARCHS_MACOS` option](options.md#archs) to `x86_64 arm64 universal2`. Cross-compilation is provided by the Xcode toolchain.
-
-!!! important
-    When cross-compiling on Intel, it is not possible to test `arm64` and the `arm64` part of a `universal2` wheel.
-
-    `cibuildwheel` will raise a warning to notify you of this - these warnings be be silenced by skipping testing on these platforms: `CIBW_TEST_SKIP: *_arm64 *_universal2:arm64`.
-
-Hopefully, this is a temporary situation. Once we have widely available Apple Silicon CI runners, we can build and test `arm64` and `universal2` wheels more natively. That's why `universal2` wheels are not yet built by default, and require opt-in by setting `CIBW_ARCHS_MACOS`.
-
-!!! note
-    Your runner image needs Xcode Command Line Tools 12.2 or later to build `universal2` and `arm64`.
-
-    So far, only CPython 3.9 supports `universal2` and `arm64` wheels.
-
-Here's an example GitHub Actions workflow with a job that builds for Apple Silicon:
-
-> .github/workflows/build_macos.yml
-
-```yml
-{% include "../examples/github-apple-silicon.yml" %}
-```
-
-### Windows and Python 2.7
-
-Building 2.7 extensions on Windows is difficult, because the VS 2008 compiler that was used for the original Python compilation was discontinued in 2018, and has since been removed from Microsoft's downloads. Most people choose to not build Windows 2.7 wheels, or to override the compiler to something more modern.
-
-To override, you need to have a modern compiler toolchain activated, and set `DISTUTILS_USE_SDK=1` and `MSSdk=1`. For example, on GitHub Actions, you would add these steps:
-
-```yaml
-    - name: Prepare compiler environment for Windows
-      if: runner.os == 'Windows'
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x64
-
-    - name: Set Windows environment variables
-      if: runner.os == 'Windows'
-      shell: bash
-      run: |
-        echo "DISTUTILS_USE_SDK=1" >> $GITHUB_ENV
-        echo "MSSdk=1" >> $GITHUB_ENV
-
-    # invoke cibuildwheel...
-```
-
-cibuildwheel will not try to build 2.7 on Windows unless it detects that the above two variables are set. Note that changing to a more modern compiler will mean your wheel picks up a runtime dependency to a different [Visual C++ Redistributable][]. You also need to be [a bit careful][] in designing your extension; some major binding tools like pybind11 do this for you.
-
-More on setting a custom Windows toolchain in our docs on modern C++ standards [here](cpp_standards.md#windows-and-python-27).
-
-[Visual C++ Redistributable]: https://support.microsoft.com/en-us/topic/the-latest-supported-visual-c-downloads-2647da03-1eea-4433-9aff-95f26a218cc0
-[a bit careful]: https://pybind11.readthedocs.io/en/stable/faq.html#working-with-ancient-visual-studio-2008-builds-on-windows
-
 ### Building packages with optional C extensions
 
 `cibuildwheel` defines the environment variable `CIBUILDWHEEL` to the value `1` allowing projects for which the C extension is optional to make it mandatory when building wheels.
@@ -180,7 +117,145 @@ myextension = Extension(
 )
 ```
 
-### 'No module named XYZ' errors after running cibuildwheel on macOS
+### Automatic updates {: #automatic-updates}
+
+Selecting a moving target (like the latest release) is generally a bad idea in CI. If something breaks, you can't tell whether it was your code or an upstream update that caused the breakage, and in a worse-case scenario, it could occur during a release.
+There are two suggested methods for keeping cibuildwheel up to date that instead involve scheduled pull requests using GitHub's dependabot.
+
+#### Option 1: GitHub Action
+
+If you use GitHub Actions for builds, you can use cibuildwheel as an action:
+
+```yaml
+uses: pypa/cibuildwheel@v2.2.0a1
+```
+
+This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal.
+
+Then, your `.github/dependabot.yml` file could look like this:
+
+```yaml
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    ignore:
+      # Optional: Official actions have moving tags like v1;
+      # if you use those, you don't need updates.
+      - dependency-name: "actions/*"
+```
+
+#### Option 2: Requirement files
+
+The second option, and the only one that supports other CI systems, is using a `requirements-*.txt` file. The file should have a distinct name and have only one entry:
+
+```bash
+# requirements-cibw.txt
+cibuildwheel==2.2.0a1
+```
+
+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:
+
+```yaml
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
+```
+
+This will also try to update other pins in all requirement files, so be sure you want to do that. The only control you have over the files used is via the directory option.
+
+
+### Alternatives to cibuildwheel options {: #cibw-options-alternatives}
+
+cibuildwheel provides lots of opportunities to configure the build
+environment. However, you  might consider adding this build configuration into
+the package itself - in general, this is preferred, because users of your
+package 'sdist' will also benefit.
+
+#### Missing build dependencies {: #cibw-options-alternatives-deps}
+
+If your build needs Python dependencies, rather than using CIBW_BEFORE_BUILD, it's best to add these to the
+[`build-system.requires`](https://www.python.org/dev/peps/pep-0518/#build-system-table)
+section of your pyproject.toml. For example, if your project requires Cython
+to build, your pyproject.toml might include a section like this:
+
+```toml
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel",
+    "Cython",
+]
+
+build-backend = "setuptools.build_meta"
+```
+
+#### Actions you need to perform before building
+
+You might need to run some other commands before building, like running a
+script that performs codegen or downloading some data that's not stored in
+your source tree.
+
+Rather than using CIBW_BEFORE_ALL or CIBW_BEFORE_BUILD, you could incorporate
+these steps into your package's build process. For example, if you're using
+setuptools, you can add steps to your package's `setup.py` using a structure
+like this:
+
+    ```python
+    import subprocess
+    import setuptools
+    import setuptools.command.build_py
+
+
+    class BuildPyCommand(setuptools.command.build_py.build_py):
+      """Custom build command."""
+
+      def run(self):
+        # your custom build steps here
+        # e.g.
+        #   subprocess.run(['python', 'scripts/my_custom_script.py'], check=True)
+        setuptools.command.build_py.build_py.run(self)
+
+
+    setuptools.setup(
+        cmdclass={
+            'build_py': BuildPyCommand,
+        },
+        # Usual setup() args.
+        # ...
+    )
+    ```
+
+#### Compiler flags
+
+Your build might need some compiler flags to be set through environment variables.
+Consider incorporating these into your package, for example, in `setup.py` using [`extra_compile_args` or
+`extra_link_args`](https://docs.python.org/3/distutils/setupscript.html#other-options).
+
+### Python 2.7 / PyPy2 wheels
+
+See the [cibuildwheel version 1 docs](https://cibuildwheel.readthedocs.io/en/1.x/) for information about building Python 2.7 or PyPy2 wheels. There are lots of tricks and workaround there that are no longer required for Python 3 in cibuildwheel 2.
+
+## Troubleshooting
+
+If your wheel didn't compile, you might have a mistake in your config.
+
+To quickly test your config without doing a git push and waiting for your code to build on CI, you can [test the Linux build in a local Docker container](setup.md#local).
+
+### Missing dependencies
+
+You might need to install something on the build machine. You can do this with apt/yum, brew or choco, using the [`CIBW_BEFORE_ALL`](options.md#before-all) option. Or, for a Python dependency, consider [adding it to pyproject.toml](#cibw-options-alternatives-deps).
+
+### macOS: ModuleNotFoundError
+
+Calling cibuildwheel from a python3 script and getting a `ModuleNotFoundError`? Due to a (fixed) [bug](https://bugs.python.org/issue22490) in CPython, you'll need to [unset the `__PYVENV_LAUNCHER__` variable](https://github.com/pypa/cibuildwheel/issues/133#issuecomment-478288597) before activating a venv.
+
+### macOS: 'No module named XYZ' errors after running cibuildwheel
 
 `cibuildwheel` on Mac installs the distributions from Python.org system-wide during its operation. This is necessary, but it can cause some confusing errors after cibuildwheel has finished.
 
@@ -204,11 +279,37 @@ python3 -m pip install twine
 python3 -m twine upload wheelhouse/*.whl
 ```
 
-### 'ImportError: DLL load failed: The specific module could not be found' error on Windows
+### macOS: Passing DYLD_LIBRARY_PATH to delocate
 
-Visual Studio and MSVC link the compiled binary wheels to the Microsoft Visual C++ Runtime. Normally, these are included with Python, but when compiling with a newer version of Visual Studio, it is possible users will run into problems on systems that do not have these runtime libraries installed. The solution is to ask users to download the corresponding Visual C++ Redistributable from the [Microsoft website](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) and install it. Since a Python installation normally includes these VC++ Redistributable files for [the version of the MSVC compiler used to compile Python](https://wiki.python.org/moin/WindowsCompilers), this is typically only a problem when compiling a Python 2.7 C extension with a newer compiler, e.g. to support a modern C++ standard (see [the section on modern C++ standards for Python 2.7](cpp_standards.md#windows-and-python-27) for more details).
+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.
 
-Additionally, Visual Studio 2019 started linking to an even newer DLL, `VCRUNTIME140_1.dll`, besides the `VCRUNTIME140.dll` that is included with recent Python versions (starting from Python 3.5; see [here](https://wiki.python.org/moin/WindowsCompilers) for more details on the corresponding Visual Studio & MSVC versions used to compile the different Python versions). To avoid this extra dependency on `VCRUNTIME140_1.dll`, the [`/d2FH4-` flag](https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64/) can be added to the MSVC invocations (check out [this issue](https://github.com/joerick/cibuildwheel/issues/423) for details and references).
+To work around this, use a different environment variable such as `REPAIR_LIBRARY_PATH` to store the library path, and set `DYLD_LIBRARY_PATH` in [`CIBW_REPAIR_WHEEL_COMMAND_MACOS`](https://cibuildwheel.readthedocs.io/en/stable/options/#repair-wheel-command), like this:
+
+!!! tab examples "Environment variables"
+
+    ```yaml
+    CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
+        DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} &&
+        DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
+    ```
+
+!!! tab examples "pyproject.toml"
+
+    ```toml
+    [tool.cibuildwheel.macos]
+    repair-wheel-command = [
+        "DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel}",
+        "DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}"
+    ]
+    ```
+
+See [#816](https://github.com/pypa/cibuildwheel/issues/816), thanks to @phoerious for reporting.
+
+### Windows: 'ImportError: DLL load failed: The specific module could not be found'
+
+Visual Studio and MSVC link the compiled binary wheels to the Microsoft Visual C++ Runtime. Normally, these are included with Python, but when compiling with a newer version of Visual Studio, it is possible users will run into problems on systems that do not have these runtime libraries installed. The solution is to ask users to download the corresponding Visual C++ Redistributable from the [Microsoft website](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) and install it. Since a Python installation normally includes these VC++ Redistributable files for [the version of the MSVC compiler used to compile Python](https://wiki.python.org/moin/WindowsCompilers), this is typically only a problem when compiling a Python C extension with a newer compiler.
+
+Additionally, Visual Studio 2019 started linking to an even newer DLL, `VCRUNTIME140_1.dll`, besides the `VCRUNTIME140.dll` that is included with recent Python versions (starting from Python 3.5; see [here](https://wiki.python.org/moin/WindowsCompilers) for more details on the corresponding Visual Studio & MSVC versions used to compile the different Python versions). To avoid this extra dependency on `VCRUNTIME140_1.dll`, the [`/d2FH4-` flag](https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64/) can be added to the MSVC invocations (check out [this issue](https://github.com/pypa/cibuildwheel/issues/423) for details and references).
 
 To add the `/d2FH4-` flag to a standard `setup.py` using `setuptools`, the `extra_compile_args` option can be used:
 
@@ -223,56 +324,3 @@ To add the `/d2FH4-` flag to a standard `setup.py` using `setuptools`, the `extr
 ```
 
 To investigate the dependencies of a C extension (i.e., the `.pyd` file, a DLL in disguise) on Windows, [Dependency Walker](http://www.dependencywalker.com/) is a great tool.
-
-
-### Automatic updates {: #automatic-updates}
-
-Selecting a moving target (like the latest release) is generally a bad idea in CI. If something breaks, you can't tell whether it was your code or an upstream update that caused the breakage, and in a worse-case scenario, it could occur during a release.
-There are two suggested methods for keeping cibuildwheel up to date that instead involve scheduled pull requests using GitHub's dependabot.
-
-#### Option 1: GitHub Action
-
-If you use GitHub Actions for builds, you can use cibuildwheel as an action:
-
-```yaml
-uses: joerick/cibuildwheel@v1.11.0
-```
-
-This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal.
-
-Then, your `dependabot.yml` file could look like this:
-
-```yaml
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    ignore:
-      # Optional: Official actions have moving tags like v1;
-      # if you use those, you don't need updates.
-      - dependency-name: "actions/*"
-```
-
-#### Option 2: Requirement files
-
-The second option, and the only one that supports other CI systems, is using a `requirements-*.txt` file. The file should have a distinct name and have only one entry:
-
-```bash
-# requirements-cibw.txt
-cibuildwheel==1.11.0
-```
-
-Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `dependabot.yml` file could look like this:
-
-```yaml
-version: 2
-updates:
-  - package-ecosystem: "pip"
-    directory: "/"
-    schedule:
-      interval: "daily"
-```
-
-This will also try to update other pins in all requirement files, so be sure you want to do that. The only control you have over the files used is via the directory option.

docs/main.py

@@ -0,0 +1,13 @@
+import subprocess
+from typing import Any
+
+# Requires Python 3.7+
+
+
+def define_env(env: Any) -> None:
+    "Hook function for mkdocs-macros"
+
+    @env.macro
+    def subprocess_run(*args: str) -> str:
+        "Run a subprocess and return the stdout"
+        return subprocess.run(args, check=True, capture_output=True, text=True).stdout

docs/setup.md

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

docs/working-examples.md

@@ -2,11 +2,216 @@
 title: Working examples
 ---
 
-{%
+<!-- START bin/projects.py -->
-   include-markdown "../README.md"
+
-   start="<!--working-examples-start-->"
+<!-- this section is generated by bin/projects.py. Don't edit it directly, instead, edit docs/data/projects.yml -->
-   end="<!--working-examples-end-->"
+
-%}
+| Name                              | CI | OS | Notes |
+|-----------------------------------|----|----|:------|
+| [scikit-learn][]                  | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The machine learning library. A complex but clean config using many of cibuildwheel's features to build a large project with Cython and C++ extensions.  |
+| [Matplotlib][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The venerable Matplotlib, a Python library with C++ portions |
+| [MyPy][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | MyPyC, the compiled component of MyPy. |
+| [psutil][]                        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python |
+| [scikit-image][]                  | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Image processing library. Uses cibuildwheel to build and test a project that uses Cython with platform-native code.  |
+| [twisted-iocpsupport][]           | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. |
+| [cmake][]                         | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
+| [websockets][]                    | ![travisci icon][] | ![apple icon][] ![linux icon][] | Library for building WebSocket servers and clients. Mostly written in Python, with a small C 'speedups' extension module.  |
+| [pyzmq][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython and CFFI.  |
+| [aiortc][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | WebRTC and ORTC implementation for Python using asyncio. |
+| [River][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python |
+| [coverage.py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python |
+| [numexpr][]                       | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas, bcolz and more |
+| [h5py][]                          | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. |
+| [Dependency Injector][]           | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI |
+| [PyAV][]                          | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Pythonic bindings for FFmpeg's libraries. |
+| [PyTables][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data |
+| [ruptures][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. |
+| [pikepdf][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by qpdf |
+| [aioquic][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python |
+| [google neuroglancer][]           | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data |
+| [DeepForest][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) |
+| [AutoPy][]                        | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
+| [Parselmouth][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. |
+| [python-rapidjson][]              | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson |
+| [H3-py][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system |
+| [markupsafe][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. |
+| [Rtree][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS ¶ |
+| [python-snappy][]                 | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for the snappy google library |
+| [pybind11 cmake_example][]        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system |
+| [KDEpy][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Kernel Density Estimation in Python |
+| [cyvcf2][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing |
+| [pybind11 python_example][]       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a Python-based build system |
+| [dd-trace-py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub |
+| [sourmash][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. |
+| [tgcalls][]                       | ![github icon][] | ![apple icon][] ![windows icon][] | Python `pybind11` binding to Telegram's WebRTC library with third party dependencies like `OpenSSL`, `MozJPEG`, `FFmpeg`, etc. |
+| [time-machine][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. |
+| [matrixprofile][]                 | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. |
+| [CTranslate2][]                   | ![github icon][] | ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://software.intel.com/content/www/us/en/develop/tools/oneapi/base-toolkit.html). The Linux wheels also include CUDA libraries for GPU execution. |
+| [iminuit][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 |
+| [jq.py][]                         | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq |
+| [Tokenizer][]                     | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support |
+| [PyGLM][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Fast OpenGL Mathematics (GLM) for Python |
+| [bx-python][]                     | ![travisci icon][] | ![apple icon][] ![linux icon][] | A library that includes Cython extensions. |
+| [iDynTree][]                      | ![github icon][] | ![linux icon][] | Uses manylinux_2_24 |
+| [boost-histogram][]               | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. |
+| [pybase64][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python |
+| [TgCrypto][]                      | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
+| [etebase-py][]                    | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. |
+| [fathon][]                        | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms |
+| [pyjet][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy |
+| [numpythia][]                     | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy |
+| [polaroid][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. |
+| [ninja][]                         | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
+| [Imagecodecs (fork)][]            | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. |
+| [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 |
+| [GSD][]                           | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Cython and NumPy project with 64-bit wheels. |
+| [pyinstrument_cext][]             | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies |
+| [xmlstarlet][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. |
+| [CorrectionLib][]                 | ![github icon][] | ![apple icon][] ![linux icon][] | Structured JSON powered correction library for HEP, designed for the CMS experiment at CERN. |
+| [SiPM][]                          | ![github icon][] | ![apple icon][] ![linux icon][] | High performance library for SiPM detectors simulation using C++17, OpenMP and AVX2 intrinsics. |
+| [pillow-heif][]                   | ![github icon][] | ![apple icon][] ![linux icon][] | Python CFFI binding to libheif library with third party dependencies like `libde265`, `x265`, `libaom` with test & publishing on PyPi. |
+
+[scikit-learn]: https://github.com/scikit-learn/scikit-learn
+[Matplotlib]: https://github.com/matplotlib/matplotlib
+[MyPy]: https://github.com/mypyc/mypy_mypyc-wheels
+[psutil]: https://github.com/giampaolo/psutil
+[scikit-image]: https://github.com/scikit-image/scikit-image
+[twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport
+[cmake]: https://github.com/scikit-build/cmake-python-distributions
+[websockets]: https://github.com/aaugustin/websockets
+[pyzmq]: https://github.com/zeromq/pyzmq
+[aiortc]: https://github.com/aiortc/aiortc
+[River]: https://github.com/online-ml/river
+[coverage.py]: https://github.com/nedbat/coveragepy
+[numexpr]: https://github.com/pydata/numexpr
+[h5py]: https://github.com/h5py/h5py
+[Dependency Injector]: https://github.com/ets-labs/python-dependency-injector
+[PyAV]: https://github.com/PyAV-Org/PyAV
+[PyTables]: https://github.com/PyTables/PyTables
+[ruptures]: https://github.com/deepcharles/ruptures
+[pikepdf]: https://github.com/pikepdf/pikepdf
+[aioquic]: https://github.com/aiortc/aioquic
+[google neuroglancer]: https://github.com/google/neuroglancer
+[DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest
+[AutoPy]: https://github.com/autopilot-rs/autopy
+[Parselmouth]: https://github.com/YannickJadoul/Parselmouth
+[python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson
+[H3-py]: https://github.com/uber/h3-py
+[markupsafe]: https://github.com/pallets/markupsafe
+[Rtree]: https://github.com/Toblerity/rtree
+[python-snappy]: https://github.com/andrix/python-snappy
+[pybind11 cmake_example]: https://github.com/pybind/cmake_example
+[KDEpy]: https://github.com/tommyod/KDEpy
+[cyvcf2]: https://github.com/brentp/cyvcf2
+[pybind11 python_example]: https://github.com/pybind/python_example
+[dd-trace-py]: https://github.com/DataDog/dd-trace-py
+[sourmash]: https://github.com/dib-lab/sourmash
+[tgcalls]: https://github.com/MarshalX/tgcalls
+[time-machine]: https://github.com/adamchainz/time-machine
+[matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile
+[CTranslate2]: https://github.com/OpenNMT/CTranslate2
+[iminuit]: https://github.com/scikit-hep/iminuit
+[jq.py]: https://github.com/mwilliamson/jq.py
+[Tokenizer]: https://github.com/OpenNMT/Tokenizer
+[PyGLM]: https://github.com/Zuzu-Typ/PyGLM
+[bx-python]: https://github.com/bxlab/bx-python
+[iDynTree]: https://github.com/robotology/idyntree
+[boost-histogram]: https://github.com/scikit-hep/boost-histogram
+[pybase64]: https://github.com/mayeut/pybase64
+[TgCrypto]: https://github.com/pyrogram/tgcrypto
+[etebase-py]: https://github.com/etesync/etebase-py
+[fathon]: https://github.com/stfbnc/fathon
+[pyjet]: https://github.com/scikit-hep/pyjet
+[numpythia]: https://github.com/scikit-hep/numpythia
+[polaroid]: https://github.com/daggy1234/polaroid
+[ninja]: https://github.com/scikit-build/ninja-python-distributions
+[Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build
+[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example
+[GSD]: https://github.com/glotzerlab/gsd
+[pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext
+[xmlstarlet]: https://github.com/dimitern/xmlstarlet
+[CorrectionLib]: https://github.com/cms-nanoAOD/correctionlib
+[SiPM]: https://github.com/EdoPro98/SimSiPM
+[pillow-heif]: https://github.com/bigcat88/pillow_heif
+
+[appveyor icon]: data/readme_icons/appveyor.svg
+[github icon]: data/readme_icons/github.svg
+[azurepipelines icon]: data/readme_icons/azurepipelines.svg
+[circleci icon]: data/readme_icons/circleci.svg
+[gitlab icon]: data/readme_icons/gitlab.svg
+[travisci icon]: data/readme_icons/travisci.svg
+[windows icon]: data/readme_icons/windows.svg
+[apple icon]: data/readme_icons/apple.svg
+[linux icon]: data/readme_icons/linux.svg
+
+<!-- scikit-learn: 47240, last pushed 0 days ago -->
+<!-- Matplotlib: 14229, last pushed 0 days ago -->
+<!-- MyPy: 11299, last pushed 0 days ago -->
+<!-- psutil: 7668, last pushed 7 days ago -->
+<!-- scikit-image: 4523, last pushed 0 days ago -->
+<!-- twisted-iocpsupport: 4373, last pushed 0 days ago -->
+<!-- cmake: 4161, last pushed 0 days ago -->
+<!-- websockets: 3569, last pushed 0 days ago -->
+<!-- pyzmq: 2911, last pushed 3 days ago -->
+<!-- aiortc: 2575, last pushed 3 days ago -->
+<!-- River: 1993, last pushed 0 days ago -->
+<!-- coverage.py: 1722, last pushed 11 days ago -->
+<!-- numexpr: 1643, last pushed 74 days ago -->
+<!-- h5py: 1585, last pushed 5 days ago -->
+<!-- Dependency Injector: 1565, last pushed 3 days ago -->
+<!-- PyAV: 1344, last pushed 17 days ago -->
+<!-- PyTables: 1061, last pushed 18 days ago -->
+<!-- ruptures: 793, last pushed 2 days ago -->
+<!-- pikepdf: 747, last pushed 4 days ago -->
+<!-- aioquic: 740, last pushed 12 days ago -->
+<!-- google neuroglancer: 685, last pushed 4 days ago -->
+<!-- DeepForest: 655, last pushed 58 days ago -->
+<!-- AutoPy: 572, last pushed 94 days ago -->
+<!-- Parselmouth: 555, last pushed 6 days ago -->
+<!-- python-rapidjson: 429, last pushed 86 days ago -->
+<!-- H3-py: 428, last pushed 12 days ago -->
+<!-- markupsafe: 424, last pushed 11 days ago -->
+<!-- Rtree: 420, last pushed 183 days ago -->
+<!-- python-snappy: 407, last pushed 60 days ago -->
+<!-- pybind11 cmake_example: 310, last pushed 5 days ago -->
+<!-- KDEpy: 299, last pushed 108 days ago -->
+<!-- cyvcf2: 268, last pushed 19 days ago -->
+<!-- pybind11 python_example: 265, last pushed 5 days ago -->
+<!-- dd-trace-py: 265, last pushed 0 days ago -->
+<!-- sourmash: 260, last pushed 0 days ago -->
+<!-- tgcalls: 248, last pushed 2 days ago -->
+<!-- time-machine: 206, last pushed 5 days ago -->
+<!-- matrixprofile: 198, last pushed 86 days ago -->
+<!-- CTranslate2: 188, last pushed 4 days ago -->
+<!-- iminuit: 184, last pushed 11 days ago -->
+<!-- jq.py: 174, last pushed 48 days ago -->
+<!-- Tokenizer: 156, last pushed 2 days ago -->
+<!-- PyGLM: 117, last pushed 5 days ago -->
+<!-- bx-python: 105, last pushed 72 days ago -->
+<!-- iDynTree: 87, last pushed 3 days ago -->
+<!-- boost-histogram: 83, last pushed 2 days ago -->
+<!-- pybase64: 73, last pushed 1 days ago -->
+<!-- TgCrypto: 71, last pushed 112 days ago -->
+<!-- etebase-py: 51, last pushed 258 days ago -->
+<!-- fathon: 35, last pushed 109 days ago -->
+<!-- pyjet: 31, last pushed 4 days ago -->
+<!-- numpythia: 31, last pushed 4 days ago -->
+<!-- polaroid: 24, last pushed 55 days ago -->
+<!-- ninja: 20, last pushed 6 days ago -->
+<!-- Imagecodecs (fork): 19, last pushed 25 days ago -->
+<!-- pybind11 scikit_build_example: 17, last pushed 5 days ago -->
+<!-- GSD: 17, last pushed 17 days ago -->
+<!-- pyinstrument_cext: 10, last pushed 33 days ago -->
+<!-- xmlstarlet: 7, last pushed 59 days ago -->
+<!-- CorrectionLib: 6, last pushed 4 days ago -->
+<!-- SiPM: 4, last pushed 72 days ago -->
+<!-- pillow-heif: 2, last pushed 3 days ago -->
+
+<!-- END bin/projects.py -->
+
+> Add your repo here! Let us know on [GitHub Discussions](https://github.com/pypa/cibuildwheel/discussions/485), or send a PR, adding your information to `docs/data/projects.yml`.
+>
+> <sup>I'd like to include notes here to indicate why an example might be interesting to cibuildwheel users - the styles/technologies/techniques used in each. Please include that in future additions!</sup>
 
 <style>
 .wy-nav-content {

examples/appveyor-minimal.yml

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

examples/azure-pipelines-minimal.yml

@@ -6,7 +6,7 @@ jobs:
     - bash: |
         set -o errexit
         python3 -m pip install --upgrade pip
-        pip3 install cibuildwheel==1.11.0
+        pip3 install cibuildwheel==2.2.0a1
       displayName: Install dependencies
     - bash: cibuildwheel --output-dir wheelhouse .
       displayName: Build wheels
@@ -20,7 +20,7 @@ jobs:
     - bash: |
         set -o errexit
         python3 -m pip install --upgrade pip
-        python3 -m pip install cibuildwheel==1.11.0
+        python3 -m pip install cibuildwheel==2.2.0a1
       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==1.11.0
+        pip install cibuildwheel==2.2.0a1
       displayName: Install dependencies
     - bash: cibuildwheel --output-dir wheelhouse .
       displayName: Build wheels

examples/circleci-minimal.yml

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

examples/github-apple-silicon.yml

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

examples/github-deploy.yml

@@ -27,7 +27,7 @@ jobs:
           python-version: '3.8'
 
       - name: Build wheels
-        uses: joerick/cibuildwheel@v1.11.0
+        uses: pypa/cibuildwheel@v2.2.0a1
 
       - uses: actions/upload-artifact@v2
         with:
@@ -64,7 +64,7 @@ jobs:
           name: artifact
           path: dist
 
-      - uses: pypa/gh-action-pypi-publish@master
+      - uses: pypa/gh-action-pypi-publish@v1.4.2
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}

examples/github-minimal.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Build wheels
-        uses: joerick/cibuildwheel@v1.11.0
+        uses: pypa/cibuildwheel@v2.2.0a1
         # to supply options, put them in 'env', like:
         # env:
         #   CIBW_SOME_OPTION: value

examples/github-with-qemu.yml

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

examples/gitlab-minimal.yml

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

examples/travis-ci-deploy.yml

@@ -1,15 +1,14 @@
 # As written, this configuration will build your wheels on every
 # commit, but will only push to PyPI on tagged commits.
 
+os: linux
+dist: focal
 language: python
 
 jobs:
   include:
     # perform a linux build
     - services: docker
-    # and a mac build
-    - os: osx
-      language: shell
     # and a windows build
     - os: windows
       language: shell
@@ -20,7 +19,7 @@ jobs:
         - ln -s /c/Python38/python.exe /c/Python38/python3.exe
 
 install:
-  - python3 -m pip install cibuildwheel==1.11.0
+  - python3 -m pip install cibuildwheel==2.2.0a1
 
 script:
   # build the wheels, put them into './wheelhouse'

examples/travis-ci-minimal.yml

@@ -1,3 +1,5 @@
+os: linux
+dist: focal
 language: python
 
 jobs:
@@ -13,9 +15,6 @@ jobs:
     # perform a linux S390X build
     - services: docker
       arch: s390x
-    # and a mac build
-    - os: osx
-      language: shell
     # and a windows build
     - os: windows
       language: shell
@@ -26,7 +25,7 @@ jobs:
         - ln -s /c/Python38/python.exe /c/Python38/python3.exe
 
 install:
-  - python3 -m pip install cibuildwheel==1.11.0
+  - python3 -m pip install cibuildwheel==2.2.0a1
 
 script:
   # build the wheels, put them into './wheelhouse'

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

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

mkdocs.yml

@@ -5,7 +5,8 @@ theme:
   highlightjs: true
   hljs_languages:
       - yaml
-repo_url: https://github.com/joerick/cibuildwheel
+repo_url: https://github.com/pypa/cibuildwheel
+edit_uri: edit/main/docs/
 
 extra_css:
   - extra.css
@@ -40,3 +41,7 @@ markdown_extensions:
 plugins:
   - include-markdown
   - search
+  - macros:
+      module_name: docs/main
+      j2_variable_start_string: «
+      j2_variable_end_string: »

noxfile.py

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

pyproject.toml

@@ -6,6 +6,62 @@ requires = [
 
 build-backend = "setuptools.build_meta"
 
+
 [tool.black]
 line-length = 100
 target-version = ['py36', 'py37', 'py38', 'py39']
+
+
+[tool.isort]
+profile = "black"
+multi_line_output = 3
+
+
+[tool.pytest.ini_options]
+minversion = 6.0
+junit_family = "xunit2"
+testpaths = [
+    "test",
+    "unit_test",
+]
+
+
+[tool.mypy]
+python_version = 3.7
+files = [
+    "cibuildwheel/*.py",
+    "test/**/*.py",
+    "unit_test/**/*.py",
+    "bin/*.py"
+]
+warn_unused_configs = true
+warn_redundant_casts = true
+no_implicit_reexport = true
+strict_equality = true
+warn_unused_ignores = true
+check_untyped_defs = true
+
+disallow_subclassing_any = true
+disallow_any_generics = true
+warn_return_any = true
+no_implicit_optional = true
+
+[[tool.mypy.overrides]]
+module = "cibuildwheel.*"
+disallow_untyped_defs = true
+disallow_untyped_calls = true
+disallow_incomplete_defs = true
+disallow_untyped_decorators = true
+
+[[tool.mypy.overrides]]
+module = [
+    "setuptools",
+    "pytest", # ignored in pre-commit to speed up check
+    "bashlex",
+    "toml.encoder", # encoder missing from stub package
+    "bracex",
+    "importlib_resources",
+    "nox",
+    "github",
+]
+ignore_missing_imports = true

setup.cfg

@@ -1,10 +1,10 @@
 [metadata]
 name = cibuildwheel
-version = 1.11.0
+version = 2.2.0a1
 description = Build Python wheels on CI with minimal configuration.
 long_description = file: README.md
 long_description_content_type = text/markdown
-url = https://github.com/joerick/cibuildwheel
+url = https://github.com/pypa/cibuildwheel
 author = Joe Rickerby
 author_email = joerick@mac.com
 license = BSD
@@ -24,7 +24,7 @@ classifiers =
     Topic :: Software Development :: Build Tools
 keywords = ci,wheel,packaging,pypi,travis,appveyor,macos,linux,windows
 project_urls =
-    Changelog=https://github.com/joerick/cibuildwheel#changelog
+    Changelog=https://github.com/pypa/cibuildwheel#changelog
     Documentation=https://cibuildwheel.readthedocs.io/
 
 [options]
@@ -65,57 +65,3 @@ exclude =
     env??/,
     .venv/,
     site/
-
-[tool:pytest]
-junit_family = xunit2
-testpaths =
-    test
-    unit_test
-
-[mypy]
-python_version = 3.7
-files = cibuildwheel/*.py,test/**/*.py,unit_test/**/*.py,bin/*.py
-warn_unused_configs = True
-warn_redundant_casts = True
-
-[mypy-test.*,mypy-unit_test.*]
-check_untyped_defs = True
-
-[mypy-cibuildwheel.*]
-disallow_any_generics = True
-disallow_subclassing_any = True
-disallow_untyped_calls = True
-disallow_untyped_defs = True
-disallow_incomplete_defs = True
-check_untyped_defs = True
-disallow_untyped_decorators = True
-no_implicit_optional = True
-warn_unused_ignores = True
-warn_return_any = True
-no_implicit_reexport = True
-strict_equality = True
-
-[mypy-setuptools.*]
-ignore_missing_imports = True
-
-# Ignored for pre-commit to speed up check
-# Not ignored if manually running and pytest installed
-[mypy-pytest.*]
-ignore_missing_imports = True
-
-[mypy-bashlex.*]
-ignore_missing_imports = True
-
-# Has type stubs, but no pyproject.toml or .pyi files in the wheel.
-[mypy-toml.*]
-ignore_missing_imports = True
-
-[mypy-bracex.*]
-ignore_missing_imports = True
-
-[mypy-importlib_resources.*]
-ignore_missing_imports = True
-
-[tool:isort]
-profile = black
-multi_line_output = 3

setup.py

@@ -5,27 +5,43 @@ extras = {
         "mkdocs-include-markdown-plugin==2.8.0",
         "mkdocs==1.0.4",
         "pymdown-extensions",
+        "mkdocs-macros-plugin",
     ],
     "test": [
         "jinja2",
-        "pytest>=4",
+        "pytest>=6",
         "pytest-timeout",
+        "pytest-xdist; sys_platform == 'linux'",
     ],
-    "dev": [
+    "bin": [
         "click",
         "ghapi",
-        "mypy>=0.800",
-        "packaging>=20.8",
         "pip-tools",
         "pygithub",
         "pyyaml",
         "requests",
         "rich>=9.6",
-        "typing-extensions",
+        "packaging>=21.0",
+    ],
+    "mypy": [
+        "mypy>=0.901",
+        "types-jinja2",
+        "types-certifi",
+        "types-toml",
+        "types-jinja2",
+        "types-pyyaml",
+        "types-click",
+        "types-requests",
+        "types-toml",
     ],
 }
 
+extras["dev"] = [
+    *extras["mypy"],
+    *extras["test"],
+    *extras["bin"],
+]
+
 extras["all"] = sum(extras.values(), [])
-extras["dev"] += extras["test"]
 
 setup(extras_require=extras)

test/conftest.py

@@ -1,7 +1,9 @@
+from typing import Dict
+
 import pytest
 
 
-def pytest_addoption(parser):
+def pytest_addoption(parser) -> None:
     parser.addoption(
         "--run-emulation", action="store_true", default=False, help="run emulation tests"
     )
@@ -11,7 +13,7 @@ def pytest_configure(config):
     config.addinivalue_line("markers", "emulation: mark test requiring qemu binfmt_misc to run")
 
 
-def pytest_collection_modifyitems(config, items):
+def pytest_collection_modifyitems(config, items) -> None:
     if config.getoption("--run-emulation"):
         # --run-emulation given in cli: do not skip emulation tests
         return
@@ -19,3 +21,10 @@ def pytest_collection_modifyitems(config, items):
     for item in items:
         if "emulation" in item.keywords:
             item.add_marker(skip_emulation)
+
+
+@pytest.fixture(
+    params=[{"CIBW_BUILD_FRONTEND": "pip"}, {"CIBW_BUILD_FRONTEND": "build"}], ids=["pip", "build"]
+)
+def build_frontend_env(request) -> Dict[str, str]:
+    return request.param  # type: ignore

test/test_0_basic.py

@@ -1,4 +1,3 @@
-import platform
 import textwrap
 
 import pytest
@@ -19,12 +18,12 @@ basic_project = test_projects.new_c_project(
 )
 
 
-def test(tmp_path):
+def test(tmp_path, build_frontend_env):
     project_dir = tmp_path / "project"
     basic_project.generate(project_dir)
 
     # build the wheels
-    actual_wheels = utils.cibuildwheel_run(project_dir)
+    actual_wheels = utils.cibuildwheel_run(project_dir, add_env=build_frontend_env)
 
     # check that the expected wheels are produced
     expected_wheels = utils.expected_wheels("spam", "0.1.0")
@@ -53,16 +52,10 @@ def test_build_identifiers(tmp_path):
 
     # check that the number of expected wheels matches the number of build
     # identifiers
-    # after adding CIBW_MANYLINUX_IMAGE to support manylinux2010, there
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
-    # can be multiple wheels for each wheel, though, so we need to limit
+    build_identifiers = utils.cibuildwheel_get_build_identifiers(
-    # the expected wheels
+        project_dir, prerelease_pythons=True
-    if platform.machine() in ["x86_64", "i686"]:
+    )
-        expected_wheels = [
+    assert len(expected_wheels) == len(
-            w
+        build_identifiers
-            for w in utils.expected_wheels("spam", "0.1.0")
+    ), f"{expected_wheels} vs {build_identifiers}"
-            if "-manylinux" not in w or "-manylinux1" in w
-        ]
-    else:
-        expected_wheels = utils.expected_wheels("spam", "0.1.0")
-    build_identifiers = utils.cibuildwheel_get_build_identifiers(project_dir)
-    assert len(expected_wheels) == len(build_identifiers)

test/test_before_build.py

@@ -25,8 +25,13 @@ project_with_before_build_asserts = test_projects.new_c_project(
             stored_executable = f.read()
         print('stored_executable', stored_executable)
         print('sys.executable', sys.executable)
+
         # windows/mac are case insensitive
-        assert os.path.realpath(stored_executable).lower() == os.path.realpath(sys.executable).lower()
+        stored_path = os.path.realpath(stored_executable).lower()
+        current_path = os.path.realpath(sys.executable).lower()
+
+        # TODO: This is not valid in an virtual environment
+        assert stored_path == current_path, '{0} != {1}'.format(stored_path, current_path)
         """
     )
 )

test/test_before_test.py

@@ -49,11 +49,11 @@ def test(tmp_path):
             # checked in setup.py
             "CIBW_BEFORE_TEST": """python -c "import sys; open('/tmp/pythonversion.txt', 'w').write(sys.version)" && python -c "import sys; open('/tmp/pythonprefix.txt', 'w').write(sys.prefix)" && python -m pip install {project}/dependency""",
             "CIBW_BEFORE_TEST_WINDOWS": """python -c "import sys; open('c:\\pythonversion.txt', 'w').write(sys.version)" && python -c "import sys; open('c:\\pythonprefix.txt', 'w').write(sys.prefix)" && python -m pip install {project}/dependency""",
-            "CIBW_TEST_REQUIRES": "nose",
+            "CIBW_TEST_REQUIRES": "pytest",
             # the 'false ||' bit is to ensure this command runs in a shell on
             # mac/linux.
-            "CIBW_TEST_COMMAND": "false || nosetests {project}/test",
+            "CIBW_TEST_COMMAND": "false || pytest {project}/test",
-            "CIBW_TEST_COMMAND_WINDOWS": "nosetests {project}/test",
+            "CIBW_TEST_COMMAND_WINDOWS": "pytest {project}/test",
         },
     )
 

test/test_build_skip.py

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

test/test_cpp_standards.py

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

test/test_dependency_versions.py

@@ -47,39 +47,28 @@ def get_versions_from_constraint_file(constraint_file):
     }
 
 
-@pytest.mark.parametrize("python_version", ["2.7", "3.5", "3.6", "3.8"])
+@pytest.mark.parametrize("python_version", ["3.6", "3.8", "3.9"])
-def test_pinned_versions(tmp_path, python_version):
+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 utils.platform == "windows" and python_version == "2.7":
-        pytest.skip("Windows requires a workaround")
-
-    is_macos_11_or_later = utils.platform == "macos" and utils.get_macos_version() >= (10, 16)
-
-    if is_macos_11_or_later and python_version == "3.5":
-        pytest.skip("CPython 3.5 doesn't work on macOS Big Sur+")
-
     project_dir = tmp_path / "project"
     project_with_expected_version_checks.generate(project_dir)
 
     build_environment = {}
 
-    if python_version == "2.7":
+    if python_version == "3.6":
-        constraint_filename = "constraints-python27.txt"
-        build_pattern = "[cp]p27-*"
-    elif python_version == "3.5":
-        constraint_filename = "constraints-python35.txt"
-        build_pattern = "[cp]p35-*"
-    elif python_version == "3.6":
         constraint_filename = "constraints-python36.txt"
         build_pattern = "[cp]p36-*"
     elif python_version == "3.7":
         constraint_filename = "constraints-python37.txt"
         build_pattern = "[cp]p37-*"
+    elif python_version == "3.8":
+        constraint_filename = "constraints-python38.txt"
+        build_pattern = "[cp]p38-*"
     else:
         constraint_filename = "constraints.txt"
-        build_pattern = "[cp]p38-*"
+        build_pattern = "[cp]p39-*"
 
     constraint_file = cibuildwheel.util.resources_dir / constraint_filename
     constraint_versions = get_versions_from_constraint_file(constraint_file)
@@ -96,19 +85,12 @@ def test_pinned_versions(tmp_path, python_version):
         add_env={
             "CIBW_BUILD": build_pattern,
             "CIBW_ENVIRONMENT": cibw_environment_option,
+            **build_frontend_env,
         },
     )
 
     # also check that we got the right wheels
-    if python_version == "2.7":
+    if python_version == "3.6":
-        expected_wheels = [
-            w for w in utils.expected_wheels("spam", "0.1.0") if "-cp27" in w or "-pp27" in w
-        ]
-    elif python_version == "3.5":
-        expected_wheels = [
-            w for w in utils.expected_wheels("spam", "0.1.0") if "-cp35" in w or "-pp35" in w
-        ]
-    elif python_version == "3.6":
         expected_wheels = [
             w for w in utils.expected_wheels("spam", "0.1.0") if "-cp36" in w or "-pp36" in w
         ]
@@ -116,31 +98,31 @@ def test_pinned_versions(tmp_path, python_version):
         expected_wheels = [
             w for w in utils.expected_wheels("spam", "0.1.0") if "-cp38" in w or "-pp38" in w
         ]
+    elif python_version == "3.9":
+        expected_wheels = [
+            w for w in utils.expected_wheels("spam", "0.1.0") if "-cp39" in w or "-pp39" in w
+        ]
     else:
         raise ValueError("unhandled python version")
 
     assert set(actual_wheels) == set(expected_wheels)
 
 
-@pytest.mark.parametrize("python_version", ["2.7", "3.x"])
+def test_dependency_constraints_file(tmp_path, build_frontend_env):
-def test_dependency_constraints_file(tmp_path, python_version):
     if utils.platform == "linux":
         pytest.skip("linux doesn't pin individual tool versions, it pins manylinux images instead")
 
-    if utils.platform == "windows" and python_version == "2.7":
-        pytest.skip("Windows + Travis CI requires a workaround")
-
     project_dir = tmp_path / "project"
     project_with_expected_version_checks.generate(project_dir)
 
     tool_versions = {
         "pip": "20.0.2",
-        "setuptools": "44.0.0" if python_version == "2.7" else "46.0.0",
+        "setuptools": "53.0.0",
         "wheel": "0.34.2",
-        "virtualenv": "20.0.10",
+        "virtualenv": "20.0.35",
     }
 
-    constraints_file = tmp_path / "constraints.txt"
+    constraints_file = tmp_path / "constraints file.txt"
     constraints_file.write_text(
         textwrap.dedent(
             """
@@ -148,6 +130,7 @@ def test_dependency_constraints_file(tmp_path, python_version):
             setuptools=={setuptools}
             wheel=={wheel}
             virtualenv=={virtualenv}
+            importlib-metadata<3,>=0.12; python_version < "3.8"
             """.format(
                 **tool_versions
             )
@@ -166,22 +149,13 @@ def test_dependency_constraints_file(tmp_path, python_version):
     actual_wheels = utils.cibuildwheel_run(
         project_dir,
         add_env={
-            "CIBW_BUILD": "[cp]p27-*" if python_version == "2.7" else "[cp]p3?-*",
             "CIBW_ENVIRONMENT": cibw_environment_option,
             "CIBW_DEPENDENCY_VERSIONS": str(constraints_file),
+            **build_frontend_env,
         },
     )
 
     # also check that we got the right wheels
-    if python_version == "2.7":
+    expected_wheels = utils.expected_wheels("spam", "0.1.0")
-        expected_wheels = [
-            w for w in utils.expected_wheels("spam", "0.1.0") if "-cp27" in w or "-pp27" in w
-        ]
-    else:
-        expected_wheels = [
-            w
-            for w in utils.expected_wheels("spam", "0.1.0")
-            if "-cp27" not in w and "-pp27" not in w
-        ]
 
     assert set(actual_wheels) == set(expected_wheels)

test/test_docker_images.py

@@ -37,14 +37,14 @@ def test(tmp_path):
         add_env={
             "CIBW_MANYLINUX_X86_64_IMAGE": "dockcross/manylinux2010-x64",
             "CIBW_MANYLINUX_I686_IMAGE": "dockcross/manylinux2010-x86",
-            "CIBW_SKIP": "pp* cp27-* cp39-*",
+            "CIBW_BUILD": "cp3{6,7,8,9}-manylinux*",
         },
     )
 
     # also check that we got the right wheels built
     expected_wheels = [
         w
-        for w in utils.expected_wheels("spam", "0.1.0")
+        for w in utils.expected_wheels("spam", "0.1.0", musllinux_versions=[])
-        if "-pp" not in w and "-cp39-" not in w and "-cp27-" not in w
+        if "-cp36-" in w or "-cp37-" in w or "-cp38-" in w or "-cp39-" in w
     ]
     assert set(actual_wheels) == set(expected_wheels)

test/test_manylinuxXXXX_only.py

@@ -57,6 +57,7 @@ def test(manylinux_image, tmp_path):
     # CFLAGS environment variable is necessary to fail on 'malloc_info' (on manylinux1) during compilation/linking,
     # rather than when dynamically loading the Python
     add_env = {
+        "CIBW_BUILD": "*-manylinux*",
         "CIBW_ENVIRONMENT": 'CFLAGS="$CFLAGS -O0 -Werror=implicit-function-declaration"',
         "CIBW_MANYLINUX_X86_64_IMAGE": manylinux_image,
         "CIBW_MANYLINUX_I686_IMAGE": manylinux_image,
@@ -64,21 +65,27 @@ def test(manylinux_image, tmp_path):
         "CIBW_MANYLINUX_AARCH64_IMAGE": manylinux_image,
         "CIBW_MANYLINUX_PPC64LE_IMAGE": manylinux_image,
         "CIBW_MANYLINUX_S390X_IMAGE": manylinux_image,
+        "CIBW_MANYLINUX_PYPY_AARCH64_IMAGE": manylinux_image,
+        "CIBW_MANYLINUX_PYPY_I686_IMAGE": manylinux_image,
     }
-    if manylinux_image == "manylinux1":
+    if manylinux_image in {"manylinux1"}:
-        # We don't have a manylinux1 image for PyPy
+        # We don't have a manylinux1 image for PyPy & CPython 3.10 and above
-        add_env["CIBW_SKIP"] = "pp*"
+        add_env["CIBW_SKIP"] = "pp* cp31*"
-    elif manylinux_image in {"manylinux2014", "manylinux_2_24"}:
+
-        # We don't have a manylinux2014 / 'manylinux_2_24' image for PyPy (yet?)
-        # Python 2.7 not available on manylinux2014 / 'manylinux_2_24'
-        add_env["CIBW_SKIP"] = "cp27* pp*"
     actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
 
-    expected_wheels = [
+    platform_tag_map = {
-        w for w in utils.expected_wheels("spam", "0.1.0", manylinux_versions=[manylinux_image])
+        "manylinux1": ["manylinux_2_5", "manylinux1"],
-    ]
+        "manylinux2010": ["manylinux_2_12", "manylinux2010"],
-    if manylinux_image in {"manylinux2014", "manylinux_2_24"}:
+        "manylinux2014": ["manylinux_2_17", "manylinux2014"],
-        expected_wheels = [w for w in expected_wheels if "-cp27" not in w]
+    }
-    if manylinux_image in {"manylinux1", "manylinux2014", "manylinux_2_24"}:
+    expected_wheels = utils.expected_wheels(
-        expected_wheels = [w for w in expected_wheels if "-pp" not in w]
+        "spam",
+        "0.1.0",
+        manylinux_versions=platform_tag_map.get(manylinux_image, [manylinux_image]),
+        musllinux_versions=[],
+    )
+    if manylinux_image in {"manylinux1"}:
+        # remove PyPy & CPython 3.10 and above
+        expected_wheels = [w for w in expected_wheels if "-pp" not in w and "-cp31" not in w]
     assert set(actual_wheels) == set(expected_wheels)

test/test_pep518.py

@@ -1,4 +1,3 @@
-import os
 import textwrap
 
 from . import test_projects, utils
@@ -8,10 +7,7 @@ basic_project = test_projects.new_c_project(
         """
         # Will fail if PEP 518 does work
         import requests
-        if sys.version_info < (3, 6, 0):
+        assert requests.__version__ == "2.23.0", "Requests found but wrong version ({0})".format(requests.__version__)
-            assert requests.__version__ == "2.22.0", "Requests found but wrong version ({0})".format(requests.__version__)
-        else:
-            assert requests.__version__ == "2.23.0", "Requests found but wrong version ({0})".format(requests.__version__)
 
         # Just making sure environment is still set
         import os
@@ -29,29 +25,36 @@ requires = [
     "setuptools >= 42",
     "setuptools_scm[toml]>=4.1.2",
     "wheel",
-    "requests==2.22.0; python_version<'3.6'",
+    "requests==2.23.0"
-    "requests==2.23.0; python_version>='3.6'"
 ]
 
 build-backend = "setuptools.build_meta"
 """
 
 
-def test_pep518(tmp_path):
+def test_pep518(tmp_path, build_frontend_env):
 
     project_dir = tmp_path / "project"
     basic_project.generate(project_dir)
 
     # build the wheels
-    actual_wheels = utils.cibuildwheel_run(project_dir)
+    actual_wheels = utils.cibuildwheel_run(project_dir, add_env=build_frontend_env)
 
     # check that the expected wheels are produced
     expected_wheels = utils.expected_wheels("spam", "0.1.0")
     assert set(actual_wheels) == set(expected_wheels)
 
     # These checks ensure an extra file is not created when using custom
-    # workaround; see https://github.com/joerick/cibuildwheel/issues/421
+    # workaround; see https://github.com/pypa/cibuildwheel/issues/421
     assert not (project_dir / "42").exists()
     assert not (project_dir / "4.1.2").exists()
 
-    assert len(os.listdir(project_dir)) == len(basic_project.files)
+    # pypa/build creates a "build" folder & a "*.egg-info" folder for the wheel being built,
+    # this should be harmless so remove them
+    contents = [
+        item
+        for item in project_dir.iterdir()
+        if item.name != "build" and not item.name.endswith(".egg-info")
+    ]
+
+    assert len(contents) == len(basic_project.files)

test/test_projects/__init__.py

@@ -1,2 +1,4 @@
-from .base import TestProject  # noqa
+from .base import TestProject
-from .c import new_c_project  # noqa
+from .c import new_c_project
+
+__all__ = ("TestProject", "new_c_project")

test/test_projects/c.py

@@ -24,38 +24,18 @@ spam_system(PyObject *self, PyObject *args)
 }
 
 /* Module initialization */
-
-#if PY_MAJOR_VERSION >= 3
-    #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
-    #define MOD_DEF(m, name, doc, methods, module_state_size) \
-        static struct PyModuleDef moduledef = { \
-            PyModuleDef_HEAD_INIT, name, doc, module_state_size, methods, }; \
-        m = PyModule_Create(&moduledef);
-    #define MOD_RETURN(m) return m;
-#else
-    #define MOD_INIT(name) PyMODINIT_FUNC init##name(void)
-    #define MOD_DEF(m, name, doc, methods, module_state_size) \
-        m = Py_InitModule3(name, methods, doc);
-    #define MOD_RETURN(m) return;
-#endif
-
 static PyMethodDef module_methods[] = {
     {"system", (PyCFunction)spam_system, METH_VARARGS,
      "Execute a shell command."},
     {NULL}  /* Sentinel */
 };
 
-MOD_INIT(spam)
+PyMODINIT_FUNC PyInit_spam(void)
 {
-    PyObject* m;
+    static struct PyModuleDef moduledef = {
-
+        PyModuleDef_HEAD_INIT, "spam", "Example module", -1, module_methods,
-    MOD_DEF(m,
+    };
-            "spam",
+    return PyModule_Create(&moduledef);
-            "Example module",
-            module_methods,
-            -1)
-
-    MOD_RETURN(m)
 }
 """
 

test/test_ssl.py

@@ -7,15 +7,12 @@ project_with_ssl_tests = test_projects.new_c_project(
         r"""
         import ssl
 
-        if sys.version_info[0] == 2:
+        from urllib.request import urlopen
-            from urllib2 import urlopen
-        else:
-            from urllib.request import urlopen
 
         context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2)
         data = urlopen("https://www.nist.gov", context=context)
-        data = urlopen("https://raw.githubusercontent.com/joerick/cibuildwheel/master/CI.md", context=context)
+        data = urlopen("https://raw.githubusercontent.com/pypa/cibuildwheel/main/CI.md", context=context)
-        data = urlopen("https://raw.githubusercontent.com/joerick/cibuildwheel/master/CI.md")
+        data = urlopen("https://raw.githubusercontent.com/pypa/cibuildwheel/main/CI.md")
         """
     )
 )

test/test_testing.py

@@ -10,7 +10,7 @@ project_with_a_test = test_projects.new_c_project(
     setup_cfg_add=textwrap.dedent(
         r"""
         [options.extras_require]
-        test = nose
+        test = pytest
         """
     )
 )
@@ -52,8 +52,7 @@ class TestSpam(TestCase):
         # sys.prefix is different from sys.base_prefix when running a virtualenv
         # See https://docs.python.org/3/library/venv.html, which virtualenv seems
         # to honor in recent releases
-        # Python 2 doesn't have sys.base_prefix by default
+        if sys.prefix == sys.base_prefix:
-        if not hasattr(sys, 'base_prefix') or sys.prefix == sys.base_prefix:
             self.fail("Not running in a virtualenv")
 
         self.assertTrue(path_contains(sys.prefix, sys.executable))
@@ -67,10 +66,6 @@ class TestSpam(TestCase):
         bits = struct.calcsize("P") * 8
         if bits == 32:
             self.assertEqual(platform.machine(), "i686")
-
-    def test_time_to_remove_the_pypy_venv_patch(self):
-        if sys.platform == "darwin":
-            assert not hasattr(sys, "pypy_version_info") or sys.pypy_version_info < (7,3,4)
 '''
 
 
@@ -82,11 +77,11 @@ def test(tmp_path):
     actual_wheels = utils.cibuildwheel_run(
         project_dir,
         add_env={
-            "CIBW_TEST_REQUIRES": "nose",
+            "CIBW_TEST_REQUIRES": "pytest",
             # the 'false ||' bit is to ensure this command runs in a shell on
             # mac/linux.
-            "CIBW_TEST_COMMAND": "false || nosetests {project}/test",
+            "CIBW_TEST_COMMAND": "false || pytest {project}/test",
-            "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || nosetests {project}/test",
+            "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest {project}/test",
         },
     )
 
@@ -106,8 +101,8 @@ def test_extras_require(tmp_path):
             "CIBW_TEST_EXTRAS": "test",
             # the 'false ||' bit is to ensure this command runs in a shell on
             # mac/linux.
-            "CIBW_TEST_COMMAND": "false || nosetests {project}/test",
+            "CIBW_TEST_COMMAND": "false || pytest {project}/test",
-            "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || nosetests {project}/test",
+            "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest {project}/test",
         },
     )
 

test/test_troubleshooting.py

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

test/test_unicode.py

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

test/utils.py

@@ -6,11 +6,9 @@ This file is added to the PYTHONPATH in the test runner at bin/run_test.py.
 
 import os
 import platform as pm
-import shutil
 import subprocess
 import sys
-from contextlib import contextmanager
+from tempfile import TemporaryDirectory
-from tempfile import mkdtemp
 
 platform: str
 
@@ -26,24 +24,17 @@ else:
     raise Exception("Unsupported platform")
 
 
-# Python 2 does not have a tempfile.TemporaryDirectory context manager
+def cibuildwheel_get_build_identifiers(project_path, env=None, *, prerelease_pythons=False):
-@contextmanager
-def TemporaryDirectoryIfNone(path):
-    _path = path or mkdtemp()
-    try:
-        yield _path
-    finally:
-        if path is None:
-            shutil.rmtree(_path)
-
-
-def cibuildwheel_get_build_identifiers(project_path, env=None):
     """
     Returns the list of build identifiers that cibuildwheel will try to build
     for the current platform.
     """
+    cmd = [sys.executable, "-m", "cibuildwheel", "--print-build-identifiers", str(project_path)]
+    if prerelease_pythons:
+        cmd.append("--prerelease-pythons")
+
     cmd_output = subprocess.run(
-        [sys.executable, "-m", "cibuildwheel", "--print-build-identifiers", str(project_path)],
+        cmd,
         universal_newlines=True,
         env=env,
         check=True,
@@ -76,21 +67,22 @@ def cibuildwheel_run(project_path, package_dir=".", env=None, add_env=None, outp
     if add_env is not None:
         env.update(add_env)
 
-    with TemporaryDirectoryIfNone(output_dir) as _output_dir:
+    with TemporaryDirectory() as tmp_output_dir:
         subprocess.run(
             [
                 sys.executable,
                 "-m",
                 "cibuildwheel",
+                "--prerelease-pythons",
                 "--output-dir",
-                str(_output_dir),
+                str(output_dir or tmp_output_dir),
                 str(package_dir),
             ],
             env=env,
             cwd=project_path,
             check=True,
         )
-        wheels = os.listdir(_output_dir)
+        wheels = os.listdir(output_dir or tmp_output_dir)
     return wheels
 
 
@@ -111,10 +103,9 @@ def expected_wheels(
     package_name,
     package_version,
     manylinux_versions=None,
+    musllinux_versions=None,
     macosx_deployment_target="10.9",
     machine_arch=None,
-    *,
-    exclude_27=platform == "windows",
 ):
     """
     Returns a list of expected wheels from a run of cibuildwheel.
@@ -129,28 +120,26 @@ def expected_wheels(
 
     if manylinux_versions is None:
         if machine_arch == "x86_64":
-            manylinux_versions = ["manylinux1", "manylinux2010"]
+            manylinux_versions = ["manylinux_2_5", "manylinux1", "manylinux_2_12", "manylinux2010"]
         else:
-            manylinux_versions = ["manylinux2014"]
+            manylinux_versions = ["manylinux_2_17", "manylinux2014"]
 
-    python_abi_tags = ["cp35-cp35m", "cp36-cp36m", "cp37-cp37m", "cp38-cp38", "cp39-cp39"]
+    if musllinux_versions is None:
+        musllinux_versions = ["musllinux_1_1"]
 
-    if machine_arch in ["x86_64", "AMD64", "x86"]:
+    python_abi_tags = ["cp36-cp36m", "cp37-cp37m", "cp38-cp38", "cp39-cp39", "cp310-cp310"]
-        python_abi_tags += ["cp27-cp27m", "pp27-pypy_73", "pp36-pypy36_pp73", "pp37-pypy37_pp73"]
 
-        if platform == "linux":
+    if machine_arch in ["x86_64", "AMD64", "x86", "aarch64"]:
-            python_abi_tags.append("cp27-cp27mu")  # python 2.7 has 2 different ABI on manylinux
+        python_abi_tags += ["pp37-pypy37_pp73"]
 
     if platform == "macos" and get_macos_version() >= (10, 16):
         # 10.16 is sometimes reported as the macOS version on macOS 11.
-        # CPython 3.5 doesn't work on macOS 11.
-        python_abi_tags.remove("cp35-cp35m")
         # pypy not supported on macOS 11.
         python_abi_tags = [t for t in python_abi_tags if not t.startswith("pp")]
 
     if platform == "macos" and machine_arch == "arm64":
-        # currently, arm64 macs are only supported by cp39
+        # currently, arm64 macs are only supported by cp39 & cp310
-        python_abi_tags = ["cp39-cp39"]
+        python_abi_tags = ["cp39-cp39", "cp310-cp310"]
 
     wheels = []
 
@@ -160,20 +149,32 @@ def expected_wheels(
         if platform == "linux":
             architectures = [machine_arch]
 
-            if machine_arch == "x86_64" and python_abi_tag.startswith("cp"):
+            if machine_arch == "x86_64":
                 architectures.append("i686")
 
             platform_tags = [
-                f"{manylinux_version}_{architecture}"
+                ".".join(
+                    f"{manylinux_version}_{architecture}"
+                    for manylinux_version in manylinux_versions
+                )
                 for architecture in architectures
-                for manylinux_version in manylinux_versions
             ]
+            if len(musllinux_versions) > 0 and not python_abi_tag.startswith("pp"):
+                platform_tags.extend(
+                    [
+                        ".".join(
+                            f"{musllinux_version}_{architecture}"
+                            for musllinux_version in musllinux_versions
+                        )
+                        for architecture in architectures
+                    ]
+                )
 
         elif platform == "windows":
             if python_abi_tag.startswith("cp"):
                 platform_tags = ["win32", "win_amd64"]
             else:
-                platform_tags = ["win32"]
+                platform_tags = ["win_amd64"]
 
         elif platform == "macos":
             if python_abi_tag == "cp39-cp39" and machine_arch == "arm64":
@@ -195,11 +196,6 @@ def expected_wheels(
         for platform_tag in platform_tags:
             wheels.append(f"{package_name}-{package_version}-{python_abi_tag}-{platform_tag}.whl")
 
-    # Travis on Windows does not support using the default Python 2.7 compiler,
-    # so we support skipping here.
-    if exclude_27:
-        wheels = [w for w in wheels if "-cp27-" not in w and "-pp2" not in w]
-
     return wheels
 
 

unit_test/build_ids_test.py

@@ -11,7 +11,7 @@ def test_compare_configs():
 
     dict_txt = toml.loads(txt)
 
-    new_txt = toml.dumps(dict_txt, encoder=InlineArrayDictEncoder())
+    new_txt = toml.dumps(dict_txt, encoder=InlineArrayDictEncoder())  # type: ignore
     print(new_txt)
 
     assert new_txt == txt
@@ -35,6 +35,6 @@ python_configurations = [
 ]
 """
 
-    output = toml.dumps(example, encoder=InlineArrayDictEncoder())
+    output = toml.dumps(example, encoder=InlineArrayDictEncoder())  # type: ignore
     print(output)
     assert output == result

unit_test/build_selector_test.py

@@ -1,68 +1,90 @@
+import pytest
 from packaging.specifiers import SpecifierSet
 
 from cibuildwheel.util import BuildSelector
 
 
 def test_build():
-    build_selector = BuildSelector(build_config="cp3?-* *-manylinux1*", skip_config="")
+    build_selector = BuildSelector(build_config="cp3*-* *-manylinux*", skip_config="")
 
-    assert build_selector("cp27-manylinux1_x86_64")
+    assert build_selector("cp36-manylinux_x86_64")
-    assert build_selector("cp36-manylinux1_x86_64")
+    assert build_selector("cp37-manylinux_x86_64")
-    assert build_selector("cp37-manylinux1_x86_64")
+    assert build_selector("cp310-manylinux_x86_64")
-    assert build_selector("cp27-manylinux1_i686")
+    assert build_selector("pp36-manylinux_x86_64")
-    assert build_selector("cp36-manylinux1_i686")
+    assert build_selector("pp37-manylinux_x86_64")
-    assert build_selector("cp37-manylinux1_i686")
+    assert build_selector("cp36-manylinux_i686")
-    assert not build_selector("cp27-macosx_10_6_intel")
+    assert build_selector("cp37-manylinux_i686")
-    assert build_selector("cp36-macosx_10_6_intel")
+    assert build_selector("cp36-macosx_intel")
-    assert build_selector("cp37-macosx_10_6_intel")
+    assert build_selector("cp37-macosx_intel")
-    assert not build_selector("cp27-win32")
+    assert build_selector("cp39-macosx_intel")
+    assert build_selector("cp39-macosx_universal2")
+    assert build_selector("cp39-macosx_arm64")
+    assert not build_selector("pp36-macosx_intel")
+    assert not build_selector("pp37-macosx_intel")
     assert build_selector("cp36-win32")
     assert build_selector("cp37-win32")
-    assert not build_selector("cp27-win_amd64")
+    assert not build_selector("pp36-win32")
+    assert not build_selector("pp37-win32")
     assert build_selector("cp36-win_amd64")
     assert build_selector("cp37-win_amd64")
+    assert build_selector("cp310-win_amd64")
+    assert not build_selector("pp36-win_amd64")
+    assert not build_selector("pp37-win_amd64")
+
+
+@pytest.mark.skip("this test only makes sense when we have a prerelease python to test with")
+def test_build_filter_pre():
+    build_selector = BuildSelector(
+        build_config="cp3*-* *-manylinux*",
+        skip_config="",
+        prerelease_pythons=True,
+    )
+
+    assert build_selector("cp37-manylinux_x86_64")
+    assert build_selector("cp310-manylinux_x86_64")
+    assert build_selector("cp37-win_amd64")
+    assert build_selector("cp310-win_amd64")
 
 
 def test_skip():
     build_selector = BuildSelector(
-        build_config="*", skip_config="cp27-* cp3?-manylinux1_i686 cp36-win* *-win32"
+        build_config="*", skip_config="pp36-* cp3?-manylinux_i686 cp36-win* *-win32"
     )
 
-    assert not build_selector("cp27-manylinux1_x86_64")
+    assert not build_selector("pp36-manylinux_x86_64")
-    assert build_selector("cp36-manylinux1_x86_64")
+    assert build_selector("pp37-manylinux_x86_64")
-    assert build_selector("cp37-manylinux1_x86_64")
+    assert build_selector("cp36-manylinux_x86_64")
-    assert not build_selector("cp27-manylinux1_i686")
+    assert build_selector("cp37-manylinux_x86_64")
-    assert not build_selector("cp36-manylinux1_i686")
+    assert not build_selector("cp36-manylinux_i686")
-    assert not build_selector("cp37-manylinux1_i686")
+    assert not build_selector("cp37-manylinux_i686")
-    assert not build_selector("cp27-macosx_10_6_intel")
+    assert not build_selector("pp36-macosx_10_6_intel")
+    assert build_selector("pp37-macosx_10_6_intel")
     assert build_selector("cp36-macosx_10_6_intel")
     assert build_selector("cp37-macosx_10_6_intel")
-    assert not build_selector("cp27-win32")
     assert not build_selector("cp36-win32")
     assert not build_selector("cp37-win32")
-    assert not build_selector("cp27-win_amd64")
     assert not build_selector("cp36-win_amd64")
     assert build_selector("cp37-win_amd64")
 
 
 def test_build_and_skip():
     build_selector = BuildSelector(
-        build_config="cp36-* cp37-macosx* *-manylinux1*", skip_config="cp27-* cp37-manylinux1_i686"
+        build_config="cp36-* cp37-macosx* *-manylinux*", skip_config="pp37-* cp37-manylinux_i686"
     )
 
-    assert not build_selector("cp27-manylinux1_x86_64")
+    assert not build_selector("pp37-manylinux_x86_64")
-    assert build_selector("cp36-manylinux1_x86_64")
+    assert build_selector("cp36-manylinux_x86_64")
-    assert build_selector("cp37-manylinux1_x86_64")
+    assert build_selector("cp37-manylinux_x86_64")
-    assert not build_selector("cp27-manylinux1_i686")
+    assert not build_selector("pp37-manylinux_i686")
-    assert build_selector("cp36-manylinux1_i686")
+    assert build_selector("cp36-manylinux_i686")
-    assert not build_selector("cp37-manylinux1_i686")
+    assert not build_selector("cp37-manylinux_i686")
-    assert not build_selector("cp27-macosx_10_6_intel")
+    assert not build_selector("pp37-macosx_10_6_intel")
     assert build_selector("cp36-macosx_10_6_intel")
     assert build_selector("cp37-macosx_10_6_intel")
-    assert not build_selector("cp27-win32")
+    assert not build_selector("pp37-win32")
     assert build_selector("cp36-win32")
     assert not build_selector("cp37-win32")
-    assert not build_selector("cp27-win_amd64")
+    assert not build_selector("pp37-win_amd64")
     assert build_selector("cp36-win_amd64")
     assert not build_selector("cp37-win_amd64")
 
@@ -70,49 +92,44 @@ def test_build_and_skip():
 def test_build_braces():
     build_selector = BuildSelector(build_config="cp{36,37}*", skip_config="")
 
-    assert not build_selector("cp27-manylinux1_x86_64")
+    assert build_selector("cp36-manylinux_x86_64")
-    assert build_selector("cp36-manylinux1_x86_64")
+    assert build_selector("cp37-manylinux_x86_64")
-    assert build_selector("cp37-manylinux1_x86_64")
+    assert not build_selector("cp38-manylinux_x86_64")
-    assert not build_selector("cp38-manylinux1_x86_64")
+    assert not build_selector("cp39-manylinux_x86_64")
-    assert not build_selector("cp39-manylinux1_x86_64")
 
 
 def test_build_limited_python():
     build_selector = BuildSelector(
-        build_config="*", skip_config="", requires_python=SpecifierSet(">=3.6")
+        build_config="*", skip_config="", requires_python=SpecifierSet(">=3.7")
     )
 
-    assert not build_selector("cp27-manylinux1_x86_64")
+    assert not build_selector("cp36-manylinux_x86_64")
-    assert build_selector("cp36-manylinux1_x86_64")
+    assert build_selector("cp37-manylinux_x86_64")
-    assert build_selector("cp37-manylinux1_x86_64")
+    assert build_selector("cp38-manylinux_x86_64")
-    assert not build_selector("cp27-manylinux1_i686")
+    assert not build_selector("cp36-manylinux_i686")
-    assert build_selector("cp36-manylinux1_i686")
+    assert build_selector("cp37-manylinux_i686")
-    assert build_selector("cp37-manylinux1_i686")
+    assert build_selector("cp38-manylinux_i686")
-    assert not build_selector("cp27-win32")
+    assert not build_selector("cp36-win32")
-    assert build_selector("cp36-win32")
     assert build_selector("cp37-win32")
-    assert not build_selector("pp27-win32")
+    assert build_selector("cp38-win32")
-    assert build_selector("pp36-win32")
+    assert build_selector("pp37-win_amd64")
-    assert build_selector("pp37-win32")
 
 
 def test_build_limited_python_partial():
     build_selector = BuildSelector(
-        build_config="*",
+        build_config="*", skip_config="", requires_python=SpecifierSet(">=3.6, !=3.7.*")
-        skip_config="",
-        requires_python=SpecifierSet(">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"),
     )
 
-    assert build_selector("cp27-manylinux1_x86_64")
+    assert build_selector("cp36-manylinux_x86_64")
-    assert not build_selector("cp35-manylinux1_x86_64")
+    assert not build_selector("cp37-manylinux_x86_64")
-    assert build_selector("cp36-manylinux1_x86_64")
+    assert build_selector("cp38-manylinux_x86_64")
+    assert build_selector("cp39-manylinux_x86_64")
 
 
 def test_build_limited_python_patch():
     build_selector = BuildSelector(
-        build_config="*", skip_config="", requires_python=SpecifierSet(">=2.7.9")
+        build_config="*", skip_config="", requires_python=SpecifierSet(">=3.6.8")
     )
 
-    assert build_selector("cp27-manylinux1_x86_64")
+    assert build_selector("cp36-manylinux_x86_64")
-    assert build_selector("cp36-manylinux1_x86_64")
+    assert build_selector("cp37-manylinux_x86_64")
-    assert build_selector("cp37-manylinux1_x86_64")

unit_test/dependency_constraints_test.py

@@ -19,9 +19,3 @@ def test_defaults():
     assert dependency_constraints.get_for_python_version("3.6").samefile(
         resources_dir / "constraints-python36.txt"
     )
-    assert dependency_constraints.get_for_python_version("3.5").samefile(
-        resources_dir / "constraints-python35.txt"
-    )
-    assert dependency_constraints.get_for_python_version("2.7").samefile(
-        resources_dir / "constraints-python27.txt"
-    )

unit_test/docker_container_test.py

@@ -63,6 +63,7 @@ def test_container_removed():
             stdout=subprocess.PIPE,
             universal_newlines=True,
         ).stdout
+        assert container.name is not None
         assert container.name in docker_containers_listing
         old_container_name = container.name
 

unit_test/download_test.py

@@ -5,7 +5,7 @@ import pytest
 
 from cibuildwheel.util import download
 
-DOWNLOAD_URL = "https://raw.githubusercontent.com/joerick/cibuildwheel/v1.6.3/requirements-dev.txt"
+DOWNLOAD_URL = "https://raw.githubusercontent.com/pypa/cibuildwheel/v1.6.3/requirements-dev.txt"
 
 
 def test_download(monkeypatch, tmp_path):

unit_test/environment_test.py

@@ -106,10 +106,12 @@ def test_substitution_with_backslash():
 
 def test_awkwardly_quoted_variable():
     environment_recipe = parse_environment(
-        'VAR2=something"like this""$VAR1"$VAR1$(echo "theres more")"$(echo "and more!")"'
+        'VAR2=something"like this""$VAR1"$VAR1$(echo "there is more")"$(echo "and more!")"'
     )
 
     # pass the existing process env so PATH is available
     environment_dict = environment_recipe.as_dictionary({"VAR1": "but wait"})
 
-    assert environment_dict.get("VAR2") == "somethinglike thisbut waitbut waittheres moreand more!"
+    assert (
+        environment_dict.get("VAR2") == "somethinglike thisbut waitbut waitthere is moreand more!"
+    )

unit_test/main_tests/main_options_test.py

@@ -81,10 +81,11 @@ def test_empty_selector(platform, intercepted_build_args, monkeypatch):
         ("i686", "manylinux2014", "quay.io/pypa/manylinux2014_i686:*"),
         ("i686", "manylinux_2_24", "quay.io/pypa/manylinux_2_24_i686:*"),
         ("i686", "custom_image", "custom_image"),
-        ("pypy_x86_64", None, "pypywheels/manylinux2010-pypy_x86_64:*"),
+        ("pypy_x86_64", None, "quay.io/pypa/manylinux2010_x86_64:*"),
         ("pypy_x86_64", "manylinux1", "manylinux1"),  # Does not exist
-        ("pypy_x86_64", "manylinux2010", "pypywheels/manylinux2010-pypy_x86_64:*"),
+        ("pypy_x86_64", "manylinux2010", "quay.io/pypa/manylinux2010_x86_64:*"),
-        ("pypy_x86_64", "manylinux2014", "manylinux2014"),  # Does not exist (yet)
+        ("pypy_x86_64", "manylinux2014", "quay.io/pypa/manylinux2014_x86_64:*"),
+        ("pypy_x86_64", "manylinux_2_24", "quay.io/pypa/manylinux_2_24_x86_64:*"),
         ("pypy_x86_64", "custom_image", "custom_image"),
     ],
 )
@@ -199,7 +200,7 @@ def test_test_command(
 
     main()
 
-    assert intercepted_build_args.args[0].test_command == test_command
+    assert intercepted_build_args.args[0].test_command == (test_command or "")
 
 
 @pytest.mark.parametrize("before_build", [None, "before --build"])
@@ -216,7 +217,7 @@ def test_before_build(
 
     main()
 
-    assert intercepted_build_args.args[0].before_build == before_build
+    assert intercepted_build_args.args[0].before_build == (before_build or "")
 
 
 @pytest.mark.parametrize("build_verbosity", [None, 0, 2, -2, 4, -4])
@@ -237,35 +238,40 @@ def test_build_verbosity(
     assert intercepted_build_args.args[0].build_verbosity == expected_verbosity
 
 
-@pytest.mark.parametrize("option_name", ["CIBW_BUILD", "CIBW_SKIP"])
 @pytest.mark.parametrize(
-    "option_value, build_selector_patterns",
+    "selector",
     [
-        ("*-manylinux1_*", ["*-manylinux_*"]),
+        "CIBW_BUILD",
-        ("*-macosx_10_6_intel", ["*-macosx_x86_64"]),
+        "CIBW_SKIP",
-        ("*-macosx_10_9_x86_64", ["*-macosx_x86_64"]),
+        "CIBW_TEST_SKIP",
-        ("cp37-macosx_10_9_x86_64", ["cp37-macosx_x86_64"]),
     ],
 )
-def test_build_selector_migrations(
+@pytest.mark.parametrize(
-    intercepted_build_args,
+    "pattern",
-    monkeypatch,
+    [
-    option_name,
+        "cp27-*",
-    option_value,
+        "cp35-*",
-    build_selector_patterns,
+        "?p27*",
-    allow_empty,
+        "?p2*",
+        "?p35*",
+    ],
+)
+def test_build_selector_deprecated_error(
+    monkeypatch, platform, intercepted_build_args, selector, pattern, allow_empty, capsys
 ):
-    monkeypatch.setenv(option_name, option_value)
+    monkeypatch.setenv(selector, pattern)
 
-    main()
+    if selector == "CIBW_BUILD":
+        with pytest.raises(SystemExit) as ex:
+            main()
+        assert ex.value.code == 4
 
-    intercepted_build_selector = intercepted_build_args.args[0].build_selector
-    assert isinstance(intercepted_build_selector, BuildSelector)
-
-    if option_name == "CIBW_BUILD":
-        assert intercepted_build_selector.build_patterns == build_selector_patterns
     else:
-        assert intercepted_build_selector.skip_patterns == build_selector_patterns
+        main()
+
+    stderr = capsys.readouterr().err
+    msg = f"cibuildwheel 2.x no longer supports Python < 3.6. Please use the 1.x series or update {selector}"
+    assert msg in stderr
 
 
 @pytest.mark.parametrize("before_all", ["", None, "test text"])
@@ -280,7 +286,4 @@ def test_before_all(before_all, platform_specific, platform, intercepted_build_a
 
     main()
 
-    if before_all is None:
+    assert intercepted_build_args.args[0].before_all == (before_all or "")
-        before_all = ""
-
-    assert intercepted_build_args.args[0].before_all == before_all