Merge branch 'main' into run-example-ci-configs-fix

Author: joerick

.github/CODEOWNERS

@@ -1,3 +1,7 @@
+# Specification files for platform maintainers
 cibuildwheel/platforms/ios.py         @freakboy3742
 cibuildwheel/platforms/pyodide.py     @hoodmane @ryanking13 @agriyakhetarpal
 cibuildwheel/platforms/android.py     @mhsmith
+
+# Constraints files
+cibuildwheel/resources/constraints-pyodide*.txt @hoodmane @ryanking13 @agriyakhetarpal

.github/workflows/test.yml

@@ -76,7 +76,7 @@ jobs:
         - os: macos-13
           python_version: '3.13'
           test_select: ios
-        - os: macos-15
+        - os: macos-14  # See https://github.com/actions/runner-images/issues/12777
           python_version: '3.13'
           test_select: ios
         - os: macos-13

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.12.8
+  rev: v0.12.10
   hooks:
   - id: ruff
     args: ["--fix", "--show-fixes"]
@@ -83,7 +83,7 @@ repos:
 
 
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.33.2
+  rev: 0.33.3
   hooks:
     - id: check-dependabot
     - id: check-github-actions

README.md

@@ -58,17 +58,19 @@ Usage
 
 |                 | Linux | macOS | Windows | Linux ARM | macOS ARM | Windows ARM | Android | iOS |
 |-----------------|-------|-------|---------|-----------|-----------|-------------|---------|-----|
-| GitHub Actions  | ✅    | ✅    | ✅       | ✅        | ✅        | ✅²         | ✅⁴      | ✅³  |
-| Azure Pipelines | ✅    | ✅    | ✅       |           | ✅        | ✅²         | ✅⁴      | ✅³  |
+| GitHub Actions  | ✅    | ✅    | ✅       | ✅        | ✅        | ✅²         | ✅⁴      | ✅³⁵ |
+| Azure Pipelines | ✅    | ✅    | ✅       |           | ✅        | ✅²         | ✅⁴      | ✅³⁵ |
 | Travis CI       | ✅    |       | ✅      | ✅        |           |             | ✅⁴      |     |
 | CircleCI        | ✅    | ✅    |         | ✅        | ✅        |             | ✅⁴      | ✅³  |
 | Gitlab CI       | ✅    | ✅    | ✅      | ✅¹       | ✅        |             | ✅⁴      | ✅³  |
 | Cirrus CI       | ✅    | ✅    | ✅      | ✅        | ✅        |             | ✅⁴      |      |
 
 <sup>¹ [Requires emulation](https://cibuildwheel.pypa.io/en/stable/faq/#emulation), distributed separately. Other services may also support Linux ARM through emulation or third-party build hosts, but these are not tested in our CI.</sup><br>
 <sup>² [Uses cross-compilation](https://cibuildwheel.pypa.io/en/stable/faq/#windows-arm64). It is not possible to test `arm64` on this CI platform.</sup><br>
-<sup>³ Requires a macOS runner; runs tests on the simulator for the runner's architecture.</sup><br>
+<sup>³ Requires a macOS runner; runs tests on the simulator for the runner's architecture. </sup><br>
 <sup>⁴ Building for Android requires the runner to be Linux x86_64, macOS ARM64 or macOS x86_64. Testing has [additional requirements](https://cibuildwheel.pypa.io/en/stable/platforms/#android).</sup><br>
+<sup>⁵ The `macos-15` and `macos-latest` images are [incompatible with cibuildwheel at this time](platforms/#ios-system-requirements)</sup><br>
+
 <!--intro-end-->
 
 Example setup
@@ -97,7 +99,7 @@ jobs:
       - uses: actions/setup-python@v5
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==3.1.3
+        run: python -m pip install cibuildwheel==3.1.4
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
@@ -178,8 +180,8 @@ Here are some repos that use cibuildwheel.
 | Name                              | CI | OS | Notes |
 |-----------------------------------|----|----|:------|
 | [scikit-learn][]                  | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The machine learning library. A complex but clean config using many of cibuildwheel's features to build a large project with Cython and C++ extensions.  |
-| [pytorch-fairseq][]               | ![github icon][] | ![apple icon][] ![linux icon][] | Facebook AI Research Sequence-to-Sequence Toolkit written in Python. |
 | [duckdb][]                        | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an analytical in-process SQL database management system |
+| [pytorch-fairseq][]               | ![github icon][] | ![apple icon][] ![linux icon][] | Facebook AI Research Sequence-to-Sequence Toolkit written in Python. |
 | [NumPy][]                         | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The fundamental package for scientific computing with Python. |
 | [Tornado][]                       | ![github icon][] | ![linux icon][] ![apple icon][] ![windows icon][] | Tornado is a Python web framework and asynchronous networking library. Uses stable ABI for a small C extension. |
 | [NCNN][]                          | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | ncnn is a high-performance neural network inference framework optimized for the mobile platform |
@@ -189,8 +191,8 @@ Here are some repos that use cibuildwheel.
 | [Kivy][]                          | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Open source UI framework written in Python, running on Windows, Linux, macOS, Android and iOS |
 
 [scikit-learn]: https://github.com/scikit-learn/scikit-learn
-[pytorch-fairseq]: https://github.com/facebookresearch/fairseq
 [duckdb]: https://github.com/duckdb/duckdb
+[pytorch-fairseq]: https://github.com/facebookresearch/fairseq
 [NumPy]: https://github.com/numpy/numpy
 [Tornado]: https://github.com/tornadoweb/tornado
 [NCNN]: https://github.com/Tencent/ncnn
@@ -227,14 +229,32 @@ Changelog
 
 <!-- [[[cog from readme_changelog import mini_changelog; print(mini_changelog()) ]]] -->
 
+### v3.1.4
+
+_19 August 2025_
+
+- ✨ Add a `--clean-cache` command to clean up our cache (#2489)
+- 🛠 Update Python to 3.14rc2 and other patch version bumps (#2542, #2556)
+- 🛠 Update Pyodide to 0.28.2 (#2562, #2558)
+- 🐛 Fix resolution with `pyodide-build` when `dependency-versions` is set (#2548)
+- 🐛 Set `CMAKE_FIND_ROOT_PATH_MODE_PACKAGE` to `BOTH` on Android (#2547)
+- 🐛 Add `patchelf` dependency for platforms that can build Android wheels (#2552)
+- 🐛 Ignore empty values for `CIBW_ARCHS` like most other environment variables (#2541)
+- 💼 The `color` and `suggest_on_error` argparse options are now default in 3.14rc1+ (#2554)
+- 💼 Use the virtualenv release URL instead of blob URL (should be more robust) (#2555)
+- 🧪 For iOS, lowering to macos-14 is needed for now due to issues with GitHub's runner images (#2557)
+- 🧪 Split out platforms iOS and Android in our tests (#2519)
+- 🧪 Fix and enable doctests (#2546)
+- 📚 Improve our docs on free-threading (#2549)
+
+
 ### v3.1.3
 
 _1 August 2025_
 
 - 🐛 Fix bug where "latest" dependencies couldn't update to pip 25.2 on Windows (#2537)
-- 🛠 Use pytest-rerunfailures to improve some of our iOS/Android tests (#2527, #2539)
-- 🛠 Remove some GraalPy Windows workarounds in our tests (#2501)
-
+- 🧪 Use pytest-rerunfailures to improve some of our iOS/Android tests (#2527, #2539)
+- 🧪 Remove some GraalPy Windows workarounds in our tests (#2501)
 
 
 ### v3.1.2
@@ -272,19 +292,10 @@ _23 July 2025_
 - 🛠 Fixed a typo in the 3.9 MUSL riscv64 identifier (`cp39-musllinux_ricv64` -> `cp39-musllinux_riscv64`) (#2490)
 - 🛠 Mistyping `--only` now shows the correct possibilities, and even suggests near matches on Python 3.14+ (#2499)
 - 🛠 Only support one output from the repair step on linux like other platforms; auditwheel fixed this over four years ago! (#2478)
-- 🛠 We now use pattern matching extensively (#2434)
+- 💼 We now use pattern matching extensively (#2434)
 - 📚 We now have platform maintainers for our special platforms and interpreters! (#2481)
 
-
-
-### v3.0.1
-
-_5 July 2025_
-
-- 🛠 Updates CPython 3.14 prerelease to 3.14.0b3 (#2471)
-- ✨ Adds a CPython 3.14 prerelease iOS build (only when prerelease builds are [enabled](https://cibuildwheel.pypa.io/en/stable/options/#enable)) (#2475)
-
-<!-- [[[end]]] (sum: Fe+mD8YR4+) -->
+<!-- [[[end]]] (sum: loynkRqdzf) -->
 
 ---
 

azure-pipelines.yml

@@ -32,7 +32,7 @@ jobs:
         pythonVersion: "3.11"
         testSelect: "native"
       ios_311:
-        imageName: "macos-latest"
+        imageName: "macos-14"  # See https://github.com/actions/runner-images/issues/12777
         pythonVersion: "3.11"
         testSelect: "ios"
       android_macos_311:

bin/generate_schema.py

@@ -6,17 +6,12 @@
 
 import argparse
 import copy
-import functools
 import json
-import sys
 from typing import Any
 
 import yaml
 
-make_parser = functools.partial(argparse.ArgumentParser, allow_abbrev=False)
-if sys.version_info >= (3, 14):
-    make_parser = functools.partial(make_parser, color=True, suggest_on_error=True)
-parser = make_parser()
+parser = argparse.ArgumentParser(allow_abbrev=False)
 parser.add_argument("--schemastore", action="store_true", help="Generate schema_store version")
 args = parser.parse_args()
 

bin/run_tests.py

@@ -2,7 +2,6 @@
 
 
 import argparse
-import functools
 import os
 import subprocess
 import sys
@@ -14,10 +13,7 @@
     else:
         default_cpu_count = os.process_cpu_count() or 2
 
-    make_parser = functools.partial(argparse.ArgumentParser, allow_abbrev=False)
-    if sys.version_info >= (3, 14):
-        make_parser = functools.partial(make_parser, color=True, suggest_on_error=True)
-    parser = make_parser()
+    parser = argparse.ArgumentParser(allow_abbrev=False)
     parser.add_argument(
         "--run-podman", action="store_true", default=False, help="run podman tests (linux only)"
     )

bin/sample_build.py

@@ -2,7 +2,6 @@
 
 
 import argparse
-import functools
 import os
 import subprocess
 import sys
@@ -13,10 +12,7 @@
     # move cwd to the project root
     os.chdir(Path(__file__).resolve().parents[1])
 
-    make_parser = functools.partial(argparse.ArgumentParser, allow_abbrev=False)
-    if sys.version_info >= (3, 14):
-        make_parser = functools.partial(make_parser, color=True, suggest_on_error=True)
-    parser = make_parser(description="Runs a sample build")
+    parser = argparse.ArgumentParser(description="Runs a sample build", allow_abbrev=False)
     parser.add_argument("project_python_path", nargs="?", default="test.test_0_basic.basic_project")
 
     options = parser.parse_args()

bin/update_virtualenv.py

@@ -4,17 +4,18 @@
 import dataclasses
 import difflib
 import logging
-import subprocess
 import tomllib
 from pathlib import Path
 from typing import Final
 
 import click
 import rich
-from packaging.version import InvalidVersion, Version
+from packaging.version import Version
 from rich.logging import RichHandler
 from rich.syntax import Syntax
 
+from cibuildwheel.extra import github_api_request
+
 log = logging.getLogger("cibw")
 
 # Looking up the dir instead of using utils.resources_dir
@@ -30,32 +31,26 @@
 
 @dataclasses.dataclass(frozen=True, order=True)
 class VersionTuple:
+    name: str
+    download_url: str
     version: Version
-    version_string: str
-
-
-def git_ls_remote_versions(url: str) -> list[VersionTuple]:
-    versions: list[VersionTuple] = []
-    tags = subprocess.run(
-        ["git", "ls-remote", "--tags", url], check=True, text=True, capture_output=True
-    ).stdout.splitlines()
-    for tag in tags:
-        _, ref = tag.split()
-        assert ref.startswith("refs/tags/")
-        version_string = ref[10:]
-        try:
-            version = Version(version_string)
-            if version.is_devrelease:
-                log.info("Ignoring development release %r", str(version))
-                continue
-            if version.is_prerelease:
-                log.info("Ignoring pre-release %r", str(version))
-                continue
-            versions.append(VersionTuple(version, version_string))
-        except InvalidVersion:
-            log.warning("Ignoring ref %r", ref)
-    versions.sort(reverse=True)
-    return versions
+
+
+def get_latest_virtualenv_release() -> VersionTuple:
+    response = github_api_request("repos/pypa/get-virtualenv/releases/latest")
+    tag_name = response["tag_name"]
+
+    asset = next(
+        (asset for asset in response["assets"] if asset["name"] == "virtualenv.pyz"),
+        None,
+    )
+    if not asset:
+        msg = "No asset named 'virtualenv.pyz' found in the latest release of get-virtualenv."
+        raise RuntimeError(msg)
+
+    return VersionTuple(
+        version=Version(tag_name), name=tag_name, download_url=asset["browser_download_url"]
+    )
 
 
 @click.command()
@@ -78,14 +73,20 @@ def update_virtualenv(force: bool, level: str) -> None:
     with toml_file_path.open("rb") as f:
         configurations = tomllib.load(f)
     default = configurations.pop("default")
-    version = str(default["version"])
-    versions = git_ls_remote_versions(GET_VIRTUALENV_GITHUB)
-    if versions[0].version > Version(version):
-        version = versions[0].version_string
+    local_version = str(default["version"])
+
+    latest_release = get_latest_virtualenv_release()
+
+    if latest_release.version > Version(local_version):
+        version = latest_release.name
+        url = latest_release.download_url
+    else:
+        version = local_version
+        url = default["url"]
 
     configurations["default"] = {
         "version": version,
-        "url": GET_VIRTUALENV_URL_TEMPLATE.format(version=version),
+        "url": url,
     }
     result_toml = "".join(
         f'{key} = {{ version = "{value["version"]}", url = "{value["url"]}" }}\n'

cibuildwheel/__init__.py

@@ -1 +1 @@
-__version__ = "3.1.3"
+__version__ = "3.1.4"