Bump version: v2.3.1

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/psf/black: 21.11b1 → 21.12b0](https://github.com/psf/black/compare/21.11b1...21.12b0)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.circleci/config.yml

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

.github/workflows/release.yml

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

.github/workflows/test.yml

@@ -22,6 +22,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
     - uses: pre-commit/action@v2.0.3
+    - run: pipx run nox -s check_manifest
 
   test:
     name: Test cibuildwheel on ${{ matrix.os }}

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/asottile/pyupgrade
-  rev: v2.29.0
+  rev: v2.29.1
   hooks:
   - id: pyupgrade
     name: PyUpgrade 3.6+
@@ -27,24 +27,23 @@ repos:
 
 # Autoremoves unused imports
 - repo: https://github.com/hadialqattan/pycln
-  rev: v1.0.3
+  rev: v1.1.0
   hooks:
   - id: pycln
     args: [--config=pyproject.toml]
-    stages: [manual]  # disabled due to artificial limit on Python 3.10
 
 - repo: https://github.com/PyCQA/isort
-  rev: 5.9.3
+  rev: 5.10.1
   hooks:
   - id: isort
 
 - repo: https://github.com/psf/black
-  rev: 21.9b0
+  rev: 21.12b0
   hooks:
   - id: black
 
 - repo: https://github.com/asottile/setup-cfg-fmt
-  rev: v1.18.0
+  rev: v1.20.0
   hooks:
   - id: setup-cfg-fmt
 
@@ -55,7 +54,9 @@ repos:
     exclude: ^(bin|cibuildwheel/resources|docs)/.*py$
     args: ["--python-version=3.6", "--scripts-are-modules", "--show-error-codes"]
     additional_dependencies: &mypy-dependencies
+      - nox
       - packaging>=21.0
+      - pygithub
       - rich
       - tomli
       - types-certifi
@@ -64,14 +65,15 @@ repos:
       - types-jinja2
       - types-pyyaml
       - types-requests
+      - bracex
   - id: mypy
     name: mypy 3.7+ on bin/
-    files: ^((bin|docs)/.*py|noxfile.py)$
+    files: ^((bin|docs)/.*py)$
     args: ["--python-version=3.7", "--scripts-are-modules", "--show-error-codes"]
     additional_dependencies: *mypy-dependencies
 
 - repo: https://github.com/asottile/yesqa
-  rev: v1.2.3
+  rev: v1.3.0
   hooks:
   - id: yesqa
     additional_dependencies: &flake8-dependencies
@@ -96,7 +98,7 @@ repos:
   - id: python-use-type-annotations
 
 - repo: https://github.com/shellcheck-py/shellcheck-py
-  rev: v0.7.2.1
+  rev: v0.8.0.1
   hooks:
   - id: shellcheck
 

MANIFEST.in

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

README.md

@@ -22,16 +22,19 @@ Python wheels are great. Building them across **Mac, Linux, Windows**, on **mult
 What does it do?
 ----------------
 
-|   | macOS Intel | macOS Apple Silicon | Windows 64bit | Windows 32bit | manylinux<br/>musllinux x86_64 | manylinux<br/>musllinux i686 | manylinux<br/>musllinux aarch64 | manylinux<br/>musllinux ppc64le | manylinux<br/>musllinux s390x |
-|---------------|----|-----|-----|-----|----|-----|----|-----|-----|
-| CPython 3.6   | ✅ | N/A | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.7   | ✅ | N/A | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.8   | ✅ | ✅  | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.9   | ✅ | ✅  | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| CPython 3.10  | ✅ | ✅  | ✅  | ✅  | ✅ | ✅  | ✅ | ✅  | ✅  |
-| PyPy 3.7 v7.3 | ✅ | N/A | ✅  | N/A | ✅¹ | ✅¹  | ✅¹ | N/A | N/A |
+|   | macOS Intel | macOS Apple Silicon | Windows 64bit | Windows 32bit | Windows Arm64 | manylinux<br/>musllinux x86_64 | manylinux<br/>musllinux i686 | manylinux<br/>musllinux aarch64 | manylinux<br/>musllinux ppc64le | manylinux<br/>musllinux s390x |
+|---------------|----|-----|-----|-----|-----|----|-----|----|-----|-----|
+| CPython 3.6   | ✅ | N/A | ✅  | ✅  | N/A | ✅  | ✅  | ✅ | ✅  | ✅  |
+| CPython 3.7   | ✅ | N/A | ✅  | ✅  | N/A | ✅ | ✅  | ✅ | ✅  | ✅  |
+| CPython 3.8   | ✅ | ✅  | ✅  | ✅  | N/A | ✅ | ✅  | ✅ | ✅  | ✅  |
+| CPython 3.9   | ✅ | ✅  | ✅  | ✅  | ✅² | ✅³ | ✅ | ✅ | ✅  | ✅  |
+| CPython 3.10  | ✅ | ✅  | ✅  | ✅  | ✅² | ✅ | ✅  | ✅ | ✅  | ✅  |
+| PyPy 3.7 v7.3 | ✅ | N/A | ✅  | N/A | N/A | ✅¹ | ✅¹  | ✅¹ | N/A | N/A |
+| PyPy 3.8 v7.3 | ✅ | N/A | ✅  | N/A | N/A | ✅¹ | ✅¹  | ✅¹ | N/A | N/A |
 
 <sup>¹ PyPy is only supported for manylinux wheels.</sup><br>
+<sup>² Windows arm64 support is experimental.</sup><br>
+<sup>³ Alpine 3.14 and very briefly 3.15's default python3 [was not able to load](https://github.com/pypa/cibuildwheel/issues/934) musllinux wheels. This has been fixed; please upgrade the python package if using Alpine from before the fix.</sup><br>
 
 - Builds manylinux, musllinux, macOS 10.9+, and Windows wheels for CPython and PyPy
 - Works on GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, and GitLab CI
@@ -85,7 +88,7 @@ jobs:
       - uses: actions/setup-python@v2
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.2.0
+        run: python -m pip install cibuildwheel==2.3.1
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
@@ -112,6 +115,7 @@ Options
 |   | [`CIBW_PRERELEASE_PYTHONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#prerelease-pythons)  | Enable building with pre-release versions of Python if available |
 | **Build customization** | [`CIBW_BUILD_FRONTEND`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-frontend)  | Set the tool to use to build, either "pip" (default for now) or "build" |
 |   | [`CIBW_ENVIRONMENT`](https://cibuildwheel.readthedocs.io/en/stable/options/#environment)  | Set environment variables needed during the build |
+|   | [`CIBW_ENVIRONMENT_PASS_LINUX`](https://cibuildwheel.readthedocs.io/en/stable/options/#environment-pass)  | Set environment variables on the host to pass-through to the container during the build. |
 |   | [`CIBW_BEFORE_ALL`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-all)  | Execute a shell command on the build system before any wheels are built. |
 |   | [`CIBW_BEFORE_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-build)  | Execute a shell command preparing each wheel's build |
 |   | [`CIBW_REPAIR_WHEEL_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#repair-wheel-command)  | Execute a shell command to repair each (non-pure Python) built wheel |
@@ -139,22 +143,22 @@ Here are some repos that use cibuildwheel.
 |-----------------------------------|----|----|:------|
 | [scikit-learn][]                  | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The machine learning library. A complex but clean config using many of cibuildwheel's features to build a large project with Cython and C++ extensions.  |
 | [Tornado][]                       | ![travisci icon][] | ![apple icon][] ![linux icon][] | Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed. |
-| [Matplotlib][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The venerable Matplotlib, a Python library with C++ portions |
 | [pytorch-fairseq][]               | ![github icon][] | ![apple icon][] ![linux icon][] | Facebook AI Research Sequence-to-Sequence Toolkit written in Python. |
+| [Matplotlib][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The venerable Matplotlib, a Python library with C++ portions |
 | [MyPy][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | MyPyC, the compiled component of MyPy. |
-| [uvloop][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | Ultra fast asyncio event loop. |
 | [pydantic][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Data parsing and validation using Python type hints |
+| [uvloop][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | Ultra fast asyncio event loop. |
 | [psutil][]                        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python |
 | [vaex][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Out-of-Core hybrid Apache Arrow/NumPy DataFrame for Python, ML, visualize and explore big tabular data at a billion rows per second 🚀 |
 | [Google Benchmark][]              | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A microbenchmark support library |
 
 [scikit-learn]: https://github.com/scikit-learn/scikit-learn
 [Tornado]: https://github.com/tornadoweb/tornado
-[Matplotlib]: https://github.com/matplotlib/matplotlib
 [pytorch-fairseq]: https://github.com/pytorch/fairseq
+[Matplotlib]: https://github.com/matplotlib/matplotlib
 [MyPy]: https://github.com/mypyc/mypy_mypyc-wheels
-[uvloop]: https://github.com/MagicStack/uvloop
 [pydantic]: https://github.com/samuelcolvin/pydantic
+[uvloop]: https://github.com/MagicStack/uvloop
 [psutil]: https://github.com/giampaolo/psutil
 [vaex]: https://github.com/vaexio/vaex
 [Google Benchmark]: https://github.com/google/benchmark
@@ -189,6 +193,39 @@ Changelog
 
 <!-- this section was generated by bin/update_readme_changelog.py -- do not edit manually -->
 
+### v2.3.1
+
+_14 December 2021_
+
+- 🐛 Setting pip options like `PIP_USE_DEPRECATED` in `CIBW_ENVIRONMENT` no longer adversely affects cibuildwheel's ability to set up a Python environment (#956)
+- 📚 Docs fixes and improvements
+
+### v2.3.0
+
+_26 November 2021_
+
+- 📈 cibuildwheel now defaults to manylinux2014 image for linux builds, rather than manylinux2010. If you want to stick with manylinux2010, it's simple to set this using [the image options](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image). (#926)
+- ✨ You can now pass environment variables from the host machine into the Docker container during a Linux build. Check out [the docs for `CIBW_ENVIRONMENT_PASS_LINUX `](https://cibuildwheel.readthedocs.io/en/latest/options/#environment-pass) for the details. (#914)
+- ✨ Added support for building PyPy 3.8 wheels. (#881)
+- ✨ Added support for building Windows arm64 CPython wheels on a Windows arm64 runner. We can't test this in CI yet, so for now, this is experimental. (#920)
+- 📚 Improved the deployment documentation (#911)
+- 🛠 Changed the escaping behaviour inside cibuildwheel's  option placeholders e.g. `{project}` in `before_build` or `{dest_dir}` in `repair_wheel_command`. This allows bash syntax like `${SOME_VAR}` to passthrough without being interpreted as a placeholder by cibuildwheel. See [this section](https://cibuildwheel.readthedocs.io/en/stable/options/#placeholders) in the docs for more info. (#889)
+- 🛠 Pip updated to 21.3, meaning it now defaults to in-tree builds again. If this causes an issue with your project, setting environment variable `PIP_USE_DEPRECATED=out-of-tree-build` is available as a temporary flag to restore the old behaviour. However, be aware that this flag will probably be removed soon. (#881)
+- 🐛 You can now access the current Python interpreter using `python3` within a build on Windows (#917)
+
+### v2.2.2
+
+_26 October 2021_
+
+- 🐛 Fix bug in the GitHub Action step causing a syntax error (#895)
+
+### v2.2.1
+
+_26 October 2021_
+
+- 🛠 Added a `config-file` option on the GitHub Action to specify something other than pyproject.toml in your GitHub Workflow file. (#883)
+- 🐛 Fix missing resources in sdist and released wheel on PyPI. We've also made some internal changes to our release processes to make them more reliable. (#893, #894)
+
 ### v2.2.0
 
 _22 October 2021_
@@ -207,34 +244,7 @@ _22 October 2021_
 
 - 🛠 Support for TOML 1.0 when reading config files, via the `tomli` package. (#876)
 
-### v2.1.3
-
-_6 October 2021_
-
-- 🛠 Updated CPython 3.10 to the 3.10.0 final release
-
-### v2.1.2
-
-_14 September 2021_
-
-- 🛠 Updated CPython 3.10 to 3.10.0rc2
-- 📚 Multiple docs updates
-- 🐛 Improved warnings when built binaries are bundled into the container on Linux. (#807)
-
-### v2.1.1
-
-_7 August 2021_
-
-- ✨ Corresponding with the release of CPython 3.10.0rc1, which is ABI stable, cibuildwheel now builds CPython 3.10 by default - without the CIBW_PRERELEASE_PYTHONS flag.
-
-<sup>Note: v2.1.0 was a bad release, it was yanked from PyPI.</sup>
-
-### v2.0.1
-
-_25 July 2021_
-
-- 📚 Docs improvements (#767)
-- 🛠 Dependency updates, including delocate 0.9.0.
+<sup>Note: This version is not available on PyPI due to some missing resources in the release files. Please use a later version instead.</sup>
 
 <!-- END bin/update_readme_changelog.py -->
 
@@ -266,7 +276,7 @@ Credits
 
 `cibuildwheel` stands on the shoulders of giants.
 
-- ⭐️ @matthew-brett for [matthew-brett/multibuild](http://github.com/matthew-brett/multibuild) and [matthew-brett/delocate](http://github.com/matthew-brett/delocate)
+- ⭐️ @matthew-brett for [multibuild](https://github.com/multi-build/multibuild) and [matthew-brett/delocate](http://github.com/matthew-brett/delocate)
 - @PyPA for the manylinux Docker images [pypa/manylinux](https://github.com/pypa/manylinux)
 - @ogrisel for [wheelhouse-uploader](https://github.com/ogrisel/wheelhouse-uploader) and `run_with_env.cmd`
 

action.yml

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

bin/inspect_all_known_projects.py

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

bin/update_pythons.py

@@ -28,7 +28,7 @@ DIR: Final[Path] = Path(__file__).parent.parent.resolve()
 RESOURCES_DIR: Final[Path] = DIR / "cibuildwheel/resources"
 
 
-ArchStr = Literal["32", "64"]
+ArchStr = Literal["32", "64", "ARM64"]
 
 
 class ConfigWinCP(TypedDict):
@@ -68,8 +68,8 @@ class WindowsVersions:
             if resource["@type"] == "PackageBaseAddress/3.0.0":
                 endpoint = resource["@id"]
 
-        ARCH_DICT = {"32": "win32", "64": "win_amd64"}
-        PACKAGE_DICT = {"32": "pythonx86", "64": "python"}
+        ARCH_DICT = {"32": "win32", "64": "win_amd64", "ARM64": "win_arm64"}
+        PACKAGE_DICT = {"32": "pythonx86", "64": "python", "ARM64": "pythonarm64"}
 
         self.arch_str = arch_str
         self.arch = ARCH_DICT[arch_str]
@@ -237,6 +237,7 @@ class AllVersions:
     def __init__(self) -> None:
         self.windows_32 = WindowsVersions("32")
         self.windows_64 = WindowsVersions("64")
+        self.windows_arm64 = WindowsVersions("ARM64")
         self.windows_pypy_64 = PyPyVersions("64")
 
         self.macos_cpython = CPythonVersions()
@@ -264,6 +265,9 @@ class AllVersions:
                 config_update = self.windows_64.update_version_windows(spec)
             elif identifier.startswith("pp"):
                 config_update = self.windows_pypy_64.update_version_windows(spec)
+        elif "win_arm64" in identifier:
+            if identifier.startswith("cp"):
+                config_update = self.windows_arm64.update_version_windows(spec)
 
         assert config_update is not None, f"{identifier} not found!"
         config.update(**config_update)

cibuildwheel/__init__.py

@@ -1 +1 @@
-__version__ = "2.2.0"
+__version__ = "2.3.1"

cibuildwheel/__main__.py

@@ -57,14 +57,15 @@ def main() -> None:
 
     parser.add_argument(
         "--output-dir",
-        help="Destination folder for the wheels.",
+        help="Destination folder for the wheels. Default: wheelhouse.",
     )
 
     parser.add_argument(
         "--config-file",
+        default="",
         help="""
-            TOML config file for cibuildwheel. Defaults to pyproject.toml, but
-            can be overridden with this option.
+            TOML config file. Default: "", meaning {package}/pyproject.toml,
+            if it exists.
         """,
     )
 
@@ -162,7 +163,7 @@ def main() -> None:
     os.environ["CIBUILDWHEEL"] = "1"
 
     # Python is buffering by default when running on the CI platforms, giving problems interleaving subprocess call output with unflushed calls to 'print'
-    sys.stdout = Unbuffered(sys.stdout)  # type: ignore[no-untyped-call,assignment]
+    sys.stdout = Unbuffered(sys.stdout)  # type: ignore[assignment]
 
     print_preamble(platform=platform, options=options, identifiers=identifiers)
 

cibuildwheel/architecture.py

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

cibuildwheel/environment.py

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

cibuildwheel/linux.py

@@ -1,15 +1,14 @@
 import subprocess
 import sys
 import textwrap
-from collections import OrderedDict
 from pathlib import Path, PurePath
-from typing import Iterator, List, NamedTuple, Set
+from typing import Iterator, List, NamedTuple, Set, Tuple
 
 from .architecture import Architecture
 from .docker_container import DockerContainer
 from .logger import log
 from .options import Options
-from .typing import PathOrStr, assert_never
+from .typing import OrderedDict, PathOrStr, assert_never
 from .util import (
     BuildSelector,
     NonPlatformWheelError,
@@ -80,7 +79,7 @@ def get_build_steps(
     Groups PythonConfigurations into BuildSteps. Each BuildStep represents a
     separate Docker container.
     """
-    steps: OrderedDict[tuple, BuildStep] = OrderedDict()  # type: ignore[type-arg]
+    steps = OrderedDict[Tuple[str, str, str], BuildStep]()
 
     for config in python_configurations:
         _, platform_tag = config.identifier.split("-", 1)

cibuildwheel/logger.py

@@ -27,6 +27,7 @@ PLATFORM_IDENTIFIER_DESCIPTIONS = {
     "musllinux_s390x": "manylinux s390x",
     "win32": "Windows 32bit",
     "win_amd64": "Windows 64bit",
+    "win_arm64": "Windows on ARM 64bit",
     "macosx_x86_64": "macOS x86_64",
     "macosx_universal2": "macOS Universal 2 - x86_64 and arm64",
     "macosx_arm64": "macOS arm64 - Apple Silicon",

cibuildwheel/macos.py

@@ -192,24 +192,10 @@ def setup_python(
     # https://github.com/pypa/virtualenv/issues/620
     # Also see https://github.com/python/cpython/pull/9516
     env.pop("__PYVENV_LAUNCHER__", None)
-    env = environment.as_dictionary(prev_environment=env)
 
     # we version pip ourselves, so we don't care about pip version checking
     env["PIP_DISABLE_PIP_VERSION_CHECK"] = "1"
 
-    # check what version we're on
-    call(["which", "python"], env=env)
-    call(["python", "--version"], env=env)
-    which_python = subprocess.run(
-        ["which", "python"], env=env, universal_newlines=True, check=True, stdout=subprocess.PIPE
-    ).stdout.strip()
-    if which_python != "/tmp/cibw_bin/python":
-        print(
-            "cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.",
-            file=sys.stderr,
-        )
-        sys.exit(1)
-
     # Install pip
 
     requires_reinstall = not (installation_bin_path / "pip").exists()
@@ -233,6 +219,10 @@ def setup_python(
         cwd="/tmp",
     )
 
+    # Apply our environment after pip is ready
+    env = environment.as_dictionary(prev_environment=env)
+
+    # check what pip version we're on
     assert (installation_bin_path / "pip").exists()
     call(["which", "pip"], env=env)
     call(["pip", "--version"], env=env)
@@ -246,6 +236,19 @@ def setup_python(
         )
         sys.exit(1)
 
+    # check what Python version we're on
+    call(["which", "python"], env=env)
+    call(["python", "--version"], env=env)
+    which_python = subprocess.run(
+        ["which", "python"], env=env, universal_newlines=True, check=True, stdout=subprocess.PIPE
+    ).stdout.strip()
+    if which_python != "/tmp/cibw_bin/python":
+        print(
+            "cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+
     # Set MACOSX_DEPLOYMENT_TARGET to 10.9, if the user didn't set it.
     # PyPy defaults to 10.7, causing inconsistencies if it's left unset.
     env.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.9")

cibuildwheel/options.py

@@ -42,7 +42,7 @@ class CommandLineArguments:
     platform: Literal["auto", "linux", "macos", "windows"]
     archs: Optional[str]
     output_dir: Optional[str]
-    config_file: Optional[str]
+    config_file: str
     package_dir: str
     print_build_identifiers: bool
     allow_empty: bool
@@ -335,8 +335,9 @@ class Options:
     def config_file_path(self) -> Optional[Path]:
         args = self.command_line_arguments
 
-        if args.config_file is not None:
+        if args.config_file:
             return Path(args.config_file.format(package=args.package_dir))
+
         # return pyproject.toml, if it's available
         pyproject_toml_path = Path(args.package_dir) / "pyproject.toml"
         if pyproject_toml_path.exists():
@@ -407,6 +408,7 @@ class Options:
             environment_config = self.reader.get(
                 "environment", table={"item": '{k}="{v}"', "sep": " "}
             )
+            environment_pass = self.reader.get("environment-pass", sep=" ").split()
             before_build = self.reader.get("before-build", sep=" && ")
             repair_command = self.reader.get("repair-wheel-command", sep=" && ")
 
@@ -437,6 +439,14 @@ class Options:
                 traceback.print_exc(None, sys.stderr)
                 sys.exit(2)
 
+            # Pass through environment variables
+            if self.platform == "linux":
+                for env_var_name in environment_pass:
+                    try:
+                        environment.add(env_var_name, os.environ[env_var_name])
+                    except KeyError:
+                        pass
+
             if dependency_versions == "pinned":
                 dependency_constraints: Optional[
                     DependencyConstraints
@@ -468,10 +478,8 @@ class Options:
                     )
 
                     if not config_value:
-                        # default to manylinux2010 if it's available, otherwise manylinux2014
-                        image = pinned_images.get("manylinux2010") or pinned_images.get(
-                            "manylinux2014"
-                        )
+                        # default to manylinux2014
+                        image = pinned_images.get("manylinux2014")
                     elif config_value in pinned_images:
                         image = pinned_images[config_value]
                     else:

cibuildwheel/projectfiles.py

@@ -12,7 +12,6 @@ if sys.version_info < (3, 8):
     def get_constant(x: ast.Str) -> str:
         return x.s
 
-
 else:
     Constant = ast.Constant
 

cibuildwheel/resources/build-platforms.toml

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

cibuildwheel/resources/constraints-python36.txt

@@ -4,29 +4,29 @@
 #
 #    bin/update_dependencies.py
 #
-backports.entry-points-selectable==1.1.0
+backports.entry-points-selectable==1.1.1
     # via virtualenv
-delocate==0.10.0
+delocate==0.10.1
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.3
+distlib==0.3.4
     # via virtualenv
-filelock==3.3.0
+filelock==3.4.0
     # via virtualenv
-importlib-metadata==4.8.1
+importlib-metadata==4.8.2
     # via
     #   backports.entry-points-selectable
     #   virtualenv
-importlib-resources==5.2.2
+importlib-resources==5.4.0
     # via virtualenv
 platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
     # via virtualenv
-typing-extensions==3.10.0.2
+typing-extensions==4.0.1
     # via
     #   delocate
     #   importlib-metadata
-virtualenv==20.8.1
+virtualenv==20.10.0
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.0
     # via
@@ -38,7 +38,7 @@ zipp==3.6.0
     #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.2.4
+pip==21.3.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==58.2.0
+setuptools==59.6.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python37.txt

@@ -4,15 +4,15 @@
 #
 #    bin/update_dependencies.py
 #
-backports.entry-points-selectable==1.1.0
+backports.entry-points-selectable==1.1.1
     # via virtualenv
-delocate==0.10.0
+delocate==0.10.1
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.3
+distlib==0.3.4
     # via virtualenv
-filelock==3.3.0
+filelock==3.4.0
     # via virtualenv
-importlib-metadata==4.8.1
+importlib-metadata==4.8.2
     # via
     #   backports.entry-points-selectable
     #   virtualenv
@@ -20,11 +20,11 @@ platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
     # via virtualenv
-typing-extensions==3.10.0.2
+typing-extensions==4.0.1
     # via
     #   delocate
     #   importlib-metadata
-virtualenv==20.8.1
+virtualenv==20.10.0
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.0
     # via
@@ -34,7 +34,7 @@ zipp==3.6.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.2.4
+pip==21.3.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==58.2.0
+setuptools==59.6.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python38.txt

@@ -4,21 +4,21 @@
 #
 #    bin/update_dependencies.py
 #
-backports.entry-points-selectable==1.1.0
+backports.entry-points-selectable==1.1.1
     # via virtualenv
-delocate==0.10.0
+delocate==0.10.1
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.3
+distlib==0.3.4
     # via virtualenv
-filelock==3.3.0
+filelock==3.4.0
     # via virtualenv
 platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
     # via virtualenv
-typing-extensions==3.10.0.2
+typing-extensions==4.0.1
     # via delocate
-virtualenv==20.8.1
+virtualenv==20.10.0
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.0
     # via
@@ -26,7 +26,7 @@ wheel==0.37.0
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.2.4
+pip==21.3.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==58.2.0
+setuptools==59.6.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints-python39.txt

@@ -4,21 +4,21 @@
 #
 #    bin/update_dependencies.py
 #
-backports.entry-points-selectable==1.1.0
+backports.entry-points-selectable==1.1.1
     # via virtualenv
-delocate==0.10.0
+delocate==0.10.1
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.3
+distlib==0.3.4
     # via virtualenv
-filelock==3.3.0
+filelock==3.4.0
     # via virtualenv
 platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
     # via virtualenv
-typing-extensions==3.10.0.2
+typing-extensions==4.0.1
     # via delocate
-virtualenv==20.8.1
+virtualenv==20.10.0
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.0
     # via
@@ -26,7 +26,7 @@ wheel==0.37.0
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.2.4
+pip==21.3.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==58.2.0
+setuptools==59.6.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/constraints.txt

@@ -4,21 +4,21 @@
 #
 #    bin/update_dependencies.py
 #
-backports.entry-points-selectable==1.1.0
+backports.entry-points-selectable==1.1.1
     # via virtualenv
-delocate==0.10.0
+delocate==0.10.1
     # via -r cibuildwheel/resources/constraints.in
-distlib==0.3.3
+distlib==0.3.4
     # via virtualenv
-filelock==3.3.0
+filelock==3.4.0
     # via virtualenv
 platformdirs==2.4.0
     # via virtualenv
 six==1.16.0
     # via virtualenv
-typing-extensions==3.10.0.2
+typing-extensions==4.0.1
     # via delocate
-virtualenv==20.8.1
+virtualenv==20.10.0
     # via -r cibuildwheel/resources/constraints.in
 wheel==0.37.0
     # via
@@ -26,7 +26,7 @@ wheel==0.37.0
     #   delocate
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.2.4
+pip==21.3.1
     # via -r cibuildwheel/resources/constraints.in
-setuptools==58.2.0
+setuptools==59.6.0
     # via -r cibuildwheel/resources/constraints.in

cibuildwheel/resources/defaults.toml

@@ -7,6 +7,7 @@ archs = ["auto"]
 build-frontend = "pip"
 dependency-versions = "pinned"
 environment = {}
+environment-pass = []
 build-verbosity = ""
 
 before-all = ""
@@ -18,13 +19,13 @@ before-test = ""
 test-requires = []
 test-extras = []
 
-manylinux-x86_64-image = "manylinux2010"
-manylinux-i686-image = "manylinux2010"
+manylinux-x86_64-image = "manylinux2014"
+manylinux-i686-image = "manylinux2014"
 manylinux-aarch64-image = "manylinux2014"
 manylinux-ppc64le-image = "manylinux2014"
 manylinux-s390x-image = "manylinux2014"
-manylinux-pypy_x86_64-image = "manylinux2010"
-manylinux-pypy_i686-image = "manylinux2010"
+manylinux-pypy_x86_64-image = "manylinux2014"
+manylinux-pypy_i686-image = "manylinux2014"
 manylinux-pypy_aarch64-image = "manylinux2014"
 
 musllinux-x86_64-image = "musllinux_1_1"

cibuildwheel/resources/pinned_docker_images.cfg

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

cibuildwheel/util.py

@@ -12,7 +12,7 @@ import urllib.request
 from enum import Enum
 from pathlib import Path
 from time import sleep
-from typing import Dict, Iterator, List, Optional
+from typing import Any, Dict, Iterable, Iterator, List, Optional, TextIO
 
 import bracex
 import certifi
@@ -48,14 +48,56 @@ MUSLLINUX_ARCHS = (
 )
 
 
+def format_safe(template: str, **kwargs: Any) -> str:
+    """
+    Works similarly to `template.format(**kwargs)`, except that unmatched
+    fields in `template` are passed through untouched.
+
+    >>> format_safe('{a} {b}', a='123')
+    '123 {b}'
+    >>> format_safe('{a} {b[4]:3f}', a='123')
+    '123 {b[4]:3f}'
+
+    To avoid variable expansion, precede with a single backslash e.g.
+    >>> format_safe('\\{a} {b}', a='123')
+    '{a} {b}'
+    """
+
+    result = template
+
+    for key, value in kwargs.items():
+        find_pattern = re.compile(
+            fr"""
+                (?<!\#)  # don't match if preceded by a hash
+                {{  # literal open curly bracket
+                {re.escape(key)}  # the field name
+                }}  # literal close curly bracket
+            """,
+            re.VERBOSE,
+        )
+
+        # we use a lambda for repl to prevent re.sub interpreting backslashes
+        # in repl as escape sequences
+        result = re.sub(
+            pattern=find_pattern,
+            repl=lambda _: str(value),
+            string=result,
+        )
+
+        # transform escaped sequences into their literal equivalents
+        result = result.replace(f"#{{{key}}}", f"{{{key}}}")
+
+    return result
+
+
 def prepare_command(command: str, **kwargs: PathOrStr) -> str:
     """
     Preprocesses a command by expanding variables like {python}.
 
     For example, used in the test_command option to specify the path to the
-    project's root.
+    project's root. Unmatched syntax will mostly be allowed through.
     """
-    return command.format(python="python", pip="pip", **kwargs)
+    return format_safe(command, python="python", pip="pip", **kwargs)
 
 
 def get_build_verbosity_extra_flags(level: int) -> List[str]:
@@ -84,9 +126,9 @@ def selector_matches(patterns: str, string: str) -> bool:
     expansion. For example, 'cp{36,37}-*' would match either of 'cp36-*' or
     'cp37-*'.
     """
-    patterns_list: List[str] = patterns.split()
-    patterns_list = itertools.chain.from_iterable(bracex.expand(p) for p in patterns_list)  # type: ignore[assignment]
-    return any(fnmatch.fnmatch(string, pat) for pat in patterns_list)
+    patterns_list = patterns.split()
+    expanded_patterns = itertools.chain.from_iterable(bracex.expand(p) for p in patterns_list)
+    return any(fnmatch.fnmatch(string, pat) for pat in expanded_patterns)
 
 
 class IdentifierSelector:
@@ -161,18 +203,18 @@ class TestSelector(IdentifierSelector):
 
 # Taken from https://stackoverflow.com/a/107717
 class Unbuffered:
-    def __init__(self, stream):  # type: ignore[no-untyped-def]
+    def __init__(self, stream: TextIO) -> None:
         self.stream = stream
 
-    def write(self, data):  # type: ignore[no-untyped-def]
+    def write(self, data: str) -> None:
         self.stream.write(data)
         self.stream.flush()
 
-    def writelines(self, data):  # type: ignore[no-untyped-def]
+    def writelines(self, data: Iterable[str]) -> None:
         self.stream.writelines(data)
         self.stream.flush()
 
-    def __getattr__(self, attr):  # type: ignore[no-untyped-def]
+    def __getattr__(self, attr: str) -> Any:
         return getattr(self.stream, attr)
 
 

cibuildwheel/windows.py

@@ -7,6 +7,8 @@ from pathlib import Path
 from typing import Dict, List, NamedTuple, Optional, Sequence, Set
 from zipfile import ZipFile
 
+from packaging.version import Version
+
 from .architecture import Architecture
 from .environment import ParsedEnvironment
 from .logger import log
@@ -43,9 +45,8 @@ def shell(
 
 
 def get_nuget_args(version: str, arch: str) -> List[str]:
-    python_name = "python"
-    if arch == "32":
-        python_name += "x86"
+    platform_suffix = {"32": "x86", "64": "", "ARM64": "arm64"}
+    python_name = "python" + platform_suffix[arch]
     return [
         python_name,
         "-Version",
@@ -73,10 +74,7 @@ def get_python_configurations(
 
     python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
 
-    map_arch = {
-        "32": Architecture.x86,
-        "64": Architecture.AMD64,
-    }
+    map_arch = {"32": Architecture.x86, "64": Architecture.AMD64, "ARM64": Architecture.ARM64}
 
     # skip builds as required
     python_configurations = [
@@ -97,6 +95,10 @@ def install_cpython(version: str, arch: str, nuget: Path) -> Path:
     nuget_args = get_nuget_args(version, arch)
     installation_path = Path(nuget_args[-1]) / (nuget_args[0] + "." + version) / "tools"
     call([nuget, "install", *nuget_args])
+    # "python3" is not included in the vanilla nuget package,
+    # though it can be present if modified (like on Azure).
+    if not (installation_path / "python3.exe").exists():
+        (installation_path / "python3.exe").symlink_to(installation_path / "python.exe")
     return installation_path
 
 
@@ -112,7 +114,6 @@ def install_pypy(version: str, arch: str, url: str) -> Path:
         download(url, pypy_zip)
         # Extract to the parent directory because the zip file still contains a directory
         extract_zip(pypy_zip, installation_path.parent)
-        (installation_path / "python.exe").symlink_to(installation_path / "pypy3.exe")
     return installation_path
 
 
@@ -156,10 +157,58 @@ def setup_python(
     )
     env["PIP_DISABLE_PIP_VERSION_CHECK"] = "1"
 
+    log.step("Installing build tools...")
+
+    # Install pip
+
+    requires_reinstall = not (installation_path / "Scripts" / "pip.exe").exists()
+
+    if requires_reinstall:
+        # maybe pip isn't installed at all. ensurepip resolves that.
+        call(["python", "-m", "ensurepip"], env=env, cwd=CIBW_INSTALL_PATH)
+
+    # pip older than 21.3 builds executables such as pip.exe for x64 platform.
+    # The first re-install of pip updates pip module but builds pip.exe using
+    # the old pip which still generates x64 executable. But the second
+    # re-install uses updated pip and correctly builds pip.exe for the target.
+    # This can be removed once ARM64 Pythons (currently 3.9 and 3.10) bundle
+    # pip versions newer than 21.3.
+    if python_configuration.arch == "ARM64" and Version(get_pip_version(env)) < Version("21.3"):
+        call(
+            [
+                "python",
+                "-m",
+                "pip",
+                "install",
+                "--force-reinstall",
+                "--upgrade",
+                "pip",
+                *dependency_constraint_flags,
+            ],
+            env=env,
+            cwd=CIBW_INSTALL_PATH,
+        )
+
+    # upgrade pip to the version matching our constraints
+    # if necessary, reinstall it to ensure that it's available on PATH as 'pip.exe'
+    call(
+        [
+            "python",
+            "-m",
+            "pip",
+            "install",
+            "--force-reinstall" if requires_reinstall else "--upgrade",
+            "pip",
+            *dependency_constraint_flags,
+        ],
+        env=env,
+        cwd=CIBW_INSTALL_PATH,
+    )
+
     # update env with results from CIBW_ENVIRONMENT
     env = environment.as_dictionary(prev_environment=env)
 
-    # for the logs - check we're running the right version of python
+    # check what Python version we're on
     call(["where", "python"], env=env)
     call(["python", "--version"], env=env)
     call(["python", "-c", "\"import struct; print(struct.calcsize('P') * 8)\""], env=env)
@@ -181,31 +230,7 @@ def setup_python(
         )
         sys.exit(1)
 
-    log.step("Installing build tools...")
-
-    # Install pip
-
-    requires_reinstall = not (installation_path / "Scripts" / "pip.exe").exists()
-    if requires_reinstall:
-        # maybe pip isn't installed at all. ensurepip resolves that.
-        call(["python", "-m", "ensurepip"], env=env, cwd=CIBW_INSTALL_PATH)
-
-    # upgrade pip to the version matching our constraints
-    # if necessary, reinstall it to ensure that it's available on PATH as 'pip.exe'
-    call(
-        [
-            "python",
-            "-m",
-            "pip",
-            "install",
-            "--force-reinstall" if requires_reinstall else "--upgrade",
-            "pip",
-            *dependency_constraint_flags,
-        ],
-        env=env,
-        cwd=CIBW_INSTALL_PATH,
-    )
-
+    # check what pip version we're on
     assert (installation_path / "Scripts" / "pip.exe").exists()
     where_pip = (
         subprocess.run(
@@ -425,7 +450,9 @@ def build(options: Options) -> None:
                 shell(test_command_prepared, cwd="c:\\", env=virtualenv_env)
 
                 # clean up
-                shutil.rmtree(venv_dir)
+                # (we ignore errors because occasionally Windows fails to unlink a file and we
+                # don't want to abort a build because of that)
+                shutil.rmtree(venv_dir, ignore_errors=True)
 
             # we're all done here; move it to output (remove if already exists)
             shutil.move(str(repaired_wheel), build_options.output_dir)

docs/changelog.md

@@ -2,6 +2,39 @@
 title: Changelog
 ---
 
+### v2.3.1
+
+_14 December 2021_
+
+- 🐛 Setting pip options like `PIP_USE_DEPRECATED` in `CIBW_ENVIRONMENT` no longer adversely affects cibuildwheel's ability to set up a Python environment (#956)
+- 📚 Docs fixes and improvements
+
+### v2.3.0
+
+_26 November 2021_
+
+- 📈 cibuildwheel now defaults to manylinux2014 image for linux builds, rather than manylinux2010. If you want to stick with manylinux2010, it's simple to set this using [the image options](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image). (#926)
+- ✨ You can now pass environment variables from the host machine into the Docker container during a Linux build. Check out [the docs for `CIBW_ENVIRONMENT_PASS_LINUX `](https://cibuildwheel.readthedocs.io/en/latest/options/#environment-pass) for the details. (#914)
+- ✨ Added support for building PyPy 3.8 wheels. (#881)
+- ✨ Added support for building Windows arm64 CPython wheels on a Windows arm64 runner. We can't test this in CI yet, so for now, this is experimental. (#920)
+- 📚 Improved the deployment documentation (#911)
+- 🛠 Changed the escaping behaviour inside cibuildwheel's  option placeholders e.g. `{project}` in `before_build` or `{dest_dir}` in `repair_wheel_command`. This allows bash syntax like `${SOME_VAR}` to passthrough without being interpreted as a placeholder by cibuildwheel. See [this section](https://cibuildwheel.readthedocs.io/en/stable/options/#placeholders) in the docs for more info. (#889)
+- 🛠 Pip updated to 21.3, meaning it now defaults to in-tree builds again. If this causes an issue with your project, setting environment variable `PIP_USE_DEPRECATED=out-of-tree-build` is available as a temporary flag to restore the old behaviour. However, be aware that this flag will probably be removed soon. (#881)
+- 🐛 You can now access the current Python interpreter using `python3` within a build on Windows (#917)
+
+### v2.2.2
+
+_26 October 2021_
+
+- 🐛 Fix bug in the GitHub Action step causing a syntax error (#895)
+
+### v2.2.1
+
+_26 October 2021_
+
+- 🛠 Added a `config-file` option on the GitHub Action to specify something other than pyproject.toml in your GitHub Workflow file. (#883)
+- 🐛 Fix missing resources in sdist and released wheel on PyPI. We've also made some internal changes to our release processes to make them more reliable. (#893, #894)
+
 ### v2.2.0
 
 _22 October 2021_
@@ -20,6 +53,8 @@ _22 October 2021_
 
 - 🛠 Support for TOML 1.0 when reading config files, via the `tomli` package. (#876)
 
+<sup>Note: This version is not available on PyPI due to some missing resources in the release files. Please use a later version instead.</sup>
+
 ### v2.1.3
 
 _6 October 2021_
@@ -455,7 +490,7 @@ _26 May 2019_
 - 🌟 Add support for building on Azure pipelines! This lets you build all
   Linux, Mac and Windows wheels on one service, so it promises to be the
   easiest to set up! Check out the quickstart in the docs, or
-  [cibuildwheel-azure-example](https://github.com/pypa/cibuildwheel-azure-example)
+  [cibuildwheel-azure-example](https://github.com/joerick/cibuildwheel-azure-example)
   for an example project. (#126, #132)
 - 🛠 Internal change - the end-to-end test projects format was updated, so we
   can more precisely assert what should be produced for each one. (#136, #137).

docs/contributing.md

@@ -127,12 +127,10 @@ bin/bump_version.py
 
 You'll be prompted to enter the new version number. Update the changelog when prompted. The script will create a 'bump version' commit and version tag.
 
-Finally, cut the release and upload to PyPI/GitHub.
+Finally, cut the release and push to GitHub.
 
 ```bash
-rm -rf dist
-python -m build
-git push && git push --tags && twine upload dist/*
+git push && git push --tags
 ```
 
-Then head to https://github.com/pypa/cibuildwheel/releases and create a GitHub release from the new tag, pasting in the changelog entry.
+Then head to https://github.com/pypa/cibuildwheel/releases and create a GitHub release from the new tag, pasting in the changelog entry. Once the release is created inside GitHub, a CI job will create the assets and upload them to PyPI.

docs/cpp_standards.md

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

docs/data/projects.yml

@@ -256,8 +256,8 @@
 
 - name: Tokenizer
   gh: OpenNMT/Tokenizer
-  ci: [github, travisci]
-  os: [apple, linux]
+  ci: [github]
+  os: [windows, apple, linux]
 
 - name: matrixprofile
   gh: matrix-profile-foundation/matrixprofile
@@ -272,8 +272,8 @@
 - name: CTranslate2
   gh: OpenNMT/CTranslate2
   ci: [github]
-  os: [apple, linux]
-  notes: Includes libraries from the [Intel oneAPI toolkit](https://software.intel.com/content/www/us/en/develop/tools/oneapi/base-toolkit.html). The Linux wheels also include CUDA libraries for GPU execution.
+  os: [windows, apple, linux]
+  notes: 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.
 
 - name: MyPy
   gh: mypyc/mypy_mypyc-wheels
@@ -494,7 +494,7 @@
   ci: [github]
   os: [apple, linux, windows]
 
-- name: Pixar OpenTimelineIO
+- name: OpenTimelineIO
   gh: PixarAnimationStudios/OpenTimelineIO
   ci: [github]
   os: [apple, linux, windows]
@@ -503,3 +503,10 @@
   gh: AcademySoftwareFoundation/OpenColorIO
   ci: [github]
   os: [apple, linux, windows]
+
+- name: Psycopg 3
+  gh: psycopg/psycopg
+  pypi: psycopg_binary
+  notes: A modern implementation of a PostgreSQL adapter for Python
+  ci: [github]
+  os: [windows, apple, linux]

docs/deliver-to-pypi.md

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

docs/faq.md

@@ -127,7 +127,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead
 If you use GitHub Actions for builds, you can use cibuildwheel as an action:
 
 ```yaml
-uses: pypa/cibuildwheel@v2.2.0
+uses: pypa/cibuildwheel@v2.3.1
 ```
 
 This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal.
@@ -153,7 +153,7 @@ The second option, and the only one that supports other CI systems, is using a `
 
 ```bash
 # requirements-cibw.txt
-cibuildwheel==2.2.0
+cibuildwheel==2.3.1
 ```
 
 Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this:

docs/options.md

@@ -142,19 +142,20 @@ which means it can be given multiple times.
 ```toml
 [tool.cibuildwheel]
 # Normal options, etc.
-manylinux-x86_64-image = "manylinux2010"
+manylinux-x86_64-image = "manylinux2014"
 
 [[tool.cibuildwheel.overrides]]
 select = "cp36-*"
 manylinux-x86_64-image = "manylinux1"
 
 [[tool.cibuildwheel.overrides]]
-select = "cp310-*"
-manylinux-x86_64-image = "manylinux2014"
+select = "cp3{7,8,9}-*"
+manylinux-x86_64-image = "manylinux2010"
 ```
 
 This example will build CPython 3.6 wheels on manylinux1, CPython 3.7-3.9
-images on manylinux2010, and CPython 3.10 wheels on manylinux2014.
+wheels on manylinux2010, and manylinux2014 wheels for any newer Python
+(like 3.10).
 
 
 ## Options summary
@@ -206,15 +207,18 @@ When setting the options, you can use shell-style globbing syntax, as per [fnmat
 | Python 3.6   | cp36-macosx_x86_64                                                     | cp36-win_amd64<br/>cp36-win32    | cp36-manylinux_x86_64<br/>cp36-manylinux_i686<br/>cp36-musllinux_x86_64<br/>cp36-musllinux_i686     | cp36-manylinux_aarch64<br/>cp36-manylinux_ppc64le<br/>cp36-manylinux_s390x<br/>cp36-musllinux_aarch64<br/>cp36-musllinux_ppc64le<br/>cp36-musllinux_s390x       |
 | Python 3.7   | cp37-macosx_x86_64                                                     | cp37-win_amd64<br/>cp37-win32    | cp37-manylinux_x86_64<br/>cp37-manylinux_i686<br/>cp37-musllinux_x86_64<br/>cp37-musllinux_i686     | cp37-manylinux_aarch64<br/>cp37-manylinux_ppc64le<br/>cp37-manylinux_s390x<br/>cp37-musllinux_aarch64<br/>cp37-musllinux_ppc64le<br/>cp37-musllinux_s390x       |
 | Python 3.8   | cp38-macosx_x86_64<br/>cp38-macosx_universal2<br/>cp38-macosx_arm64    | cp38-win_amd64<br/>cp38-win32    | cp38-manylinux_x86_64<br/>cp38-manylinux_i686<br/>cp38-musllinux_x86_64<br/>cp38-musllinux_i686     | cp38-manylinux_aarch64<br/>cp38-manylinux_ppc64le<br/>cp38-manylinux_s390x<br/>cp38-musllinux_aarch64<br/>cp38-musllinux_ppc64le<br/>cp38-musllinux_s390x       |
-| Python 3.9   | cp39-macosx_x86_64<br/>cp39-macosx_universal2<br/>cp39-macosx_arm64    | cp39-win_amd64<br/>cp39-win32    | cp39-manylinux_x86_64<br/>cp39-manylinux_i686<br/>cp39-musllinux_x86_64<br/>cp39-musllinux_i686     | cp39-manylinux_aarch64<br/>cp39-manylinux_ppc64le<br/>cp39-manylinux_s390x<br/>cp39-musllinux_aarch64<br/>cp39-musllinux_ppc64le<br/>cp39-musllinux_s390x       |
-| Python 3.10  | cp310-macosx_x86_64<br/>cp310-macosx_universal2<br/>cp310-macosx_arm64 | cp310-win_amd64<br/>cp310-win32  | cp310-manylinux_x86_64<br/>cp310-manylinux_i686<br/>cp310-musllinux_x86_64<br/>cp310-musllinux_i686 | cp310-manylinux_aarch64<br/>cp310-manylinux_ppc64le<br/>cp310-manylinux_s390x<br/>cp310-musllinux_aarch64<br/>cp310-musllinux_ppc64le<br/>cp310-musllinux_s390x |
-| PyPy3.7 v7.3 | pp37-macosx_x86_64                                                     | pp37-win_amd64                   | pp37-manylinux_x86_64                                                                               |                                                                                                                                                                 |
+| Python 3.9   | cp39-macosx_x86_64<br/>cp39-macosx_universal2<br/>cp39-macosx_arm64    | cp39-win_amd64<br/>cp39-win32<br/>cp39-win_arm64    | cp39-manylinux_x86_64<br/>cp39-manylinux_i686<br/>cp39-musllinux_x86_64<br/>cp39-musllinux_i686     | cp39-manylinux_aarch64<br/>cp39-manylinux_ppc64le<br/>cp39-manylinux_s390x<br/>cp39-musllinux_aarch64<br/>cp39-musllinux_ppc64le<br/>cp39-musllinux_s390x       |
+| Python 3.10  | cp310-macosx_x86_64<br/>cp310-macosx_universal2<br/>cp310-macosx_arm64 | cp310-win_amd64<br/>cp310-win32<br/>cp310-win_arm64   | cp310-manylinux_x86_64<br/>cp310-manylinux_i686<br/>cp310-musllinux_x86_64<br/>cp310-musllinux_i686 | cp310-manylinux_aarch64<br/>cp310-manylinux_ppc64le<br/>cp310-manylinux_s390x<br/>cp310-musllinux_aarch64<br/>cp310-musllinux_ppc64le<br/>cp310-musllinux_s390x |
+| PyPy3.7 v7.3 | pp37-macosx_x86_64                                                     | pp37-win_amd64                   | pp37-manylinux_x86_64<br/>pp37-manylinux_i686                                                       | pp37-manylinux_aarch64                                                                                                                                          |
+| PyPy3.8 v7.3 | pp38-macosx_x86_64                                                     | pp38-win_amd64                   | pp38-manylinux_x86_64<br/>pp38-manylinux_i686                                                       | pp38-manylinux_aarch64                                                                                                                                          |
 
 The list of supported and currently selected build identifiers can also be retrieved by passing the `--print-build-identifiers` flag to cibuildwheel.
 The format is `python_tag-platform_tag`, with tags similar to those in [PEP 425](https://www.python.org/dev/peps/pep-0425/#details).
 
 For CPython, the minimally supported macOS version is 10.9; for PyPy 3.7, macOS 10.13 or higher is required.
 
+Windows arm64 platform support is experimental.
+
 See the [cibuildwheel 1 documentation](https://cibuildwheel.readthedocs.io/en/1.x/) for past end of life versions of Python, and PyPy2.7.
 
 #### Examples
@@ -604,6 +608,41 @@ Platform-specific environment variables are also available:<br/>
 !!! note
     cibuildwheel always defines the environment variable `CIBUILDWHEEL=1`. This can be useful for [building wheels with optional extensions](faq.md#building-packages-with-optional-c-extensions).
 
+### `CIBW_ENVIRONMENT_PASS_LINUX` {: #environment-pass}
+> Set environment variables on the host to pass-through to the container during the build.
+
+A list of environment variables to pass into the linux container during the build. It has no affect on the other platforms, which can already access all environment variables directly.
+
+To specify more than one environment variable, separate the variable names by spaces.
+
+#### Examples
+
+!!! tab examples "Environment passthrough"
+
+    ```yaml
+    # Export a variable
+    CIBW_ENVIRONMENT_PASS_LINUX: CFLAGS
+
+    # Set two flags variables
+    CIBW_ENVIRONMENT_PASS_LINUX: BUILD_TIME SAMPLE_TEXT
+    ```
+
+    Separate multiple values with a space.
+
+!!! tab examples "pyproject.toml"
+
+    ```toml
+    [tool.cibuildwheel.linux]
+
+    # Export a variable
+    environment-pass = ["CFLAGS"]
+
+    # Set two flags variables
+    environment-pass = ["BUILD_TIME", "SAMPLE_TEXT"]
+    ```
+
+    In configuration mode, you can use a [TOML][] list instead of a raw string as shown above.
+
 ### `CIBW_BEFORE_ALL` {: #before-all}
 > Execute a shell command on the build system before any wheels are built.
 
@@ -842,14 +881,14 @@ Platform-specific environment variables are also available:<br/>
 
 The available options are (default value):
 
-- `CIBW_MANYLINUX_X86_64_IMAGE` ([`quay.io/pypa/manylinux2010_x86_64`](https://quay.io/pypa/manylinux2010_x86_64))
-- `CIBW_MANYLINUX_I686_IMAGE` ([`quay.io/pypa/manylinux2010_i686`](https://quay.io/pypa/manylinux2010_i686))
-- `CIBW_MANYLINUX_PYPY_X86_64_IMAGE` ([`quay.io/pypa/manylinux2010_x86_64`](https://quay.io/pypa/manylinux2010_x86_64))
+- `CIBW_MANYLINUX_X86_64_IMAGE` ([`quay.io/pypa/manylinux2014_x86_64`](https://quay.io/pypa/manylinux2014_x86_64))
+- `CIBW_MANYLINUX_I686_IMAGE` ([`quay.io/pypa/manylinux2014_i686`](https://quay.io/pypa/manylinux2014_i686))
+- `CIBW_MANYLINUX_PYPY_X86_64_IMAGE` ([`quay.io/pypa/manylinux2014_x86_64`](https://quay.io/pypa/manylinux2014_x86_64))
 - `CIBW_MANYLINUX_AARCH64_IMAGE` ([`quay.io/pypa/manylinux2014_aarch64`](https://quay.io/pypa/manylinux2014_aarch64))
 - `CIBW_MANYLINUX_PPC64LE_IMAGE` ([`quay.io/pypa/manylinux2014_ppc64le`](https://quay.io/pypa/manylinux2014_ppc64le))
-- `CIBW_MANYLINUX_S390X_IMAGE` ([`quay.io/pypa/manylinux2014_s390x`](https://quay.io/pypa/manylinux2010_s390x))
+- `CIBW_MANYLINUX_S390X_IMAGE` ([`quay.io/pypa/manylinux2014_s390x`](https://quay.io/pypa/manylinux2014_s390x))
 - `CIBW_MANYLINUX_PYPY_AARCH64_IMAGE` ([`quay.io/pypa/manylinux2014_aarch64`](https://quay.io/pypa/manylinux2014_aarch64))
-- `CIBW_MANYLINUX_PYPY_I686_IMAGE` ([`quay.io/pypa/manylinux2010_i686`](https://quay.io/pypa/manylinux2010_i686))
+- `CIBW_MANYLINUX_PYPY_I686_IMAGE` ([`quay.io/pypa/manylinux2014_i686`](https://quay.io/pypa/manylinux2014_i686))
 - `CIBW_MUSLLINUX_X86_64_IMAGE` ([`quay.io/pypa/musllinux_1_1_x86_64`](https://quay.io/pypa/musllinux_1_1_x86_64))
 - `CIBW_MUSLLINUX_I686_IMAGE` ([`quay.io/pypa/musllinux_1_1_i686`](https://quay.io/pypa/musllinux_1_1_i686))
 - `CIBW_MUSLLINUX_AARCH64_IMAGE` ([`quay.io/pypa/musllinux_1_1_aarch64`](https://quay.io/pypa/musllinux_1_1_aarch64))
@@ -886,12 +925,12 @@ Auditwheel detects the version of the manylinux / musllinux standard in the Dock
     CIBW_MANYLINUX_PYPY_X86_64_IMAGE: manylinux2014
     CIBW_MANYLINUX_PYPY_I686_IMAGE: manylinux2014
 
-    # Build using the latest manylinux2010 release, instead of the cibuildwheel
+    # Build using the latest manylinux2014 release, instead of the cibuildwheel
     # pinned version
-    CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2010_x86_64:latest
-    CIBW_MANYLINUX_I686_IMAGE: quay.io/pypa/manylinux2010_i686:latest
-    CIBW_MANYLINUX_PYPY_X86_64_IMAGE: quay.io/pypa/manylinux2010_x86_64:latest
-    CIBW_MANYLINUX_PYPY_I686_IMAGE: quay.io/pypa/manylinux2010_i686:latest
+    CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64:latest
+    CIBW_MANYLINUX_I686_IMAGE: quay.io/pypa/manylinux2014_i686:latest
+    CIBW_MANYLINUX_PYPY_X86_64_IMAGE: quay.io/pypa/manylinux2014_x86_64:latest
+    CIBW_MANYLINUX_PYPY_I686_IMAGE: quay.io/pypa/manylinux2014_i686:latest
 
     # Build using a different image from the docker registry
     CIBW_MANYLINUX_X86_64_IMAGE: dockcross/manylinux-x64
@@ -908,7 +947,7 @@ Auditwheel detects the version of the manylinux / musllinux standard in the Dock
     manylinux-i686-image = "manylinux1"
 
     # Build using the manylinux2014 image
-    manylinux-x86_64_image = "manylinux2014"
+    manylinux-x86_64-image = "manylinux2014"
     manylinux-i686-image = "manylinux2014"
     manylinux-pypy_x86_64-image = "manylinux2014"
     manylinux-pypy_i686-image = "manylinux2014"
@@ -1258,6 +1297,10 @@ Platform-specific environment variables are also available:<br/>
 « subprocess_run("cibuildwheel", "--help") »
 ```
 
+## Placeholders
+
+Some options support placeholders, like `{project}`, `{package}` or `{wheel}`, that are substituted by cibuildwheel before they are used. If, for some reason, you need to write the literal name of a placeholder, e.g. literally `{project}` in a command that would ordinarily substitute `{project}`, prefix it with a hash character - `#{project}`. This is only necessary in commands where the specific string between the curly brackets would be substituted - otherwise, strings not modified.
+
 <style>
   .options-toc {
     display: grid;

docs/setup.md

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

docs/working-examples.md

@@ -10,11 +10,11 @@ title: Working examples
 |-----------------------------------|----|----|:------|
 | [scikit-learn][]                  | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The machine learning library. A complex but clean config using many of cibuildwheel's features to build a large project with Cython and C++ extensions.  |
 | [Tornado][]                       | ![travisci icon][] | ![apple icon][] ![linux icon][] | Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed. |
-| [Matplotlib][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The venerable Matplotlib, a Python library with C++ portions |
 | [pytorch-fairseq][]               | ![github icon][] | ![apple icon][] ![linux icon][] | Facebook AI Research Sequence-to-Sequence Toolkit written in Python. |
+| [Matplotlib][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The venerable Matplotlib, a Python library with C++ portions |
 | [MyPy][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | MyPyC, the compiled component of MyPy. |
-| [uvloop][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | Ultra fast asyncio event loop. |
 | [pydantic][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Data parsing and validation using Python type hints |
+| [uvloop][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | Ultra fast asyncio event loop. |
 | [psutil][]                        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python |
 | [vaex][]                          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Out-of-Core hybrid Apache Arrow/NumPy DataFrame for Python, ML, visualize and explore big tabular data at a billion rows per second 🚀 |
 | [Google Benchmark][]              | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A microbenchmark support library |
@@ -23,39 +23,40 @@ title: Working examples
 | [scikit-image][]                  | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Image processing library. Uses cibuildwheel to build and test a project that uses Cython with platform-native code.  |
 | [twisted-iocpsupport][]           | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. |
 | [cmake][]                         | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
-| [websockets][]                    | ![travisci icon][] | ![apple icon][] ![linux icon][] | Library for building WebSocket servers and clients. Mostly written in Python, with a small C 'speedups' extension module.  |
 | [duckdb][]                        | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System |
+| [websockets][]                    | ![travisci icon][] | ![apple icon][] ![linux icon][] | Library for building WebSocket servers and clients. Mostly written in Python, with a small C 'speedups' extension module.  |
 | [cvxpy][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A Python-embedded modeling language for convex optimization problems. |
 | [Triton][]                        | ![github icon][] | ![linux icon][] | Self hosted runners |
 | [PyOxidizer][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A modern Python application packaging and distribution tool |
-| [pyzmq][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython and CFFI.  |
 | [OpenSpiel][]                     | ![github icon][] | ![apple icon][] ![linux icon][] | OpenSpiel is a collection of environments and algorithms for research in general reinforcement learning and search/planning in games. |
-| [vispy][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Main repository for Vispy |
+| [pyzmq][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython and CFFI.  |
 | [River][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python |
+| [vispy][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Main repository for Vispy |
 | [aiortc][]                        | ![github icon][] | ![apple icon][] ![linux icon][] | WebRTC and ORTC implementation for Python using asyncio. |
 | [Confluent client for Kafka][]    | ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | setup in `tools/wheels/build-wheels.bat` |
 | [tinyobjloader][]                 | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Tiny but powerful single file wavefront obj loader |
 | [coverage.py][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python |
 | [PyCryptodome][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A self-contained cryptographic library for Python |
-| [numexpr][]                       | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas, bcolz and more |
 | [Dependency Injector][]           | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI |
+| [numexpr][]                       | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas, bcolz and more |
 | [PyYAML][]                        | ![github icon][] | ![apple icon][] | Canonical source repository for PyYAML |
 | [h5py][]                          | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. |
 | [PyAV][]                          | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Pythonic bindings for FFmpeg's libraries. |
 | [OpenColorIO][]                   | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A color management framework for visual effects and animation. |
 | [PyTables][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data |
 | [Line Profiler][]                 | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Line-by-line profiling for Python |
-| [Pixar OpenTimelineIO][]          | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Open Source API and interchange format for editorial timeline information. |
+| [OpenTimelineIO][]                | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Open Source API and interchange format for editorial timeline information. |
 | [ruptures][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. |
 | [pikepdf][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by qpdf |
 | [aioquic][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python |
 | [google neuroglancer][]           | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data |
 | [DeepForest][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) |
-| [AutoPy][]                        | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
 | [Parselmouth][]                   | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. |
+| [AutoPy][]                        | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
+| [Psycopg 3][]                     | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A modern implementation of a PostgreSQL adapter for Python |
 | [H3-py][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system |
-| [python-rapidjson][]              | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson |
 | [markupsafe][]                    | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. |
+| [python-rapidjson][]              | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson |
 | [Rtree][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS ¶ |
 | [python-snappy][]                 | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for the snappy google library |
 | [pybind11 cmake_example][]        | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system |
@@ -68,38 +69,38 @@ title: Working examples
 | [time-machine][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. |
 | [matrixprofile][]                 | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. |
 | [CTranslate2][]                   | ![github icon][] | ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://software.intel.com/content/www/us/en/develop/tools/oneapi/base-toolkit.html). The Linux wheels also include CUDA libraries for GPU execution. |
-| [iminuit][]                       | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 |
 | [jq.py][]                         | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq |
-| [Tokenizer][]                     | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support |
+| [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 |
 | [PyGLM][]                         | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Fast OpenGL Mathematics (GLM) for Python |
 | [bx-python][]                     | ![travisci icon][] | ![apple icon][] ![linux icon][] | A library that includes Cython extensions. |
 | [boost-histogram][]               | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. |
 | [iDynTree][]                      | ![github icon][] | ![linux icon][] | Uses manylinux_2_24 |
-| [pybase64][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python |
 | [TgCrypto][]                      | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
+| [pybase64][]                      | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python |
 | [etebase-py][]                    | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. |
 | [fathon][]                        | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms |
-| [pyjet][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy |
 | [numpythia][]                     | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy |
+| [pyjet][]                         | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy |
 | [polaroid][]                      | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. |
 | [Imagecodecs (fork)][]            | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. |
-| [ninja][]                         | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
-| [GSD][]                           | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Cython and NumPy project with 64-bit wheels. |
-| [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 |
 | [clang-format][]                  | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. |
+| [ninja][]                         | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. |
+| [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 |
+| [GSD][]                           | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Cython and NumPy project with 64-bit wheels. |
 | [pyinstrument_cext][]             | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies |
 | [xmlstarlet][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. |
 | [CorrectionLib][]                 | ![github icon][] | ![apple icon][] ![linux icon][] | Structured JSON powered correction library for HEP, designed for the CMS experiment at CERN. |
-| [SiPM][]                          | ![github icon][] | ![apple icon][] ![linux icon][] | High performance library for SiPM detectors simulation using C++17, OpenMP and AVX2 intrinsics. |
 | [pillow-heif][]                   | ![github icon][] | ![apple icon][] ![linux icon][] | Python CFFI binding to libheif library with third party dependencies like `libde265`, `x265`, `libaom` with test & publishing on PyPi. |
+| [SiPM][]                          | ![github icon][] | ![apple icon][] ![linux icon][] | High performance library for SiPM detectors simulation using C++17, OpenMP and AVX2 intrinsics. |
 
 [scikit-learn]: https://github.com/scikit-learn/scikit-learn
 [Tornado]: https://github.com/tornadoweb/tornado
-[Matplotlib]: https://github.com/matplotlib/matplotlib
 [pytorch-fairseq]: https://github.com/pytorch/fairseq
+[Matplotlib]: https://github.com/matplotlib/matplotlib
 [MyPy]: https://github.com/mypyc/mypy_mypyc-wheels
-[uvloop]: https://github.com/MagicStack/uvloop
 [pydantic]: https://github.com/samuelcolvin/pydantic
+[uvloop]: https://github.com/MagicStack/uvloop
 [psutil]: https://github.com/giampaolo/psutil
 [vaex]: https://github.com/vaexio/vaex
 [Google Benchmark]: https://github.com/google/benchmark
@@ -108,39 +109,40 @@ title: Working examples
 [scikit-image]: https://github.com/scikit-image/scikit-image
 [twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport
 [cmake]: https://github.com/scikit-build/cmake-python-distributions
-[websockets]: https://github.com/aaugustin/websockets
 [duckdb]: https://github.com/duckdb/duckdb
+[websockets]: https://github.com/aaugustin/websockets
 [cvxpy]: https://github.com/cvxpy/cvxpy
 [Triton]: https://github.com/openai/triton
 [PyOxidizer]: https://github.com/indygreg/PyOxidizer
-[pyzmq]: https://github.com/zeromq/pyzmq
 [OpenSpiel]: https://github.com/deepmind/open_spiel
-[vispy]: https://github.com/vispy/vispy
+[pyzmq]: https://github.com/zeromq/pyzmq
 [River]: https://github.com/online-ml/river
+[vispy]: https://github.com/vispy/vispy
 [aiortc]: https://github.com/aiortc/aiortc
 [Confluent client for Kafka]: https://github.com/confluentinc/confluent-kafka-python
 [tinyobjloader]: https://github.com/tinyobjloader/tinyobjloader
 [coverage.py]: https://github.com/nedbat/coveragepy
 [PyCryptodome]: https://github.com/Legrandin/pycryptodome
-[numexpr]: https://github.com/pydata/numexpr
 [Dependency Injector]: https://github.com/ets-labs/python-dependency-injector
+[numexpr]: https://github.com/pydata/numexpr
 [PyYAML]: https://github.com/yaml/pyyaml
 [h5py]: https://github.com/h5py/h5py
 [PyAV]: https://github.com/PyAV-Org/PyAV
 [OpenColorIO]: https://github.com/AcademySoftwareFoundation/OpenColorIO
 [PyTables]: https://github.com/PyTables/PyTables
 [Line Profiler]: https://github.com/pyutils/line_profiler
-[Pixar OpenTimelineIO]: https://github.com/PixarAnimationStudios/OpenTimelineIO
+[OpenTimelineIO]: https://github.com/PixarAnimationStudios/OpenTimelineIO
 [ruptures]: https://github.com/deepcharles/ruptures
 [pikepdf]: https://github.com/pikepdf/pikepdf
 [aioquic]: https://github.com/aiortc/aioquic
 [google neuroglancer]: https://github.com/google/neuroglancer
 [DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest
-[AutoPy]: https://github.com/autopilot-rs/autopy
 [Parselmouth]: https://github.com/YannickJadoul/Parselmouth
+[AutoPy]: https://github.com/autopilot-rs/autopy
+[Psycopg 3]: https://github.com/psycopg/psycopg
 [H3-py]: https://github.com/uber/h3-py
-[python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson
 [markupsafe]: https://github.com/pallets/markupsafe
+[python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson
 [Rtree]: https://github.com/Toblerity/rtree
 [python-snappy]: https://github.com/andrix/python-snappy
 [pybind11 cmake_example]: https://github.com/pybind/cmake_example
@@ -153,30 +155,30 @@ title: Working examples
 [time-machine]: https://github.com/adamchainz/time-machine
 [matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile
 [CTranslate2]: https://github.com/OpenNMT/CTranslate2
-[iminuit]: https://github.com/scikit-hep/iminuit
 [jq.py]: https://github.com/mwilliamson/jq.py
+[iminuit]: https://github.com/scikit-hep/iminuit
 [Tokenizer]: https://github.com/OpenNMT/Tokenizer
 [PyGLM]: https://github.com/Zuzu-Typ/PyGLM
 [bx-python]: https://github.com/bxlab/bx-python
 [boost-histogram]: https://github.com/scikit-hep/boost-histogram
 [iDynTree]: https://github.com/robotology/idyntree
-[pybase64]: https://github.com/mayeut/pybase64
 [TgCrypto]: https://github.com/pyrogram/tgcrypto
+[pybase64]: https://github.com/mayeut/pybase64
 [etebase-py]: https://github.com/etesync/etebase-py
 [fathon]: https://github.com/stfbnc/fathon
-[pyjet]: https://github.com/scikit-hep/pyjet
 [numpythia]: https://github.com/scikit-hep/numpythia
+[pyjet]: https://github.com/scikit-hep/pyjet
 [polaroid]: https://github.com/daggy1234/polaroid
 [Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build
-[ninja]: https://github.com/scikit-build/ninja-python-distributions
-[GSD]: https://github.com/glotzerlab/gsd
-[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example
 [clang-format]: https://github.com/ssciwr/clang-format-wheel
+[ninja]: https://github.com/scikit-build/ninja-python-distributions
+[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example
+[GSD]: https://github.com/glotzerlab/gsd
 [pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext
 [xmlstarlet]: https://github.com/dimitern/xmlstarlet
 [CorrectionLib]: https://github.com/cms-nanoAOD/correctionlib
-[SiPM]: https://github.com/EdoPro98/SimSiPM
 [pillow-heif]: https://github.com/bigcat88/pillow_heif
+[SiPM]: https://github.com/EdoPro98/SimSiPM
 
 [appveyor icon]: data/readme_icons/appveyor.svg
 [github icon]: data/readme_icons/github.svg
@@ -188,90 +190,91 @@ title: Working examples
 [apple icon]: data/readme_icons/apple.svg
 [linux icon]: data/readme_icons/linux.svg
 
-<!-- scikit-learn: 47525, last pushed 0 days ago -->
-<!-- Tornado: 20226, last pushed 9 days ago -->
-<!-- Matplotlib: 14334, last pushed 0 days ago -->
-<!-- pytorch-fairseq: 14077, last pushed 0 days ago -->
-<!-- MyPy: 11462, last pushed 0 days ago -->
-<!-- uvloop: 8093, last pushed 5 days ago -->
-<!-- pydantic: 7761, last pushed 2 days ago -->
-<!-- psutil: 7724, last pushed 1 days ago -->
-<!-- vaex: 6633, last pushed 1 days ago -->
-<!-- Google Benchmark: 5790, last pushed 5 days ago -->
-<!-- asyncpg: 5107, last pushed 19 days ago -->
-<!-- Apache Beam: 5022, last pushed 0 days ago -->
-<!-- scikit-image: 4547, last pushed 2 days ago -->
-<!-- twisted-iocpsupport: 4386, last pushed 5 days ago -->
-<!-- cmake: 4195, last pushed 0 days ago -->
-<!-- websockets: 3600, last pushed 2 days ago -->
-<!-- duckdb: 3568, last pushed 0 days ago -->
-<!-- cvxpy: 3544, last pushed 2 days ago -->
-<!-- Triton: 3268, last pushed 0 days ago -->
-<!-- PyOxidizer: 3215, last pushed 10 days ago -->
-<!-- pyzmq: 2930, last pushed 0 days ago -->
-<!-- OpenSpiel: 2889, last pushed 4 days ago -->
-<!-- vispy: 2741, last pushed 2 days ago -->
-<!-- River: 2610, last pushed 2 days ago -->
-<!-- aiortc: 2606, last pushed 4 days ago -->
-<!-- Confluent client for Kafka: 2462, last pushed 3 days ago -->
-<!-- tinyobjloader: 2286, last pushed 1 days ago -->
-<!-- coverage.py: 1752, last pushed 0 days ago -->
-<!-- PyCryptodome: 1730, last pushed 0 days ago -->
-<!-- numexpr: 1657, last pushed 15 days ago -->
-<!-- Dependency Injector: 1615, last pushed 4 days ago -->
-<!-- PyYAML: 1615, last pushed 0 days ago -->
-<!-- h5py: 1594, last pushed 2 days ago -->
-<!-- PyAV: 1357, last pushed 14 days ago -->
-<!-- OpenColorIO: 1168, last pushed 1 days ago -->
-<!-- PyTables: 1065, last pushed 14 days ago -->
-<!-- Line Profiler: 912, last pushed 3 days ago -->
-<!-- Pixar OpenTimelineIO: 907, last pushed 0 days ago -->
-<!-- ruptures: 811, last pushed 2 days ago -->
-<!-- pikepdf: 763, last pushed 1 days ago -->
-<!-- aioquic: 749, last pushed 13 days ago -->
-<!-- google neuroglancer: 689, last pushed 6 days ago -->
-<!-- DeepForest: 663, last pushed 79 days ago -->
-<!-- AutoPy: 578, last pushed 115 days ago -->
-<!-- Parselmouth: 567, last pushed 6 days ago -->
-<!-- H3-py: 436, last pushed 33 days ago -->
-<!-- python-rapidjson: 429, last pushed 107 days ago -->
-<!-- markupsafe: 426, last pushed 4 days ago -->
-<!-- Rtree: 421, last pushed 4 days ago -->
-<!-- python-snappy: 407, last pushed 81 days ago -->
-<!-- pybind11 cmake_example: 315, last pushed 4 days ago -->
-<!-- KDEpy: 302, last pushed 129 days ago -->
-<!-- tgcalls: 275, last pushed 20 days ago -->
-<!-- dd-trace-py: 272, last pushed 1 days ago -->
-<!-- pybind11 python_example: 271, last pushed 4 days ago -->
-<!-- cyvcf2: 269, last pushed 40 days ago -->
-<!-- sourmash: 262, last pushed 0 days ago -->
-<!-- time-machine: 214, last pushed 1 days ago -->
-<!-- matrixprofile: 201, last pushed 107 days ago -->
-<!-- CTranslate2: 188, last pushed 2 days ago -->
-<!-- iminuit: 185, last pushed 1 days ago -->
-<!-- jq.py: 176, last pushed 69 days ago -->
-<!-- Tokenizer: 156, last pushed 2 days ago -->
-<!-- PyGLM: 119, last pushed 11 days ago -->
-<!-- bx-python: 106, last pushed 93 days ago -->
-<!-- boost-histogram: 92, last pushed 6 days ago -->
-<!-- iDynTree: 89, last pushed 7 days ago -->
-<!-- pybase64: 74, last pushed 3 days ago -->
-<!-- TgCrypto: 73, last pushed 7 days ago -->
-<!-- etebase-py: 52, last pushed 279 days ago -->
-<!-- fathon: 39, last pushed 130 days ago -->
-<!-- pyjet: 31, last pushed 4 days ago -->
-<!-- numpythia: 31, last pushed 4 days ago -->
-<!-- polaroid: 25, last pushed 8 days ago -->
-<!-- Imagecodecs (fork): 21, last pushed 46 days ago -->
-<!-- ninja: 19, last pushed 1 days ago -->
-<!-- GSD: 18, last pushed 2 days ago -->
-<!-- pybind11 scikit_build_example: 17, last pushed 4 days ago -->
-<!-- clang-format: 15, last pushed 3 days ago -->
-<!-- pyinstrument_cext: 10, last pushed 2 days ago -->
-<!-- xmlstarlet: 7, last pushed 80 days ago -->
-<!-- CorrectionLib: 7, last pushed 3 days ago -->
-<!-- SiPM: 4, last pushed 0 days ago -->
-<!-- pillow-heif: 3, last pushed 2 days ago -->
+<!-- scikit-learn: 48265, last pushed 0 days ago -->
+<!-- Tornado: 20306, last pushed 4 days ago -->
+<!-- pytorch-fairseq: 14811, last pushed 2 days ago -->
+<!-- Matplotlib: 14705, last pushed 0 days ago -->
+<!-- MyPy: 11966, last pushed 0 days ago -->
+<!-- pydantic: 8289, last pushed 0 days ago -->
+<!-- uvloop: 8233, last pushed 3 days ago -->
+<!-- psutil: 7929, last pushed 5 days ago -->
+<!-- vaex: 6784, last pushed 0 days ago -->
+<!-- Google Benchmark: 5975, last pushed 0 days ago -->
+<!-- asyncpg: 5208, last pushed 4 days ago -->
+<!-- Apache Beam: 5141, last pushed 0 days ago -->
+<!-- scikit-image: 4682, last pushed 0 days ago -->
+<!-- twisted-iocpsupport: 4437, last pushed 6 days ago -->
+<!-- cmake: 4340, last pushed 0 days ago -->
+<!-- duckdb: 3989, last pushed 0 days ago -->
+<!-- websockets: 3712, last pushed 22 days ago -->
+<!-- cvxpy: 3634, last pushed 0 days ago -->
+<!-- Triton: 3402, last pushed 2 days ago -->
+<!-- PyOxidizer: 3377, last pushed 1 days ago -->
+<!-- OpenSpiel: 2978, last pushed 3 days ago -->
+<!-- pyzmq: 2968, last pushed 4 days ago -->
+<!-- River: 2967, last pushed 1 days ago -->
+<!-- vispy: 2769, last pushed 2 days ago -->
+<!-- aiortc: 2696, last pushed 10 days ago -->
+<!-- Confluent client for Kafka: 2572, last pushed 2 days ago -->
+<!-- tinyobjloader: 2362, last pushed 7 days ago -->
+<!-- coverage.py: 1851, last pushed 0 days ago -->
+<!-- PyCryptodome: 1812, last pushed 9 days ago -->
+<!-- Dependency Injector: 1758, last pushed 14 days ago -->
+<!-- numexpr: 1691, last pushed 1 days ago -->
+<!-- PyYAML: 1678, last pushed 10 days ago -->
+<!-- h5py: 1641, last pushed 1 days ago -->
+<!-- PyAV: 1406, last pushed 3 days ago -->
+<!-- OpenColorIO: 1201, last pushed 0 days ago -->
+<!-- PyTables: 1080, last pushed 0 days ago -->
+<!-- Line Profiler: 983, last pushed 10 days ago -->
+<!-- OpenTimelineIO: 946, last pushed 0 days ago -->
+<!-- ruptures: 869, last pushed 3 days ago -->
+<!-- pikepdf: 827, last pushed 1 days ago -->
+<!-- aioquic: 790, last pushed 6 days ago -->
+<!-- google neuroglancer: 704, last pushed 9 days ago -->
+<!-- DeepForest: 686, last pushed 142 days ago -->
+<!-- Parselmouth: 596, last pushed 12 days ago -->
+<!-- AutoPy: 596, last pushed 178 days ago -->
+<!-- Psycopg 3: 544, last pushed 3 days ago -->
+<!-- H3-py: 457, last pushed 40 days ago -->
+<!-- markupsafe: 437, last pushed 6 days ago -->
+<!-- python-rapidjson: 433, last pushed 57 days ago -->
+<!-- Rtree: 432, last pushed 67 days ago -->
+<!-- python-snappy: 413, last pushed 4 days ago -->
+<!-- pybind11 cmake_example: 336, last pushed 14 days ago -->
+<!-- KDEpy: 315, last pushed 192 days ago -->
+<!-- tgcalls: 293, last pushed 83 days ago -->
+<!-- dd-trace-py: 286, last pushed 0 days ago -->
+<!-- pybind11 python_example: 285, last pushed 14 days ago -->
+<!-- cyvcf2: 279, last pushed 4 days ago -->
+<!-- sourmash: 267, last pushed 9 days ago -->
+<!-- time-machine: 236, last pushed 5 days ago -->
+<!-- matrixprofile: 217, last pushed 170 days ago -->
+<!-- CTranslate2: 213, last pushed 0 days ago -->
+<!-- jq.py: 189, last pushed 132 days ago -->
+<!-- iminuit: 189, last pushed 29 days ago -->
+<!-- Tokenizer: 161, last pushed 4 days ago -->
+<!-- PyGLM: 124, last pushed 7 days ago -->
+<!-- bx-python: 108, last pushed 1 days ago -->
+<!-- boost-histogram: 101, last pushed 6 days ago -->
+<!-- iDynTree: 92, last pushed 6 days ago -->
+<!-- TgCrypto: 80, last pushed 62 days ago -->
+<!-- pybase64: 76, last pushed 6 days ago -->
+<!-- etebase-py: 53, last pushed 342 days ago -->
+<!-- fathon: 41, last pushed 25 days ago -->
+<!-- numpythia: 32, last pushed 13 days ago -->
+<!-- pyjet: 31, last pushed 14 days ago -->
+<!-- polaroid: 27, last pushed 1 days ago -->
+<!-- Imagecodecs (fork): 26, last pushed 23 days ago -->
+<!-- clang-format: 22, last pushed 59 days ago -->
+<!-- ninja: 20, last pushed 0 days ago -->
+<!-- pybind11 scikit_build_example: 19, last pushed 14 days ago -->
+<!-- GSD: 18, last pushed 25 days ago -->
+<!-- pyinstrument_cext: 10, last pushed 65 days ago -->
+<!-- xmlstarlet: 7, last pushed 34 days ago -->
+<!-- CorrectionLib: 7, last pushed 2 days ago -->
+<!-- pillow-heif: 7, last pushed 1 days ago -->
+<!-- SiPM: 4, last pushed 35 days ago -->
 
 <!-- END bin/projects.py -->
 

examples/appveyor-minimal.yml

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

examples/azure-pipelines-minimal.yml

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

examples/circleci-minimal.yml

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

examples/github-apple-silicon.yml

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

examples/github-deploy.yml

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

examples/github-minimal.yml

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

examples/github-with-qemu.yml

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

examples/gitlab-minimal.yml

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

examples/travis-ci-deploy.yml

@@ -19,11 +19,11 @@ jobs:
         - ln -s /c/Python38/python.exe /c/Python38/python3.exe
 
 install:
-  - python3 -m pip install cibuildwheel==2.2.0
+  - python3 -m pip install cibuildwheel==2.3.1
 
 script:
-  # build the wheels, put them into './wheelhouse'
-  - python3 -m cibuildwheel --output-dir wheelhouse
+  # build the wheels, put them into './dist'
+  - python3 -m cibuildwheel --output-dir dist
 
 deploy:
   provider: pypi

examples/travis-ci-minimal.yml

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

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

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

noxfile.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 import nox
 
-nox.options.sessions = ["lint", "tests"]
+nox.options.sessions = ["lint", "check_manifest", "tests"]
 
 PYTHON_ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]
 
@@ -34,6 +34,16 @@ def lint(session: nox.Session) -> None:
     session.run("pre-commit", "run", "--all-files", *session.posargs)
 
 
+@nox.session
+def check_manifest(session: nox.Session) -> None:
+    """
+    Ensure all needed files are included in the manifest.
+    """
+
+    session.install("check-manifest")
+    session.run("check-manifest", *session.posargs)
+
+
 @nox.session(python=PYTHON_ALL_VERSIONS)
 def update_constraints(session: nox.Session) -> None:
     """

pyproject.toml

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

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = cibuildwheel
-version = 2.2.0
+version = 2.3.1
 description = Build Python wheels on CI with minimal configuration.
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -37,7 +37,7 @@ install_requires =
     packaging
     tomli
     dataclasses;python_version < '3.7'
-    typing_extensions;python_version < '3.8'
+    typing-extensions>=3.10.0.0;python_version < '3.8'
 python_requires = >=3.6
 include_package_data = True
 zip_safe = False

test/test_docker_images.py

@@ -35,8 +35,8 @@ def test(tmp_path):
     actual_wheels = utils.cibuildwheel_run(
         project_dir,
         add_env={
-            "CIBW_MANYLINUX_X86_64_IMAGE": "dockcross/manylinux2010-x64",
-            "CIBW_MANYLINUX_I686_IMAGE": "dockcross/manylinux2010-x86",
+            "CIBW_MANYLINUX_X86_64_IMAGE": "dockcross/manylinux2014-x64",
+            "CIBW_MANYLINUX_I686_IMAGE": "dockcross/manylinux2014-x86",
             "CIBW_BUILD": "cp3{6,7,8,9}-manylinux*",
         },
     )

test/utils.py

@@ -120,7 +120,12 @@ def expected_wheels(
 
     if manylinux_versions is None:
         if machine_arch == "x86_64":
-            manylinux_versions = ["manylinux_2_5", "manylinux1", "manylinux_2_12", "manylinux2010"]
+            manylinux_versions = [
+                "manylinux_2_5",
+                "manylinux1",
+                "manylinux_2_17",
+                "manylinux2014",
+            ]
         else:
             manylinux_versions = ["manylinux_2_17", "manylinux2014"]
 
@@ -130,7 +135,7 @@ def expected_wheels(
     python_abi_tags = ["cp36-cp36m", "cp37-cp37m", "cp38-cp38", "cp39-cp39", "cp310-cp310"]
 
     if machine_arch in ["x86_64", "AMD64", "x86", "aarch64"]:
-        python_abi_tags += ["pp37-pypy37_pp73"]
+        python_abi_tags += ["pp37-pypy37_pp73", "pp38-pypy38_pp73"]
 
     if platform == "macos" and machine_arch == "arm64":
         # currently, arm64 macs are only supported by cp39 & cp310

unit_test/build_selector_test.py

@@ -53,6 +53,9 @@ def test_skip():
 
     assert not build_selector("pp36-manylinux_x86_64")
     assert build_selector("pp37-manylinux_x86_64")
+    assert build_selector("pp38-manylinux_x86_64")
+    assert build_selector("pp37-manylinux_i686")
+    assert build_selector("pp38-manylinux_i686")
     assert build_selector("cp36-manylinux_x86_64")
     assert build_selector("cp37-manylinux_x86_64")
     assert not build_selector("cp36-manylinux_i686")

unit_test/docker_container_test.py

@@ -8,7 +8,7 @@ from pathlib import Path, PurePath
 import pytest
 
 from cibuildwheel.docker_container import DockerContainer
-from cibuildwheel.environment import EnvironmentAssignment
+from cibuildwheel.environment import EnvironmentAssignmentBash
 
 # for these tests we use manylinux2014 images, because they're available on
 # multi architectures and include python3.8
@@ -198,5 +198,5 @@ def test_dir_operations(tmp_path: Path):
 @pytest.mark.docker
 def test_environment_executor():
     with DockerContainer(docker_image=DEFAULT_IMAGE) as container:
-        assignment = EnvironmentAssignment("TEST=$(echo 42)")
+        assignment = EnvironmentAssignmentBash("TEST=$(echo 42)")
         assert assignment.evaluated_value({}, container.environment_executor) == "42"

unit_test/environment_test.py

@@ -7,30 +7,24 @@ def test_basic_parsing():
     environment_recipe = parse_environment("VAR=1 VBR=2")
 
     environment_dict = environment_recipe.as_dictionary(prev_environment={})
-    environment_cmds = environment_recipe.as_shell_commands()
 
     assert environment_dict == {"VAR": "1", "VBR": "2"}
-    assert environment_cmds == ["export VAR=1", "export VBR=2"]
 
 
 def test_quotes():
     environment_recipe = parse_environment("A=1 VAR=\"1 NOT_A_VAR=2\" VBR='vbr'")
 
     environment_dict = environment_recipe.as_dictionary(prev_environment={})
-    environment_cmds = environment_recipe.as_shell_commands()
 
     assert environment_dict == {"A": "1", "VAR": "1 NOT_A_VAR=2", "VBR": "vbr"}
-    assert environment_cmds == ["export A=1", 'export VAR="1 NOT_A_VAR=2"', "export VBR='vbr'"]
 
 
 def test_inheritance():
     environment_recipe = parse_environment("PATH=$PATH:/usr/local/bin")
 
     environment_dict = environment_recipe.as_dictionary(prev_environment={"PATH": "/usr/bin"})
-    environment_cmds = environment_recipe.as_shell_commands()
 
     assert environment_dict == {"PATH": "/usr/bin:/usr/local/bin"}
-    assert environment_cmds == ["export PATH=$PATH:/usr/local/bin"]
 
 
 def test_shell_eval():
@@ -40,40 +34,32 @@ def test_shell_eval():
     env_copy.pop("VAR", None)
 
     environment_dict = environment_recipe.as_dictionary(prev_environment=env_copy)
-    environment_cmds = environment_recipe.as_shell_commands()
 
     assert environment_dict["VAR"] == "a   test string"
-    assert environment_cmds == ['export VAR="$(echo "a   test" string)"']
 
 
 def test_shell_eval_and_env():
     environment_recipe = parse_environment('VAR="$(echo "$PREV_VAR" string)"')
 
     environment_dict = environment_recipe.as_dictionary(prev_environment={"PREV_VAR": "1 2 3"})
-    environment_cmds = environment_recipe.as_shell_commands()
 
     assert environment_dict == {"PREV_VAR": "1 2 3", "VAR": "1 2 3 string"}
-    assert environment_cmds == ['export VAR="$(echo "$PREV_VAR" string)"']
 
 
 def test_empty_var():
     environment_recipe = parse_environment("CFLAGS=")
 
     environment_dict = environment_recipe.as_dictionary(prev_environment={"CFLAGS": "-Wall"})
-    environment_cmds = environment_recipe.as_shell_commands()
 
     assert environment_dict == {"CFLAGS": ""}
-    assert environment_cmds == ["export CFLAGS="]
 
 
 def test_no_vars():
     environment_recipe = parse_environment("")
 
     environment_dict = environment_recipe.as_dictionary(prev_environment={})
-    environment_cmds = environment_recipe.as_shell_commands()
 
     assert environment_dict == {}
-    assert environment_cmds == []
 
 
 def test_no_vars_pass_through():

unit_test/main_tests/main_options_test.py

@@ -71,19 +71,19 @@ def test_empty_selector(platform, intercepted_build_args, monkeypatch):
 @pytest.mark.parametrize(
     "architecture, image, full_image",
     [
-        ("x86_64", None, "quay.io/pypa/manylinux2010_x86_64:*"),
+        ("x86_64", None, "quay.io/pypa/manylinux2014_x86_64:*"),
         ("x86_64", "manylinux1", "quay.io/pypa/manylinux1_x86_64:*"),
         ("x86_64", "manylinux2010", "quay.io/pypa/manylinux2010_x86_64:*"),
         ("x86_64", "manylinux2014", "quay.io/pypa/manylinux2014_x86_64:*"),
         ("x86_64", "manylinux_2_24", "quay.io/pypa/manylinux_2_24_x86_64:*"),
         ("x86_64", "custom_image", "custom_image"),
-        ("i686", None, "quay.io/pypa/manylinux2010_i686:*"),
+        ("i686", None, "quay.io/pypa/manylinux2014_i686:*"),
         ("i686", "manylinux1", "quay.io/pypa/manylinux1_i686:*"),
         ("i686", "manylinux2010", "quay.io/pypa/manylinux2010_i686:*"),
         ("i686", "manylinux2014", "quay.io/pypa/manylinux2014_i686:*"),
         ("i686", "manylinux_2_24", "quay.io/pypa/manylinux_2_24_i686:*"),
         ("i686", "custom_image", "custom_image"),
-        ("pypy_x86_64", None, "quay.io/pypa/manylinux2010_x86_64:*"),
+        ("pypy_x86_64", None, "quay.io/pypa/manylinux2014_x86_64:*"),
         ("pypy_x86_64", "manylinux1", "manylinux1"),  # Does not exist
         ("pypy_x86_64", "manylinux2010", "quay.io/pypa/manylinux2010_x86_64:*"),
         ("pypy_x86_64", "manylinux2014", "quay.io/pypa/manylinux2014_x86_64:*"),

unit_test/main_tests/main_platform_test.py

@@ -178,7 +178,11 @@ def test_archs_platform_all(platform, intercepted_build_args, monkeypatch):
             Architecture.s390x,
         }
     elif platform == "windows":
-        assert options.globals.architectures == {Architecture.x86, Architecture.AMD64}
+        assert options.globals.architectures == {
+            Architecture.x86,
+            Architecture.AMD64,
+            Architecture.ARM64,
+        }
     elif platform == "macos":
         assert options.globals.architectures == {
             Architecture.x86_64,

unit_test/option_prepare_test.py

@@ -11,7 +11,7 @@ import pytest
 from cibuildwheel import linux, util
 from cibuildwheel.__main__ import main
 
-ALL_IDS = {"cp36", "cp37", "cp38", "cp39", "cp310", "pp37"}
+ALL_IDS = {"cp36", "cp37", "cp38", "cp39", "cp310", "pp37", "pp38"}
 
 
 @pytest.fixture
@@ -52,7 +52,7 @@ def test_build_default_launches(mock_build_docker, fake_package_dir, monkeypatch
 
     # In Python 3.8+, this can be simplified to [0].kwargs
     kwargs = build_on_docker.call_args_list[0][1]
-    assert "quay.io/pypa/manylinux2010_x86_64" in kwargs["docker"]["docker_image"]
+    assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["docker_image"]
     assert kwargs["docker"]["cwd"] == Path("/project")
     assert not kwargs["docker"]["simulate_32_bit"]
 
@@ -60,7 +60,7 @@ def test_build_default_launches(mock_build_docker, fake_package_dir, monkeypatch
     assert identifiers == {f"{x}-manylinux_x86_64" for x in ALL_IDS}
 
     kwargs = build_on_docker.call_args_list[1][1]
-    assert "quay.io/pypa/manylinux2010_i686" in kwargs["docker"]["docker_image"]
+    assert "quay.io/pypa/manylinux2014_i686" in kwargs["docker"]["docker_image"]
     assert kwargs["docker"]["cwd"] == Path("/project")
     assert kwargs["docker"]["simulate_32_bit"]
 
@@ -94,13 +94,13 @@ def test_build_with_override_launches(mock_build_docker, monkeypatch, tmp_path):
     cibw_toml.write_text(
         """
 [tool.cibuildwheel]
-manylinux-x86_64-image = "manylinux2014"
+manylinux-x86_64-image = "manylinux_2_24"
 
-# Before Python 3.10, manylinux2010 is the most compatible
+# Before Python 3.10, use manylinux2014
 [[tool.cibuildwheel.overrides]]
 select = "cp3?-*"
-manylinux-x86_64-image = "manylinux2010"
-manylinux-i686-image = "manylinux2010"
+manylinux-x86_64-image = "manylinux2014"
+manylinux-i686-image = "manylinux2014"
 
 [[tool.cibuildwheel.overrides]]
 select = "cp36-manylinux_x86_64"
@@ -118,7 +118,7 @@ before-all = "true"
     assert build_on_docker.call_count == 6
 
     kwargs = build_on_docker.call_args_list[0][1]
-    assert "quay.io/pypa/manylinux2010_x86_64" in kwargs["docker"]["docker_image"]
+    assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["docker_image"]
     assert kwargs["docker"]["cwd"] == Path("/project")
     assert not kwargs["docker"]["simulate_32_bit"]
 
@@ -127,23 +127,29 @@ before-all = "true"
     assert kwargs["options"].build_options("cp36-manylinux_x86_64").before_all == "true"
 
     kwargs = build_on_docker.call_args_list[1][1]
-    assert "quay.io/pypa/manylinux2010_x86_64" in kwargs["docker"]["docker_image"]
-    assert kwargs["docker"]["cwd"] == Path("/project")
-    assert not kwargs["docker"]["simulate_32_bit"]
-
-    identifiers = {x.identifier for x in kwargs["platform_configs"]}
-    assert identifiers == {f"{x}-manylinux_x86_64" for x in ALL_IDS - {"cp36", "cp310", "pp37"}}
-    assert kwargs["options"].build_options("cp37-manylinux_x86_64").before_all == ""
-
-    kwargs = build_on_docker.call_args_list[2][1]
     assert "quay.io/pypa/manylinux2014_x86_64" in kwargs["docker"]["docker_image"]
     assert kwargs["docker"]["cwd"] == Path("/project")
     assert not kwargs["docker"]["simulate_32_bit"]
+
     identifiers = {x.identifier for x in kwargs["platform_configs"]}
-    assert identifiers == {"cp310-manylinux_x86_64", "pp37-manylinux_x86_64"}
+    assert identifiers == {
+        f"{x}-manylinux_x86_64" for x in ALL_IDS - {"cp36", "cp310", "pp37", "pp38"}
+    }
+    assert kwargs["options"].build_options("cp37-manylinux_x86_64").before_all == ""
+
+    kwargs = build_on_docker.call_args_list[2][1]
+    assert "quay.io/pypa/manylinux_2_24_x86_64" in kwargs["docker"]["docker_image"]
+    assert kwargs["docker"]["cwd"] == Path("/project")
+    assert not kwargs["docker"]["simulate_32_bit"]
+    identifiers = {x.identifier for x in kwargs["platform_configs"]}
+    assert identifiers == {
+        "cp310-manylinux_x86_64",
+        "pp37-manylinux_x86_64",
+        "pp38-manylinux_x86_64",
+    }
 
     kwargs = build_on_docker.call_args_list[3][1]
-    assert "quay.io/pypa/manylinux2010_i686" in kwargs["docker"]["docker_image"]
+    assert "quay.io/pypa/manylinux2014_i686" in kwargs["docker"]["docker_image"]
     assert kwargs["docker"]["cwd"] == Path("/project")
     assert kwargs["docker"]["simulate_32_bit"]
 

unit_test/options_test.py

@@ -1,5 +1,7 @@
 import platform as platform_module
 
+import pytest
+
 from cibuildwheel.__main__ import get_build_identifiers
 from cibuildwheel.environment import parse_environment
 from cibuildwheel.options import Options, _get_pinned_docker_images
@@ -15,6 +17,8 @@ test-command = "pyproject"
 
 manylinux-x86_64-image = "manylinux1"
 
+environment-pass = ["EXAMPLE_ENV"]
+
 [tool.cibuildwheel.macos]
 test-requires = "else"
 
@@ -66,3 +70,47 @@ test_command: 'pyproject'
     assert local.manylinux_images is not None
     assert local.test_command == "pyproject-override"
     assert local.manylinux_images["x86_64"] == pinned_x86_64_docker_image["manylinux2014"]
+
+
+def test_passthrough(tmp_path, monkeypatch):
+    with tmp_path.joinpath("pyproject.toml").open("w") as f:
+        f.write(PYPROJECT_1)
+
+    args = get_default_command_line_arguments()
+    args.package_dir = str(tmp_path)
+
+    monkeypatch.setattr(platform_module, "machine", lambda: "x86_64")
+    monkeypatch.setenv("EXAMPLE_ENV", "ONE")
+
+    options = Options(platform="linux", command_line_arguments=args)
+
+    default_build_options = options.build_options(identifier=None)
+
+    assert default_build_options.environment.as_dictionary(prev_environment={}) == {
+        "FOO": "BAR",
+        "EXAMPLE_ENV": "ONE",
+    }
+
+
+@pytest.mark.parametrize(
+    "env_var_value",
+    [
+        "normal value",
+        '"value wrapped in quotes"',
+        "an unclosed single-quote: '",
+        'an unclosed double-quote: "',
+        "string\nwith\ncarriage\nreturns\n",
+        "a trailing backslash \\",
+    ],
+)
+def test_passthrough_evil(tmp_path, monkeypatch, env_var_value):
+    args = get_default_command_line_arguments()
+    args.package_dir = str(tmp_path)
+
+    monkeypatch.setattr(platform_module, "machine", lambda: "x86_64")
+    monkeypatch.setenv("CIBW_ENVIRONMENT_PASS_LINUX", "ENV_VAR")
+    options = Options(platform="linux", command_line_arguments=args)
+
+    monkeypatch.setenv("ENV_VAR", env_var_value)
+    parsed_environment = options.build_options(identifier=None).environment
+    assert parsed_environment.as_dictionary(prev_environment={}) == {"ENV_VAR": env_var_value}

unit_test/options_toml_test.py

@@ -60,7 +60,7 @@ def test_simple_settings(tmp_path, platform, fname):
     )
 
     assert options_reader.get("manylinux-x86_64-image") == "manylinux1"
-    assert options_reader.get("manylinux-i686-image") == "manylinux2010"
+    assert options_reader.get("manylinux-i686-image") == "manylinux2014"
 
     with pytest.raises(ConfigOptionError):
         options_reader.get("environment", sep=" ")
@@ -71,7 +71,7 @@ def test_simple_settings(tmp_path, platform, fname):
 
 def test_envvar_override(tmp_path, platform, monkeypatch):
     monkeypatch.setenv("CIBW_BUILD", "cp38*")
-    monkeypatch.setenv("CIBW_MANYLINUX_X86_64_IMAGE", "manylinux2014")
+    monkeypatch.setenv("CIBW_MANYLINUX_X86_64_IMAGE", "manylinux_2_24")
     monkeypatch.setenv("CIBW_TEST_COMMAND", "mytest")
     monkeypatch.setenv("CIBW_TEST_REQUIRES", "docs")
     monkeypatch.setenv("CIBW_TEST_REQUIRES_LINUX", "scod")
@@ -84,8 +84,8 @@ def test_envvar_override(tmp_path, platform, monkeypatch):
     assert options_reader.get("archs", sep=" ") == "auto"
 
     assert options_reader.get("build", sep=" ") == "cp38*"
-    assert options_reader.get("manylinux-x86_64-image") == "manylinux2014"
-    assert options_reader.get("manylinux-i686-image") == "manylinux2010"
+    assert options_reader.get("manylinux-x86_64-image") == "manylinux_2_24"
+    assert options_reader.get("manylinux-i686-image") == "manylinux2014"
 
     assert (
         options_reader.get("test-requires", sep=" ")
@@ -222,7 +222,7 @@ manylinux-x86_64-image = ""
     assert options_reader.get("manylinux-i686-image") == ""
     assert options_reader.get("manylinux-aarch64-image") == "manylinux1"
 
-    assert options_reader.get("manylinux-x86_64-image", ignore_empty=True) == "manylinux2010"
+    assert options_reader.get("manylinux-x86_64-image", ignore_empty=True) == "manylinux2014"
     assert options_reader.get("manylinux-i686-image", ignore_empty=True) == "manylinux1"
     assert options_reader.get("manylinux-aarch64-image", ignore_empty=True) == "manylinux1"
 

unit_test/utils.py

@@ -7,7 +7,7 @@ def get_default_command_line_arguments() -> CommandLineArguments:
     defaults.platform = "auto"
     defaults.allow_empty = False
     defaults.archs = None
-    defaults.config_file = None
+    defaults.config_file = ""
     defaults.output_dir = None
     defaults.package_dir = "."
     defaults.prerelease_pythons = False

unit_test/utils_test.py

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