Merge branch 'main' into travis-ci-debugging

Author: joerick

.github/workflows/test.yml

@@ -83,7 +83,7 @@ jobs:
           CIBW_ENABLE=all
         else
           # get the default CIBW_ENABLE value from the test module
-          CIBW_ENABLE=$(uv run --no-sync python -c 'import sys, test.conftest as c; sys.stdout.write(c.DEFAULT_CIBW_ENABLE)')
+          CIBW_ENABLE=$(uv run --no-sync python -c 'import sys, test.utils as c; sys.stdout.write(c.DEFAULT_CIBW_ENABLE)')
 
           # if this is a PR, check for labels
           if [[ -n "$GITHUB_PR_LABEL_CI_PYPY" ]]; then

README.md

@@ -58,7 +58,7 @@ Usage
 
 |                 | Linux | macOS | Windows | Linux ARM | macOS ARM | Windows ARM | iOS |
 |-----------------|-------|-------|---------|-----------|-----------|-------------|-----|
-| GitHub Actions  | ✅    | ✅    | ✅       | ✅        | ✅        | ✅²         | ✅³  |
+| GitHub Actions  | ✅    | ✅    | ✅       | ✅        | ✅        | ✅          | ✅³  |
 | Azure Pipelines | ✅    | ✅    | ✅       |           | ✅        | ✅²         | ✅³  |
 | Travis CI       | ✅    |       | ✅      | ✅        |           |             |     |
 | CircleCI        | ✅    | ✅    |         | ✅        | ✅        |             | ✅³  |
@@ -97,7 +97,7 @@ jobs:
       - uses: actions/setup-python@v5
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.23.3
+        run: python -m pip install cibuildwheel==3.0.0b1
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
@@ -217,6 +217,29 @@ Changelog
 
 <!-- this section was generated by bin/update_readme_changelog.py -- do not edit manually -->
 
+### v3.0.0
+
+Not yet released, but available for testing.
+
+Note - when using a beta version, be sure to check the [latest docs](https://cibuildwheel.pypa.io/en/latest/), rather than the stable version, which is still on v2.X.
+
+#### 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). \[discussion about the test cwd change and how to use to come!\]
+- ✨ Added `dependency-versions` inline syntax (#2123)
+- 🛠 EOL manylinux options can no longer be specified by their shortname. Full OCI URL can still be used for these images, if you wish (#2316)
+- 🛠 Build environments no longer have setuptools and wheel preinstalled. (#2329)
+- ⚠️ 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`.
+- ⚠️ 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)
+
 ### v2.23.3
 
 _26 April 2025_
@@ -229,6 +252,7 @@ _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)
+-
 
 ### v2.23.1
 
@@ -237,33 +261,6 @@ _15 March 2025_
 - ⚠️ Added warnings when the shorthand values `manylinux1`, `manylinux2010`, `manylinux_2_24`, and `musllinux_1_1` are used to specify the images in linux builds. The shorthand to these (unmaintainted) images will be removed in v3.0. If you want to keep using these images, explicitly opt-in using the full image URL, which can be found in [this file](https://github.com/pypa/cibuildwheel/blob/v2.23.1/cibuildwheel/resources/pinned_docker_images.cfg). (#2312)
 - 🛠 Dependency updates, including a manylinux update which fixes an [issue with rustup](https://github.com/pypa/cibuildwheel/issues/2303). (#2315)
 
-### v2.23.0
-
-_1 March 2025_
-
-- ✨ Adds official support for the new GitHub Actions Arm runners. In fact these worked out-of-the-box, now we include them in our tests and example configs. (#2135 via #2281)
-- ✨ Adds support for building PyPy 3.11 wheels (#2268 via #2281)
-- 🛠 Adopts the beta pypa/manylinux image for armv7l builds (#2269 via #2281)
-- 🛠 Dependency updates, including Pyodide 0.27 (#2117 and #2281)
-
-### v2.22.0
-
-_23 November 2024_
-
-- 🌟 Added a new `CIBW_ENABLE`/`enable` feature that replaces `CIBW_FREETHREADED_SUPPORT`/`free-threaded-support` and `CIBW_PRERELEASE_PYTHONS` with a system that supports both. In cibuildwheel 3, this will also include a PyPy setting and the deprecated options will be removed. (#2048)
-- 🌟 [Dependency groups](https://peps.python.org/pep-0735/) are now supported for tests. Use `CIBW_TEST_GROUPS`/`test-groups` to specify groups in `[dependency-groups]` for testing. (#2063)
-- 🌟 Support for the experimental Ubuntu-based ARMv7l manylinux image (#2052)
-- ✨ Show a warning when cibuildwheel is run from Python 3.10 or older; cibuildwheel 3.0 will require Python 3.11 or newer as host (#2050)
-- 🐛 Fix issue with stderr interfering with checking the docker version (#2074)
-- 🛠 Python 3.9 is now used in `CIBW_BEFORE_ALL`/`before-all` on linux, replacing 3.8, which is now EoL (#2043)
-- 🛠 Error messages for producing a pure-Python wheel are slightly more informative (#2044)
-- 🛠 Better error when `uname -m` fails on ARM (#2049)
-- 🛠 Better error when repair fails and docs for abi3audit on Windows (#2058)
-- 🛠 Better error when `manylinux-interpreters ensure` fails (#2066)
-- 🛠 Update Pyodide to 0.26.4, and adapt to the unbundled pyodide-build (now 0.29) (#2090)
-- 🛠 Now cibuildwheel uses dependency-groups for development dependencies (#2064, #2085)
-- 📚 Docs updates and tidy ups (#2061, #2067, #2072)
-
 <!-- END bin/update_readme_changelog.py -->
 
 ---

bin/bump_version.py

@@ -22,8 +22,6 @@
     ("cibuildwheel/__init__.py", '__version__ = "{}"'),
     ("docs/faq.md", "cibuildwheel=={}"),
     ("docs/faq.md", "cibuildwheel@v{}"),
-    ("docs/setup.md", "cibuildwheel=={}"),
-    ("docs/ci-services.md", "cibuildwheel=={}"),
     ("examples/*", "cibuildwheel=={}"),
     ("examples/*", "cibuildwheel@v{}"),
 ]

bin/generate_schema.py

@@ -36,6 +36,7 @@
       - cpython-freethreading
       - cpython-prerelease
       - pypy
+      - pypy-eol
       - cpython-experimental-riscv64
   description: A Python version or flavor to enable.
 additionalProperties: false

cibuildwheel/__init__.py

@@ -1 +1 @@
-__version__ = "2.23.3"
+__version__ = "3.0.0b1"

cibuildwheel/platforms/ios.py

@@ -32,7 +32,7 @@
     download,
     move_file,
 )
-from ..util.helpers import prepare_command
+from ..util.helpers import prepare_command, unwrap_preserving_paragraphs
 from ..util.packaging import (
     combine_constraints,
     find_compatible_wheel,
@@ -593,14 +593,51 @@ def build(options: Options, tmp_path: Path) -> None:
                     )
 
                     log.step("Running test suite...")
+
+                    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:]
+
                     try:
                         call(
                             "python",
                             testbed_path,
                             "run",
                             *(["--verbose"] if build_options.build_verbosity > 0 else []),
                             "--",
-                            *(shlex.split(build_options.test_command)),
+                            *test_command_parts,
                             env=build_env,
                         )
                         failed = False

cibuildwheel/resources/cibuildwheel.schema.json

@@ -16,6 +16,7 @@
         "cpython-freethreading",
         "cpython-prerelease",
         "pypy",
+        "pypy-eol",
         "cpython-experimental-riscv64"
       ]
     },

cibuildwheel/resources/constraints-pyodide312.txt

@@ -89,7 +89,7 @@ shellingham==1.5.4
     # via typer
 sniffio==1.3.1
     # via anyio
-typer==0.15.3
+typer==0.15.4
     # via
     #   auditwheel-emscripten
     #   pyodide-build

cibuildwheel/resources/nodejs.toml

@@ -1,3 +1,3 @@
 url = "https://nodejs.org/dist/"
-v22 = "v22.15.0"
-v20 = "v20.19.1"
+v22 = "v22.15.1"
+v20 = "v20.19.2"

cibuildwheel/resources/pinned_docker_images.cfg

@@ -1,47 +1,47 @@
 [x86_64]
-manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.10-2
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.10-2
-manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.10-2
-musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.05.10-2
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.16-1
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.16-1
+manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.16-1
+musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.05.16-1
 
 [i686]
-manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.10-2
-musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.05.10-2
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.16-1
+musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.05.16-1
 
 [aarch64]
-manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.10-2
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.10-2
-manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.10-2
-musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.05.10-2
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.16-1
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.16-1
+manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.16-1
+musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.05.16-1
 
 [ppc64le]
-manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.05.10-2
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.05.10-2
-manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.05.10-2
-musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.05.10-2
+manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.05.16-1
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.05.16-1
+manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.05.16-1
+musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.05.16-1
 
 [s390x]
-manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.05.10-2
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.05.10-2
-manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.05.10-2
-musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.05.10-2
+manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.05.16-1
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.05.16-1
+manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.05.16-1
+musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.05.16-1
 
 [pypy_x86_64]
-manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.10-2
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.10-2
-manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.10-2
+manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.16-1
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.16-1
+manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.16-1
 
 [pypy_i686]
-manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.10-2
+manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.16-1
 
 [pypy_aarch64]
-manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.10-2
-manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.10-2
-manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.10-2
+manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.16-1
+manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.16-1
+manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.16-1
 
 [armv7l]
-manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.05.10-2
-musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.05.10-2
+manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.05.16-1
+musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.05.16-1
 
 [riscv64]
 

cibuildwheel/selector.py

@@ -32,6 +32,7 @@ class EnableGroup(StrEnum):
     CPythonFreeThreading = "cpython-freethreading"
     CPythonPrerelease = "cpython-prerelease"
     PyPy = "pypy"
+    PyPyEoL = "pypy-eol"
     CPythonExperimentalRiscV64 = "cpython-experimental-riscv64"
     GraalPy = "graalpy"
 
@@ -87,7 +88,9 @@ def __call__(self, build_id: str) -> bool:
             return False
         if EnableGroup.CPythonPrerelease not in self.enable and fnmatch(build_id, "cp314*"):
             return False
-        if EnableGroup.PyPy not in self.enable and fnmatch(build_id, "pp*"):
+        if EnableGroup.PyPy not in self.enable and fnmatch(build_id, "pp31*"):
+            return False
+        if EnableGroup.PyPyEoL not in self.enable and fnmatch(build_id, "pp3?-*"):
             return False
         if EnableGroup.CPythonExperimentalRiscV64 not in self.enable and fnmatch(
             build_id, "*_riscv64"

cibuildwheel/util/helpers.py

@@ -76,6 +76,21 @@ def unwrap(text: str) -> str:
     return re.sub(r"\s+", " ", text)
 
 
+def unwrap_preserving_paragraphs(text: str) -> str:
+    """
+    Unwraps multi-line text to a single line, but preserves paragraphs
+    """
+    # remove initial line indent
+    text = textwrap.dedent(text)
+    # remove leading/trailing whitespace
+    text = text.strip()
+
+    paragraphs = text.split("\n\n")
+    # remove consecutive whitespace
+    paragraphs = [re.sub(r"\s+", " ", paragraph) for paragraph in paragraphs]
+    return "\n\n".join(paragraphs)
+
+
 def parse_key_value_string(
     key_value_string: str,
     positional_arg_names: Sequence[str] | None = None,

docs/changelog.md

@@ -4,6 +4,29 @@ title: Changelog
 
 # Changelog
 
+### v3.0.0
+
+Not yet released, but available for testing.
+
+Note - when using a beta version, be sure to check the [latest docs](https://cibuildwheel.pypa.io/en/latest/), rather than the stable version, which is still on v2.X.
+
+#### 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). \[discussion about the test cwd change and how to use to come!\]
+- ✨ Added `dependency-versions` inline syntax (#2123)
+- 🛠 EOL manylinux options can no longer be specified by their shortname. Full OCI URL can still be used for these images, if you wish (#2316)
+- 🛠 Build environments no longer have setuptools and wheel preinstalled. (#2329)
+- ⚠️ 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`.
+- ⚠️ 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)
+
 ### v2.23.3
 
 _26 April 2025_
@@ -16,6 +39,7 @@ _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)
+-
 
 ### v2.23.1
 

docs/contributing.md

@@ -78,11 +78,11 @@ nox -s tests -- test -k before_build
 
 A few notes-
 
-- Because they run inside a container, Linux tests can run on all platforms where Docker is installed, so they're convenient for running integration tests locally. Set CIBW_PLATFORM to do this: `CIBW_PLATFORM=linux nox -s tests -- test`.
+- Because they run inside a container, Linux tests can run on all platforms where Docker is installed, so they're convenient for running integration tests locally. Set the `--platform` flag on pytest to do this: `nox -s tests -- test --platform linux`.
 
 - Running the macOS integration tests requires _system installs_ of Python from python.org for all the versions that are tested. We won't attempt to install these when running locally, but you can do so manually using the URL in the error message that is printed when the install is not found.
 
-- The 'enable groups' run by default are just 'cpython-prerelease' and 'cpython-freethreading'. You can add other groups like pypy or graalpy by setting the [CIBW_ENABLE](options.md#enable) environment variable. On GitHub PRs, you can add a label to the PR to enable these groups.
+- The ['enable groups'](options.md#enable) run by default are just 'cpython-prerelease' and 'cpython-freethreading'. You can add other groups like pypy or graalpy by passing the `--enable` argument to pytest, i.e. `nox -s tests -- test --enable pypy`. On GitHub PRs, you can add a label to the PR to enable these groups.
 
 #### Running pytest directly