Bump version: v2.9.0

Remove pytest-azurepipelines for now

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2
 
 jobs:
-  osx-python3.6:
+  osx-python3.9:
     macos:
       xcode: 12.5.1
     environment:
@@ -17,9 +17,9 @@ jobs:
           command: venv/bin/python ./bin/run_tests.py
           no_output_timeout: 30m
 
-  linux-python3.6:
+  linux-python3.9:
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.9
     environment:
       PYTHON: python3
       # Temporarily restrict the tests that are run on CircleCI to prevent
@@ -41,5 +41,5 @@ workflows:
   version: 2
   all-tests:
     jobs:
-      - osx-python3.6
-      - linux-python3.6
+      - osx-python3.9
+      - linux-python3.9

.github/workflows/release.yml

@@ -34,7 +34,7 @@ jobs:
         name: artifact
         path: dist
 
-    - uses: pypa/gh-action-pypi-publish@v1.5.0
+    - uses: pypa/gh-action-pypi-publish@v1.5.1
       with:
         user: __token__
         password: ${{ secrets.pypi_password }}

.github/workflows/update-dependencies.yml

@@ -1,6 +1,15 @@
 name: Update dependencies
 
 on:
+  pull_request:
+    paths:
+      - '.github/workflows/update-dependencies.yml'
+      - 'bin/update_pythons.py'
+      - 'bin/update_docker.py'
+      - 'bin/update_virtualenv.py'
+      - 'bin/projects.py'
+      - 'docs/data/projects.yml'
+      - 'noxfile.py'
   workflow_dispatch:
   schedule:
     - cron: '0 6 * * 1'  # "At 06:00 on Monday."
@@ -12,10 +21,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+
+    - uses: wntrblm/nox@2022.8.7
       with:
-        python-version: "3.11-dev"
-    - uses: excitedleigh/setup-nox@v2.1.0
+        python-versions: "3.6, 3.7, 3.8, 3.9, 3.10, 3.11-dev"
 
     - name: "Run update: dependencies"
       run: nox --force-color -s update_constraints

.pre-commit-config.yaml

@@ -14,20 +14,15 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/asottile/pyupgrade
-  rev: v2.37.1
+  rev: v2.37.3
   hooks:
   - id: pyupgrade
-    name: PyUpgrade 3.6+
-    args: ["--py36-plus"]
-    exclude: ^bin/
-  - id: pyupgrade
-    name: PyUpgrade 3.7+ on bin
-    exclude: ^(cibuildwheel|unit_test|test)/
     args: ["--py37-plus"]
+    exclude: ^cibuildwheel/resources/.*py$
 
 # Autoremoves unused imports
 - repo: https://github.com/hadialqattan/pycln
-  rev: v2.0.3
+  rev: v2.1.1
   hooks:
   - id: pycln
     args: [--all]
@@ -37,6 +32,8 @@ repos:
   rev: 5.10.1
   hooks:
   - id: isort
+    args: ["-a", "from __future__ import annotations"]
+    exclude: ^cibuildwheel/resources/.*py$
 
 - repo: https://github.com/psf/black
   rev: 22.6.0
@@ -44,17 +41,18 @@ repos:
   - id: black
 
 - repo: https://github.com/asottile/setup-cfg-fmt
-  rev: v1.20.1
+  rev: v2.0.0
   hooks:
   - id: setup-cfg-fmt
+    args: [--include-version-classifiers, --max-py-version=3.10]
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.961
+  rev: v0.971
   hooks:
   - id: mypy
-    name: mypy 3.6 on cibuildwheel/
-    exclude: ^(bin|cibuildwheel/resources|docs)/.*py$
-    args: ["--python-version=3.6"]
+    name: mypy 3.7 on cibuildwheel/
+    exclude: ^cibuildwheel/resources/.*py$
+    args: ["--python-version=3.7"]
     additional_dependencies: &mypy-dependencies
       - nox
       - packaging>=21.0
@@ -70,25 +68,20 @@ repos:
       - types-requests
       - bracex
       - dataclasses
-  - id: mypy
-    name: mypy 3.7+ on bin/
-    files: ^((bin|docs)/.*py)$
-    args: ["--python-version=3.7"]
-    additional_dependencies: *mypy-dependencies
   - id: mypy
     name: mypy 3.10
     args: ["--python-version=3.10"]
     additional_dependencies: *mypy-dependencies
 
 - repo: https://github.com/asottile/yesqa
-  rev: v1.3.0
+  rev: v1.4.0
   hooks:
   - id: yesqa
     additional_dependencies: &flake8-dependencies
     - flake8-bugbear
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 4.0.1
+  rev: 5.0.4
   hooks:
   - id: flake8
     exclude: cibuildwheel/resources/

.travis.yml

@@ -8,21 +8,21 @@ branches:
 
 jobs:
   include:
-    - name: Linux | x86_64 + i686 | Python 3.6
-      python: 3.6
+    - name: Linux | x86_64 + i686 | Python 3.7
+      python: 3.7
       services: docker
       env: PYTHON=python
 
-    - name: Linux | arm64 | Python 3.6
-      python: 3.6
+    - name: Linux | arm64 | Python 3.7
+      python: 3.7
       services: docker
       arch: arm64-graviton2
       group: edge
       virt: vm
       env: PYTHON=python
 
-    - name: Linux | ppc64le | Python 3.6
-      python: 3.6
+    - name: Linux | ppc64le | Python 3.7
+      python: 3.7
       services: docker
       arch: ppc64le
       allow_failure: True
@@ -32,18 +32,18 @@ jobs:
         # 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
+    - name: Windows | x86_64 | Python 3.7
       os: windows
       language: shell
       before_install:
-        - choco upgrade python3 -y --version 3.6.8 --limit-output
+        - choco upgrade python3 -y --version 3.7.9 --limit-output
         # Update root certificates to fix SSL error; see http://www.chawn.com/RootCerts.htm
         - powershell "md C:\temp\certs; CertUtil -generateSSTFromWU C:\temp\certs\RootStore.sst; Get-ChildItem -Path C:\\temp\certs\Rootstore.sst | Import-Certificate -CertStoreLocation Cert:\\LocalMachine\\Root\\ | out-null"
       env:
-        - PYTHON=C:\\Python36\\python
+        - PYTHON=C:\\Python37\\python
 
-    - name: Linux | s390x | Python 3.6
-      python: 3.6
+    - name: Linux | s390x | Python 3.7
+      python: 3.7
       services: docker
       arch: s390x
       env: PYTHON=python

CI.md

@@ -1,11 +1,11 @@
 This is a summary of the Python versions and platforms covered by the different CI platforms:
 
-|          | 3.6                          | 3.7                         | 3.8              |
-|----------|------------------------------|-----------------------------|------------------|
-| Linux    | Travis CI / CircleCI         | AppVeyor¹ / GitHub Actions  | Azure Pipelines  |
-| macOS    | CircleCI                     | AppVeyor¹ / GitHub Actions  | Azure Pipelines  |
-| Windows  | Travis CI / Azure Pipelines  | AppVeyor¹ / GitHub Actions  | Azure Pipelines  |
+|          | 3.7                   | 3.8                       | 3.9      | 3.10           |
+|----------|-----------------------|---------------------------|----------|----------------|
+| Linux    | AppVeyor¹ / Travis CI | Azure Pipelines / GitLab  | CircleCI | GitHub Actions |
+| macOS    | AppVeyor¹ / Travis CI | Azure Pipelines           | CircleCI | GitHub Actions |
+| Windows  | AppVeyor¹ / Travis CI | Azure Pipelines           |          | GitHub Actions |
 
 > ¹ AppVeyor only runs the "basic" test to reduce load.
 
-Non-x86 architectures are covered on Travis CI using Python 3.6.
+Non-x86 architectures are covered on Travis CI using Python 3.7.

README.md

@@ -29,7 +29,7 @@ What does it do?
 | CPython 3.8   | ✅ | ✅  | ✅  | ✅  | N/A | ✅ | ✅  | ✅ | ✅  | ✅  |
 | CPython 3.9   | ✅ | ✅  | ✅  | ✅  | ✅² | ✅³ | ✅ | ✅ | ✅  | ✅  |
 | CPython 3.10  | ✅ | ✅  | ✅  | ✅  | ✅² | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.11⁴ | ✅ | ✅  | ✅  | ✅  | ✅² | ✅ | ✅  | ✅ | ✅  | ✅  |
+| CPython 3.11  | ✅ | ✅  | ✅  | ✅  | ✅² | ✅ | ✅  | ✅ | ✅  | ✅  |
 | PyPy 3.7 v7.3 | ✅ | N/A | ✅  | N/A | N/A | ✅¹ | ✅¹  | ✅¹ | N/A | N/A |
 | PyPy 3.8 v7.3 | ✅ | N/A | ✅  | N/A | N/A | ✅¹ | ✅¹  | ✅¹ | N/A | N/A |
 | PyPy 3.9 v7.3 | ✅ | N/A | ✅  | N/A | N/A | ✅¹ | ✅¹  | ✅¹ | N/A | N/A |
@@ -37,7 +37,6 @@ What does it do?
 <sup>¹ PyPy is only supported for manylinux wheels.</sup><br>
 <sup>² Windows arm64 support is experimental.</sup><br>
 <sup>³ Alpine 3.14 and very briefly 3.15's default python3 [was not able to load](https://github.com/pypa/cibuildwheel/issues/934) musllinux wheels. This has been fixed; please upgrade the python package if using Alpine from before the fix.</sup><br>
-<sup>⁴ CPython 3.11 is available using the [CIBW_PRERELEASE_PYTHONS](https://cibuildwheel.readthedocs.io/en/stable/options/#prerelease-pythons) option.</sup><br>
 
 - Builds manylinux, musllinux, macOS 10.9+, and Windows wheels for CPython and PyPy
 - Works on GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, and GitLab CI
@@ -89,7 +88,7 @@ jobs:
       - uses: actions/setup-python@v3
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.8.1
+        run: python -m pip install cibuildwheel==2.9.0
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
@@ -204,6 +203,15 @@ Changelog
 
 <!-- this section was generated by bin/update_readme_changelog.py -- do not edit manually -->
 
+### v2.9.0
+
+_11 August 2022_
+
+- 🌟 CPython 3.11 wheels are now built by default - without the CIBW_PRERELEASE_PYTHONS flag. It's time to build and upload these wheels to PyPI! This release includes CPython 3.11.0rc1, which is guaranteed to be ABI compatible with the final release. (#1226)
+- ⚠️ Removed support for running cibuildwheel in Python 3.6. Python 3.6 is EOL. However, cibuildwheel continues to build CPython 3.6 wheels for the moment. (#1175)
+- ✨ Improved error messages when misspelling TOML options, suggesting close matches (#1205)
+- 🛠 When running on Apple Silicon (so far, an unsupported mode of operation), cibuildwheel no longer builds universal2 wheels by default - just arm64. See [#1204](https://github.com/pypa/cibuildwheel/issues/1204) for discussion. We hope to release official support for native builds on Apple Silicon soon! (#1217)
+
 ### v2.8.1
 
 _18 July 2022_
@@ -241,13 +249,6 @@ _7 June 2022_
 
 - 🛠 Update the prerelease CPython 3.11 to 3.11.0b3
 
-### v2.6.0
-
-_25 May 2022_
-
-- 🌟 Added the ability to test building wheels on CPython 3.11! Because CPython 3.11 is in beta, these wheels should not be distributed, because they might not be compatible with the final release, but it's available to build for testing purposes. Use the flag [`--prerelease-pythons` or `CIBW_PRERELEASE_PYTHONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#prerelease-pythons) to test. This version of cibuildwheel includes CPython 3.11.0b1. (#1109)
-- 📚 Added an interactive diagram showing how cibuildwheel works to the [docs](https://cibuildwheel.readthedocs.io/en/stable/#how-it-works) (#1100)
-
 <!-- END bin/update_readme_changelog.py -->
 
 ---

azure-pipelines.yml

@@ -7,7 +7,7 @@ jobs:
       inputs:
         versionSpec: '3.8'
     - bash: |
-        python -m pip install -e ".[dev]" pytest-azurepipelines
+        python -m pip install -e ".[dev]"
         python ./bin/run_tests.py
 
 - job: macos_38
@@ -17,18 +17,7 @@ jobs:
       inputs:
         versionSpec: '3.8'
     - bash: |
-        python -m pip install -e ".[dev]" pytest-azurepipelines
-        python ./bin/run_tests.py
-
-- job: windows_36
-  pool: {vmImage: 'windows-2019'}
-  timeoutInMinutes: 180
-  steps:
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: '3.6'
-    - bash: |
-        python -m pip install -e ".[dev]" pytest-azurepipelines
+        python -m pip install -e ".[dev]"
         python ./bin/run_tests.py
 
 - job: windows_38
@@ -39,5 +28,5 @@ jobs:
       inputs:
         versionSpec: '3.8'
     - bash: |
-        python -m pip install -e ".[dev]" pytest-azurepipelines
+        python -m pip install -e ".[dev]"
         python ./bin/run_tests.py

bin/run_tests.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 
+from __future__ import annotations
+
 import argparse
 import os
 import subprocess

bin/update_dependencies.py

@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-# This file supports 3.6+
-
-import os
-import shutil
-import subprocess
-import sys
-from pathlib import Path
-
-DIR = Path(__file__).parent.resolve()
-RESOURCES = DIR.parent / "cibuildwheel/resources"
-
-python_version = "".join(str(v) for v in sys.version_info[:2])
-
-env = os.environ.copy()
-
-# CUSTOM_COMPILE_COMMAND is a pip-compile option that tells users how to
-# regenerate the constraints files
-env["CUSTOM_COMPILE_COMMAND"] = "bin/update_dependencies.py"
-
-os.chdir(DIR.parent)
-
-subprocess.run(
-    [
-        "pip-compile",
-        "--allow-unsafe",
-        "--upgrade",
-        "cibuildwheel/resources/constraints.in",
-        f"--output-file=cibuildwheel/resources/constraints-python{python_version}.txt",
-    ],
-    check=True,
-    env=env,
-)
-
-# default constraints.txt
-if python_version == "39":
-    shutil.copyfile(
-        RESOURCES / f"constraints-python{python_version}.txt",
-        RESOURCES / "constraints.txt",
-    )

bin/update_readme_changelog.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 
+from __future__ import annotations
+
 import re
 import sys
 from pathlib import Path

cibuildwheel/__init__.py

@@ -1 +1,3 @@
-__version__ = "2.8.1"
+from __future__ import annotations
+
+__version__ = "2.9.0"

cibuildwheel/__main__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import argparse
 import os
 import shutil
@@ -7,7 +9,6 @@ import tempfile
 import textwrap
 from pathlib import Path
 from tempfile import mkdtemp
-from typing import List, Set, Union
 
 import cibuildwheel
 import cibuildwheel.linux
@@ -257,7 +258,7 @@ def build_in_directory(args: CommandLineArguments) -> None:
             log.warning(f"Can't delete temporary folder '{str(tmp_path)}'")
 
 
-def print_preamble(platform: str, options: Options, identifiers: List[str]) -> None:
+def print_preamble(platform: str, options: Options, identifiers: list[str]) -> None:
     print(
         textwrap.dedent(
             """
@@ -287,13 +288,13 @@ def print_preamble(platform: str, options: Options, identifiers: List[str]) -> N
 
 
 def get_build_identifiers(
-    platform: PlatformName, build_selector: BuildSelector, architectures: Set[Architecture]
-) -> List[str]:
-    python_configurations: Union[
-        List[cibuildwheel.linux.PythonConfiguration],
-        List[cibuildwheel.windows.PythonConfiguration],
-        List[cibuildwheel.macos.PythonConfiguration],
-    ]
+    platform: PlatformName, build_selector: BuildSelector, architectures: set[Architecture]
+) -> list[str]:
+    python_configurations: (
+        list[cibuildwheel.linux.PythonConfiguration]
+        | list[cibuildwheel.windows.PythonConfiguration]
+        | list[cibuildwheel.macos.PythonConfiguration]
+    )
 
     if platform == "linux":
         python_configurations = cibuildwheel.linux.get_python_configurations(
@@ -313,7 +314,7 @@ def get_build_identifiers(
     return [config.identifier for config in python_configurations]
 
 
-def detect_warnings(*, options: Options, identifiers: List[str]) -> List[str]:
+def detect_warnings(*, options: Options, identifiers: list[str]) -> list[str]:
     warnings = []
 
     # warn about deprecated {python} and {pip}

cibuildwheel/architecture.py

@@ -1,8 +1,9 @@
+from __future__ import annotations
+
 import functools
 import platform as platform_module
 import re
 from enum import Enum
-from typing import Set
 
 from .typing import Final, Literal, PlatformName, assert_never
 
@@ -32,11 +33,11 @@ class Architecture(Enum):
     ARM64 = "ARM64"
 
     # Allow this to be sorted
-    def __lt__(self, other: "Architecture") -> bool:
+    def __lt__(self, other: Architecture) -> bool:
         return self.value < other.value
 
     @staticmethod
-    def parse_config(config: str, platform: PlatformName) -> "Set[Architecture]":
+    def parse_config(config: str, platform: PlatformName) -> set[Architecture]:
         result = set()
         for arch_str in re.split(r"[\s,]+", config):
             if arch_str == "auto":
@@ -54,7 +55,7 @@ class Architecture(Enum):
         return result
 
     @staticmethod
-    def auto_archs(platform: PlatformName) -> "Set[Architecture]":
+    def auto_archs(platform: PlatformName) -> set[Architecture]:
         native_architecture = Architecture(platform_module.machine())
         result = {native_architecture}
 
@@ -65,14 +66,10 @@ class Architecture(Enum):
         if platform == "windows" and native_architecture == Architecture.AMD64:
             result.add(Architecture.x86)
 
-        if platform == "macos" and native_architecture == Architecture.arm64:
-            # arm64 can build and test both archs of a universal2 wheel.
-            result.add(Architecture.universal2)
-
         return result
 
     @staticmethod
-    def all_archs(platform: PlatformName) -> "Set[Architecture]":
+    def all_archs(platform: PlatformName) -> set[Architecture]:
         all_archs_map = {
             "linux": {
                 Architecture.x86_64,
@@ -87,7 +84,7 @@ class Architecture(Enum):
         return all_archs_map[platform]
 
     @staticmethod
-    def bitness_archs(platform: PlatformName, bitness: Literal["64", "32"]) -> "Set[Architecture]":
+    def bitness_archs(platform: PlatformName, bitness: Literal["64", "32"]) -> set[Architecture]:
         archs_32 = {Architecture.i686, Architecture.x86}
         auto_archs = Architecture.auto_archs(platform)
 
@@ -101,7 +98,7 @@ class Architecture(Enum):
 
 def allowed_architectures_check(
     platform: PlatformName,
-    architectures: Set[Architecture],
+    architectures: set[Architecture],
 ) -> None:
 
     allowed_architectures = Architecture.all_archs(platform)

cibuildwheel/bashlex_eval.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 import subprocess
 from dataclasses import dataclass
-from typing import Callable, Dict, List, Optional, Sequence
+from typing import Callable, Dict, List, Sequence
 
 import bashlex
 
@@ -8,21 +10,19 @@ import bashlex
 EnvironmentExecutor = Callable[[List[str], Dict[str, str]], str]
 
 
-def local_environment_executor(command: List[str], env: Dict[str, str]) -> str:
-    return subprocess.run(
-        command, env=env, universal_newlines=True, stdout=subprocess.PIPE, check=True
-    ).stdout
+def local_environment_executor(command: list[str], env: dict[str, str]) -> str:
+    return subprocess.run(command, env=env, text=True, stdout=subprocess.PIPE, check=True).stdout
 
 
 @dataclass(frozen=True)
 class NodeExecutionContext:
-    environment: Dict[str, str]
+    environment: dict[str, str]
     input: str
     executor: EnvironmentExecutor
 
 
 def evaluate(
-    value: str, environment: Dict[str, str], executor: Optional[EnvironmentExecutor] = None
+    value: str, environment: dict[str, str], executor: EnvironmentExecutor | None = None
 ) -> str:
     if not value:
         # empty string evaluates to empty string
@@ -103,7 +103,7 @@ def evaluate_nodes_as_compound_command(
 
 
 def evaluate_nodes_as_simple_command(
-    nodes: List[bashlex.ast.node], context: NodeExecutionContext
+    nodes: list[bashlex.ast.node], context: NodeExecutionContext
 ) -> str:
     command = [evaluate_node(part, context=context) for part in nodes]
     return context.executor(command, context.environment)

cibuildwheel/environment.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 import dataclasses
-from typing import Any, Dict, List, Mapping, Optional, Sequence
+from typing import Any, Mapping, Sequence
 
 import bashlex
 
@@ -12,7 +14,7 @@ class EnvironmentParseError(Exception):
     pass
 
 
-def split_env_items(env_string: str) -> List[str]:
+def split_env_items(env_string: str) -> list[str]:
     """Splits space-separated variable assignments into a list of individual assignments.
 
     >>> split_env_items('VAR=abc')
@@ -47,8 +49,8 @@ class EnvironmentAssignment(Protocol):
     def evaluated_value(
         self,
         *,
-        environment: Dict[str, str],
-        executor: Optional[bashlex_eval.EnvironmentExecutor] = None,
+        environment: dict[str, str],
+        executor: bashlex_eval.EnvironmentExecutor | None = None,
     ) -> str:
         """Returns the value of this assignment, as evaluated in the environment"""
 
@@ -84,8 +86,8 @@ class EnvironmentAssignmentBash:
 
     def evaluated_value(
         self,
-        environment: Dict[str, str],
-        executor: Optional[bashlex_eval.EnvironmentExecutor] = None,
+        environment: dict[str, str],
+        executor: bashlex_eval.EnvironmentExecutor | None = None,
     ) -> str:
         return bashlex_eval.evaluate(self.value, environment=environment, executor=executor)
 
@@ -100,7 +102,7 @@ class EnvironmentAssignmentBash:
 
 @dataclasses.dataclass
 class ParsedEnvironment:
-    assignments: List[EnvironmentAssignment]
+    assignments: list[EnvironmentAssignment]
 
     def __init__(self, assignments: Sequence[EnvironmentAssignment]) -> None:
         self.assignments = list(assignments)
@@ -108,8 +110,8 @@ class ParsedEnvironment:
     def as_dictionary(
         self,
         prev_environment: Mapping[str, str],
-        executor: Optional[bashlex_eval.EnvironmentExecutor] = None,
-    ) -> Dict[str, str]:
+        executor: bashlex_eval.EnvironmentExecutor | None = None,
+    ) -> dict[str, str]:
         environment = dict(**prev_environment)
 
         for assignment in self.assignments:

cibuildwheel/extra.py

@@ -2,8 +2,9 @@
 These are utilities for the `/bin` scripts, not for the `cibuildwheel` program.
 """
 
+from __future__ import annotations
+
 from io import StringIO
-from typing import Dict, List
 
 from .typing import Protocol
 
@@ -15,7 +16,7 @@ class Printable(Protocol):
         ...
 
 
-def dump_python_configurations(inp: Dict[str, Dict[str, List[Dict[str, Printable]]]]) -> str:
+def dump_python_configurations(inp: dict[str, dict[str, list[dict[str, Printable]]]]) -> str:
     output = StringIO()
     for header, values in inp.items():
         output.write(f"[{header}]\n")

cibuildwheel/functools_cached_property_38.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 from threading import RLock
-from typing import Any, Callable, Generic, Optional, Type, TypeVar, overload
+from typing import Any, Callable, Generic, TypeVar, overload
 
 __all__ = ["cached_property"]
 
@@ -11,11 +13,11 @@ _T = TypeVar("_T")
 class cached_property(Generic[_T]):
     def __init__(self, func: Callable[[Any], _T]):
         self.func = func
-        self.attrname: Optional[str] = None
+        self.attrname: str | None = None
         self.__doc__ = func.__doc__
         self.lock = RLock()
 
-    def __set_name__(self, owner: Type[Any], name: str) -> None:
+    def __set_name__(self, owner: type[Any], name: str) -> None:
         if self.attrname is None:
             self.attrname = name
         elif name != self.attrname:
@@ -25,14 +27,14 @@ class cached_property(Generic[_T]):
             )
 
     @overload
-    def __get__(self, instance: None, owner: Optional[Type[Any]] = ...) -> "cached_property[_T]":
+    def __get__(self, instance: None, owner: type[Any] | None = ...) -> cached_property[_T]:
         ...
 
     @overload
-    def __get__(self, instance: object, owner: Optional[Type[Any]] = ...) -> _T:
+    def __get__(self, instance: object, owner: type[Any] | None = ...) -> _T:
         ...
 
-    def __get__(self, instance: Optional[object], owner: Optional[Type[Any]] = None) -> Any:
+    def __get__(self, instance: object | None, owner: type[Any] | None = None) -> Any:
         if instance is None:
             return self
         if self.attrname is None:

cibuildwheel/linux.py

@@ -1,9 +1,11 @@
+from __future__ import annotations
+
 import subprocess
 import sys
 import textwrap
 from dataclasses import dataclass
 from pathlib import Path, PurePath, PurePosixPath
-from typing import Iterator, List, Set, Tuple
+from typing import Iterator, Tuple
 
 from .architecture import Architecture
 from .logger import log
@@ -35,15 +37,15 @@ class PythonConfiguration:
 
 @dataclass(frozen=True)
 class BuildStep:
-    platform_configs: List[PythonConfiguration]
+    platform_configs: list[PythonConfiguration]
     platform_tag: str
     container_image: str
 
 
 def get_python_configurations(
     build_selector: BuildSelector,
-    architectures: Set[Architecture],
-) -> List[PythonConfiguration]:
+    architectures: set[Architecture],
+) -> list[PythonConfiguration]:
 
     full_python_configs = read_python_configs("linux")
 
@@ -79,7 +81,7 @@ def container_image_for_python_configuration(config: PythonConfiguration, option
 
 
 def get_build_steps(
-    options: Options, python_configurations: List[PythonConfiguration]
+    options: Options, python_configurations: list[PythonConfiguration]
 ) -> Iterator[BuildStep]:
     """
     Groups PythonConfigurations into BuildSteps. Each BuildStep represents a
@@ -110,7 +112,7 @@ def get_build_steps(
 def build_in_container(
     *,
     options: Options,
-    platform_configs: List[PythonConfiguration],
+    platform_configs: list[PythonConfiguration],
     container: OCIContainer,
     container_project_path: PurePath,
     container_package_dir: PurePath,
@@ -140,13 +142,13 @@ def build_in_container(
         )
         container.call(["sh", "-c", before_all_prepared], env=env)
 
-    built_wheels: List[PurePosixPath] = []
+    built_wheels: list[PurePosixPath] = []
 
     for config in platform_configs:
         log.build_start(config.identifier)
         build_options = options.build_options(config.identifier)
 
-        dependency_constraint_flags: List[PathOrStr] = []
+        dependency_constraint_flags: list[PathOrStr] = []
 
         if build_options.dependency_constraints:
             constraints_file = build_options.dependency_constraints.get_for_python_version(
@@ -395,7 +397,7 @@ def build(options: Options, tmp_path: Path) -> None:  # pylint: disable=unused-a
             sys.exit(1)
 
 
-def _matches_prepared_command(error_cmd: List[str], command_template: str) -> bool:
+def _matches_prepared_command(error_cmd: list[str], command_template: str) -> bool:
     if len(error_cmd) < 3 or error_cmd[0:2] != ["sh", "-c"]:
         return False
     command_prefix = command_template.split("{", maxsplit=1)[0].strip()

cibuildwheel/logger.py

@@ -1,9 +1,11 @@
+from __future__ import annotations
+
 import codecs
 import os
 import re
 import sys
 import time
-from typing import IO, AnyStr, Optional, Union
+from typing import IO, AnyStr
 
 from cibuildwheel.typing import Final
 from cibuildwheel.util import CIProvider, detect_ci_provider
@@ -39,10 +41,10 @@ class Logger:
     fold_mode: str
     colors_enabled: bool
     unicode_enabled: bool
-    active_build_identifier: Optional[str] = None
-    build_start_time: Optional[float] = None
-    step_start_time: Optional[float] = None
-    active_fold_group_name: Optional[str] = None
+    active_build_identifier: str | None = None
+    build_start_time: float | None = None
+    step_start_time: float | None = None
+    active_fold_group_name: str | None = None
 
     def __init__(self) -> None:
         if sys.platform == "win32" and hasattr(sys.stdout, "reconfigure"):
@@ -120,7 +122,7 @@ class Logger:
 
             self.step_start_time = None
 
-    def step_end_with_error(self, error: Union[BaseException, str]) -> None:
+    def step_end_with_error(self, error: BaseException | str) -> None:
         self.step_end(success=False)
         self.error(error)
 
@@ -131,7 +133,7 @@ class Logger:
             c = self.colors
             print(f"{c.yellow}Warning{c.end}: {message}\n", file=sys.stderr)
 
-    def error(self, error: Union[BaseException, str]) -> None:
+    def error(self, error: BaseException | str) -> None:
         if self.fold_mode == "github":
             print(f"::error::{error}\n", file=sys.stderr)
         else:
@@ -174,11 +176,11 @@ class Logger:
         return identifier.lower()[:20]
 
     @property
-    def colors(self) -> "Colors":
+    def colors(self) -> Colors:
         return Colors(enabled=self.colors_enabled)
 
     @property
-    def symbols(self) -> "Symbols":
+    def symbols(self) -> Symbols:
         return Symbols(unicode=self.unicode_enabled)
 
 

cibuildwheel/macos.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import functools
 import os
 import platform
@@ -7,7 +9,7 @@ import subprocess
 import sys
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Dict, List, Sequence, Set, Tuple, cast
+from typing import Sequence, Tuple, cast
 
 from filelock import FileLock
 
@@ -37,7 +39,7 @@ from .util import (
 )
 
 
-def get_macos_version() -> Tuple[int, int]:
+def get_macos_version() -> tuple[int, int]:
     """
     Returns the macOS major/minor version, as a tuple, e.g. (10, 15) or (11, 0)
 
@@ -51,7 +53,7 @@ def get_macos_version() -> Tuple[int, int]:
     return cast(Tuple[int, int], version)
 
 
-def get_macos_sdks() -> List[str]:
+def get_macos_sdks() -> list[str]:
     output = call("xcodebuild", "-showsdks", capture_stdout=True)
     return [m.group(1) for m in re.finditer(r"-sdk (macosx\S+)", output)]
 
@@ -64,8 +66,8 @@ class PythonConfiguration:
 
 
 def get_python_configurations(
-    build_selector: BuildSelector, architectures: Set[Architecture]
-) -> List[PythonConfiguration]:
+    build_selector: BuildSelector, architectures: set[Architecture]
+) -> list[PythonConfiguration]:
 
     full_python_configs = read_python_configs("macos")
 
@@ -134,7 +136,7 @@ def setup_python(
     dependency_constraint_flags: Sequence[PathOrStr],
     environment: ParsedEnvironment,
     build_frontend: BuildFrontend,
-) -> Dict[str, str]:
+) -> dict[str, str]:
     tmp.mkdir()
     implementation_id = python_configuration.identifier.split("-")[0]
     log.step(f"Installing Python {implementation_id}...")
@@ -295,7 +297,7 @@ def build(options: Options, tmp_path: Path) -> None:
             )
             shell(before_all_prepared, env=env)
 
-        built_wheels: List[Path] = []
+        built_wheels: list[Path] = []
 
         for config in python_configurations:
             build_options = options.build_options(config.identifier)
@@ -418,7 +420,7 @@ def build(options: Options, tmp_path: Path) -> None:
 
             if build_options.test_command and build_options.test_selector(config.identifier):
                 machine_arch = platform.machine()
-                testing_archs: List[Literal["x86_64", "arm64"]]
+                testing_archs: list[Literal["x86_64", "arm64"]]
 
                 if config_is_arm64:
                     testing_archs = ["arm64"]
@@ -505,7 +507,7 @@ def build(options: Options, tmp_path: Path) -> None:
 
                     # define a custom 'call' function that adds the arch prefix each time
                     call_with_arch = functools.partial(call, *arch_prefix)
-                    shell_with_arch = functools.partial(shell, *arch_prefix)
+                    shell_with_arch = functools.partial(call, *arch_prefix, "/bin/sh", "-c")
 
                     # Use --no-download to ensure determinism by using seed libraries
                     # built into virtualenv

cibuildwheel/oci_container.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import io
 import json
 import os
@@ -9,7 +11,7 @@ import sys
 import uuid
 from pathlib import Path, PurePath, PurePosixPath
 from types import TracebackType
-from typing import IO, Dict, List, Optional, Sequence, Type, cast
+from typing import IO, Dict, Sequence, cast
 
 from cibuildwheel.util import CIProvider, detect_ci_provider
 
@@ -52,7 +54,7 @@ class OCIContainer:
         *,
         image: str,
         simulate_32_bit: bool = False,
-        cwd: Optional[PathOrStr] = None,
+        cwd: PathOrStr | None = None,
         engine: ContainerEngine = "docker",
     ):
         if not image:
@@ -61,10 +63,10 @@ class OCIContainer:
         self.image = image
         self.simulate_32_bit = simulate_32_bit
         self.cwd = cwd
-        self.name: Optional[str] = None
+        self.name: str | None = None
         self.engine = engine
 
-    def __enter__(self) -> "OCIContainer":
+    def __enter__(self) -> OCIContainer:
 
         self.name = f"cibuildwheel-{uuid.uuid4()}"
 
@@ -122,9 +124,9 @@ class OCIContainer:
 
     def __exit__(
         self,
-        exc_type: Optional[Type[BaseException]],
-        exc_val: Optional[BaseException],
-        exc_tb: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
     ) -> None:
 
         self.bash_stdin.write(b"exit 0\n")
@@ -217,7 +219,7 @@ class OCIContainer:
         else:
             raise KeyError(self.engine)
 
-    def glob(self, path: PurePosixPath, pattern: str) -> List[PurePosixPath]:
+    def glob(self, path: PurePosixPath, pattern: str) -> list[PurePosixPath]:
         glob_pattern = path.joinpath(pattern)
 
         path_strings = json.loads(
@@ -236,9 +238,9 @@ class OCIContainer:
     def call(
         self,
         args: Sequence[PathOrStr],
-        env: Optional[Dict[str, str]] = None,
+        env: dict[str, str] | None = None,
         capture_output: bool = False,
-        cwd: Optional[PathOrStr] = None,
+        cwd: PathOrStr | None = None,
     ) -> str:
 
         if cwd is None:
@@ -314,7 +316,7 @@ class OCIContainer:
 
         return output
 
-    def get_environment(self) -> Dict[str, str]:
+    def get_environment(self) -> dict[str, str]:
         env = json.loads(
             self.call(
                 [
@@ -327,7 +329,7 @@ class OCIContainer:
         )
         return cast(Dict[str, str], env)
 
-    def environment_executor(self, command: List[str], environment: Dict[str, str]) -> str:
+    def environment_executor(self, command: list[str], environment: dict[str, str]) -> str:
         # used as an EnvironmentExecutor to evaluate commands and capture output
         return self.call(command, env=environment, capture_output=True)
 

cibuildwheel/options.py

@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+import difflib
 import functools
 import os
 import sys
@@ -6,18 +9,7 @@ from configparser import ConfigParser
 from contextlib import contextmanager
 from dataclasses import asdict, dataclass
 from pathlib import Path
-from typing import (
-    Any,
-    Dict,
-    Generator,
-    List,
-    Mapping,
-    Optional,
-    Set,
-    Tuple,
-    Union,
-    cast,
-)
+from typing import Any, Dict, Generator, List, Mapping, Union, cast
 
 if sys.version_info >= (3, 11):
     import tomllib
@@ -50,7 +42,7 @@ from .util import (
 @dataclass
 class CommandLineArguments:
     platform: Literal["auto", "linux", "macos", "windows"]
-    archs: Optional[str]
+    archs: str | None
     output_dir: Path
     config_file: str
     package_dir: Path
@@ -65,7 +57,7 @@ class GlobalOptions:
     output_dir: Path
     build_selector: BuildSelector
     test_selector: TestSelector
-    architectures: Set[Architecture]
+    architectures: set[Architecture]
     container_engine: ContainerEngine
 
 
@@ -74,14 +66,14 @@ class BuildOptions:
     globals: GlobalOptions
     environment: ParsedEnvironment
     before_all: str
-    before_build: Optional[str]
+    before_build: str | None
     repair_command: str
-    manylinux_images: Optional[Dict[str, str]]
-    musllinux_images: Optional[Dict[str, str]]
-    dependency_constraints: Optional[DependencyConstraints]
-    test_command: Optional[str]
-    before_test: Optional[str]
-    test_requires: List[str]
+    manylinux_images: dict[str, str] | None
+    musllinux_images: dict[str, str] | None
+    dependency_constraints: DependencyConstraints | None
+    test_command: str | None
+    before_test: str | None
+    test_requires: list[str]
     test_extras: str
     build_verbosity: int
     build_frontend: BuildFrontend
@@ -103,7 +95,7 @@ class BuildOptions:
         return self.globals.test_selector
 
     @property
-    def architectures(self) -> Set[Architecture]:
+    def architectures(self) -> set[Architecture]:
         return self.globals.architectures
 
 
@@ -113,7 +105,7 @@ Setting = Union[Dict[str, str], List[str], str, int]
 @dataclass(frozen=True)
 class Override:
     select_pattern: str
-    options: Dict[str, Setting]
+    options: dict[str, Setting]
 
 
 MANYLINUX_OPTIONS = {f"manylinux-{build_platform}-image" for build_platform in MANYLINUX_ARCHS}
@@ -134,7 +126,7 @@ class ConfigOptionError(KeyError):
     pass
 
 
-def _dig_first(*pairs: Tuple[Mapping[str, Setting], str], ignore_empty: bool = False) -> Setting:
+def _dig_first(*pairs: tuple[Mapping[str, Setting], str], ignore_empty: bool = False) -> Setting:
     """
     Return the first dict item that matches from pairs of dicts and keys.
     Will throw a KeyError if missing.
@@ -176,10 +168,10 @@ class OptionsReader:
 
     def __init__(
         self,
-        config_file_path: Optional[Path] = None,
+        config_file_path: Path | None = None,
         *,
         platform: PlatformName,
-        disallow: Optional[Dict[str, Set[str]]] = None,
+        disallow: dict[str, set[str]] | None = None,
     ) -> None:
         self.platform = platform
         self.disallow = disallow or {}
@@ -189,69 +181,76 @@ class OptionsReader:
         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] = {}
+        config_options: dict[str, Any] = {}
+        config_platform_options: dict[str, Any] = {}
 
         if config_file_path is not None:
             config_options, config_platform_options = self._load_file(config_file_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')
+            self._validate_global_option(option_name)
 
         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._validate_platform_option(option_name)
 
         self.config_options = config_options
         self.config_platform_options = config_platform_options
 
-        self.overrides: List[Override] = []
-        self.current_identifier: Optional[str] = None
+        self.overrides: list[Override] = []
+        self.current_identifier: str | None = None
 
         config_overrides = self.config_options.get("overrides")
 
         if config_overrides is not None:
             if not isinstance(config_overrides, list):
-                raise ConfigOptionError('"tool.cibuildwheel.overrides" must be a list')
+                raise ConfigOptionError("'tool.cibuildwheel.overrides' must be a list")
 
             for config_override in config_overrides:
                 select = config_override.pop("select", None)
 
                 if not select:
-                    raise ConfigOptionError('"select" must be set in an override')
+                    raise ConfigOptionError("'select' must be set in an override")
 
                 if isinstance(select, list):
                     select = " ".join(select)
 
                 self.overrides.append(Override(select, config_override))
 
-    def _is_valid_global_option(self, name: str) -> bool:
+    def _validate_global_option(self, name: str) -> None:
         """
-        Returns True if an option with this name is allowed in the
+        Raises an error if an option with this name is not allowed in the
         [tool.cibuildwheel] section of a config file.
         """
         allowed_option_names = self.default_options.keys() | PLATFORMS | {"overrides"}
 
-        return name in allowed_option_names
+        if name not in allowed_option_names:
+            msg = f"Option {name!r} not supported in a config file."
+            matches = difflib.get_close_matches(name, allowed_option_names, 1, 0.7)
+            if matches:
+                msg += f" Perhaps you meant {matches[0]!r}?"
+            raise ConfigOptionError(msg)
 
-    def _is_valid_platform_option(self, name: str) -> bool:
+    def _validate_platform_option(self, name: str) -> None:
         """
-        Returns True if an option with this name is allowed in the
+        Raises an error if an option with this name is not 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
+            msg = f"{name!r} is not allowed in {disallowed_platform_options}"
+            raise ConfigOptionError(msg)
 
         allowed_option_names = self.default_options.keys() | self.default_platform_options.keys()
 
-        return name in allowed_option_names
+        if name not in allowed_option_names:
+            msg = f"Option {name!r} not supported in the {self.platform!r} section"
+            matches = difflib.get_close_matches(name, allowed_option_names, 1, 0.7)
+            if matches:
+                msg += f" Perhaps you meant {matches[0]!r}?"
+            raise ConfigOptionError(msg)
 
-    def _load_file(self, filename: Path) -> Tuple[Dict[str, Any], Dict[str, Any]]:
+    def _load_file(self, filename: Path) -> tuple[dict[str, Any], dict[str, Any]]:
         """
         Load a toml file, returns global and platform as separate dicts.
         """
@@ -264,7 +263,7 @@ class OptionsReader:
         return global_options, platform_options
 
     @property
-    def active_config_overrides(self) -> List[Override]:
+    def active_config_overrides(self) -> list[Override]:
         if self.current_identifier is None:
             return []
         return [
@@ -272,7 +271,7 @@ class OptionsReader:
         ]
 
     @contextmanager
-    def identifier(self, identifier: Optional[str]) -> Generator[None, None, None]:
+    def identifier(self, identifier: str | None) -> Generator[None, None, None]:
         self.current_identifier = identifier
         try:
             yield
@@ -284,8 +283,8 @@ class OptionsReader:
         name: str,
         *,
         env_plat: bool = True,
-        sep: Optional[str] = None,
-        table: Optional[TableFmt] = None,
+        sep: str | None = None,
+        table: TableFmt | None = None,
         ignore_empty: bool = False,
     ) -> str:
         """
@@ -299,7 +298,8 @@ class OptionsReader:
         """
 
         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")
+            msg = f"{name!r} must be in cibuildwheel/resources/defaults.toml file to be accessed."
+            raise ConfigOptionError(msg)
 
         # Environment variable form
         envvar = f"CIBW_{name.upper().replace('-', '_')}"
@@ -323,12 +323,12 @@ class OptionsReader:
 
         if isinstance(result, dict):
             if table is None:
-                raise ConfigOptionError(f"{name} does not accept a table")
+                raise ConfigOptionError(f"{name!r} does not accept a table")
             return table["sep"].join(table["item"].format(k=k, v=v) for k, v in result.items())
 
         if isinstance(result, list):
             if sep is None:
-                raise ConfigOptionError(f"{name} does not accept a list")
+                raise ConfigOptionError(f"{name!r} does not accept a list")
             return sep.join(result)
 
         if isinstance(result, int):
@@ -349,7 +349,7 @@ class Options:
         )
 
     @property
-    def config_file_path(self) -> Optional[Path]:
+    def config_file_path(self) -> Path | None:
         args = self.command_line_arguments
 
         if args.config_file:
@@ -363,7 +363,7 @@ class Options:
         return None
 
     @cached_property
-    def package_requires_python_str(self) -> Optional[str]:
+    def package_requires_python_str(self) -> str | None:
         args = self.command_line_arguments
         return get_requires_python_str(Path(args.package_dir))
 
@@ -383,7 +383,7 @@ class Options:
 
         # 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] = (
+        requires_python_str: str | None = (
             os.environ.get("CIBW_PROJECT_REQUIRES_PYTHON") or self.package_requires_python_str
         )
         requires_python = None if requires_python_str is None else SpecifierSet(requires_python_str)
@@ -402,7 +402,7 @@ class Options:
         container_engine_str = self.reader.get("container-engine")
 
         if container_engine_str not in ["docker", "podman"]:
-            msg = f"cibuildwheel: Unrecognised container_engine '{container_engine_str}', only 'docker' and 'podman' are supported"
+            msg = f"cibuildwheel: Unrecognised container_engine {container_engine_str!r}, only 'docker' and 'podman' are supported"
             print(msg, file=sys.stderr)
             sys.exit(2)
 
@@ -417,7 +417,7 @@ class Options:
             container_engine=container_engine,
         )
 
-    def build_options(self, identifier: Optional[str]) -> BuildOptions:
+    def build_options(self, identifier: str | None) -> BuildOptions:
         """
         Compute BuildOptions for a single run configuration.
         """
@@ -446,7 +446,7 @@ class Options:
             elif build_frontend_str == "pip":
                 build_frontend = "pip"
             else:
-                msg = f"cibuildwheel: Unrecognised build frontend '{build_frontend_str}', only 'pip' and 'build' are supported"
+                msg = f"cibuildwheel: Unrecognised build frontend {build_frontend_str!r}, only 'pip' and 'build' are supported"
                 print(msg, file=sys.stderr)
                 sys.exit(2)
 
@@ -454,7 +454,7 @@ class Options:
                 environment = parse_environment(environment_config)
             except (EnvironmentParseError, ValueError):
                 print(
-                    f'cibuildwheel: Malformed environment option "{environment_config}"',
+                    f"cibuildwheel: Malformed environment option {environment_config!r}",
                     file=sys.stderr,
                 )
                 traceback.print_exc(None, sys.stderr)
@@ -469,9 +469,9 @@ class Options:
                         pass
 
             if dependency_versions == "pinned":
-                dependency_constraints: Optional[
+                dependency_constraints: None | (
                     DependencyConstraints
-                ] = DependencyConstraints.with_defaults()
+                ) = DependencyConstraints.with_defaults()
             elif dependency_versions == "latest":
                 dependency_constraints = None
             else:
@@ -486,8 +486,8 @@ class Options:
             except ValueError:
                 build_verbosity = 0
 
-            manylinux_images: Dict[str, str] = {}
-            musllinux_images: Dict[str, str] = {}
+            manylinux_images: dict[str, str] = {}
+            musllinux_images: dict[str, str] = {}
             if self.platform == "linux":
                 all_pinned_container_images = _get_pinned_container_images()
 
@@ -539,7 +539,7 @@ class Options:
                 build_frontend=build_frontend,
             )
 
-    def check_for_invalid_configuration(self, identifiers: List[str]) -> None:
+    def check_for_invalid_configuration(self, identifiers: list[str]) -> None:
         if self.platform in ["macos", "windows"]:
             before_all_values = {self.build_options(i).before_all for i in identifiers}
 
@@ -562,7 +562,7 @@ class Options:
         deprecated_selectors("CIBW_SKIP", build_selector.skip_config)
         deprecated_selectors("CIBW_TEST_SKIP", test_selector.skip_config)
 
-    def summary(self, identifiers: List[str]) -> str:
+    def summary(self, identifiers: list[str]) -> str:
         lines = [
             f"{option_name}: {option_value!r}"
             for option_name, option_value in sorted(asdict(self.globals).items())

cibuildwheel/projectfiles.py

@@ -1,8 +1,10 @@
+from __future__ import annotations
+
 import ast
 import sys
 from configparser import ConfigParser
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 if sys.version_info >= (3, 11):
     import tomllib
@@ -24,7 +26,7 @@ else:
 
 class Analyzer(ast.NodeVisitor):
     def __init__(self) -> None:
-        self.requires_python: Optional[str] = None
+        self.requires_python: str | None = None
 
     def visit(self, node: ast.AST) -> None:
         for inner_node in ast.walk(node):
@@ -43,7 +45,7 @@ class Analyzer(ast.NodeVisitor):
                 self.requires_python = get_constant(node.value)
 
 
-def setup_py_python_requires(content: str) -> Optional[str]:
+def setup_py_python_requires(content: str) -> str | None:
     try:
         tree = ast.parse(content)
         analyzer = Analyzer()
@@ -53,7 +55,7 @@ def setup_py_python_requires(content: str) -> Optional[str]:
         return None
 
 
-def get_requires_python_str(package_dir: Path) -> Optional[str]:
+def get_requires_python_str(package_dir: Path) -> str | None:
     """Return the python requires string from the most canonical source available, or None"""
 
     # Read in from pyproject.toml:project.requires-python

cibuildwheel/resources/build-platforms.toml

@@ -81,12 +81,12 @@ python_configurations = [
   { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.13/python-3.9.13-macos11.pkg" },
   { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.13/python-3.9.13-macos11.pkg" },
   { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.13/python-3.9.13-macos11.pkg" },
-  { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.5/python-3.10.5-macos11.pkg" },
-  { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.5/python-3.10.5-macos11.pkg" },
-  { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.5/python-3.10.5-macos11.pkg" },
-  { identifier = "cp311-macosx_x86_64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.0/python-3.11.0b4-macos11.pkg" },
-  { identifier = "cp311-macosx_arm64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.0/python-3.11.0b4-macos11.pkg" },
-  { identifier = "cp311-macosx_universal2", version = "3.11", url = "https://www.python.org/ftp/python/3.11.0/python-3.11.0b4-macos11.pkg" },
+  { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.6/python-3.10.6-macos11.pkg" },
+  { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.6/python-3.10.6-macos11.pkg" },
+  { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.6/python-3.10.6-macos11.pkg" },
+  { identifier = "cp311-macosx_x86_64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.0/python-3.11.0rc1-macos11.pkg" },
+  { identifier = "cp311-macosx_arm64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.0/python-3.11.0rc1-macos11.pkg" },
+  { identifier = "cp311-macosx_universal2", version = "3.11", url = "https://www.python.org/ftp/python/3.11.0/python-3.11.0rc1-macos11.pkg" },
   { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.9-osx64.tar.bz2" },
   { identifier = "pp38-macosx_x86_64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.9-osx64.tar.bz2" },
   { identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.9-osx64.tar.bz2" },
@@ -102,13 +102,13 @@ python_configurations = [
   { identifier = "cp38-win_amd64", version = "3.8.10", arch = "64" },
   { identifier = "cp39-win32", version = "3.9.13", arch = "32" },
   { identifier = "cp39-win_amd64", version = "3.9.13", arch = "64" },
-  { identifier = "cp310-win32", version = "3.10.5", arch = "32" },
-  { identifier = "cp310-win_amd64", version = "3.10.5", arch = "64" },
-  { identifier = "cp311-win32", version = "3.11.0-b4", arch = "32" },
-  { identifier = "cp311-win_amd64", version = "3.11.0-b4", arch = "64" },
+  { identifier = "cp310-win32", version = "3.10.6", arch = "32" },
+  { identifier = "cp310-win_amd64", version = "3.10.6", arch = "64" },
+  { identifier = "cp311-win32", version = "3.11.0-rc1", arch = "32" },
+  { identifier = "cp311-win_amd64", version = "3.11.0-rc1", arch = "64" },
   { identifier = "cp39-win_arm64", version = "3.9.10", arch = "ARM64" },
-  { identifier = "cp310-win_arm64", version = "3.10.5", arch = "ARM64" },
-  { identifier = "cp311-win_arm64", version = "3.11.0-b4", arch = "ARM64" },
+  { identifier = "cp310-win_arm64", version = "3.10.6", arch = "ARM64" },
+  { identifier = "cp311-win_arm64", version = "3.11.0-rc1", arch = "ARM64" },
   { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.9-win64.zip" },
   { identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.9-win64.zip" },
   { identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.9-win64.zip" },

cibuildwheel/resources/constraints-python310.txt

@@ -2,21 +2,19 @@
 # This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
-#    bin/update_dependencies.py
+#    nox -s update_constraints-3.10
 #
 delocate==0.10.2
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.5
     # via virtualenv
-filelock==3.7.1
+filelock==3.8.0
     # via virtualenv
 platformdirs==2.5.2
     # via virtualenv
-six==1.16.0
-    # via virtualenv
 typing-extensions==4.3.0
     # via delocate
-virtualenv==20.15.1
+virtualenv==20.16.3
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.1
     # via
@@ -24,7 +22,7 @@ wheel==0.37.1
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==22.1.2
+pip==22.2.2
     # via -r cibuildwheel/resources/constraints.in
-setuptools==63.2.0
+setuptools==63.4.2
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python311.txt

@@ -2,21 +2,19 @@
 # This file is autogenerated by pip-compile with python 3.11
 # To update, run:
 #
-#    bin/update_dependencies.py
+#    nox -s update_constraints-3.11
 #
 delocate==0.10.2
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.5
     # via virtualenv
-filelock==3.7.1
+filelock==3.8.0
     # via virtualenv
 platformdirs==2.5.2
     # via virtualenv
-six==1.16.0
-    # via virtualenv
 typing-extensions==4.3.0
     # via delocate
-virtualenv==20.15.1
+virtualenv==20.16.3
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.1
     # via
@@ -24,7 +22,7 @@ wheel==0.37.1
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==22.1.2
+pip==22.2.2
     # via -r cibuildwheel/resources/constraints.in
-setuptools==63.2.0
+setuptools==63.4.2
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python36.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with python 3.6
 # To update, run:
 #
-#    bin/update_dependencies.py
+#    nox -s update_constraints-3.6
 #
 delocate==0.10.2
     # via -r cibuildwheel/resources/constraints.in
@@ -16,13 +16,11 @@ importlib-resources==5.4.0
     # via virtualenv
 platformdirs==2.4.0
     # via virtualenv
-six==1.16.0
-    # via virtualenv
 typing-extensions==4.1.1
     # via
     #   delocate
     #   importlib-metadata
-virtualenv==20.15.1
+virtualenv==20.16.3
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.1
     # via

cibuildwheel/resources/constraints-python37.txt

@@ -2,25 +2,23 @@
 # This file is autogenerated by pip-compile with python 3.7
 # To update, run:
 #
-#    bin/update_dependencies.py
+#    nox -s update_constraints-3.7
 #
 delocate==0.10.2
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.5
     # via virtualenv
-filelock==3.7.1
+filelock==3.8.0
     # via virtualenv
 importlib-metadata==4.12.0
     # via virtualenv
 platformdirs==2.5.2
     # via virtualenv
-six==1.16.0
-    # via virtualenv
 typing-extensions==4.3.0
     # via
     #   delocate
     #   importlib-metadata
-virtualenv==20.15.1
+virtualenv==20.16.3
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.1
     # via
@@ -30,7 +28,7 @@ zipp==3.8.1
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==22.1.2
+pip==22.2.2
     # via -r cibuildwheel/resources/constraints.in
-setuptools==63.2.0
+setuptools==63.4.2
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python38.txt

@@ -2,21 +2,19 @@
 # This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
-#    bin/update_dependencies.py
+#    nox -s update_constraints-3.8
 #
 delocate==0.10.2
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.5
     # via virtualenv
-filelock==3.7.1
+filelock==3.8.0
     # via virtualenv
 platformdirs==2.5.2
     # via virtualenv
-six==1.16.0
-    # via virtualenv
 typing-extensions==4.3.0
     # via delocate
-virtualenv==20.15.1
+virtualenv==20.16.3
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.1
     # via
@@ -24,7 +22,7 @@ wheel==0.37.1
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==22.1.2
+pip==22.2.2
     # via -r cibuildwheel/resources/constraints.in
-setuptools==63.2.0
+setuptools==63.4.2
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python39.txt

@@ -2,21 +2,19 @@
 # This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
-#    bin/update_dependencies.py
+#    nox -s update_constraints-3.9
 #
 delocate==0.10.2
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.5
     # via virtualenv
-filelock==3.7.1
+filelock==3.8.0
     # via virtualenv
 platformdirs==2.5.2
     # via virtualenv
-six==1.16.0
-    # via virtualenv
 typing-extensions==4.3.0
     # via delocate
-virtualenv==20.15.1
+virtualenv==20.16.3
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.1
     # via
@@ -24,7 +22,7 @@ wheel==0.37.1
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==22.1.2
+pip==22.2.2
     # via -r cibuildwheel/resources/constraints.in
-setuptools==63.2.0
+setuptools==63.4.2
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints.txt

@@ -1,22 +1,20 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile with python 3.11
 # To update, run:
 #
-#    bin/update_dependencies.py
+#    nox -s update_constraints-3.11
 #
 delocate==0.10.2
     # via -r cibuildwheel/resources/constraints.in
 distlib==0.3.5
     # via virtualenv
-filelock==3.7.1
+filelock==3.8.0
     # via virtualenv
 platformdirs==2.5.2
     # via virtualenv
-six==1.16.0
-    # via virtualenv
 typing-extensions==4.3.0
     # via delocate
-virtualenv==20.15.1
+virtualenv==20.16.3
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.1
     # via
@@ -24,7 +22,7 @@ wheel==0.37.1
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==22.1.2
+pip==22.2.2
     # via -r cibuildwheel/resources/constraints.in
-setuptools==63.2.0
+setuptools==63.4.2
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/pinned_docker_images.cfg

@@ -1,48 +1,48 @@
 [x86_64]
-manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-07-17-f8ddacc
-manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-07-17-51324db
-manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-07-17-51324db
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-07-17-51324db
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2022-07-17-51324db
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-07-17-51324db
+manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-08-08-7292f33
+manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-08-09-51a01be
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-08-09-51a01be
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2022-08-09-51a01be
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-08-09-51a01be
 
 [i686]
-manylinux1 = quay.io/pypa/manylinux1_i686:2022-07-17-f8ddacc
-manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-07-17-51324db
-manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-07-17-51324db
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-07-17-51324db
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-07-17-51324db
+manylinux1 = quay.io/pypa/manylinux1_i686:2022-08-08-7292f33
+manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-08-05-4535177
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-08-09-51a01be
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-08-09-51a01be
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-08-09-51a01be
 
 [pypy_x86_64]
-manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-07-17-51324db
-manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-07-17-51324db
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-07-17-51324db
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2022-07-17-51324db
+manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-08-09-51a01be
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-08-09-51a01be
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2022-08-09-51a01be
 
 [pypy_i686]
-manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-07-17-51324db
-manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-07-17-51324db
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-07-17-51324db
+manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-08-05-4535177
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-08-09-51a01be
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-08-09-51a01be
 
 [aarch64]
-manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-07-17-51324db
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-07-17-51324db
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2022-07-17-51324db
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-07-17-51324db
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-08-09-51a01be
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-08-09-51a01be
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2022-08-09-51a01be
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-08-09-51a01be
 
 [ppc64le]
-manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-07-17-51324db
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-07-17-51324db
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2022-07-17-51324db
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-07-17-51324db
+manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-08-09-51a01be
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-08-09-51a01be
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2022-08-09-51a01be
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-08-09-51a01be
 
 [s390x]
-manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-07-17-51324db
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-07-17-51324db
-musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-07-17-51324db
+manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-08-09-51a01be
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-08-09-51a01be
+musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-08-09-51a01be
 
 [pypy_aarch64]
-manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-07-17-51324db
-manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-07-17-51324db
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2022-07-17-51324db
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-08-09-51a01be
+manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-08-09-51a01be
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2022-08-09-51a01be
 

cibuildwheel/resources/virtualenv.toml

@@ -1,2 +1,2 @@
-version = "20.15.1"
-url = "https://github.com/pypa/get-virtualenv/blob/20.15.1/public/virtualenv.pyz?raw=true"
+version = "20.16.3"
+url = "https://github.com/pypa/get-virtualenv/blob/20.16.3/public/virtualenv.pyz?raw=true"

cibuildwheel/typing.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import subprocess
 import sys
@@ -36,7 +38,7 @@ else:
 
 
 PlatformName = Literal["linux", "macos", "windows"]
-PLATFORMS: Final[Set[PlatformName]] = {"linux", "macos", "windows"}
+PLATFORMS: Final[set[PlatformName]] = {"linux", "macos", "windows"}
 
 
 def assert_never(value: NoReturn) -> NoReturn:

cibuildwheel/util.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import contextlib
 import fnmatch
 import itertools
@@ -18,15 +20,11 @@ from time import sleep
 from typing import (
     Any,
     ClassVar,
-    Dict,
     Generator,
     Iterable,
-    List,
-    Optional,
     Sequence,
     TextIO,
     TypeVar,
-    Union,
     cast,
     overload,
 )
@@ -98,8 +96,8 @@ IS_WIN: Final = sys.platform.startswith("win")
 @overload
 def call(
     *args: PathOrStr,
-    env: Optional[Dict[str, str]] = None,
-    cwd: Optional[PathOrStr] = None,
+    env: dict[str, str] | None = None,
+    cwd: PathOrStr | None = None,
     capture_stdout: Literal[False] = ...,
 ) -> None:
     ...
@@ -108,8 +106,8 @@ def call(
 @overload
 def call(
     *args: PathOrStr,
-    env: Optional[Dict[str, str]] = None,
-    cwd: Optional[PathOrStr] = None,
+    env: dict[str, str] | None = None,
+    cwd: PathOrStr | None = None,
     capture_stdout: Literal[True],
 ) -> str:
     ...
@@ -117,10 +115,10 @@ def call(
 
 def call(
     *args: PathOrStr,
-    env: Optional[Dict[str, str]] = None,
-    cwd: Optional[PathOrStr] = None,
+    env: dict[str, str] | None = None,
+    cwd: PathOrStr | None = None,
     capture_stdout: bool = False,
-) -> Optional[str]:
+) -> str | None:
     """
     Run subprocess.run, but print the commands first. Takes the commands as
     *args. Uses shell=True on Windows due to a bug. Also converts to
@@ -130,7 +128,7 @@ def call(
     args_ = [str(arg) for arg in args]
     # print the command executing for the logs
     print("+ " + " ".join(shlex.quote(a) for a in args_))
-    kwargs: Dict[str, Any] = {}
+    kwargs: dict[str, Any] = {}
     if capture_stdout:
         kwargs["universal_newlines"] = True
         kwargs["stdout"] = subprocess.PIPE
@@ -140,9 +138,7 @@ def call(
     return cast(str, result.stdout)
 
 
-def shell(
-    *commands: str, env: Optional[Dict[str, str]] = None, cwd: Optional[PathOrStr] = None
-) -> None:
+def shell(*commands: str, env: dict[str, str] | None = None, cwd: PathOrStr | None = None) -> None:
     command = " ".join(commands)
     print(f"+ {command}")
     subprocess.run(command, env=env, cwd=cwd, shell=True, check=True)
@@ -200,7 +196,7 @@ def prepare_command(command: str, **kwargs: PathOrStr) -> str:
     return format_safe(command, python="python", pip="pip", **kwargs)
 
 
-def get_build_verbosity_extra_flags(level: int) -> List[str]:
+def get_build_verbosity_extra_flags(level: int) -> list[str]:
     if level > 0:
         return ["-" + level * "v"]
     elif level < 0:
@@ -209,11 +205,11 @@ def get_build_verbosity_extra_flags(level: int) -> List[str]:
         return []
 
 
-def read_python_configs(config: PlatformName) -> List[Dict[str, str]]:
+def read_python_configs(config: PlatformName) -> list[dict[str, str]]:
     input_file = resources_dir / "build-platforms.toml"
     with input_file.open("rb") as f:
         loaded_file = tomllib.load(f)
-    results: List[Dict[str, str]] = list(loaded_file[config]["python_configurations"])
+    results: list[dict[str, str]] = list(loaded_file[config]["python_configurations"])
     return results
 
 
@@ -243,10 +239,10 @@ class BuildSelector:
 
     build_config: str
     skip_config: str
-    requires_python: Optional[SpecifierSet] = None
+    requires_python: SpecifierSet | None = None
 
     # a pattern that skips prerelease versions, when include_prereleases is False.
-    PRERELEASE_SKIP: ClassVar[str] = "cp311-*"
+    PRERELEASE_SKIP: ClassVar[str] = ""
     prerelease_pythons: bool = False
 
     def __call__(self, build_id: str) -> bool:
@@ -328,7 +324,7 @@ class DependencyConstraints:
         self.base_file_path = base_file_path.resolve()
 
     @staticmethod
-    def with_defaults() -> "DependencyConstraints":
+    def with_defaults() -> DependencyConstraints:
         return DependencyConstraints(base_file_path=resources_dir / "constraints.txt")
 
     def get_for_python_version(self, version: str) -> Path:
@@ -400,7 +396,7 @@ class CIProvider(Enum):
     other = "other"
 
 
-def detect_ci_provider() -> Optional[CIProvider]:
+def detect_ci_provider() -> CIProvider | None:
     if "TRAVIS" in os.environ:
         return CIProvider.travis_ci
     elif "APPVEYOR" in os.environ:
@@ -473,7 +469,7 @@ def print_new_wheels(msg: str, output_dir: Path) -> Generator[None, None, None]:
     )
 
 
-def get_pip_version(env: Dict[str, str]) -> str:
+def get_pip_version(env: dict[str, str]) -> str:
     versions_output_text = call(
         "python", "-m", "pip", "freeze", "--all", capture_stdout=True, env=env
     )
@@ -501,7 +497,7 @@ def _ensure_virtualenv() -> Path:
 
 def _parse_constraints_for_virtualenv(
     dependency_constraint_flags: Sequence[PathOrStr],
-) -> Dict[str, str]:
+) -> dict[str, str]:
     """
     Parses the constraints file referenced by `dependency_constraint_flags` and returns a dict where
     the key is the package name, and the value is the constraint version.
@@ -547,7 +543,7 @@ def _parse_constraints_for_virtualenv(
 
 def virtualenv(
     python: Path, venv_path: Path, dependency_constraint_flags: Sequence[PathOrStr]
-) -> Dict[str, str]:
+) -> dict[str, str]:
     assert python.exists()
     virtualenv_app = _ensure_virtualenv()
     constraints = _parse_constraints_for_virtualenv(dependency_constraint_flags)
@@ -589,7 +585,7 @@ def virtualenv(
 T = TypeVar("T", bound=PurePath)
 
 
-def find_compatible_wheel(wheels: Sequence[T], identifier: str) -> Optional[T]:
+def find_compatible_wheel(wheels: Sequence[T], identifier: str) -> T | None:
     """
     Finds a wheel with an abi3 or a none ABI tag in `wheels` compatible with the Python interpreter
     specified by `identifier` that is previously built.
@@ -641,7 +637,7 @@ else:
 
 # Can be replaced by contextlib.chdir in Python 3.11
 @contextlib.contextmanager
-def chdir(new_path: Union[Path, str]) -> Generator[None, None, None]:
+def chdir(new_path: Path | str) -> Generator[None, None, None]:
     """Non thread-safe context manager to change the current working directory."""
 
     cwd = os.getcwd()

cibuildwheel/windows.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import shutil
 import subprocess
@@ -5,7 +7,7 @@ import sys
 from dataclasses import dataclass
 from functools import lru_cache
 from pathlib import Path
-from typing import Dict, List, Optional, Sequence, Set
+from typing import Sequence
 from zipfile import ZipFile
 
 from filelock import FileLock
@@ -34,7 +36,7 @@ from .util import (
 )
 
 
-def get_nuget_args(version: str, arch: str, output_directory: Path) -> List[str]:
+def get_nuget_args(version: str, arch: str, output_directory: Path) -> list[str]:
     platform_suffix = {"32": "x86", "64": "", "ARM64": "arm64"}
     python_name = "python" + platform_suffix[arch]
     return [
@@ -53,13 +55,13 @@ class PythonConfiguration:
     version: str
     arch: str
     identifier: str
-    url: Optional[str] = None
+    url: str | None = None
 
 
 def get_python_configurations(
     build_selector: BuildSelector,
-    architectures: Set[Architecture],
-) -> List[PythonConfiguration]:
+    architectures: set[Architecture],
+) -> list[PythonConfiguration]:
 
     full_python_configs = read_python_configs("windows")
 
@@ -124,7 +126,7 @@ def setup_python(
     dependency_constraint_flags: Sequence[PathOrStr],
     environment: ParsedEnvironment,
     build_frontend: BuildFrontend,
-) -> Dict[str, str]:
+) -> dict[str, str]:
     tmp.mkdir()
     implementation_id = python_configuration.identifier.split("-")[0]
     log.step(f"Installing Python {implementation_id}...")
@@ -253,7 +255,7 @@ def build(options: Options, tmp_path: Path) -> None:
             )
             shell(before_all_prepared, env=env)
 
-        built_wheels: List[Path] = []
+        built_wheels: list[Path] = []
 
         for config in python_configurations:
             build_options = options.build_options(config.identifier)

docs/changelog.md

@@ -2,6 +2,15 @@
 title: Changelog
 ---
 
+### v2.9.0
+
+_11 August 2022_
+
+- 🌟 CPython 3.11 wheels are now built by default - without the CIBW_PRERELEASE_PYTHONS flag. It's time to build and upload these wheels to PyPI! This release includes CPython 3.11.0rc1, which is guaranteed to be ABI compatible with the final release. (#1226)
+- ⚠️ Removed support for running cibuildwheel in Python 3.6. Python 3.6 is EOL. However, cibuildwheel continues to build CPython 3.6 wheels for the moment. (#1175)
+- ✨ Improved error messages when misspelling TOML options, suggesting close matches (#1205)
+- 🛠 When running on Apple Silicon (so far, an unsupported mode of operation), cibuildwheel no longer builds universal2 wheels by default - just arm64. See [#1204](https://github.com/pypa/cibuildwheel/issues/1204) for discussion. We hope to release official support for native builds on Apple Silicon soon! (#1217)
+
 ### v2.8.1
 
 _18 July 2022_

docs/contributing.md

@@ -94,7 +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 3.6.11
 pyenv install 3.7.8
 # Optionally add 3.8 and make it the local version;
 # otherwise assuming 3.8+ already is your current python version
@@ -103,7 +102,6 @@ pyenv install 3.7.8
 Then, you need to make the required virtual environments:
 
 ```bash
-$(pyenv prefix 3.6.11)/bin/python -m venv env36
 $(pyenv prefix 3.7.8)/bin/python -m venv env37
 ```
 

docs/data/projects.yml

@@ -594,3 +594,15 @@
   gh: SciTools/cf-units
   ci: [github]
   os: [apple, linux]
+
+- name: envd
+  gh: tensorchord/envd
+  ci: [github]
+  os: [apple, linux, windows]
+  note: A machine learning development environment build toool
+
+- name: mosec
+  gh: mosecorg/mosec
+  ci: [github]
+  os: [linux, apple]
+  note: A machine learning model serving framework powered by Rust

docs/faq.md

@@ -53,11 +53,11 @@ to load on Apple Silicon.
     available.
 
 Generally speaking, because Pip 20.3 is required for the `universal2` wheel,
-most packages should provide both `x86_64` and `universal2` wheels for now.
-Once Pip 20.3+ is common on macOS, then it should be possible to ship only the
-`universal2` wheel.
+most packages should provide both `x86_64` and one of `universal2`/`arm64`
+wheels for now. When Pip 20.3+ is common on macOS, then it might be possible
+to ship only the `universal2` wheel.
 
-**Apple Silicon wheels are not built by default**, but can be enabled by adding extra archs to the [`CIBW_ARCHS_MACOS` option](options.md#archs) - e.g. `x86_64 arm64 universal2`. Cross-compilation is provided by the Xcode toolchain.
+**Apple Silicon wheels are not built by default on Intel runners**, but can be enabled by adding extra archs to the [`CIBW_ARCHS_MACOS` option](options.md#archs) - e.g. `x86_64 arm64`. 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.
@@ -66,8 +66,7 @@ Once Pip 20.3+ is common on macOS, then it should be possible to ship only the
 
 Hopefully, cross-compilation is a temporary situation. Once we have widely
 available Apple Silicon CI runners, we can build and test `arm64` and
-`universal2` wheels natively. That's why `universal2` wheels are not yet built
-by default, and require opt-in by setting `CIBW_ARCHS_MACOS`.
+`universal2` wheels natively. That's why `universal2`/`arm64` wheels 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`.
@@ -133,7 +132,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead
 If you use GitHub Actions for builds, you can use cibuildwheel as an action:
 
 ```yaml
-uses: pypa/cibuildwheel@v2.8.1
+uses: pypa/cibuildwheel@v2.9.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.
@@ -155,7 +154,7 @@ The second option, and the only one that supports other CI systems, is using a `
 
 ```bash
 # requirements-cibw.txt
-cibuildwheel==2.8.1
+cibuildwheel==2.9.0
 ```
 
 Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this:

docs/main.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import subprocess
 from typing import Any
 

docs/options.md

@@ -351,7 +351,7 @@ Default: `auto`
 | Linux / Intel | `x86_64` | `x86_64` `i686` | `x86_64` | `i686` |
 | Windows / Intel | `AMD64` | `AMD64` `x86` | `AMD64` | `x86` |
 | macOS / Intel | `x86_64` | `x86_64` | `x86_64` |  |
-| macOS / Apple Silicon | `arm64` | `arm64` `universal2` | `arm64` `universal2`|  |
+| macOS / Apple Silicon | `arm64` | `arm64` | `arm64` |  |
 
 If not listed above, `auto` is the same as `native`.
 

docs/setup.md

@@ -182,7 +182,7 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/
           - uses: actions/checkout@v3
 
           - name: Build wheels
-            run: pipx run cibuildwheel==2.8.1
+            run: pipx run cibuildwheel==2.9.0
 
           - uses: actions/upload-artifact@v3
             with:
@@ -217,7 +217,7 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/
           - uses: actions/setup-python@v3
 
           - name: Install cibuildwheel
-            run: python -m pip install cibuildwheel==2.8.1
+            run: python -m pip install cibuildwheel==2.9.0
 
           - name: Build wheels
             run: python -m cibuildwheel --output-dir wheelhouse

docs/working-examples.md

@@ -23,16 +23,16 @@ title: Working examples
 | [psutil][]                        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python |
 | [vaex][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Out-of-Core hybrid Apache Arrow/NumPy DataFrame for Python, ML, visualization and exploration of big tabular data at a billion rows per second 🚀 |
 | [Google Benchmark][]              | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A microbenchmark support library |
+| [duckdb][]                        | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System |
 | [Apache Beam][]                   | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Apache Beam is a unified programming model for Batch and Streaming data processing. |
 | [asyncpg][]                       | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A fast PostgreSQL Database Client Library for Python/asyncio. |
-| [duckdb][]                        | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System |
-| [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.  |
 | [PyGame][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | pygame (the library) is a Free and Open Source python programming language library for making multimedia applications like games built on top of the excellent SDL library. C, Python, Native, OpenGL. |
+| [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.  |
 | [cmake][]                         | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
 | [twisted-iocpsupport][]           | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. |
 | [websockets][]                    | ![travisci icon][] | ![apple icon][] ![linux icon][] | Library for building WebSocket servers and clients. Mostly written in Python, with a small C 'speedups' extension module.  |
-| [cvxpy][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A Python-embedded modeling language for convex optimization problems. |
 | [PyOxidizer][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A modern Python application packaging and distribution tool |
+| [cvxpy][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A Python-embedded modeling language for convex optimization problems. |
 | [Triton][]                        | ![github icon][] | ![linux icon][] | Self hosted runners |
 | [UltraJSON][]                     | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Ultra fast JSON decoder and encoder written in C with Python bindings |
 | [River][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python |
@@ -40,8 +40,8 @@ title: Working examples
 | [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. |
 | [vispy][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Main repository for Vispy |
-| [Confluent client for Kafka][]    | ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | setup in `tools/wheels/build-wheels.bat` |
 | [Implicit][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes GPU support for linux wheels |
+| [Confluent client for Kafka][]    | ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | setup in `tools/wheels/build-wheels.bat` |
 | [tinyobjloader][]                 | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Tiny but powerful single file wavefront obj loader |
 | [Dependency Injector][]           | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI |
 | [coverage.py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python |
@@ -57,11 +57,11 @@ title: Working examples
 | [Line Profiler][]                 | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Line-by-line profiling for Python |
 | [PyTables][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data |
 | [OpenTimelineIO][]                | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Open Source API and interchange format for editorial timeline information. |
-| [ruptures][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. |
 | [aioquic][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python |
+| [ruptures][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. |
 | [DeepForest][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) |
-| [google neuroglancer][]           | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data |
 | [Psycopg 3][]                     | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A modern implementation of a PostgreSQL adapter for Python |
+| [google neuroglancer][]           | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data |
 | [Parselmouth][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. |
 | [AutoPy][]                        | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
 | [H3-py][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system |
@@ -74,12 +74,12 @@ title: Working examples
 | [tgcalls][]                       | ![github icon][] | ![apple icon][] ![windows icon][] | Python `pybind11` binding to Telegram's WebRTC library with third party dependencies like `OpenSSL`, `MozJPEG`, `FFmpeg`, etc. |
 | [dd-trace-py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub |
 | [pybind11 python_example][]       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a Python-based build system |
-| [sourmash][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. |
 | [time-machine][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. |
+| [sourmash][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. |
 | [CTranslate2][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit.html) and CUDA kernels compiled for multiple GPU architectures. |
 | [cyvcf2][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing |
-| [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. |
 | [abess][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A fast best-subset selection library. It uses cibuildwheel to build a large project with C++ extensions. |
+| [matrixprofile][]                 | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. |
 | [jq.py][]                         | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq |
 | [iminuit][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 |
 | [Tokenizer][]                     | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support |
@@ -96,17 +96,17 @@ title: Working examples
 | [polaroid][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. |
 | [cf-units][]                      | ![github icon][] | ![apple icon][] ![linux icon][] | Units of measure as required by the Climate and Forecast (CF) Metadata Conventions |
 | [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. |
-| [clang-format][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. |
 | [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. |
 | [power-grid-model][]              | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python/C++ library for distribution power system analysis |
+| [clang-format][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. |
 | [numpythia][]                     | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy |
 | [pyjet][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy |
 | [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 |
 | [ninja][]                         | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
 | [GSD][]                           | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Cython and NumPy project with 64-bit wheels. |
 | [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. |
+| [xmlstarlet][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. |
 | [SiPM][]                          | ![github icon][] | ![apple icon][] ![linux icon][] | High performance library for SiPM detectors simulation using C++17, OpenMP and AVX2 intrinsics. |
 
 [scikit-learn]: https://github.com/scikit-learn/scikit-learn
@@ -124,16 +124,16 @@ title: Working examples
 [psutil]: https://github.com/giampaolo/psutil
 [vaex]: https://github.com/vaexio/vaex
 [Google Benchmark]: https://github.com/google/benchmark
+[duckdb]: https://github.com/duckdb/duckdb
 [Apache Beam]: https://github.com/apache/beam
 [asyncpg]: https://github.com/MagicStack/asyncpg
-[duckdb]: https://github.com/duckdb/duckdb
-[scikit-image]: https://github.com/scikit-image/scikit-image
 [PyGame]: https://github.com/pygame/pygame
+[scikit-image]: https://github.com/scikit-image/scikit-image
 [cmake]: https://github.com/scikit-build/cmake-python-distributions
 [twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport
 [websockets]: https://github.com/aaugustin/websockets
-[cvxpy]: https://github.com/cvxpy/cvxpy
 [PyOxidizer]: https://github.com/indygreg/PyOxidizer
+[cvxpy]: https://github.com/cvxpy/cvxpy
 [Triton]: https://github.com/openai/triton
 [UltraJSON]: https://github.com/ultrajson/ultrajson
 [River]: https://github.com/online-ml/river
@@ -141,8 +141,8 @@ title: Working examples
 [pyzmq]: https://github.com/zeromq/pyzmq
 [aiortc]: https://github.com/aiortc/aiortc
 [vispy]: https://github.com/vispy/vispy
-[Confluent client for Kafka]: https://github.com/confluentinc/confluent-kafka-python
 [Implicit]: https://github.com/benfred/implicit
+[Confluent client for Kafka]: https://github.com/confluentinc/confluent-kafka-python
 [tinyobjloader]: https://github.com/tinyobjloader/tinyobjloader
 [Dependency Injector]: https://github.com/ets-labs/python-dependency-injector
 [coverage.py]: https://github.com/nedbat/coveragepy
@@ -158,11 +158,11 @@ title: Working examples
 [Line Profiler]: https://github.com/pyutils/line_profiler
 [PyTables]: https://github.com/PyTables/PyTables
 [OpenTimelineIO]: https://github.com/PixarAnimationStudios/OpenTimelineIO
-[ruptures]: https://github.com/deepcharles/ruptures
 [aioquic]: https://github.com/aiortc/aioquic
+[ruptures]: https://github.com/deepcharles/ruptures
 [DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest
-[google neuroglancer]: https://github.com/google/neuroglancer
 [Psycopg 3]: https://github.com/psycopg/psycopg
+[google neuroglancer]: https://github.com/google/neuroglancer
 [Parselmouth]: https://github.com/YannickJadoul/Parselmouth
 [AutoPy]: https://github.com/autopilot-rs/autopy
 [H3-py]: https://github.com/uber/h3-py
@@ -175,12 +175,12 @@ title: Working examples
 [tgcalls]: https://github.com/MarshalX/tgcalls
 [dd-trace-py]: https://github.com/DataDog/dd-trace-py
 [pybind11 python_example]: https://github.com/pybind/python_example
-[sourmash]: https://github.com/dib-lab/sourmash
 [time-machine]: https://github.com/adamchainz/time-machine
+[sourmash]: https://github.com/dib-lab/sourmash
 [CTranslate2]: https://github.com/OpenNMT/CTranslate2
 [cyvcf2]: https://github.com/brentp/cyvcf2
-[matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile
 [abess]: https://github.com/abess-team/abess
+[matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile
 [jq.py]: https://github.com/mwilliamson/jq.py
 [iminuit]: https://github.com/scikit-hep/iminuit
 [Tokenizer]: https://github.com/OpenNMT/Tokenizer
@@ -197,17 +197,17 @@ title: Working examples
 [polaroid]: https://github.com/daggy1234/polaroid
 [cf-units]: https://github.com/SciTools/cf-units
 [Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build
-[clang-format]: https://github.com/ssciwr/clang-format-wheel
 [pillow-heif]: https://github.com/bigcat88/pillow_heif
 [power-grid-model]: https://github.com/alliander-opensource/power-grid-model
+[clang-format]: https://github.com/ssciwr/clang-format-wheel
 [numpythia]: https://github.com/scikit-hep/numpythia
 [pyjet]: https://github.com/scikit-hep/pyjet
 [pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example
 [ninja]: https://github.com/scikit-build/ninja-python-distributions
 [GSD]: https://github.com/glotzerlab/gsd
 [pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext
-[xmlstarlet]: https://github.com/dimitern/xmlstarlet
 [CorrectionLib]: https://github.com/cms-nanoAOD/correctionlib
+[xmlstarlet]: https://github.com/dimitern/xmlstarlet
 [SiPM]: https://github.com/EdoPro98/SimSiPM
 
 [appveyor icon]: data/readme_icons/appveyor.svg
@@ -220,106 +220,106 @@ title: Working examples
 [apple icon]: data/readme_icons/apple.svg
 [linux icon]: data/readme_icons/linux.svg
 
-<!-- scikit-learn: 50754, last pushed 0 days ago -->
-<!-- NumPy: 20975, last pushed 0 days ago -->
-<!-- Tornado: 20638, last pushed 0 days ago -->
-<!-- pytorch-fairseq: 18489, last pushed 2 days ago -->
-<!-- Matplotlib: 15822, last pushed 0 days ago -->
-<!-- NCNN: 14975, last pushed 0 days ago -->
-<!-- Kivy: 14789, last pushed 0 days ago -->
-<!-- Prophet: 14684, last pushed 10 days ago -->
-<!-- MyPy: 13444, last pushed 0 days ago -->
-<!-- pydantic: 10450, last pushed 0 days ago -->
-<!-- MemRay: 8836, last pushed 2 days ago -->
-<!-- uvloop: 8725, last pushed 0 days ago -->
-<!-- psutil: 8531, last pushed 3 days ago -->
-<!-- vaex: 7175, last pushed 0 days ago -->
-<!-- Google Benchmark: 6659, last pushed 0 days ago -->
-<!-- Apache Beam: 5702, last pushed 0 days ago -->
-<!-- asyncpg: 5558, last pushed 10 days ago -->
-<!-- duckdb: 5546, last pushed 0 days ago -->
-<!-- scikit-image: 4978, last pushed 0 days ago -->
-<!-- PyGame: 4976, last pushed 0 days ago -->
-<!-- cmake: 4910, last pushed 0 days ago -->
-<!-- twisted-iocpsupport: 4666, last pushed 3 days ago -->
-<!-- websockets: 4022, last pushed 1 days ago -->
-<!-- cvxpy: 4009, last pushed 0 days ago -->
-<!-- PyOxidizer: 3919, last pushed 1 days ago -->
-<!-- Triton: 3786, last pushed 0 days ago -->
-<!-- UltraJSON: 3755, last pushed 7 days ago -->
-<!-- River: 3488, last pushed 2 days ago -->
-<!-- OpenSpiel: 3248, last pushed 0 days ago -->
-<!-- pyzmq: 3130, last pushed 4 days ago -->
-<!-- aiortc: 2993, last pushed 23 days ago -->
-<!-- vispy: 2904, last pushed 5 days ago -->
-<!-- Confluent client for Kafka: 2848, last pushed 2 days ago -->
-<!-- Implicit: 2847, last pushed 1 days ago -->
-<!-- tinyobjloader: 2594, last pushed 13 days ago -->
-<!-- Dependency Injector: 2244, last pushed 7 days ago -->
-<!-- coverage.py: 2106, last pushed 1 days ago -->
-<!-- PyCryptodome: 2054, last pushed 7 days ago -->
-<!-- PyYAML: 1883, last pushed 1 days ago -->
-<!-- numexpr: 1775, last pushed 0 days ago -->
-<!-- h5py: 1757, last pushed 12 days ago -->
-<!-- Wrapt: 1705, last pushed 77 days ago -->
-<!-- PyAV: 1605, last pushed 0 days ago -->
-<!-- SimpleJSON: 1500, last pushed 17 days ago -->
-<!-- pikepdf: 1385, last pushed 1 days ago -->
-<!-- OpenColorIO: 1335, last pushed 6 days ago -->
-<!-- Line Profiler: 1284, last pushed 5 days ago -->
-<!-- PyTables: 1137, last pushed 90 days ago -->
-<!-- OpenTimelineIO: 1071, last pushed 0 days ago -->
-<!-- ruptures: 988, last pushed 11 days ago -->
-<!-- aioquic: 986, last pushed 0 days ago -->
-<!-- DeepForest: 769, last pushed 65 days ago -->
-<!-- google neuroglancer: 740, last pushed 4 days ago -->
-<!-- Psycopg 3: 733, last pushed 0 days ago -->
-<!-- Parselmouth: 671, last pushed 7 days ago -->
-<!-- AutoPy: 662, last pushed 205 days ago -->
-<!-- H3-py: 548, last pushed 15 days ago -->
-<!-- Rtree: 489, last pushed 90 days ago -->
-<!-- markupsafe: 480, last pushed 13 days ago -->
-<!-- python-rapidjson: 456, last pushed 11 days ago -->
-<!-- python-snappy: 440, last pushed 123 days ago -->
-<!-- pybind11 cmake_example: 420, last pushed 12 days ago -->
-<!-- KDEpy: 387, last pushed 158 days ago -->
-<!-- tgcalls: 376, last pushed 16 days ago -->
-<!-- dd-trace-py: 342, last pushed 0 days ago -->
-<!-- pybind11 python_example: 337, last pushed 12 days ago -->
-<!-- sourmash: 313, last pushed 0 days ago -->
-<!-- time-machine: 312, last pushed 6 days ago -->
-<!-- CTranslate2: 308, last pushed 0 days ago -->
-<!-- cyvcf2: 302, last pushed 58 days ago -->
-<!-- matrixprofile: 272, last pushed 14 days ago -->
-<!-- abess: 271, last pushed 3 days ago -->
-<!-- jq.py: 220, last pushed 162 days ago -->
-<!-- iminuit: 206, last pushed 1 days ago -->
-<!-- Tokenizer: 187, last pushed 133 days ago -->
-<!-- PyGLM: 147, last pushed 111 days ago -->
-<!-- boost-histogram: 116, last pushed 1 days ago -->
-<!-- bx-python: 114, last pushed 194 days ago -->
-<!-- TgCrypto: 108, last pushed 136 days ago -->
-<!-- iDynTree: 106, last pushed 5 days ago -->
-<!-- Python-WebRTC: 92, last pushed 129 days ago -->
-<!-- pybase64: 85, last pushed 4 days ago -->
-<!-- Arbor: 76, last pushed 0 days ago -->
-<!-- fathon: 63, last pushed 45 days ago -->
-<!-- etebase-py: 58, last pushed 11 days ago -->
-<!-- polaroid: 49, last pushed 67 days ago -->
-<!-- cf-units: 49, last pushed 0 days ago -->
-<!-- Imagecodecs (fork): 46, last pushed 33 days ago -->
-<!-- clang-format: 41, last pushed 13 days ago -->
-<!-- pillow-heif: 37, last pushed 1 days ago -->
-<!-- power-grid-model: 37, last pushed 0 days ago -->
-<!-- numpythia: 34, last pushed 12 days ago -->
-<!-- pyjet: 33, last pushed 17 days ago -->
-<!-- pybind11 scikit_build_example: 29, last pushed 12 days ago -->
+<!-- scikit-learn: 51026, last pushed 0 days ago -->
+<!-- NumPy: 21131, last pushed 0 days ago -->
+<!-- Tornado: 20669, last pushed 9 days ago -->
+<!-- pytorch-fairseq: 18851, last pushed 0 days ago -->
+<!-- Matplotlib: 15939, last pushed 0 days ago -->
+<!-- NCNN: 15158, last pushed 0 days ago -->
+<!-- Kivy: 14873, last pushed 0 days ago -->
+<!-- Prophet: 14779, last pushed 4 days ago -->
+<!-- MyPy: 13581, last pushed 0 days ago -->
+<!-- pydantic: 10706, last pushed 0 days ago -->
+<!-- MemRay: 8980, last pushed 0 days ago -->
+<!-- uvloop: 8778, last pushed 3 days ago -->
+<!-- psutil: 8593, last pushed 7 days ago -->
+<!-- vaex: 7216, last pushed 1 days ago -->
+<!-- Google Benchmark: 6724, last pushed 0 days ago -->
+<!-- duckdb: 5814, last pushed 0 days ago -->
+<!-- Apache Beam: 5766, last pushed 0 days ago -->
+<!-- asyncpg: 5591, last pushed 6 days ago -->
+<!-- PyGame: 5104, last pushed 0 days ago -->
+<!-- scikit-image: 5010, last pushed 1 days ago -->
+<!-- cmake: 4975, last pushed 0 days ago -->
+<!-- twisted-iocpsupport: 4697, last pushed 1 days ago -->
+<!-- websockets: 4103, last pushed 0 days ago -->
+<!-- PyOxidizer: 4064, last pushed 0 days ago -->
+<!-- cvxpy: 4038, last pushed 0 days ago -->
+<!-- Triton: 3860, last pushed 0 days ago -->
+<!-- UltraJSON: 3784, last pushed 1 days ago -->
+<!-- River: 3517, last pushed 2 days ago -->
+<!-- OpenSpiel: 3275, last pushed 0 days ago -->
+<!-- pyzmq: 3138, last pushed 1 days ago -->
+<!-- aiortc: 3032, last pushed 46 days ago -->
+<!-- vispy: 2913, last pushed 4 days ago -->
+<!-- Implicit: 2906, last pushed 0 days ago -->
+<!-- Confluent client for Kafka: 2885, last pushed 6 days ago -->
+<!-- tinyobjloader: 2606, last pushed 36 days ago -->
+<!-- Dependency Injector: 2277, last pushed 6 days ago -->
+<!-- coverage.py: 2136, last pushed 3 days ago -->
+<!-- PyCryptodome: 2085, last pushed 7 days ago -->
+<!-- PyYAML: 1897, last pushed 24 days ago -->
+<!-- numexpr: 1793, last pushed 21 days ago -->
+<!-- h5py: 1762, last pushed 8 days ago -->
+<!-- Wrapt: 1716, last pushed 100 days ago -->
+<!-- PyAV: 1626, last pushed 15 days ago -->
+<!-- SimpleJSON: 1507, last pushed 40 days ago -->
+<!-- pikepdf: 1449, last pushed 1 days ago -->
+<!-- OpenColorIO: 1351, last pushed 29 days ago -->
+<!-- Line Profiler: 1310, last pushed 18 days ago -->
+<!-- PyTables: 1142, last pushed 113 days ago -->
+<!-- OpenTimelineIO: 1083, last pushed 0 days ago -->
+<!-- aioquic: 1012, last pushed 23 days ago -->
+<!-- ruptures: 1011, last pushed 34 days ago -->
+<!-- DeepForest: 768, last pushed 88 days ago -->
+<!-- Psycopg 3: 750, last pushed 1 days ago -->
+<!-- google neuroglancer: 744, last pushed 0 days ago -->
+<!-- Parselmouth: 673, last pushed 31 days ago -->
+<!-- AutoPy: 666, last pushed 228 days ago -->
+<!-- H3-py: 552, last pushed 0 days ago -->
+<!-- Rtree: 497, last pushed 113 days ago -->
+<!-- markupsafe: 487, last pushed 8 days ago -->
+<!-- python-rapidjson: 456, last pushed 21 days ago -->
+<!-- python-snappy: 443, last pushed 147 days ago -->
+<!-- pybind11 cmake_example: 426, last pushed 12 days ago -->
+<!-- KDEpy: 394, last pushed 181 days ago -->
+<!-- tgcalls: 382, last pushed 39 days ago -->
+<!-- dd-trace-py: 350, last pushed 0 days ago -->
+<!-- pybind11 python_example: 349, last pushed 9 days ago -->
+<!-- time-machine: 317, last pushed 1 days ago -->
+<!-- sourmash: 317, last pushed 0 days ago -->
+<!-- CTranslate2: 315, last pushed 5 days ago -->
+<!-- cyvcf2: 300, last pushed 6 days ago -->
+<!-- abess: 275, last pushed 1 days ago -->
+<!-- matrixprofile: 275, last pushed 37 days ago -->
+<!-- jq.py: 223, last pushed 185 days ago -->
+<!-- iminuit: 209, last pushed 1 days ago -->
+<!-- Tokenizer: 187, last pushed 5 days ago -->
+<!-- PyGLM: 148, last pushed 134 days ago -->
+<!-- boost-histogram: 115, last pushed 1 days ago -->
+<!-- bx-python: 114, last pushed 217 days ago -->
+<!-- TgCrypto: 110, last pushed 159 days ago -->
+<!-- iDynTree: 109, last pushed 3 days ago -->
+<!-- Python-WebRTC: 92, last pushed 152 days ago -->
+<!-- pybase64: 85, last pushed 1 days ago -->
+<!-- Arbor: 77, last pushed 0 days ago -->
+<!-- fathon: 65, last pushed 69 days ago -->
+<!-- etebase-py: 58, last pushed 34 days ago -->
+<!-- polaroid: 51, last pushed 90 days ago -->
+<!-- cf-units: 49, last pushed 1 days ago -->
+<!-- Imagecodecs (fork): 47, last pushed 1 days ago -->
+<!-- pillow-heif: 44, last pushed 0 days ago -->
+<!-- power-grid-model: 42, last pushed 1 days ago -->
+<!-- clang-format: 41, last pushed 8 days ago -->
+<!-- numpythia: 34, last pushed 7 days ago -->
+<!-- pyjet: 33, last pushed 7 days ago -->
+<!-- pybind11 scikit_build_example: 31, last pushed 9 days ago -->
 <!-- ninja: 24, last pushed 1 days ago -->
-<!-- GSD: 19, last pushed 13 days ago -->
-<!-- pyinstrument_cext: 10, last pushed 283 days ago -->
-<!-- xmlstarlet: 9, last pushed 7 days ago -->
-<!-- CorrectionLib: 9, last pushed 12 days ago -->
-<!-- SiPM: 6, last pushed 47 days ago -->
+<!-- GSD: 19, last pushed 9 days ago -->
+<!-- pyinstrument_cext: 10, last pushed 306 days ago -->
+<!-- CorrectionLib: 10, last pushed 0 days ago -->
+<!-- xmlstarlet: 9, last pushed 9 days ago -->
+<!-- SiPM: 7, last pushed 70 days ago -->
 
 <!-- END bin/projects.py -->
 

examples/appveyor-minimal.yml

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

examples/azure-pipelines-minimal.yml

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

examples/circleci-minimal.yml

@@ -4,14 +4,14 @@ jobs:
   linux-wheels:
     working_directory: ~/linux-wheels
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.9
     steps:
       - checkout
       - setup_remote_docker
       - run:
           name: Build the Linux wheels.
           command: |
-            pip3 install --user cibuildwheel==2.8.1
+            pip3 install --user cibuildwheel==2.9.0
             cibuildwheel --output-dir wheelhouse
       - store_artifacts:
           path: wheelhouse/
@@ -25,7 +25,7 @@ jobs:
       - run:
           name: Build the OS X wheels.
           command: |
-            pip3 install cibuildwheel==2.8.1
+            pip3 install cibuildwheel==2.9.0
             cibuildwheel --output-dir wheelhouse
       - store_artifacts:
           path: wheelhouse/

examples/github-apple-silicon.yml

@@ -10,9 +10,9 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.8.1
+        uses: pypa/cibuildwheel@v2.9.0
         env:
-          CIBW_ARCHS_MACOS: x86_64 universal2
+          CIBW_ARCHS_MACOS: x86_64 arm64
 
       - uses: actions/upload-artifact@v3
         with:

examples/github-deploy.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.8.1
+        uses: pypa/cibuildwheel@v2.9.0
 
       - uses: actions/upload-artifact@v3
         with:

examples/github-minimal.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.8.1
+        uses: pypa/cibuildwheel@v2.9.0
         # env:
         #   CIBW_SOME_OPTION: value
         #    ...

examples/github-with-qemu.yml

@@ -13,19 +13,14 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-python@v3
-        name: Install Python
-        with:
-          python-version: '3.7'
-
       - name: Set up QEMU
         if: runner.os == 'Linux'
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: all
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.8.1
+        uses: pypa/cibuildwheel@v2.9.0
         env:
           # configure cibuildwheel to build native archs ('auto'), and some
           # emulated ones

examples/gitlab-minimal.yml

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

examples/travis-ci-deploy.yml

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

examples/travis-ci-minimal.yml

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

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

@@ -9,7 +9,6 @@ os: linux
 dist: focal
 language: python
 python:
-  - 3.6
   - 3.7
   - 3.8
 
@@ -55,7 +54,7 @@ jobs:
     - stage: deploy
       name: Build and deploy Linux wheels
       services: docker
-      install: python3 -m pip install cibuildwheel==2.8.1 twine
+      install: python3 -m pip install cibuildwheel==2.9.0 twine
       script: python3 -m cibuildwheel --output-dir wheelhouse
       after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl
     # Deploy on windows
@@ -63,7 +62,7 @@ jobs:
       name: Build and deploy Windows wheels
       os: windows
       language: shell
-      install: python3 -m pip install cibuildwheel==2.8.1 twine
+      install: python3 -m pip install cibuildwheel==2.9.0 twine
       script: python3 -m cibuildwheel --output-dir wheelhouse
       after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl
 

noxfile.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import shutil
 import sys
@@ -63,8 +65,27 @@ def update_constraints(session: nox.Session) -> None:
     """
     Update the dependencies inplace.
     """
-    session.install("requests", "pip-tools")
-    session.run("python", "bin/update_dependencies.py")
+    session.install("pip-tools")
+    assert isinstance(session.python, str)
+    python_version = session.python.replace(".", "")
+    env = os.environ.copy()
+    # CUSTOM_COMPILE_COMMAND is a pip-compile option that tells users how to
+    # regenerate the constraints files
+    env["CUSTOM_COMPILE_COMMAND"] = f"nox -s {session.name}"
+    session.run(
+        "pip-compile",
+        "--allow-unsafe",
+        "--upgrade",
+        "cibuildwheel/resources/constraints.in",
+        f"--output-file=cibuildwheel/resources/constraints-python{python_version}.txt",
+        env=env,
+    )
+    if session.python == PYTHON_ALL_VERSIONS[-1]:
+        RESOURCES = DIR / "cibuildwheel" / "resources"
+        shutil.copyfile(
+            RESOURCES / f"constraints-python{python_version}.txt",
+            RESOURCES / "constraints.txt",
+        )
 
 
 @nox.session

pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.black]
 line-length = 100
-target-version = ['py36', 'py37', 'py38', 'py39', 'py310']
+target-version = ['py37', 'py38', 'py39', 'py310']
 
 
 [tool.isort]
@@ -88,7 +88,7 @@ ignore = [
 ]
 
 [tool.pylint]
-master.py-version = "3.6"
+master.py-version = "3.7"
 master.jobs = "0"
 master.fail-on = ["E", "F"]
 master.fail-under = "9.8"

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = cibuildwheel
-version = 2.8.1
+version = 2.9.0
 description = Build Python wheels on CI with minimal configuration.
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -16,7 +16,6 @@ classifiers =
     Natural Language :: English
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
@@ -37,10 +36,9 @@ install_requires =
     filelock
     packaging>=20.9
     platformdirs
-    dataclasses;python_version < '3.7'
     tomli;python_version < '3.11'
     typing-extensions>=3.10.0.0;python_version < '3.8'
-python_requires = >=3.6
+python_requires = >=3.7
 include_package_data = True
 zip_safe = False
 

setup.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from setuptools import setup
 
 extras = {

test/conftest.py

@@ -1,4 +1,4 @@
-from typing import Dict
+from __future__ import annotations
 
 import pytest
 
@@ -13,5 +13,5 @@ def pytest_addoption(parser) -> None:
 @pytest.fixture(
     params=[{"CIBW_BUILD_FRONTEND": "pip"}, {"CIBW_BUILD_FRONTEND": "build"}], ids=["pip", "build"]
 )
-def build_frontend_env(request) -> Dict[str, str]:
+def build_frontend_env(request) -> dict[str, str]:
     return request.param  # type: ignore[no-any-return]

test/test_0_basic.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import textwrap
 
 import pytest

test/test_abi_variants.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import textwrap
 
 from . import test_projects, utils

test/test_before_all.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import subprocess
 import textwrap
 

test/test_before_build.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import subprocess
 import textwrap
 

test/test_before_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from . import test_projects, utils
 
 before_test_project = test_projects.new_c_project()

test/test_build_skip.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import textwrap
 
 from . import test_projects, utils

test/test_container_images.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import platform
 import textwrap
 

test/test_cpp_standards.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 
 import jinja2

test/test_dependency_versions.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import re
 import textwrap
 

test/test_emulation.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import subprocess
 
 import pytest

test/test_environment.py

@@ -1,5 +1,8 @@
+from __future__ import annotations
+
 import os
 import subprocess
+import sys
 import textwrap
 
 import pytest
@@ -33,6 +36,7 @@ project_with_environment_asserts = test_projects.new_c_project(
 
 
 def test(tmp_path):
+    python_echo = f"'{sys.executable}' -c \"import sys; print(*sys.argv[1:])\""
     project_dir = tmp_path / "project"
     project_with_environment_asserts.generate(project_dir)
 
@@ -43,7 +47,7 @@ def test(tmp_path):
         project_dir,
         add_env={
             "CIBW_ENVIRONMENT": """CIBW_TEST_VAR="a b c" CIBW_TEST_VAR_2=1 CIBW_TEST_VAR_3="$(echo 'test string 3')" PATH=$PATH:/opt/cibw_test_path""",
-            "CIBW_ENVIRONMENT_WINDOWS": '''CIBW_TEST_VAR="a b c" CIBW_TEST_VAR_2=1 CIBW_TEST_VAR_3="$(echo 'test string 3')" PATH="$PATH;/opt/cibw_test_path"''',
+            "CIBW_ENVIRONMENT_WINDOWS": f'''CIBW_TEST_VAR="a b c" CIBW_TEST_VAR_2=1 CIBW_TEST_VAR_3="$({python_echo} 'test string 3')" PATH="$PATH;/opt/cibw_test_path"''',
         },
     )
 

test/test_from_sdist.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import subprocess
 import sys

test/test_macos_archs.py

@@ -1,6 +1,7 @@
+from __future__ import annotations
+
 import platform
 import subprocess
-from typing import Tuple
 
 import pytest
 
@@ -10,14 +11,14 @@ basic_project = test_projects.new_c_project()
 
 ALL_MACOS_WHEELS = {
     *utils.expected_wheels("spam", "0.1.0", machine_arch="x86_64"),
-    *utils.expected_wheels("spam", "0.1.0", machine_arch="arm64"),
+    *utils.expected_wheels("spam", "0.1.0", machine_arch="arm64", include_universal2=True),
 }
 
 
-def get_xcode_version() -> Tuple[int, int]:
+def get_xcode_version() -> tuple[int, int]:
     output = subprocess.run(
         ["xcodebuild", "-version"],
-        universal_newlines=True,
+        text=True,
         check=True,
         stdout=subprocess.PIPE,
     ).stdout

test/test_manylinuxXXXX_only.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import platform
 import textwrap
 

test/test_pep518.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import textwrap
 
 from . import test_projects, utils

test/test_podman.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 from . import test_projects, utils

test/test_projects/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from .base import TestProject
 from .c import new_c_project
 

test/test_projects/__main__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import importlib
 import subprocess
 import sys

test/test_projects/base.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pathlib import Path
 from typing import Any, Dict, Union
 

test/test_projects/c.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import jinja2
 
 from .base import TestProject

test/test_pure_wheel.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import subprocess
 from test import test_projects
 

test/test_same_wheel.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import subprocess
 from test import test_projects
 

test/test_ssl.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import textwrap
 
 from . import test_projects, utils

test/test_subdir_package.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pathlib import Path
 
 import jinja2

test/test_testing.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import subprocess
 import textwrap

test/test_troubleshooting.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import subprocess
 
 import pytest

test/test_wheel_tag.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pytest
 
 from . import test_projects, utils

test/utils.py

@@ -4,6 +4,8 @@ Utility functions used by the cibuildwheel tests.
 This file is added to the PYTHONPATH in the test runner at bin/run_test.py.
 """
 
+from __future__ import annotations
+
 import os
 import platform as pm
 import subprocess
@@ -35,7 +37,7 @@ def cibuildwheel_get_build_identifiers(project_path, env=None, *, prerelease_pyt
 
     cmd_output = subprocess.run(
         cmd,
-        universal_newlines=True,
+        text=True,
         env=env,
         check=True,
         stdout=subprocess.PIPE,
@@ -114,6 +116,7 @@ def expected_wheels(
     macosx_deployment_target="10.9",
     machine_arch=None,
     python_abi_tags=None,
+    include_universal2=False,
 ):
     """
     Returns a list of expected wheels from a run of cibuildwheel.
@@ -197,14 +200,14 @@ def expected_wheels(
                 arm64_macosx_deployment_target = _get_arm64_macosx_deployment_target(
                     macosx_deployment_target
                 )
-                platform_tags = [
-                    f'macosx_{macosx_deployment_target.replace(".", "_")}_universal2',
-                    f'macosx_{arm64_macosx_deployment_target.replace(".", "_")}_arm64',
-                ]
+                platform_tags = [f'macosx_{arm64_macosx_deployment_target.replace(".", "_")}_arm64']
             else:
-                platform_tags = [
-                    f'macosx_{macosx_deployment_target.replace(".", "_")}_x86_64',
-                ]
+                platform_tags = [f'macosx_{macosx_deployment_target.replace(".", "_")}_x86_64']
+
+            if include_universal2:
+                platform_tags.append(
+                    f'macosx_{macosx_deployment_target.replace(".", "_")}_universal2',
+                )
 
         else:
             raise Exception("unsupported platform")

unit_test/build_ids_test.py

@@ -1,5 +1,6 @@
+from __future__ import annotations
+
 import sys
-from typing import Dict, List
 
 if sys.version_info >= (3, 11):
     import tomllib
@@ -27,7 +28,7 @@ def test_compare_configs():
 
 def test_dump_with_Version():
     # MyPy doesn't understand deeply nested dicts correctly
-    example: Dict[str, Dict[str, List[Dict[str, Printable]]]] = {
+    example: dict[str, dict[str, list[dict[str, Printable]]]] = {
         "windows": {
             "python_configurations": [
                 {"identifier": "cp27-win32", "version": Version("2.7.18"), "arch": "32"},

unit_test/build_selector_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from packaging.specifiers import SpecifierSet
 
 from cibuildwheel.util import BuildSelector
@@ -9,7 +11,7 @@ def test_build():
     assert build_selector("cp36-manylinux_x86_64")
     assert build_selector("cp37-manylinux_x86_64")
     assert build_selector("cp310-manylinux_x86_64")
-    assert not build_selector("cp311-manylinux_x86_64")
+    assert build_selector("cp311-manylinux_x86_64")
     assert build_selector("pp36-manylinux_x86_64")
     assert build_selector("pp37-manylinux_x86_64")
     assert build_selector("cp36-manylinux_i686")
@@ -28,7 +30,7 @@ def test_build():
     assert build_selector("cp36-win_amd64")
     assert build_selector("cp37-win_amd64")
     assert build_selector("cp310-win_amd64")
-    assert not build_selector("cp311-win_amd64")
+    assert build_selector("cp311-win_amd64")
     assert not build_selector("pp36-win_amd64")
     assert not build_selector("pp37-win_amd64")
 

unit_test/conftest.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 from pathlib import Path
 
@@ -12,7 +14,7 @@ def pytest_addoption(parser):
 
 
 @pytest.fixture
-def fake_package_dir(monkeypatch):
+def fake_package_dir(tmp_path, monkeypatch):
     """
     Monkey-patch enough for the main() function to run
     """
@@ -25,6 +27,8 @@ def fake_package_dir(monkeypatch):
             return real_path_exists(path)
 
     args = ["cibuildwheel", str(MOCK_PACKAGE_DIR)]
+    tmp_path.joinpath(MOCK_PACKAGE_DIR).mkdir()
     monkeypatch.setattr(Path, "exists", mock_path_exists)
     monkeypatch.setattr(sys, "argv", args)
+    monkeypatch.chdir(tmp_path)
     return args

unit_test/dependency_constraints_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from pathlib import Path
 
 from cibuildwheel.util import DependencyConstraints

unit_test/download_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import ssl
 
 import certifi

unit_test/environment_test.py

@@ -1,7 +1,13 @@
+from __future__ import annotations
+
 import os
+import sys
 
 from cibuildwheel.environment import parse_environment
 
+# this command is equivalent to Unix 'echo', but works on Windows too
+PYTHON_ECHO = f"'{sys.executable}' -c \"import sys; print(*sys.argv[1:])\""
+
 
 def test_basic_parsing():
     environment_recipe = parse_environment("VAR=1 VBR=2")
@@ -28,7 +34,7 @@ def test_inheritance():
 
 
 def test_shell_eval():
-    environment_recipe = parse_environment('VAR="$(echo "a   test" string)"')
+    environment_recipe = parse_environment(f'VAR="$({PYTHON_ECHO} "a   test" string)"')
 
     env_copy = os.environ.copy()
     env_copy.pop("VAR", None)
@@ -39,11 +45,12 @@ def test_shell_eval():
 
 
 def test_shell_eval_and_env():
-    environment_recipe = parse_environment('VAR="$(echo "$PREV_VAR" string)"')
+    environment_recipe = parse_environment(f'VAR="$({PYTHON_ECHO} "$PREV_VAR" string)"')
 
-    environment_dict = environment_recipe.as_dictionary(prev_environment={"PREV_VAR": "1 2 3"})
+    prev_environment = {**os.environ, "PREV_VAR": "1 2 3"}
+    environment_dict = environment_recipe.as_dictionary(prev_environment=prev_environment)
 
-    assert environment_dict == {"PREV_VAR": "1 2 3", "VAR": "1 2 3 string"}
+    assert environment_dict == {**prev_environment, "VAR": "1 2 3 string"}
 
 
 def test_empty_var():
@@ -73,10 +80,12 @@ def test_no_vars_pass_through():
 
 
 def test_operators_inside_eval():
-    environment_recipe = parse_environment('SOMETHING="$(echo a; echo b; echo c)"')
+    environment_recipe = parse_environment(
+        f'SOMETHING="$({PYTHON_ECHO} a; {PYTHON_ECHO} b; {PYTHON_ECHO} c)"'
+    )
 
-    # pass the existing process env so PATH is available
-    environment_dict = environment_recipe.as_dictionary(os.environ.copy())
+    # pass the existing process env so subcommands can be run in the evaluation
+    environment_dict = environment_recipe.as_dictionary(prev_environment=os.environ.copy())
 
     assert environment_dict.get("SOMETHING") == "a\nb\nc"
 
@@ -84,7 +93,6 @@ def test_operators_inside_eval():
 def test_substitution_with_backslash():
     environment_recipe = parse_environment('PATH2="somewhere_else;$PATH1"')
 
-    # pass the existing process env so PATH is available
     environment_dict = environment_recipe.as_dictionary(prev_environment={"PATH1": "c:\\folder\\"})
 
     assert environment_dict.get("PATH2") == "somewhere_else;c:\\folder\\"
@@ -92,11 +100,11 @@ def test_substitution_with_backslash():
 
 def test_awkwardly_quoted_variable():
     environment_recipe = parse_environment(
-        'VAR2=something"like this""$VAR1"$VAR1$(echo "there is more")"$(echo "and more!")"'
+        f'VAR2=something"like this""$VAR1"$VAR1$({PYTHON_ECHO} "there is more")"$({PYTHON_ECHO} "and more!")"'
     )
 
-    # pass the existing process env so PATH is available
-    environment_dict = environment_recipe.as_dictionary({"VAR1": "but wait"})
+    prev_environment = {**os.environ, "VAR1": "but wait"}
+    environment_dict = environment_recipe.as_dictionary(prev_environment=prev_environment)
 
     assert (
         environment_dict.get("VAR2") == "somethinglike thisbut waitbut waitthere is moreand more!"

unit_test/linux_build_steps_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import textwrap
 from pathlib import Path
 from pprint import pprint
@@ -58,8 +60,12 @@ def test_linux_container_split(tmp_path: Path, monkeypatch):
     pprint(build_steps)
 
     assert build_steps[0].container_image == "normal_container_image"
-    assert identifiers(build_steps[0]) == ["cp36-manylinux_x86_64", "cp37-manylinux_x86_64"]
-    assert before_alls(build_steps[0]) == ["", ""]
+    assert identifiers(build_steps[0]) == [
+        "cp36-manylinux_x86_64",
+        "cp37-manylinux_x86_64",
+        "cp311-manylinux_x86_64",
+    ]
+    assert before_alls(build_steps[0]) == ["", "", ""]
 
     assert build_steps[1].container_image == "other_container_image"
     assert identifiers(build_steps[1]) == ["cp38-manylinux_x86_64", "cp310-manylinux_x86_64"]

unit_test/main_tests/conftest.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import contextlib
 import platform as platform_module
 import subprocess

unit_test/main_tests/main_options_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 from fnmatch import fnmatch
 from pathlib import Path

unit_test/main_tests/main_platform_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 
 import pytest

unit_test/main_tests/main_requires_python_test.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 import textwrap