Merge branch 'main' into enable-legacy-removal

Author: mayeut

.github/workflows/release.yml

@@ -33,7 +33,7 @@ jobs:
         path: dist
 
     - name: Generate artifact attestation for sdist and wheel
-      uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # v1.4.4
+      uses: actions/attest-build-provenance@7668571508540a607bdfd90a87a560489fe372eb # v2.1.0
       with:
         subject-path: "dist/cibuildwheel-*"
 

.github/workflows/test.yml

@@ -51,7 +51,7 @@ jobs:
         python-version: ${{ matrix.python_version }}
         allow-prereleases: true
 
-    - uses: astral-sh/setup-uv@v4
+    - uses: astral-sh/setup-uv@v5
 
     # free some space to prevent reaching GHA disk space limits
     - name: Clean docker images
@@ -136,7 +136,7 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: "3.x"
-    - uses: astral-sh/setup-uv@v4
+    - uses: astral-sh/setup-uv@v5
     - name: Install dependencies
       run: uv sync --no-dev --group test
     - name: Get qemu emulated architectures
@@ -159,7 +159,7 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: "3.x"
-    - uses: astral-sh/setup-uv@v4
+    - uses: astral-sh/setup-uv@v5
     - name: Install dependencies
       run: uv sync --no-dev --group test
 
@@ -180,7 +180,7 @@ jobs:
       name: Install Python 3.12
       with:
         python-version: '3.12'
-    - uses: astral-sh/setup-uv@v4
+    - uses: astral-sh/setup-uv@v5
 
     - name: Install dependencies
       run: uv sync --no-dev --group test

.github/workflows/update-dependencies.yml

@@ -33,8 +33,6 @@ jobs:
     - uses: actions/checkout@v4
 
     - uses: wntrblm/[email protected]
-      with:
-        python-versions: "3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13"
 
     - name: "Run update: dependencies"
       run: nox --force-color -s update_constraints

.pre-commit-config.yaml

@@ -14,14 +14,14 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.8.4
+  rev: v0.8.6
   hooks:
   - id: ruff
     args: ["--fix", "--show-fixes"]
   - id: ruff-format
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.14.0
+  rev: v1.14.1
   hooks:
   - id: mypy
     name: mypy 3.11 on cibuildwheel/

README.md

@@ -143,6 +143,7 @@ Options
 |   | [`CIBW_DEPENDENCY_VERSIONS`](https://cibuildwheel.pypa.io/en/stable/options/#dependency-versions)  | Specify how cibuildwheel controls the versions of the tools it uses |
 | **Testing** | [`CIBW_TEST_COMMAND`](https://cibuildwheel.pypa.io/en/stable/options/#test-command)  | Execute a shell command to test each built wheel |
 |   | [`CIBW_BEFORE_TEST`](https://cibuildwheel.pypa.io/en/stable/options/#before-test)  | Execute a shell command before testing each wheel |
+|   | [`CIBW_TEST_SOURCES`](https://cibuildwheel.pypa.io/en/stable/options/#test-sources)  | Files and folders from the source tree that are copied into an isolated tree before running the tests |
 |   | [`CIBW_TEST_REQUIRES`](https://cibuildwheel.pypa.io/en/stable/options/#test-requires)  | Install Python dependencies before running the tests |
 |   | [`CIBW_TEST_EXTRAS`](https://cibuildwheel.pypa.io/en/stable/options/#test-extras)  | Install your wheel for testing using extras_require |
 |   | [`CIBW_TEST_SKIP`](https://cibuildwheel.pypa.io/en/stable/options/#test-skip)  | Skip running tests on some builds |

cibuildwheel/linux.py

@@ -21,12 +21,12 @@
 from .util import (
     BuildFrontendConfig,
     BuildSelector,
+    copy_test_sources,
     find_compatible_wheel,
     get_build_verbosity_extra_flags,
     prepare_command,
     read_python_configs,
     split_config_settings,
-    test_fail_cwd_file,
     unwrap,
 )
 
@@ -401,9 +401,19 @@ def build_in_container(
                 package=container_package_dir,
                 wheel=wheel_to_test,
             )
-            test_cwd = testing_temp_dir / "test_cwd"
-            container.call(["mkdir", "-p", test_cwd])
-            container.copy_into(test_fail_cwd_file, test_cwd / "test_fail.py")
+
+            if build_options.test_sources:
+                test_cwd = testing_temp_dir / "test_cwd"
+                container.call(["mkdir", "-p", test_cwd])
+                copy_test_sources(
+                    build_options.test_sources,
+                    build_options.package_dir,
+                    test_cwd,
+                    copy_into=container.copy_into,
+                )
+            else:
+                # There are no test sources. Run the tests in the project directory.
+                test_cwd = PurePosixPath(container_project_path)
 
             container.call(["sh", "-c", test_command_prepared], cwd=test_cwd, env=virtualenv_env)
 

cibuildwheel/macos.py

@@ -30,6 +30,7 @@
     BuildSelector,
     call,
     combine_constraints,
+    copy_test_sources,
     detect_ci_provider,
     download,
     find_compatible_wheel,
@@ -43,7 +44,6 @@
     read_python_configs,
     shell,
     split_config_settings,
-    test_fail_cwd_file,
     unwrap,
     virtualenv,
 )
@@ -138,7 +138,7 @@ def get_python_configurations(
     return python_configurations
 
 
-def install_cpython(tmp: Path, version: str, url: str, free_threading: bool) -> Path:
+def install_cpython(_tmp: Path, version: str, url: str, free_threading: bool) -> Path:
     ft = "T" if free_threading else ""
     installation_path = Path(f"/Library/Frameworks/Python{ft}.framework/Versions/{version}")
     with FileLock(CIBW_CACHE_PATH / f"cpython{version}.lock"):
@@ -160,10 +160,10 @@ def install_cpython(tmp: Path, version: str, url: str, free_threading: bool) ->
                     """
                 )
                 raise errors.FatalError(msg)
-            pkg_path = tmp / "Python.pkg"
-            # download the pkg
-            download(url, pkg_path)
-            # install
+            python_filename = url.split("/")[-1]
+            pkg_path = CIBW_CACHE_PATH / "cpython-installer" / python_filename
+            if not pkg_path.exists():
+                download(url, pkg_path)
             args = []
             if version.startswith("3.13"):
                 # Python 3.13 is the first version to have a free-threading option
@@ -735,9 +735,17 @@ def build(options: Options, tmp_path: Path) -> None:
                         wheel=repaired_wheel,
                     )
 
-                    test_cwd = identifier_tmp_dir / "test_cwd"
-                    test_cwd.mkdir(exist_ok=True)
-                    (test_cwd / "test_fail.py").write_text(test_fail_cwd_file.read_text())
+                    if build_options.test_sources:
+                        test_cwd = identifier_tmp_dir / "test_cwd"
+                        test_cwd.mkdir(exist_ok=True)
+                        copy_test_sources(
+                            build_options.test_sources,
+                            build_options.package_dir,
+                            test_cwd,
+                        )
+                    else:
+                        # There are no test sources. Run the tests in the project directory.
+                        test_cwd = Path(".").resolve()
 
                     shell_with_arch(test_command_prepared, cwd=test_cwd, env=virtualenv_env)
 

cibuildwheel/options.py

@@ -10,7 +10,7 @@
 import shlex
 import textwrap
 import tomllib
-from collections.abc import Generator, Iterable, Mapping, Sequence, Set
+from collections.abc import Callable, Generator, Iterable, Mapping, Sequence, Set
 from pathlib import Path
 from typing import Any, Literal, assert_never
 
@@ -90,6 +90,7 @@ class BuildOptions:
     dependency_constraints: DependencyConstraints | None
     test_command: str | None
     before_test: str | None
+    test_sources: list[str]
     test_requires: list[str]
     test_extras: str
     test_groups: list[str]
@@ -169,11 +170,12 @@ class ListFormat(OptionFormat):
     A format that joins lists with a separator.
     """
 
-    def __init__(self, sep: str) -> None:
+    def __init__(self, sep: str, quote: Callable[[str], str] | None = None) -> None:
         self.sep = sep
+        self.quote = quote if quote else lambda s: s
 
     def format_list(self, value: SettingList) -> str:
-        return self.sep.join(str(v) for v in value)
+        return self.sep.join(self.quote(str(v)) for v in value)
 
     def merge_values(self, before: str, after: str) -> str:
         return f"{before}{self.sep}{after}"
@@ -680,6 +682,11 @@ def build_options(self, identifier: str | None) -> BuildOptions:
             dependency_versions = self.reader.get("dependency-versions")
             test_command = self.reader.get("test-command", option_format=ListFormat(sep=" && "))
             before_test = self.reader.get("before-test", option_format=ListFormat(sep=" && "))
+            test_sources = shlex.split(
+                self.reader.get(
+                    "test-sources", option_format=ListFormat(sep=" ", quote=shlex.quote)
+                )
+            )
             test_requires = self.reader.get(
                 "test-requires", option_format=ListFormat(sep=" ")
             ).split()
@@ -788,6 +795,7 @@ def build_options(self, identifier: str | None) -> BuildOptions:
             return BuildOptions(
                 globals=self.globals,
                 test_command=test_command,
+                test_sources=test_sources,
                 test_requires=[*test_requires, *test_requirements_from_groups],
                 test_extras=test_extras,
                 test_groups=test_groups,

cibuildwheel/pyodide.py

@@ -21,6 +21,7 @@
     BuildSelector,
     call,
     combine_constraints,
+    copy_test_sources,
     download,
     ensure_node,
     extract_zip,
@@ -31,7 +32,6 @@
     read_python_configs,
     shell,
     split_config_settings,
-    test_fail_cwd_file,
     virtualenv,
 )
 
@@ -387,9 +387,17 @@ def build(options: Options, tmp_path: Path) -> None:
                     package=build_options.package_dir.resolve(),
                 )
 
-                test_cwd = identifier_tmp_dir / "test_cwd"
-                test_cwd.mkdir(exist_ok=True)
-                (test_cwd / "test_fail.py").write_text(test_fail_cwd_file.read_text())
+                if build_options.test_sources:
+                    test_cwd = identifier_tmp_dir / "test_cwd"
+                    test_cwd.mkdir(exist_ok=True)
+                    copy_test_sources(
+                        build_options.test_sources,
+                        build_options.package_dir,
+                        test_cwd,
+                    )
+                else:
+                    # There are no test sources. Run the tests in the project directory.
+                    test_cwd = Path(".").resolve()
 
                 shell(test_command_prepared, cwd=test_cwd, env=virtualenv_env)
 

cibuildwheel/resources/build-platforms.toml

@@ -138,15 +138,15 @@ python_configurations = [
   { identifier = "cp311-macosx_x86_64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.9/python-3.11.9-macos11.pkg" },
   { identifier = "cp311-macosx_arm64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.9/python-3.11.9-macos11.pkg" },
   { identifier = "cp311-macosx_universal2", version = "3.11", url = "https://www.python.org/ftp/python/3.11.9/python-3.11.9-macos11.pkg" },
-  { identifier = "cp312-macosx_x86_64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.7/python-3.12.7-macos11.pkg" },
-  { identifier = "cp312-macosx_arm64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.7/python-3.12.7-macos11.pkg" },
-  { identifier = "cp312-macosx_universal2", version = "3.12", url = "https://www.python.org/ftp/python/3.12.7/python-3.12.7-macos11.pkg" },
-  { identifier = "cp313-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0-macos11.pkg" },
-  { identifier = "cp313-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0-macos11.pkg" },
-  { identifier = "cp313-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0-macos11.pkg" },
-  { identifier = "cp313t-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0-macos11.pkg" },
-  { identifier = "cp313t-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0-macos11.pkg" },
-  { identifier = "cp313t-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0-macos11.pkg" },
+  { identifier = "cp312-macosx_x86_64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.8/python-3.12.8-macos11.pkg" },
+  { identifier = "cp312-macosx_arm64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.8/python-3.12.8-macos11.pkg" },
+  { identifier = "cp312-macosx_universal2", version = "3.12", url = "https://www.python.org/ftp/python/3.12.8/python-3.12.8-macos11.pkg" },
+  { identifier = "cp313-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.1/python-3.13.1-macos11.pkg" },
+  { identifier = "cp313-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.1/python-3.13.1-macos11.pkg" },
+  { identifier = "cp313-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.1/python-3.13.1-macos11.pkg" },
+  { identifier = "cp313t-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.1/python-3.13.1-macos11.pkg" },
+  { identifier = "cp313t-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.1/python-3.13.1-macos11.pkg" },
+  { identifier = "cp313t-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.1/python-3.13.1-macos11.pkg" },
   { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.9-osx64.tar.bz2" },
   { identifier = "pp38-macosx_x86_64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.11-macos_x86_64.tar.bz2" },
   { identifier = "pp38-macosx_arm64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.11-macos_arm64.tar.bz2" },
@@ -170,18 +170,18 @@ python_configurations = [
   { identifier = "cp310-win_amd64", version = "3.10.11", arch = "64" },
   { identifier = "cp311-win32", version = "3.11.9", arch = "32" },
   { identifier = "cp311-win_amd64", version = "3.11.9", arch = "64" },
-  { identifier = "cp312-win32", version = "3.12.7", arch = "32" },
-  { identifier = "cp312-win_amd64", version = "3.12.7", arch = "64" },
-  { identifier = "cp313-win32", version = "3.13.0", arch = "32" },
-  { identifier = "cp313t-win32", version = "3.13.0", arch = "32" },
-  { identifier = "cp313-win_amd64", version = "3.13.0", arch = "64" },
-  { identifier = "cp313t-win_amd64", version = "3.13.0", arch = "64" },
+  { identifier = "cp312-win32", version = "3.12.8", arch = "32" },
+  { identifier = "cp312-win_amd64", version = "3.12.8", arch = "64" },
+  { identifier = "cp313-win32", version = "3.13.1", arch = "32" },
+  { identifier = "cp313t-win32", version = "3.13.1", arch = "32" },
+  { identifier = "cp313-win_amd64", version = "3.13.1", arch = "64" },
+  { identifier = "cp313t-win_amd64", version = "3.13.1", arch = "64" },
   { identifier = "cp39-win_arm64", version = "3.9.10", arch = "ARM64" },
   { identifier = "cp310-win_arm64", version = "3.10.11", arch = "ARM64" },
   { identifier = "cp311-win_arm64", version = "3.11.9", arch = "ARM64" },
-  { identifier = "cp312-win_arm64", version = "3.12.7", arch = "ARM64" },
-  { identifier = "cp313-win_arm64", version = "3.13.0", arch = "ARM64" },
-  { identifier = "cp313t-win_arm64", version = "3.13.0", arch = "ARM64" },
+  { identifier = "cp312-win_arm64", version = "3.12.8", arch = "ARM64" },
+  { identifier = "cp313-win_arm64", version = "3.13.1", arch = "ARM64" },
+  { identifier = "cp313t-win_arm64", version = "3.13.1", arch = "ARM64" },
   { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.9-win64.zip" },
   { identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.11-win64.zip" },
   { identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.16-win64.zip" },
@@ -190,5 +190,5 @@ python_configurations = [
 
 [pyodide]
 python_configurations = [
-  { identifier = "cp312-pyodide_wasm32", version = "3.12", pyodide_version = "0.26.4", pyodide_build_version = "0.29.0", emscripten_version = "3.1.58", node_version = "v20" },
+  { identifier = "cp312-pyodide_wasm32", version = "3.12", pyodide_version = "0.27.0", pyodide_build_version = "0.29.2", emscripten_version = "3.1.58", node_version = "v20" },
 ]