Merge branch 'main' into add-falcon-to-working-examples

Author: vytas7

.cirrus.yml

@@ -46,8 +46,8 @@ linux_aarch64_task:
   <<: *RUN_TESTS
 
 windows_x86_task:
-  # The task takes ~55 minutes while the timeout happens
-  # after 60 minutes by default, let's allow some wiggle room.
+  # The task takes ~55 minutes while the timeout happens after 60 minutes by default,
+  # let's allow some wiggle room.
   timeout_in: 120m
   windows_container:
     image: cirrusci/windowsservercore:visualstudio2022

.github/CODEOWNERS

@@ -1,2 +1,3 @@
 cibuildwheel/platforms/ios.py         @freakboy3742
 cibuildwheel/platforms/pyodide.py     @hoodmane @ryanking13 @agriyakhetarpal
+cibuildwheel/platforms/android.py     @mhsmith

.github/workflows/test.yml

@@ -51,6 +51,7 @@ jobs:
     needs: lint
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-13, macos-15]
         python_version: ['3.13']
@@ -97,6 +98,7 @@ jobs:
         uv sync --no-dev --group test
 
     - uses: joerick/[email protected]
+
     - name: Set CIBW_ENABLE
       shell: bash
       run: |
@@ -134,16 +136,16 @@ jobs:
       with:
         package-dir: sample_proj
         output-dir: wheelhouse_only
-        only: cp312-${{ runner.os == 'Linux' && (runner.arch == 'ARM64' && 'manylinux_aarch64' || 'manylinux_x86_64') || (runner.os == 'Windows' && 'win_amd64' || 'macosx_x86_64') }}
+        only: cp313-${{ runner.os == 'Linux' && (runner.arch == 'ARM64' && 'manylinux_aarch64' || 'manylinux_x86_64') || (runner.os == 'Windows' && 'win_amd64' || 'macosx_x86_64') }}
 
     - name: Create custom configuration file
       shell: bash
       run: |
         cat > sample_proj/cibw.toml <<EOF
         [tool.cibuildwheel]
-        # Only build on CPython 3.12 on native arch
+        # Only build on CPython 3.13 on native arch
         archs = ["native"]
-        build = "cp312-*"
+        build = "cp313-*"
         # Skip musllinux
         skip = "*-musllinux*"
         EOF

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.12.4
+  rev: v0.12.5
   hooks:
   - id: ruff
     args: ["--fix", "--show-fixes"]

README.md

@@ -97,7 +97,7 @@ jobs:
       - uses: actions/setup-python@v5
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==3.1.0
+        run: python -m pip install cibuildwheel==3.1.2
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
@@ -227,6 +227,27 @@ Changelog
 
 <!-- [[[cog from readme_changelog import mini_changelog; print(mini_changelog()) ]]] -->
 
+### v3.1.2
+
+_29 July 2025_
+
+- ⚠️  Add an error if `CIBW_FREE_THREADING_SUPPORT` is set; you are likely missing 3.13t wheels, please use the `enable`/`CIBW_ENABLE` (#2520)
+- 🛠 `riscv64` now enabled if you target that architecture, it's now supported on PyPI (#2509)
+- 🛠 Add warning when using `cpython-experimental-riscv64` (no longer needed) (#2526, #2528)
+- 🛠 iOS versions bumped, fixing issues with 3.14 (now RC 1) (#2530)
+- 🐛 Fix bug in Android running wheel from our GitHub Action (#2517)
+- 🐛 Fix warning when using `test-skip` of `"*-macosx_universal2:arm64"` (#2522)
+- 🐛 Fix incorrect number of wheels reported in logs, again (#2517)
+- 📚 We welcome our Android platform maintainer (#2516)
+
+
+### v3.1.1
+
+_24 July 2025_
+
+- 🐛 Fix a bug showing an incorrect wheel count at the end of execution, and misrepresenting test-only runs in the GitHub Action summary (#2512)
+- 📚 Docs fix (#2510)
+
 ### v3.1.0
 
 _23 July 2025_
@@ -291,20 +312,7 @@ See @henryiii's [release post](https://iscinumpy.dev/post/cibuildwheel-3-0-0/) f
 - 📚 Docs now primarily use the pyproject.toml name of options, rather than the environment variable name. (#2389)
 - 📚 README table now matches docs and auto-updates. (#2427, #2428)
 
-### v2.23.3
-
-_26 April 2025_
-
-- 🛠 Dependency updates, including Python 3.13.3 (#2371)
-
-### v2.23.2
-
-_24 March 2025_
-
-- 🐛 Workaround an issue with pyodide builds when running cibuildwheel with a Python that was installed via UV (#2328 via #2331)
-- 🛠 Dependency updates, including a manylinux update that fixes an ['undefined symbol' error](https://github.com/pypa/manylinux/issues/1760) in gcc-toolset (#2334)
-
-<!-- [[[end]]] (sum: HkLT9ZhhtV) -->
+<!-- [[[end]]] (sum: sVC5DNuhaF) -->
 
 ---
 
@@ -339,6 +347,7 @@ Platform maintainers:
 - Hood Chatham [@hoodmane](https://github.com/hoodmane) (Pyodide)
 - Gyeongjae Choi [@ryanking13](https://github.com/ryanking13) (Pyodide)
 - Tim Felgentreff [@timfel](https://github.com/timfel) (GraalPy)
+- Malcolm Smith [@mhsmith](https://github.com/mhsmith) (Android)
 
 Credits
 -------

cibuildwheel/__init__.py

@@ -1 +1 @@
-__version__ = "3.1.0"
+__version__ = "3.1.2"

cibuildwheel/__main__.py

@@ -9,7 +9,7 @@
 import textwrap
 import traceback
 import typing
-from collections.abc import Iterable, Sequence
+from collections.abc import Generator, Iterable, Sequence
 from pathlib import Path
 from tempfile import mkdtemp
 from typing import Any, Literal, TextIO
@@ -369,41 +369,61 @@ def print_preamble(platform: str, options: Options, identifiers: Sequence[str])
     print(f"Cache folder: {CIBW_CACHE_PATH}")
     print()
 
-    warnings = detect_warnings(options=options, identifiers=identifiers)
+    warnings = detect_warnings(options=options)
     for warning in warnings:
         log.warning(warning)
 
-    print("Here we go!\n")
+    error_list = list(detect_errors(options=options, identifiers=identifiers))
+    if error_list:
+        for error in error_list:
+            log.error(error)
+        msg = "\n".join(error_list)
+        raise errors.ConfigurationError(msg)
 
+    print("Here we go!\n")
 
-def detect_warnings(*, options: Options, identifiers: Iterable[str]) -> list[str]:
-    warnings = []
 
-    python_version_deprecation = ((3, 11), 3)
-    if sys.version_info[:2] < python_version_deprecation[0]:
-        python_version = ".".join(map(str, python_version_deprecation[0]))
-        msg = (
-            f"cibuildwheel {python_version_deprecation[1]} will require Python {python_version}+, "
-            "please upgrade the Python version used to run cibuildwheel. "
-            "This does not affect the versions you can target when building wheels. See: https://cibuildwheel.pypa.io/en/stable/#what-does-it-do"
+def detect_errors(*, options: Options, identifiers: Iterable[str]) -> Generator[str, None, None]:
+    # Check for deprecated CIBW_FREE_THREADED_SUPPORT environment variable
+    if "CIBW_FREE_THREADED_SUPPORT" in os.environ:
+        yield (
+            "CIBW_FREE_THREADED_SUPPORT environment variable is no longer supported. "
+            'Use tool.cibuildwheel.enable = ["cpython-freethreading"] in pyproject.toml '
+            "or set CIBW_ENABLE=cpython-freethreading instead."
         )
-        warnings.append(msg)
 
-    # warn about deprecated {python} and {pip}
+    # Deprecated {python} and {pip}
     for option_name in ["test_command", "before_build"]:
         option_values = [getattr(options.build_options(i), option_name) for i in identifiers]
 
         if any(o and ("{python}" in o or "{pip}" in o) for o in option_values):
             # Reminder: in an f-string, double braces means literal single brace
-            msg = (
+            yield (
                 f"{option_name}: '{{python}}' and '{{pip}}' are no longer supported "
                 "and have been removed in cibuildwheel 3. Simply use 'python' or 'pip' instead."
             )
-            raise errors.ConfigurationError(msg)
+
+
+def detect_warnings(*, options: Options) -> Generator[str, None, None]:
+    python_version_deprecation = ((3, 11), 3)
+    if sys.version_info[:2] < python_version_deprecation[0]:
+        python_version = ".".join(map(str, python_version_deprecation[0]))
+        yield (
+            f"cibuildwheel {python_version_deprecation[1]} will require Python {python_version}+, "
+            "please upgrade the Python version used to run cibuildwheel. "
+            "This does not affect the versions you can target when building wheels. See: https://cibuildwheel.pypa.io/en/stable/#what-does-it-do"
+        )
 
     build_selector = options.globals.build_selector
     test_selector = options.globals.test_selector
 
+    if EnableGroup.CPythonExperimentalRiscV64 in build_selector.enable:
+        yield (
+            "'cpython-experimental-riscv64' enable is deprecated and will be removed in a future version. "
+            "It should be removed from tool.cibuildwheel.enable in pyproject.toml "
+            "or CIBW_ENABLE environment variable."
+        )
+
     all_valid_identifiers = [
         config.identifier
         for module in ALL_PLATFORM_MODULES.values()
@@ -417,27 +437,25 @@ def detect_warnings(*, options: Options, identifiers: Iterable[str]) -> list[str
         identifier for identifier in all_valid_identifiers if enabled_selector(identifier)
     ]
 
-    warnings += check_for_invalid_selectors(
+    yield from check_for_invalid_selectors(
         selector_name="build",
         selector_value=build_selector.build_config,
         all_valid_identifiers=all_valid_identifiers,
         all_enabled_identifiers=all_enabled_identifiers,
     )
-    warnings += check_for_invalid_selectors(
+    yield from check_for_invalid_selectors(
         selector_name="skip",
         selector_value=build_selector.skip_config,
         all_valid_identifiers=all_valid_identifiers,
         all_enabled_identifiers=all_enabled_identifiers,
     )
-    warnings += check_for_invalid_selectors(
+    yield from check_for_invalid_selectors(
         selector_name="test_skip",
         selector_value=test_selector.skip_config,
         all_valid_identifiers=all_valid_identifiers,
         all_enabled_identifiers=all_enabled_identifiers,
     )
 
-    return warnings
-
 
 def check_for_invalid_selectors(
     *,
@@ -449,17 +467,31 @@ def check_for_invalid_selectors(
     warnings = []
 
     for selector in selector_value.split():
-        if not any(selector_matches(selector, i) for i in all_enabled_identifiers):
+        selector_ = selector
+        if selector_name == "test_skip":
+            # macosx_universal2 uses an additional identifier for tests which ends with ":{arch}"
+            values = selector.split(":")
+            universal2_identifiers = filter(
+                lambda x: x.endswith("-macosx_universal2"), all_valid_identifiers
+            )
+            if len(values) == 2 and any(
+                selector_matches(selector_, f"{i}:{arch}")
+                for i in universal2_identifiers
+                for arch in ["arm64", "x86_64"]
+            ):
+                # just ignore the arch part in the rest of the check
+                selector_ = values[0]
+        if not any(selector_matches(selector_, i) for i in all_enabled_identifiers):
             msg = f"Invalid {selector_name} selector: {selector!r}. "
             error_type: type = errors.ConfigurationError
 
-            if any(selector_matches(selector, i) for i in all_valid_identifiers):
+            if any(selector_matches(selector_, i) for i in all_valid_identifiers):
                 msg += "This selector matches a group that wasn't enabled. Enable it using the `enable` option or remove this selector. "
 
-            if "p2" in selector or "p35" in selector:
+            if "p2" in selector_ or "p35" in selector_:
                 msg += f"cibuildwheel 3.x no longer supports Python < 3.8. Please use the 1.x series or update `{selector_name}`. "
                 error_type = errors.DeprecationError
-            if "p36" in selector or "p37" in selector:
+            if "p36" in selector_ or "p37" in selector_:
                 msg += f"cibuildwheel 3.x no longer supports Python < 3.8. Please use the 2.x series or update `{selector_name}`. "
                 error_type = errors.DeprecationError
 

cibuildwheel/logger.py

@@ -242,11 +242,11 @@ def print_summary(self, *, options: "Options") -> Generator[None, None, None]:
             github_summary = self._github_step_summary(duration=duration, options=options)
             Path(summary_path).write_text(filter_ansi_codes(github_summary), encoding="utf-8")
 
-        n = len(self.summary)
-        s = "s" if n > 1 else ""
+        n_wheels = len([info for info in self.summary if info.filename])
+        s = "s" if n_wheels > 1 else ""
         duration_str = humanize.naturaldelta(duration)
         print()
-        self._start_fold_group(f"{n} wheel{s} produced in {duration_str}")
+        self._start_fold_group(f"{n_wheels} wheel{s} produced in {duration_str}")
         for build_info in self.summary:
             print(" ", build_info)
         self._end_fold_group()
@@ -320,7 +320,7 @@ def _github_step_summary(self, duration: float, options: "Options") -> str:
         n_wheels = len([b for b in self.summary if b.filename])
         wheel_rows = "\n".join(
             "<tr>"
-            f"<td nowrap>{'<samp>' + b.filename.name + '</samp>' if b.filename else '*Build only*'}</td>"
+            f"<td nowrap>{'<samp>' + b.filename.name + '</samp>' if b.filename else '*Test only*'}</td>"
             f"<td nowrap>{b.size or 'N/A'}</td>"
             f"<td nowrap><samp>{b.identifier}</samp></td>"
             f"<td nowrap>{humanize.naturaldelta(b.duration)}</td>"

cibuildwheel/options.py

@@ -665,7 +665,7 @@ def globals(self) -> GlobalOptions:
             build_config = args.only
             skip_config = ""
             architectures = Architecture.all_archs(self.platform)
-            enable = set(EnableGroup)
+            enable |= EnableGroup.all_groups()
 
         build_selector = BuildSelector(
             build_config=build_config,

cibuildwheel/platforms/android.py

@@ -6,6 +6,7 @@
 import shlex
 import shutil
 import subprocess
+import sys
 from collections.abc import Iterable, Iterator
 from dataclasses import dataclass
 from os.path import relpath
@@ -21,7 +22,7 @@
 from elftools.elf.elffile import ELFFile
 from filelock import FileLock
 
-from .. import errors, platforms
+from .. import errors, platforms  # pylint: disable=cyclic-import
 from ..architecture import Architecture, arch_synonym
 from ..frontend import get_build_frontend_extra_flags, parse_config_settings
 from ..logger import log
@@ -517,7 +518,7 @@ def repair_default(
                 f"${{ORIGIN}}/{relpath(libs_dir, path.parent)}",
                 path,
             )
-        call("wheel", "pack", unpacked_dir, "-d", repaired_wheel_dir)
+        call(sys.executable, "-m", "wheel", "pack", unpacked_dir, "-d", repaired_wheel_dir)
 
 
 def elf_file_filter(paths: Iterable[Path]) -> Iterator[tuple[Path, ELFFile]]: