Merge remote-tracking branch 'origin/main' into android

Author: mhsmith

.gitlab-ci.yml

@@ -29,7 +29,7 @@ windows:
   variables:
     PYTEST_ADDOPTS: -k "unit_test or test_0_basic" --suppress-no-test-exit-code
   before_script:
-    - choco install python -y --version 3.12.4
+    - choco install python -y --allow-downgrade --version 3.12.4
   rules:
     - if: '$CI_COMMIT_BRANCH == "main"'
       variables:

.pre-commit-config.yaml

@@ -14,14 +14,14 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.11.11
+  rev: v0.11.12
   hooks:
   - id: ruff
     args: ["--fix", "--show-fixes"]
   - id: ruff-format
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.15.0
+  rev: v1.16.0
   hooks:
   - id: mypy
     name: mypy 3.11 on cibuildwheel/
@@ -88,7 +88,8 @@ repos:
     - id: check-github-actions
     - id: check-github-workflows
     - id: check-gitlab-ci
-    - id: check-readthedocs
+    # Disabled due to schema issue for now:
+    # - id: check-readthedocs
     - id: check-travis
     - id: check-jsonschema
       name: Check projects

.readthedocs.yml

@@ -3,10 +3,10 @@
 version: 2
 
 build:
-  os: ubuntu-22.04
-  tools:
-    python: "3.12"
+  os: ubuntu-24.04
   commands:
+    - asdf install python 3.14-dev
+    - asdf global python 3.14-dev
     - asdf plugin add uv
     - asdf install uv latest
     - asdf global uv latest

README.md

@@ -97,7 +97,7 @@ jobs:
       - uses: actions/setup-python@v5
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==3.0.0b4
+        run: python -m pip install cibuildwheel==3.0.0b5
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
@@ -179,8 +179,8 @@ 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.  |
 | [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. |
 | [duckdb][]                        | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an analytical in-process SQL database management system |
+| [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 |
 | [Matplotlib][]                    | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The venerable Matplotlib, a Python library with C++ portions |
@@ -190,8 +190,8 @@ Here are some repos that use cibuildwheel.
 
 [scikit-learn]: https://github.com/scikit-learn/scikit-learn
 [pytorch-fairseq]: https://github.com/facebookresearch/fairseq
-[NumPy]: https://github.com/numpy/numpy
 [duckdb]: https://github.com/duckdb/duckdb
+[NumPy]: https://github.com/numpy/numpy
 [Tornado]: https://github.com/tornadoweb/tornado
 [NCNN]: https://github.com/Tencent/ncnn
 [Matplotlib]: https://github.com/matplotlib/matplotlib
@@ -240,12 +240,24 @@ note to self, when doing final release, change to docs URLs in this section to t
 If you've used previous versions of the beta:
 - ⚠️ Previous betas of v3.0 changed the working directory for tests. This has been rolled back to the v2.x behaviour, so you might need to change configs if you adapted to the beta 1 or 2 behaviour. See [issue #2406](https://github.com/pypa/cibuildwheel/issues/2406) for more information.
 - ⚠️ GraalPy shipped with the identifier `gp242-*` in previous betas, this has been changed to `gp311_242-*` to be consistent with other interpreters, and to fix a bug with GraalPy and project requires-python detection. If you were using GraalPy, you might need to update your config to use the new identifier.
+- ⚠️ `test-sources` now uses `project` directory instead of the `package` directory (matching the docs).
+
+#### v3.0.0b5
+
+_3 June 2025_
+
+- ✨ Support multiple commands on iOS, joined by `&&`, like the other platforms. (#2432)
+- ✨ Add `pyodide-prerelease` enable option, with an early build of 0.28 (Python 3.13). (#2431)
+- 🛠 test-sources now uses the `project` directory instead of the `package` directory (matching the docs). (#2437)
+- 🛠 Fixed a bug with GraalPy if vsdevcmd prints an error. Cirrus CI works again. (#2414)
+- 🛠 Use the standard Schema line for the integrated JSONSchema. (#2433)
+- 📚 Use Python 3.14 color output in docs CLI output. (#2407)
 
 #### v3.0.0b4
 
 _29 May 2025_
 
-- 🛠 Dependency updates, including Python 3.14.0b2 (#2371)
+- 🛠 Dependency updates, including Python 3.14.0b2. (#2371)
 - 🛠 Remove the addition of `PYTHONSAFEPATH` to `test-environment`. (#2429)
 - 📚 README table now matches docs and auto-updates. (#2427, #2428)
 
@@ -263,34 +275,7 @@ _25 May 2025_
 - ✨ Adds the [`CIBW_TEST_ENVIRONMENT`](https://cibuildwheel.pypa.io/en/latest/options/#test-environment) option, which allows you to set environment variables for the test command. cibuildwheel now sets `PYTHONSAFEPATH=1` in test environments by default, to avoid picking up package imports from the local directory - we want to test the installed wheel, not the source tree! You can change that, or any other environment variable in the test environment using this option. (#2388)
 - ✨ Improves support for Pyodide builds and adds the [`CIBW_PYODIDE_VERSION`](https://cibuildwheel.pypa.io/en/latest/options/#pyodide-version) option, which allows you to specify the version of Pyodide to use for builds. (#2002)
 
-#### v3.0.0b1
-
-_19 May 2025_
-
-- 🌟 Adds the ability to [build wheels for iOS](https://cibuildwheel.pypa.io/en/latest/platforms/#ios)! Set the [`platform` option](https://cibuildwheel.pypa.io/en/latest/options/#platform) to `ios` on a Mac with the iOS toolchain to try it out!
-- 🌟 Adds support for the GraalPy interpreter! Enable for your project using the [`enable` option](https://cibuildwheel.pypa.io/en/latest/options/#enable). (#1538)
-- ✨ Adds CPython 3.14 support, under the [`enable` option](https://cibuildwheel.pypa.io/en/latest/options/#enable) `cpython-prerelease`. This version of cibuildwheel uses 3.14.0b1.
-
-    _While CPython is in beta, the ABI can change, so your wheels might not be compatible with the final release. For this reason, we don't recommend distributing wheels until RC1, at which point 3.14 will be available in cibuildwheel without the flag._ (#2390)
-- ✨ Adds the [test-sources option](https://cibuildwheel.pypa.io/en/latest/options/#test-sources), and changes the working directory for tests.
-
-    - If this option is set, cibuildwheel will copy the files and folders specified in `test-sources` into a temporary directory, and run the tests from there. This is required for iOS builds, but also useful for other platforms, as it allows you to test the installed wheel without any chance of accidentally importing from the source tree.
-    - ~If this option is not set, cibuildwheel will run the tests in the source tree. This is a change from the previous behavior, where cibuildwheel would run the tests from a temporary directory. We're still investigating what's best here, so if you encounter any issues with this, please let us know in [issue #2406](https://github.com/pypa/cibuildwheel/issues/2406).~
-    - If this option is not set, behaviour matches v2.x - cibuildwheel will run the tests from a temporary directory, and you can use the `{project}` placeholder in the `test-command` to refer to the project directory.
-
-- ✨ Added´ `dependency-versions` inline syntax (#2123)
-- 🛠 The default [manylinux image](https://cibuildwheel.pypa.io/en/latest/options/#linux-image) has changed from `manylinux2014` to `manylinux_2_28` (#2330)
-- 🛠 Invokes `build` rather than `pip wheel` to build wheels by default. You can control this via the [`build-frontend`](https://cibuildwheel.pypa.io/en/latest/options/#build-frontend) option. You might notice that you can see your build log output now! (#2321)
-- 🛠 Removed the `CIBW_PRERELEASE_PYTHONS` and `CIBW_FREE_THREADED_SUPPORT` options - these have been folded into the [`enable`](https://cibuildwheel.pypa.io/en/latest/options/#enable) option instead. (#2095)
-- 🛠 EOL images `manylinux1`, `manylinux2010`, `manylinux_2_24` and `musllinux_1_1` can no longer be specified by their shortname. The full OCI name can still be used for these images, if you wish (#2316)
-- 🛠 Build environments no longer have setuptools and wheel preinstalled. (#2329)
-- ⚠️ Dropped support for building Python 3.6 and 3.7 wheels. If you need to build wheels for these versions, use cibuildwheel v2.23.3 or earlier. (#2282)
-- ⚠️ The minimum Python version required to run cibuildwheel is now Python 3.11. You can still build wheels for Python 3.8 and newer. (#1912)
-- ⚠️ PyPy wheels no longer built by default, due to a change to our options system. To continue building PyPy wheels, you'll now need to set the [`enable` option](https://cibuildwheel.pypa.io/en/latest/options/#enable) to `pypy` or `pypy-eol`. (#2095)
-- ⚠️ Dropped official support for Appveyor. If it was working for you before, it will probably continue to do so, but we can't be sure, because our CI doesn't run there anymore. (#2386)
-- 📚 A reorganisation of the docs, and numerous updates (#2280)
-
-<!-- [[[end]]] (checksum: b231dd6d65d5003b403f91d925140069) -->
+<!-- [[[end]]] (checksum: c95d170eee4d70055d927723c033426a) -->
 
 ---
 

bin/generate_schema.py

@@ -33,11 +33,13 @@
     description: How to inherit the parent's value.
   enable:
     enum:
+      - cpython-experimental-riscv64
       - cpython-freethreading
       - cpython-prerelease
+      - graalpy
+      - pyodide-prerelease
       - pypy
       - pypy-eol
-      - cpython-experimental-riscv64
   description: A Python version or flavor to enable.
 additionalProperties: false
 description: cibuildwheel's settings.

bin/projects.py

@@ -135,6 +135,7 @@ def fetch_icon(icon_name: str) -> None:
 
     document = xml.dom.minidom.parseString(original_svg_data)
     svgElement = document.documentElement
+    assert svgElement is not None
     assert svgElement.nodeName == "svg"
     svgElement.setAttribute("width", "16px")
     svgElement.setAttribute("fill", "#606060")

cibuildwheel/__init__.py

@@ -1 +1 @@
-__version__ = "3.0.0b4"
+__version__ = "3.0.0b5"

cibuildwheel/platforms/ios.py

@@ -24,7 +24,7 @@
 from ..options import Options
 from ..selector import BuildSelector
 from ..util import resources
-from ..util.cmd import call, shell
+from ..util.cmd import call, shell, split_command
 from ..util.file import (
     CIBW_CACHE_PATH,
     copy_test_sources,
@@ -564,7 +564,7 @@ def build(options: Options, tmp_path: Path) -> None:
                     if build_options.test_sources:
                         copy_test_sources(
                             build_options.test_sources,
-                            build_options.package_dir,
+                            Path.cwd(),
                             testbed_app_path,
                         )
                     else:
@@ -617,62 +617,58 @@ def build(options: Options, tmp_path: Path) -> None:
                         )
                         raise errors.FatalError(msg)
 
-                    test_command_parts = shlex.split(build_options.test_command)
-                    if test_command_parts[0:2] != ["python", "-m"]:
-                        first_part = test_command_parts[0]
-                        if first_part == "pytest":
-                            # pytest works exactly the same as a module, so we
-                            # can just run it as a module.
-                            log.warning(
-                                unwrap_preserving_paragraphs(f"""
-                                    iOS tests configured with a test command which doesn't start
-                                    with 'python -m'. iOS tests must execute python modules - other
-                                    entrypoints are not supported.
-
-                                    cibuildwheel will try to execute it as if it started with
-                                    'python -m'. If this works, all you need to do is add that to
-                                    your test command.
-
-                                    Test command: {build_options.test_command!r}
-                                """)
-                            )
-                        else:
-                            msg = unwrap_preserving_paragraphs(
-                                f"""
-                                    iOS tests configured with a test command which doesn't start
-                                    with 'python -m'. iOS tests must execute python modules - other
-                                    entrypoints are not supported.
-
-                                    Test command: {build_options.test_command!r}
-                                """
-                            )
-                            raise errors.FatalError(msg)
-                    else:
-                        # the testbed run command actually doesn't want the
-                        # python -m prefix - it's implicit, so we remove it
-                        # here.
-                        test_command_parts = test_command_parts[2:]
-
+                    test_command_list = shlex.split(build_options.test_command)
                     try:
-                        call(
-                            "python",
-                            testbed_path,
-                            "run",
-                            *(["--verbose"] if build_options.build_verbosity > 0 else []),
-                            "--",
-                            *test_command_parts,
-                            env=test_env,
-                        )
-                        failed = False
+                        for test_command_parts in split_command(test_command_list):
+                            match test_command_parts:
+                                case ["python", "-m", *rest]:
+                                    final_command = rest
+                                case ["pytest", *rest]:
+                                    # pytest works exactly the same as a module, so we
+                                    # can just run it as a module.
+                                    msg = unwrap_preserving_paragraphs(f"""
+                                        iOS tests configured with a test command which doesn't start
+                                        with 'python -m'. iOS tests must execute python modules - other
+                                        entrypoints are not supported.
+
+                                        cibuildwheel will try to execute it as if it started with
+                                        'python -m'. If this works, all you need to do is add that to
+                                        your test command.
+
+                                        Test command: {build_options.test_command!r}
+                                    """)
+                                    log.warning(msg)
+                                    final_command = ["pytest", *rest]
+                                case _:
+                                    msg = unwrap_preserving_paragraphs(
+                                        f"""
+                                            iOS tests configured with a test command which doesn't start
+                                            with 'python -m'. iOS tests must execute python modules - other
+                                            entrypoints are not supported.
+
+                                            Test command: {build_options.test_command!r}
+                                        """
+                                    )
+                                    raise errors.FatalError(msg)
+
+                            call(
+                                "python",
+                                testbed_path,
+                                "run",
+                                *(["--verbose"] if build_options.build_verbosity > 0 else []),
+                                "--",
+                                *final_command,
+                                env=test_env,
+                            )
                     except subprocess.CalledProcessError:
-                        failed = True
-
-                    log.step_end(success=not failed)
-
-                    if failed:
+                        # catches the first test command failure in the loop,
+                        # implementing short-circuiting
+                        log.step_end(success=False)
                         log.error(f"Test suite failed on {config.identifier}")
                         sys.exit(1)
 
+                    log.step_end()
+
             # We're all done here; move it to output (overwrite existing)
             if compatible_wheel is None:
                 output_wheel = build_options.output_dir.joinpath(built_wheel.name)

cibuildwheel/platforms/linux.py

@@ -403,7 +403,7 @@ def build_in_container(
             if build_options.test_sources:
                 copy_test_sources(
                     build_options.test_sources,
-                    build_options.package_dir,
+                    Path.cwd(),
                     test_cwd,
                     copy_into=container.copy_into,
                 )

cibuildwheel/platforms/macos.py

@@ -712,7 +712,7 @@ def build(options: Options, tmp_path: Path) -> None:
                             test_cwd.mkdir()
                             copy_test_sources(
                                 build_options.test_sources,
-                                build_options.package_dir,
+                                Path.cwd(),
                                 test_cwd,
                             )
                     else: