From 697693ae4d4b928e61604840ba3c4a9cc38b0460 Mon Sep 17 00:00:00 2001 From: mayeut Date: Mon, 31 Jan 2022 06:11:14 +0000 Subject: [PATCH 0001/1105] Update dependencies --- .../resources/constraints-python37.txt | 4 +- .../resources/constraints-python38.txt | 4 +- .../resources/constraints-python39.txt | 4 +- cibuildwheel/resources/constraints.txt | 4 +- .../resources/pinned_docker_images.cfg | 54 +++--- docs/working-examples.md | 178 +++++++++--------- 6 files changed, 124 insertions(+), 124 deletions(-) diff --git a/cibuildwheel/resources/constraints-python37.txt b/cibuildwheel/resources/constraints-python37.txt index f1138c100..e013fd33e 100644 --- a/cibuildwheel/resources/constraints-python37.txt +++ b/cibuildwheel/resources/constraints-python37.txt @@ -30,7 +30,7 @@ zipp==3.7.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -pip==21.3.1 +pip==22.0.2 # via -r cibuildwheel/resources/constraints.in -setuptools==60.5.0 +setuptools==60.6.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index 16424d18a..a3ed6094f 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -24,7 +24,7 @@ wheel==0.37.1 # delocate # The following packages are considered to be unsafe in a requirements file: -pip==21.3.1 +pip==22.0.2 # via -r cibuildwheel/resources/constraints.in -setuptools==60.5.0 +setuptools==60.6.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index 70434786b..8cddfea40 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -24,7 +24,7 @@ wheel==0.37.1 # delocate # The following packages are considered to be unsafe in a requirements file: -pip==21.3.1 +pip==22.0.2 # via -r cibuildwheel/resources/constraints.in -setuptools==60.5.0 +setuptools==60.6.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index 70434786b..8cddfea40 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -24,7 +24,7 @@ wheel==0.37.1 # delocate # The following packages are considered to be unsafe in a requirements file: -pip==21.3.1 +pip==22.0.2 # via -r cibuildwheel/resources/constraints.in -setuptools==60.5.0 +setuptools==60.6.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 5970ea43e..2bad7fcd2 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,43 +1,43 @@ [x86_64] -manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-01-22-4072568 -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-01-22-72ab18b -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-01-22-72ab18b -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-01-22-72ab18b -musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-01-22-72ab18b +manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-01-30-700835c +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-01-30-4e8ddf1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-01-30-4e8ddf1 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-01-30-4e8ddf1 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-01-30-4e8ddf1 [i686] -manylinux1 = quay.io/pypa/manylinux1_i686:2022-01-22-4072568 -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-01-22-72ab18b -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-01-22-72ab18b -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-01-22-72ab18b -musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-01-22-72ab18b +manylinux1 = quay.io/pypa/manylinux1_i686:2022-01-30-700835c +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-01-30-4e8ddf1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-01-30-4e8ddf1 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-01-30-4e8ddf1 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-01-30-4e8ddf1 [pypy_x86_64] -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-01-22-72ab18b -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-01-22-72ab18b -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-01-22-72ab18b +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-01-30-4e8ddf1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-01-30-4e8ddf1 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-01-30-4e8ddf1 [pypy_i686] -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-01-22-72ab18b -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-01-22-72ab18b -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-01-22-72ab18b +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-01-30-4e8ddf1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-01-30-4e8ddf1 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-01-30-4e8ddf1 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-01-22-72ab18b -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-01-22-72ab18b -musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-01-22-72ab18b +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-01-30-4e8ddf1 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-01-30-4e8ddf1 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-01-30-4e8ddf1 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-01-22-72ab18b -manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-01-22-72ab18b -musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-01-22-72ab18b +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-01-30-4e8ddf1 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-01-30-4e8ddf1 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-01-30-4e8ddf1 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-01-22-72ab18b -manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-01-22-72ab18b -musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-01-22-72ab18b +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-01-30-4e8ddf1 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-01-30-4e8ddf1 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-01-30-4e8ddf1 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-01-22-72ab18b -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-01-22-72ab18b +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-01-30-4e8ddf1 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-01-30-4e8ddf1 diff --git a/docs/working-examples.md b/docs/working-examples.md index 68a6650b3..0c7546921 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -28,8 +28,8 @@ title: Working examples | [cvxpy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A Python-embedded modeling language for convex optimization problems. | | [Triton][] | ![github icon][] | ![linux icon][] | Self hosted runners | | [PyOxidizer][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A modern Python application packaging and distribution tool | -| [OpenSpiel][] | ![github icon][] | ![apple icon][] ![linux icon][] | OpenSpiel is a collection of environments and algorithms for research in general reinforcement learning and search/planning in games. | | [River][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python | +| [OpenSpiel][] | ![github icon][] | ![apple icon][] ![linux icon][] | OpenSpiel is a collection of environments and algorithms for research in general reinforcement learning and search/planning in games. | | [pyzmq][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython and CFFI. | | [vispy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Main repository for Vispy | | [aiortc][] | ![github icon][] | ![apple icon][] ![linux icon][] | WebRTC and ORTC implementation for Python using asyncio. | @@ -46,8 +46,8 @@ title: Working examples | [PyTables][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data | | [Line Profiler][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Line-by-line profiling for Python | | [OpenTimelineIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Open Source API and interchange format for editorial timeline information. | -| [ruptures][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. | | [pikepdf][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by qpdf | +| [ruptures][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. | | [aioquic][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python | | [DeepForest][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) | | [google neuroglancer][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data | @@ -114,8 +114,8 @@ title: Working examples [cvxpy]: https://github.com/cvxpy/cvxpy [Triton]: https://github.com/openai/triton [PyOxidizer]: https://github.com/indygreg/PyOxidizer -[OpenSpiel]: https://github.com/deepmind/open_spiel [River]: https://github.com/online-ml/river +[OpenSpiel]: https://github.com/deepmind/open_spiel [pyzmq]: https://github.com/zeromq/pyzmq [vispy]: https://github.com/vispy/vispy [aiortc]: https://github.com/aiortc/aiortc @@ -132,8 +132,8 @@ title: Working examples [PyTables]: https://github.com/PyTables/PyTables [Line Profiler]: https://github.com/pyutils/line_profiler [OpenTimelineIO]: https://github.com/PixarAnimationStudios/OpenTimelineIO -[ruptures]: https://github.com/deepcharles/ruptures [pikepdf]: https://github.com/pikepdf/pikepdf +[ruptures]: https://github.com/deepcharles/ruptures [aioquic]: https://github.com/aiortc/aioquic [DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest [google neuroglancer]: https://github.com/google/neuroglancer @@ -190,91 +190,91 @@ title: Working examples [apple icon]: data/readme_icons/apple.svg [linux icon]: data/readme_icons/linux.svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From b52698dad6af15f292cef3e9d2f148969ac730fa Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 4 Feb 2022 16:04:47 -0500 Subject: [PATCH 0002/1105] [pre-commit.ci] pre-commit autoupdate (#1009) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/psf/black: 21.12b0 → 22.1.0](https://github.com/psf/black/compare/21.12b0...22.1.0) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- cibuildwheel/util.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c8279f28c..7793c1d6d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,7 @@ repos: - id: isort - repo: https://github.com/psf/black - rev: 21.12b0 + rev: 22.1.0 hooks: - id: black diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index 516804d27..77af409db 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -141,7 +141,7 @@ def format_safe(template: str, **kwargs: Any) -> str: for key, value in kwargs.items(): find_pattern = re.compile( - fr""" + rf""" (? Date: Fri, 11 Feb 2022 10:17:40 -0500 Subject: [PATCH 0003/1105] fix: include Requires-Python info in printout (#1017) --- .pre-commit-config.yaml | 10 +++++++-- cibuildwheel/util.py | 45 +++++++++++++---------------------------- 2 files changed, 22 insertions(+), 33 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7793c1d6d..9e12a6ee0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -51,8 +51,9 @@ repos: rev: v0.931 hooks: - id: mypy + name: mypy 3.6 on cibuildwheel/ exclude: ^(bin|cibuildwheel/resources|docs)/.*py$ - args: ["--python-version=3.6", "--scripts-are-modules", "--show-error-codes"] + args: ["--python-version=3.6", "--show-error-codes"] additional_dependencies: &mypy-dependencies - nox - packaging>=21.0 @@ -66,10 +67,15 @@ repos: - types-pyyaml - types-requests - bracex + - dataclasses - id: mypy name: mypy 3.7+ on bin/ files: ^((bin|docs)/.*py)$ - args: ["--python-version=3.7", "--scripts-are-modules", "--show-error-codes"] + args: ["--python-version=3.7", "--show-error-codes"] + additional_dependencies: *mypy-dependencies + - id: mypy + name: mypy 3.10 + args: ["--python-version=3.10", "--show-error-codes"] additional_dependencies: *mypy-dependencies - repo: https://github.com/asottile/yesqa diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index 77af409db..c116dc131 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -1,4 +1,5 @@ import contextlib +import dataclasses import fnmatch import itertools import os @@ -16,6 +17,7 @@ from time import sleep from typing import ( Any, + ClassVar, Dict, Iterable, Iterator, @@ -205,6 +207,8 @@ def selector_matches(patterns: str, string: str) -> bool: return any(fnmatch.fnmatch(string, pat) for pat in expanded_patterns) +# Once we require Python 3.10+, we can add kw_only=True +@dataclasses.dataclass class IdentifierSelector: """ This class holds a set of build/skip patterns. You call an instance with a @@ -215,20 +219,12 @@ class IdentifierSelector: """ # a pattern that skips prerelease versions, when include_prereleases is False. - PRERELEASE_SKIP = "" - - def __init__( - self, - *, - build_config: str, - skip_config: str, - requires_python: Optional[SpecifierSet] = None, - prerelease_pythons: bool = False, - ): - self.build_config = build_config - self.skip_config = skip_config - self.requires_python = requires_python - self.prerelease_pythons = prerelease_pythons + PRERELEASE_SKIP: ClassVar[str] = "" + + skip_config: str + build_config: str + requires_python: Optional[SpecifierSet] = None + prerelease_pythons: bool = False def __call__(self, build_id: str) -> bool: # Filter build selectors by python_requires if set @@ -241,9 +237,7 @@ def __call__(self, build_id: str) -> bool: return False # filter out the prerelease pythons if self.prerelease_pythons is False - if not self.prerelease_pythons and selector_matches( - BuildSelector.PRERELEASE_SKIP, build_id - ): + if not self.prerelease_pythons and selector_matches(self.PRERELEASE_SKIP, build_id): return False should_build = selector_matches(self.build_config, build_id) @@ -251,28 +245,17 @@ def __call__(self, build_id: str) -> bool: return should_build and not should_skip - def __repr__(self) -> str: - result = f"{self.__class__.__name__}(build_config={self.build_config!r}" - - if self.skip_config: - result += f", skip_config={self.skip_config!r}" - if self.prerelease_pythons: - result += ", prerelease_pythons=True" - - result += ")" - - return result - +@dataclasses.dataclass class BuildSelector(IdentifierSelector): pass # Note that requires-python is not needed for TestSelector, as you can't test # what you can't build. +@dataclasses.dataclass class TestSelector(IdentifierSelector): - def __init__(self, *, skip_config: str): - super().__init__(build_config="*", skip_config=skip_config) + build_config: str = "*" # Taken from https://stackoverflow.com/a/107717 From 27db8355cd984a078524bd0aca9a7eecc64e0747 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Fri, 11 Feb 2022 22:08:28 +0100 Subject: [PATCH 0004/1105] chore: use `Final` type annotation on every top-level constant (#1010) --- cibuildwheel/architecture.py | 4 ++-- cibuildwheel/logger.py | 7 ++++--- cibuildwheel/util.py | 18 +++++++++--------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/cibuildwheel/architecture.py b/cibuildwheel/architecture.py index 9d39d5533..c6df9e364 100644 --- a/cibuildwheel/architecture.py +++ b/cibuildwheel/architecture.py @@ -4,9 +4,9 @@ from enum import Enum from typing import Set -from .typing import Literal, PlatformName, assert_never +from .typing import Final, Literal, PlatformName, assert_never -PRETTY_NAMES = {"linux": "Linux", "macos": "macOS", "windows": "Windows"} +PRETTY_NAMES: Final = {"linux": "Linux", "macos": "macOS", "windows": "Windows"} @functools.total_ordering diff --git a/cibuildwheel/logger.py b/cibuildwheel/logger.py index f79c51ada..6a12d782d 100644 --- a/cibuildwheel/logger.py +++ b/cibuildwheel/logger.py @@ -5,16 +5,17 @@ import time from typing import IO, AnyStr, Optional, Union +from cibuildwheel.typing import Final from cibuildwheel.util import CIProvider, detect_ci_provider -DEFAULT_FOLD_PATTERN = ("{name}", "") -FOLD_PATTERNS = { +DEFAULT_FOLD_PATTERN: Final = ("{name}", "") +FOLD_PATTERNS: Final = { "azure": ("##[group]{name}", "##[endgroup]"), "travis": ("travis_fold:start:{identifier}\n{name}", "travis_fold:end:{identifier}"), "github": ("::group::{name}", "::endgroup::{name}"), } -PLATFORM_IDENTIFIER_DESCRIPTIONS = { +PLATFORM_IDENTIFIER_DESCRIPTIONS: Final = { "manylinux_x86_64": "manylinux x86_64", "manylinux_i686": "manylinux i686", "manylinux_aarch64": "manylinux aarch64", diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index c116dc131..d0602fdaa 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -39,15 +39,15 @@ from packaging.version import Version from platformdirs import user_cache_path -from cibuildwheel.typing import Literal, PathOrStr, PlatformName +from cibuildwheel.typing import Final, Literal, PathOrStr, PlatformName -resources_dir = Path(__file__).parent / "resources" +resources_dir: Final = Path(__file__).parent / "resources" -install_certifi_script = resources_dir / "install_certifi.py" +install_certifi_script: Final = resources_dir / "install_certifi.py" -BuildFrontend = Literal["pip", "build"] +BuildFrontend: Final = Literal["pip", "build"] -MANYLINUX_ARCHS = ( +MANYLINUX_ARCHS: Final = ( "x86_64", "i686", "pypy_x86_64", @@ -58,7 +58,7 @@ "pypy_i686", ) -MUSLLINUX_ARCHS = ( +MUSLLINUX_ARCHS: Final = ( "x86_64", "i686", "aarch64", @@ -66,10 +66,10 @@ "s390x", ) -DEFAULT_CIBW_CACHE_PATH = user_cache_path(appname="cibuildwheel", appauthor="pypa") -CIBW_CACHE_PATH = Path(os.environ.get("CIBW_CACHE_PATH", DEFAULT_CIBW_CACHE_PATH)).resolve() +DEFAULT_CIBW_CACHE_PATH: Final = user_cache_path(appname="cibuildwheel", appauthor="pypa") +CIBW_CACHE_PATH: Final = Path(os.environ.get("CIBW_CACHE_PATH", DEFAULT_CIBW_CACHE_PATH)).resolve() -IS_WIN = sys.platform.startswith("win") +IS_WIN: Final = sys.platform.startswith("win") @overload From 508785192c53e559e7bbed475c4911beac21145f Mon Sep 17 00:00:00 2001 From: Brent Huisman Date: Fri, 11 Feb 2022 22:08:49 +0100 Subject: [PATCH 0005/1105] docs: add Arbor (#1016) * Add Arbor * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update docs/data/projects.yml Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner --- docs/data/projects.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/data/projects.yml b/docs/data/projects.yml index 48ea51437..ba49e9b1a 100644 --- a/docs/data/projects.yml +++ b/docs/data/projects.yml @@ -510,3 +510,15 @@ notes: A modern implementation of a PostgreSQL adapter for Python ci: [github] os: [windows, apple, linux] + +- name: Arbor + gh: arbor-sim/arbor + ci: [github] + os: [apple, linux] + pypi: arbor + notes: > + Arbor is a multi-compartment neuron simulation library; compatible with + next-generation accelerators; best-practices applied to research software; + focused on community-driven development. Includes a + [small script](https://github.com/arbor-sim/arbor/blob/master/scripts/patchwheel.py) + patching `rpath` in bundled libraries. From d7e8bed29574b385f28cd68a5dca20ce71c116da Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 16:09:31 -0500 Subject: [PATCH 0006/1105] [pre-commit.ci] pre-commit autoupdate (#1013) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/shellcheck-py/shellcheck-py: v0.8.0.3 → v0.8.0.4](https://github.com/shellcheck-py/shellcheck-py/compare/v0.8.0.3...v0.8.0.4) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9e12a6ee0..4c03d78a6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -104,7 +104,7 @@ repos: - id: python-use-type-annotations - repo: https://github.com/shellcheck-py/shellcheck-py - rev: v0.8.0.3 + rev: v0.8.0.4 hooks: - id: shellcheck From 07be87f34c9a7266f5d62b5fa96a8ec9d6f98bd5 Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 16:09:45 -0500 Subject: [PATCH 0007/1105] Update dependencies (#1012) Co-authored-by: mayeut --- .../resources/constraints-python36.txt | 2 +- .../resources/constraints-python37.txt | 6 +- .../resources/constraints-python38.txt | 6 +- .../resources/constraints-python39.txt | 6 +- cibuildwheel/resources/constraints.txt | 6 +- .../resources/pinned_docker_images.cfg | 54 +++--- cibuildwheel/resources/virtualenv.toml | 4 +- docs/working-examples.md | 168 +++++++++--------- 8 files changed, 126 insertions(+), 126 deletions(-) diff --git a/cibuildwheel/resources/constraints-python36.txt b/cibuildwheel/resources/constraints-python36.txt index 83fb265f5..874fe576a 100644 --- a/cibuildwheel/resources/constraints-python36.txt +++ b/cibuildwheel/resources/constraints-python36.txt @@ -22,7 +22,7 @@ typing-extensions==4.0.1 # via # delocate # importlib-metadata -virtualenv==20.13.0 +virtualenv==20.13.1 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via diff --git a/cibuildwheel/resources/constraints-python37.txt b/cibuildwheel/resources/constraints-python37.txt index e013fd33e..51127e580 100644 --- a/cibuildwheel/resources/constraints-python37.txt +++ b/cibuildwheel/resources/constraints-python37.txt @@ -20,7 +20,7 @@ typing-extensions==4.0.1 # via # delocate # importlib-metadata -virtualenv==20.13.0 +virtualenv==20.13.1 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -30,7 +30,7 @@ zipp==3.7.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -pip==22.0.2 +pip==22.0.3 # via -r cibuildwheel/resources/constraints.in -setuptools==60.6.0 +setuptools==60.8.1 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index a3ed6094f..32577c753 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.0.1 # via delocate -virtualenv==20.13.0 +virtualenv==20.13.1 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -24,7 +24,7 @@ wheel==0.37.1 # delocate # The following packages are considered to be unsafe in a requirements file: -pip==22.0.2 +pip==22.0.3 # via -r cibuildwheel/resources/constraints.in -setuptools==60.6.0 +setuptools==60.8.1 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index 8cddfea40..80b3ac5c3 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.0.1 # via delocate -virtualenv==20.13.0 +virtualenv==20.13.1 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -24,7 +24,7 @@ wheel==0.37.1 # delocate # The following packages are considered to be unsafe in a requirements file: -pip==22.0.2 +pip==22.0.3 # via -r cibuildwheel/resources/constraints.in -setuptools==60.6.0 +setuptools==60.8.1 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index 8cddfea40..80b3ac5c3 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.0.1 # via delocate -virtualenv==20.13.0 +virtualenv==20.13.1 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -24,7 +24,7 @@ wheel==0.37.1 # delocate # The following packages are considered to be unsafe in a requirements file: -pip==22.0.2 +pip==22.0.3 # via -r cibuildwheel/resources/constraints.in -setuptools==60.6.0 +setuptools==60.8.1 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 2bad7fcd2..a176a3598 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,43 +1,43 @@ [x86_64] -manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-01-30-700835c -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-01-30-4e8ddf1 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-01-30-4e8ddf1 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-01-30-4e8ddf1 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-01-30-4e8ddf1 +manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-02-06-b47a1c3 +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-06-28e8f4e +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-06-28e8f4e +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-06-28e8f4e +musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-02-06-28e8f4e [i686] -manylinux1 = quay.io/pypa/manylinux1_i686:2022-01-30-700835c -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-01-30-4e8ddf1 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-01-30-4e8ddf1 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-01-30-4e8ddf1 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-01-30-4e8ddf1 +manylinux1 = quay.io/pypa/manylinux1_i686:2022-02-06-b47a1c3 +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-06-28e8f4e +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-06-28e8f4e +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-06-28e8f4e +musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-02-06-28e8f4e [pypy_x86_64] -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-01-30-4e8ddf1 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-01-30-4e8ddf1 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-01-30-4e8ddf1 +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-06-28e8f4e +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-06-28e8f4e +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-06-28e8f4e [pypy_i686] -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-01-30-4e8ddf1 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-01-30-4e8ddf1 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-01-30-4e8ddf1 +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-06-28e8f4e +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-06-28e8f4e +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-06-28e8f4e [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-01-30-4e8ddf1 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-01-30-4e8ddf1 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-01-30-4e8ddf1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-06-28e8f4e +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-06-28e8f4e +musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-02-06-28e8f4e [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-01-30-4e8ddf1 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-01-30-4e8ddf1 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-01-30-4e8ddf1 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-02-06-28e8f4e +manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-02-06-28e8f4e +musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-02-06-28e8f4e [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-01-30-4e8ddf1 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-01-30-4e8ddf1 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-01-30-4e8ddf1 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-02-06-28e8f4e +manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-02-06-28e8f4e +musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-02-06-28e8f4e [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-01-30-4e8ddf1 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-01-30-4e8ddf1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-06-28e8f4e +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-06-28e8f4e diff --git a/cibuildwheel/resources/virtualenv.toml b/cibuildwheel/resources/virtualenv.toml index e6c1df91c..72051b9b7 100644 --- a/cibuildwheel/resources/virtualenv.toml +++ b/cibuildwheel/resources/virtualenv.toml @@ -1,2 +1,2 @@ -version = "20.13.0" -url = "https://github.com/pypa/get-virtualenv/blob/20.13.0/public/virtualenv.pyz?raw=true" +version = "20.13.1" +url = "https://github.com/pypa/get-virtualenv/blob/20.13.1/public/virtualenv.pyz?raw=true" diff --git a/docs/working-examples.md b/docs/working-examples.md index 0c7546921..7bcf37419 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -190,91 +190,91 @@ title: Working examples [apple icon]: data/readme_icons/apple.svg [linux icon]: data/readme_icons/linux.svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + From 51b50db510b941bbbaf2ee1eb7d263f852095f36 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 12 Feb 2022 12:29:58 -0500 Subject: [PATCH 0008/1105] fix: A type alias cannot be final (#1024) Addition of Python 3.10 to the checks exposed this. --- cibuildwheel/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index d0602fdaa..265d3747b 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -45,7 +45,7 @@ install_certifi_script: Final = resources_dir / "install_certifi.py" -BuildFrontend: Final = Literal["pip", "build"] +BuildFrontend = Literal["pip", "build"] MANYLINUX_ARCHS: Final = ( "x86_64", From f78331da10c76073cd4a7c1477886bbc9f183f93 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 22 Feb 2022 17:26:20 -0500 Subject: [PATCH 0009/1105] [pre-commit.ci] pre-commit autoupdate (#1033) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/hadialqattan/pycln: v1.1.0 → v1.2.0](https://github.com/hadialqattan/pycln/compare/v1.1.0...v1.2.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4c03d78a6..4754bd04c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: # Autoremoves unused imports - repo: https://github.com/hadialqattan/pycln - rev: v1.1.0 + rev: v1.2.0 hooks: - id: pycln args: [--config=pyproject.toml] From 2d1fee2b352adb722071bd74ff747bab89a4dae3 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Tue, 22 Feb 2022 14:26:51 -0800 Subject: [PATCH 0010/1105] Update Azure Windows image names (#1029) --- azure-pipelines.yml | 4 ++-- examples/azure-pipelines-minimal.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5a47c585f..a5497a46c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,7 +21,7 @@ jobs: python ./bin/run_tests.py - job: windows_36 - pool: {vmImage: 'vs2017-win2016'} + pool: {vmImage: 'windows-2019'} timeoutInMinutes: 180 steps: - task: UsePythonVersion@0 @@ -32,7 +32,7 @@ jobs: python ./bin/run_tests.py - job: windows_38 - pool: {vmImage: 'vs2017-win2016'} + pool: {vmImage: 'windows-2019'} timeoutInMinutes: 180 steps: - task: UsePythonVersion@0 diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index dcfed02c9..50a53f136 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -28,7 +28,7 @@ jobs: inputs: {pathtoPublish: wheelhouse} - job: windows - pool: {vmImage: 'vs2017-win2016'} + pool: {vmImage: 'windows-2019'} steps: - task: UsePythonVersion@0 - bash: | From 45a211eb1c73804c4827e6c43e352c9af18f71af Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 22 Feb 2022 17:27:20 -0500 Subject: [PATCH 0011/1105] chore: cleanup and harden pytest config (#1011) * chore: cleanup and harden pytest config * fix: try alternate terminate strategy * Update cibuildwheel/docker_container.py Co-authored-by: Joe Rickerby Co-authored-by: Joe Rickerby --- cibuildwheel/docker_container.py | 6 ++++-- noxfile.py | 2 +- pyproject.toml | 9 ++++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index a145072e9..20e5aacb8 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -100,9 +100,11 @@ def __exit__( exc_tb: Optional[TracebackType], ) -> None: + self.bash_stdin.write(b"exit 0\n") + self.bash_stdin.flush() + self.process.wait(timeout=30) self.bash_stdin.close() - self.process.terminate() - self.process.wait() + self.bash_stdout.close() assert isinstance(self.name, str) diff --git a/noxfile.py b/noxfile.py index bee10da53..62908c046 100644 --- a/noxfile.py +++ b/noxfile.py @@ -6,7 +6,7 @@ nox.options.sessions = ["lint", "check_manifest", "tests"] -PYTHON_ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9"] +PYTHON_ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10"] DIR = Path(__file__).parent.resolve() diff --git a/pyproject.toml b/pyproject.toml index ab4ed941f..3e4878669 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,21 +9,24 @@ build-backend = "setuptools.build_meta" [tool.black] line-length = 100 -target-version = ['py36', 'py37', 'py38', 'py39'] +target-version = ['py36', 'py37', 'py38', 'py39', 'py310'] [tool.isort] profile = "black" -multi_line_output = 3 [tool.pytest.ini_options] -minversion = 6.0 +minversion = "6.0" +addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"] junit_family = "xunit2" testpaths = [ "test", "unit_test", ] +xfail_strict = true +filterwarnings = ["error"] +log_cli_level = "info" [tool.mypy] From 4465ec193f1508ee4b9b2866eae68f3a2a198d88 Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Tue, 22 Feb 2022 17:27:47 -0500 Subject: [PATCH 0012/1105] Update dependencies (#1027) Co-authored-by: mayeut --- cibuildwheel/resources/build-platforms.toml | 8 +- .../resources/constraints-python36.txt | 2 +- .../resources/constraints-python37.txt | 10 +- .../resources/constraints-python38.txt | 8 +- .../resources/constraints-python39.txt | 8 +- cibuildwheel/resources/constraints.txt | 8 +- .../resources/pinned_docker_images.cfg | 54 ++--- docs/working-examples.md | 185 +++++++++--------- 8 files changed, 143 insertions(+), 140 deletions(-) diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index 00c633819..136254615 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -71,8 +71,8 @@ python_configurations = [ { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.2/python-3.10.2-macos11.pkg" }, { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.2/python-3.10.2-macos11.pkg" }, { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.2/python-3.10.2-macos11.pkg" }, - { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-osx64.tar.bz2" }, - { identifier = "pp38-macosx_x86_64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.7-osx64.tar.bz2" }, + { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.8-osx64.tar.bz2" }, + { identifier = "pp38-macosx_x86_64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.8-osx64.tar.bz2" }, ] [windows] @@ -89,6 +89,6 @@ python_configurations = [ { identifier = "cp310-win_amd64", version = "3.10.2", arch = "64" }, { identifier = "cp39-win_arm64", version = "3.9.10", arch = "ARM64" }, { identifier = "cp310-win_arm64", version = "3.10.2", arch = "ARM64" }, - { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-win64.zip" }, - { identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.7-win64.zip" }, + { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.8-win64.zip" }, + { identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.8-win64.zip" }, ] diff --git a/cibuildwheel/resources/constraints-python36.txt b/cibuildwheel/resources/constraints-python36.txt index 874fe576a..dc1ff26de 100644 --- a/cibuildwheel/resources/constraints-python36.txt +++ b/cibuildwheel/resources/constraints-python36.txt @@ -18,7 +18,7 @@ platformdirs==2.4.0 # via virtualenv six==1.16.0 # via virtualenv -typing-extensions==4.0.1 +typing-extensions==4.1.1 # via # delocate # importlib-metadata diff --git a/cibuildwheel/resources/constraints-python37.txt b/cibuildwheel/resources/constraints-python37.txt index 51127e580..efb098633 100644 --- a/cibuildwheel/resources/constraints-python37.txt +++ b/cibuildwheel/resources/constraints-python37.txt @@ -8,15 +8,15 @@ delocate==0.10.2 # via -r cibuildwheel/resources/constraints.in distlib==0.3.4 # via virtualenv -filelock==3.4.2 +filelock==3.6.0 # via virtualenv -importlib-metadata==4.10.1 +importlib-metadata==4.11.1 # via virtualenv -platformdirs==2.4.1 +platformdirs==2.5.1 # via virtualenv six==1.16.0 # via virtualenv -typing-extensions==4.0.1 +typing-extensions==4.1.1 # via # delocate # importlib-metadata @@ -32,5 +32,5 @@ zipp==3.7.0 # The following packages are considered to be unsafe in a requirements file: pip==22.0.3 # via -r cibuildwheel/resources/constraints.in -setuptools==60.8.1 +setuptools==60.9.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index 32577c753..4f3a6e11e 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -8,13 +8,13 @@ delocate==0.10.2 # via -r cibuildwheel/resources/constraints.in distlib==0.3.4 # via virtualenv -filelock==3.4.2 +filelock==3.6.0 # via virtualenv -platformdirs==2.4.1 +platformdirs==2.5.1 # via virtualenv six==1.16.0 # via virtualenv -typing-extensions==4.0.1 +typing-extensions==4.1.1 # via delocate virtualenv==20.13.1 # via -r cibuildwheel/resources/constraints.in @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.3 # via -r cibuildwheel/resources/constraints.in -setuptools==60.8.1 +setuptools==60.9.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index 80b3ac5c3..2ec337292 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -8,13 +8,13 @@ delocate==0.10.2 # via -r cibuildwheel/resources/constraints.in distlib==0.3.4 # via virtualenv -filelock==3.4.2 +filelock==3.6.0 # via virtualenv -platformdirs==2.4.1 +platformdirs==2.5.1 # via virtualenv six==1.16.0 # via virtualenv -typing-extensions==4.0.1 +typing-extensions==4.1.1 # via delocate virtualenv==20.13.1 # via -r cibuildwheel/resources/constraints.in @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.3 # via -r cibuildwheel/resources/constraints.in -setuptools==60.8.1 +setuptools==60.9.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index 80b3ac5c3..2ec337292 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -8,13 +8,13 @@ delocate==0.10.2 # via -r cibuildwheel/resources/constraints.in distlib==0.3.4 # via virtualenv -filelock==3.4.2 +filelock==3.6.0 # via virtualenv -platformdirs==2.4.1 +platformdirs==2.5.1 # via virtualenv six==1.16.0 # via virtualenv -typing-extensions==4.0.1 +typing-extensions==4.1.1 # via delocate virtualenv==20.13.1 # via -r cibuildwheel/resources/constraints.in @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.3 # via -r cibuildwheel/resources/constraints.in -setuptools==60.8.1 +setuptools==60.9.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index a176a3598..3b9468302 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,43 +1,43 @@ [x86_64] -manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-02-06-b47a1c3 -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-06-28e8f4e -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-06-28e8f4e -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-06-28e8f4e -musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-02-06-28e8f4e +manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-02-20-044a1ea +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-20-e7cad68 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-20-e7cad68 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-20-e7cad68 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-02-20-e7cad68 [i686] -manylinux1 = quay.io/pypa/manylinux1_i686:2022-02-06-b47a1c3 -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-06-28e8f4e -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-06-28e8f4e -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-06-28e8f4e -musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-02-06-28e8f4e +manylinux1 = quay.io/pypa/manylinux1_i686:2022-02-20-044a1ea +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-20-e7cad68 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-20-e7cad68 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-20-e7cad68 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-02-20-e7cad68 [pypy_x86_64] -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-06-28e8f4e -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-06-28e8f4e -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-06-28e8f4e +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-20-e7cad68 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-20-e7cad68 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-20-e7cad68 [pypy_i686] -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-06-28e8f4e -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-06-28e8f4e -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-06-28e8f4e +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-20-e7cad68 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-20-e7cad68 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-20-e7cad68 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-06-28e8f4e -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-06-28e8f4e -musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-02-06-28e8f4e +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-20-e7cad68 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-20-e7cad68 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-02-20-e7cad68 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-02-06-28e8f4e -manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-02-06-28e8f4e -musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-02-06-28e8f4e +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-02-20-e7cad68 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-02-20-e7cad68 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-02-20-e7cad68 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-02-06-28e8f4e -manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-02-06-28e8f4e -musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-02-06-28e8f4e +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-02-20-e7cad68 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-02-20-e7cad68 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-02-20-e7cad68 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-06-28e8f4e -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-06-28e8f4e +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-20-e7cad68 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-20-e7cad68 diff --git a/docs/working-examples.md b/docs/working-examples.md index 7bcf37419..379337631 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -36,8 +36,8 @@ title: Working examples | [Confluent client for Kafka][] | ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | setup in `tools/wheels/build-wheels.bat` | | [tinyobjloader][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Tiny but powerful single file wavefront obj loader | | [coverage.py][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python | -| [PyCryptodome][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A self-contained cryptographic library for Python | | [Dependency Injector][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI | +| [PyCryptodome][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A self-contained cryptographic library for Python | | [PyYAML][] | ![github icon][] | ![apple icon][] | Canonical source repository for PyYAML | | [numexpr][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas, bcolz and more | | [h5py][] | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. | @@ -67,8 +67,8 @@ title: Working examples | [cyvcf2][] | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing | | [sourmash][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. | | [time-machine][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. | -| [CTranslate2][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit.html) and CUDA kernels compiled for multiple GPU architectures. | | [matrixprofile][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. | +| [CTranslate2][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit.html) and CUDA kernels compiled for multiple GPU architectures. | | [jq.py][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq | | [iminuit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 | | [Tokenizer][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support | @@ -78,6 +78,7 @@ title: Working examples | [iDynTree][] | ![github icon][] | ![linux icon][] | Uses manylinux_2_24 | | [TgCrypto][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | | [pybase64][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python | +| [Arbor][] | ![github icon][] | ![apple icon][] ![linux icon][] | Arbor is a multi-compartment neuron simulation library; compatible with next-generation accelerators; best-practices applied to research software; focused on community-driven development. Includes a [small script](https://github.com/arbor-sim/arbor/blob/master/scripts/patchwheel.py) patching `rpath` in bundled libraries. | | [etebase-py][] | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. | | [fathon][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms | | [Imagecodecs (fork)][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. | @@ -88,8 +89,8 @@ title: Working examples | [ninja][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | | [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 | | [GSD][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Cython and NumPy project with 64-bit wheels. | -| [pyinstrument_cext][] | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies | | [pillow-heif][] | ![github icon][] | ![apple icon][] ![linux icon][] | Python CFFI binding to libheif library with third party dependencies like `libde265`, `x265`, `libaom` with test & publishing on PyPi. | +| [pyinstrument_cext][] | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies | | [xmlstarlet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. | | [CorrectionLib][] | ![github icon][] | ![apple icon][] ![linux icon][] | Structured JSON powered correction library for HEP, designed for the CMS experiment at CERN. | | [SiPM][] | ![github icon][] | ![apple icon][] ![linux icon][] | High performance library for SiPM detectors simulation using C++17, OpenMP and AVX2 intrinsics. | @@ -122,8 +123,8 @@ title: Working examples [Confluent client for Kafka]: https://github.com/confluentinc/confluent-kafka-python [tinyobjloader]: https://github.com/tinyobjloader/tinyobjloader [coverage.py]: https://github.com/nedbat/coveragepy -[PyCryptodome]: https://github.com/Legrandin/pycryptodome [Dependency Injector]: https://github.com/ets-labs/python-dependency-injector +[PyCryptodome]: https://github.com/Legrandin/pycryptodome [PyYAML]: https://github.com/yaml/pyyaml [numexpr]: https://github.com/pydata/numexpr [h5py]: https://github.com/h5py/h5py @@ -153,8 +154,8 @@ title: Working examples [cyvcf2]: https://github.com/brentp/cyvcf2 [sourmash]: https://github.com/dib-lab/sourmash [time-machine]: https://github.com/adamchainz/time-machine -[CTranslate2]: https://github.com/OpenNMT/CTranslate2 [matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile +[CTranslate2]: https://github.com/OpenNMT/CTranslate2 [jq.py]: https://github.com/mwilliamson/jq.py [iminuit]: https://github.com/scikit-hep/iminuit [Tokenizer]: https://github.com/OpenNMT/Tokenizer @@ -164,6 +165,7 @@ title: Working examples [iDynTree]: https://github.com/robotology/idyntree [TgCrypto]: https://github.com/pyrogram/tgcrypto [pybase64]: https://github.com/mayeut/pybase64 +[Arbor]: https://github.com/arbor-sim/arbor [etebase-py]: https://github.com/etesync/etebase-py [fathon]: https://github.com/stfbnc/fathon [Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build @@ -174,8 +176,8 @@ title: Working examples [ninja]: https://github.com/scikit-build/ninja-python-distributions [pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example [GSD]: https://github.com/glotzerlab/gsd -[pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext [pillow-heif]: https://github.com/bigcat88/pillow_heif +[pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext [xmlstarlet]: https://github.com/dimitern/xmlstarlet [CorrectionLib]: https://github.com/cms-nanoAOD/correctionlib [SiPM]: https://github.com/EdoPro98/SimSiPM @@ -190,91 +192,92 @@ title: Working examples [apple icon]: data/readme_icons/apple.svg [linux icon]: data/readme_icons/linux.svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e9fc3332fd0b605e1598728a498cfaa956d6c141 Mon Sep 17 00:00:00 2001 From: mayeut Date: Thu, 24 Feb 2022 22:27:45 +0100 Subject: [PATCH 0013/1105] fix: revert to PyPy 3.7 7.3.7 --- cibuildwheel/resources/build-platforms.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index 136254615..a3bde3a98 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -71,7 +71,7 @@ python_configurations = [ { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.2/python-3.10.2-macos11.pkg" }, { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.2/python-3.10.2-macos11.pkg" }, { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.2/python-3.10.2-macos11.pkg" }, - { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.8-osx64.tar.bz2" }, + { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-osx64.tar.bz2" }, { identifier = "pp38-macosx_x86_64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.8-osx64.tar.bz2" }, ] @@ -89,6 +89,6 @@ python_configurations = [ { identifier = "cp310-win_amd64", version = "3.10.2", arch = "64" }, { identifier = "cp39-win_arm64", version = "3.9.10", arch = "ARM64" }, { identifier = "cp310-win_arm64", version = "3.10.2", arch = "ARM64" }, - { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.8-win64.zip" }, + { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-win64.zip" }, { identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.8-win64.zip" }, ] From a0341ab06432b7fe7325a4d478fa3025feefea19 Mon Sep 17 00:00:00 2001 From: mayeut Date: Thu, 24 Feb 2022 22:43:58 +0100 Subject: [PATCH 0014/1105] chore: skip PyPy 3.7 7.3.8 updates --- bin/update_pythons.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/update_pythons.py b/bin/update_pythons.py index 30859259a..e4939f799 100755 --- a/bin/update_pythons.py +++ b/bin/update_pythons.py @@ -109,7 +109,12 @@ def __init__(self, arch_str: ArchStr): response = requests.get("https://downloads.python.org/pypy/versions.json") response.raise_for_status() - releases = [r for r in response.json() if r["pypy_version"] != "nightly"] + releases = [ + r + for r in response.json() + if r["pypy_version"] != "nightly" + and f'{r["python_version"]}-{r["pypy_version"]}' != "3.7.12-7.3.8" + ] for release in releases: release["pypy_version"] = Version(release["pypy_version"]) release["python_version"] = Version(release["python_version"]) From 70780dbc4e749f5b7abbcfa93570490bb14c153d Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 20 Feb 2022 22:41:46 +0100 Subject: [PATCH 0015/1105] feature: Add PyPy 3.9 --- README.md | 1 + cibuildwheel/resources/build-platforms.toml | 5 ++ .../resources/pinned_docker_images.cfg | 50 +++++++++---------- docs/options.md | 1 + test/test_manylinuxXXXX_only.py | 6 +++ test/utils.py | 2 +- unit_test/option_prepare_test.py | 5 +- 7 files changed, 42 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 41cb62037..702b9baad 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ What does it do? | CPython 3.10 | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | | PyPy 3.7 v7.3 | ✅ | N/A | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | | PyPy 3.8 v7.3 | ✅ | N/A | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | +| PyPy 3.9 v7.3 | ✅ | N/A | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | ¹ PyPy is only supported for manylinux wheels.
² Windows arm64 support is experimental.
diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index a3bde3a98..5bb0350e9 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -12,6 +12,7 @@ python_configurations = [ { identifier = "cp310-manylinux_i686", version = "3.10", path_str = "/opt/python/cp310-cp310" }, { identifier = "pp37-manylinux_x86_64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" }, { identifier = "pp38-manylinux_x86_64", version = "3.8", path_str = "/opt/python/pp38-pypy38_pp73" }, + { identifier = "pp39-manylinux_x86_64", version = "3.9", path_str = "/opt/python/pp39-pypy39_pp73" }, { identifier = "cp36-manylinux_aarch64", version = "3.6", path_str = "/opt/python/cp36-cp36m" }, { identifier = "cp37-manylinux_aarch64", version = "3.7", path_str = "/opt/python/cp37-cp37m" }, { identifier = "cp38-manylinux_aarch64", version = "3.8", path_str = "/opt/python/cp38-cp38" }, @@ -29,8 +30,10 @@ python_configurations = [ { identifier = "cp310-manylinux_s390x", version = "3.10", path_str = "/opt/python/cp310-cp310" }, { identifier = "pp37-manylinux_aarch64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" }, { identifier = "pp38-manylinux_aarch64", version = "3.8", path_str = "/opt/python/pp38-pypy38_pp73" }, + { identifier = "pp39-manylinux_aarch64", version = "3.9", path_str = "/opt/python/pp39-pypy39_pp73" }, { identifier = "pp37-manylinux_i686", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" }, { identifier = "pp38-manylinux_i686", version = "3.8", path_str = "/opt/python/pp38-pypy38_pp73" }, + { identifier = "pp39-manylinux_i686", version = "3.9", path_str = "/opt/python/pp39-pypy39_pp73" }, { identifier = "cp36-musllinux_x86_64", version = "3.6", path_str = "/opt/python/cp36-cp36m" }, { identifier = "cp37-musllinux_x86_64", version = "3.7", path_str = "/opt/python/cp37-cp37m" }, { identifier = "cp38-musllinux_x86_64", version = "3.8", path_str = "/opt/python/cp38-cp38" }, @@ -73,6 +76,7 @@ python_configurations = [ { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.2/python-3.10.2-macos11.pkg" }, { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-osx64.tar.bz2" }, { identifier = "pp38-macosx_x86_64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.8-osx64.tar.bz2" }, + { identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.8-osx64.tar.bz2" }, ] [windows] @@ -91,4 +95,5 @@ python_configurations = [ { identifier = "cp310-win_arm64", version = "3.10.2", arch = "ARM64" }, { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-win64.zip" }, { identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.8-win64.zip" }, + { identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.8-win64.zip" }, ] diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 3b9468302..ffcb0f03d 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,43 +1,43 @@ [x86_64] manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-02-20-044a1ea -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-20-e7cad68 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-20-e7cad68 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-20-e7cad68 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-02-20-e7cad68 +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-24-3876535 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-24-3876535 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-24-3876535 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-02-24-3876535 [i686] manylinux1 = quay.io/pypa/manylinux1_i686:2022-02-20-044a1ea -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-20-e7cad68 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-20-e7cad68 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-20-e7cad68 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-02-20-e7cad68 +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-24-3876535 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-24-3876535 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-24-3876535 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-02-24-3876535 [pypy_x86_64] -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-20-e7cad68 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-20-e7cad68 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-20-e7cad68 +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-24-3876535 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-24-3876535 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-24-3876535 [pypy_i686] -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-20-e7cad68 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-20-e7cad68 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-20-e7cad68 +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-24-3876535 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-24-3876535 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-24-3876535 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-20-e7cad68 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-20-e7cad68 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-02-20-e7cad68 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-24-3876535 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-24-3876535 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-02-24-3876535 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-02-20-e7cad68 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-02-20-e7cad68 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-02-20-e7cad68 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-02-24-3876535 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-02-24-3876535 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-02-24-3876535 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-02-20-e7cad68 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-02-20-e7cad68 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-02-20-e7cad68 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-02-24-3876535 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-02-24-3876535 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-02-24-3876535 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-20-e7cad68 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-20-e7cad68 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-24-3876535 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-24-3876535 diff --git a/docs/options.md b/docs/options.md index 46f2d24e1..45f67873a 100644 --- a/docs/options.md +++ b/docs/options.md @@ -211,6 +211,7 @@ When setting the options, you can use shell-style globbing syntax, as per [fnmat | Python 3.10 | cp310-macosx_x86_64
cp310-macosx_universal2
cp310-macosx_arm64 | cp310-win_amd64
cp310-win32
cp310-win_arm64 | cp310-manylinux_x86_64
cp310-manylinux_i686
cp310-musllinux_x86_64
cp310-musllinux_i686 | cp310-manylinux_aarch64
cp310-manylinux_ppc64le
cp310-manylinux_s390x
cp310-musllinux_aarch64
cp310-musllinux_ppc64le
cp310-musllinux_s390x | | PyPy3.7 v7.3 | pp37-macosx_x86_64 | pp37-win_amd64 | pp37-manylinux_x86_64
pp37-manylinux_i686 | pp37-manylinux_aarch64 | | PyPy3.8 v7.3 | pp38-macosx_x86_64 | pp38-win_amd64 | pp38-manylinux_x86_64
pp38-manylinux_i686 | pp38-manylinux_aarch64 | +| PyPy3.9 v7.3 | pp39-macosx_x86_64 | pp39-win_amd64 | pp39-manylinux_x86_64
pp39-manylinux_i686 | pp39-manylinux_aarch64 | The list of supported and currently selected build identifiers can also be retrieved by passing the `--print-build-identifiers` flag to cibuildwheel. The format is `python_tag-platform_tag`, with tags similar to those in [PEP 425](https://www.python.org/dev/peps/pep-0425/#details). diff --git a/test/test_manylinuxXXXX_only.py b/test/test_manylinuxXXXX_only.py index f7c533d49..7ae5ebb18 100644 --- a/test/test_manylinuxXXXX_only.py +++ b/test/test_manylinuxXXXX_only.py @@ -71,6 +71,9 @@ def test(manylinux_image, tmp_path): if manylinux_image in {"manylinux1"}: # We don't have a manylinux1 image for PyPy & CPython 3.10 and above add_env["CIBW_SKIP"] = "pp* cp31*" + if manylinux_image in {"manylinux2010"}: + # We don't have a manylinux2010 image for PyPy 3.9 + add_env["CIBW_SKIP"] = "pp39*" actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env) @@ -88,4 +91,7 @@ def test(manylinux_image, tmp_path): if manylinux_image in {"manylinux1"}: # remove PyPy & CPython 3.10 and above expected_wheels = [w for w in expected_wheels if "-pp" not in w and "-cp31" not in w] + if manylinux_image in {"manylinux2010"}: + # remove PyPy 3.9 + expected_wheels = [w for w in expected_wheels if "-pp39" not in w] assert set(actual_wheels) == set(expected_wheels) diff --git a/test/utils.py b/test/utils.py index 987159543..0248a7c15 100644 --- a/test/utils.py +++ b/test/utils.py @@ -135,7 +135,7 @@ def expected_wheels( python_abi_tags = ["cp36-cp36m", "cp37-cp37m", "cp38-cp38", "cp39-cp39", "cp310-cp310"] if machine_arch in ["x86_64", "AMD64", "x86", "aarch64"]: - python_abi_tags += ["pp37-pypy37_pp73", "pp38-pypy38_pp73"] + python_abi_tags += ["pp37-pypy37_pp73", "pp38-pypy38_pp73", "pp39-pypy39_pp73"] if platform == "macos" and machine_arch == "arm64": # currently, arm64 macs are only supported by cp39 & cp310 diff --git a/unit_test/option_prepare_test.py b/unit_test/option_prepare_test.py index d21ba65d5..354cda4a6 100644 --- a/unit_test/option_prepare_test.py +++ b/unit_test/option_prepare_test.py @@ -11,7 +11,7 @@ from cibuildwheel import linux, util from cibuildwheel.__main__ import main -ALL_IDS = {"cp36", "cp37", "cp38", "cp39", "cp310", "pp37", "pp38"} +ALL_IDS = {"cp36", "cp37", "cp38", "cp39", "cp310", "pp37", "pp38", "pp39"} @pytest.fixture @@ -133,7 +133,7 @@ def test_build_with_override_launches(mock_build_docker, monkeypatch, tmp_path): identifiers = {x.identifier for x in kwargs["platform_configs"]} assert identifiers == { - f"{x}-manylinux_x86_64" for x in ALL_IDS - {"cp36", "cp310", "pp37", "pp38"} + f"{x}-manylinux_x86_64" for x in ALL_IDS - {"cp36", "cp310", "pp37", "pp38", "pp39"} } assert kwargs["options"].build_options("cp37-manylinux_x86_64").before_all == "" @@ -146,6 +146,7 @@ def test_build_with_override_launches(mock_build_docker, monkeypatch, tmp_path): "cp310-manylinux_x86_64", "pp37-manylinux_x86_64", "pp38-manylinux_x86_64", + "pp39-manylinux_x86_64", } kwargs = build_on_docker.call_args_list[3][1] From d6dc3b7cd94a0a836a442df046da2859c4ed3859 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sun, 27 Feb 2022 14:16:37 -0500 Subject: [PATCH 0016/1105] chore: add PyLint and fix most issues (#999) * chore: add PyLint and fix most issues * fix: minor fixes after first push * chore: remove reference to old toml lib * chore: minor options cleanup * ci: only fail with many pylint issues, annotate in GHA * refactor: address review * ci: force nox to report in CI * refactor: use map instead of if chain * refactor: simpler shell_with_arch * refactor: even simpler shell_with_arch * Restore if...elif...else blocks where guard-style is not intended Co-authored-by: Joe Rickerby --- .github/matchers/pylint.json | 32 ++++++++++ .github/workflows/test.yml | 15 +++-- cibuildwheel/__main__.py | 4 +- cibuildwheel/architecture.py | 16 +++-- cibuildwheel/docker_container.py | 4 +- cibuildwheel/environment.py | 2 +- cibuildwheel/functools_cached_property_38.py | 65 ++++++++++++++++++++ cibuildwheel/linux.py | 4 +- cibuildwheel/logger.py | 17 ++--- cibuildwheel/macos.py | 20 +++--- cibuildwheel/options.py | 37 ++++++----- cibuildwheel/projectfiles.py | 12 ++-- cibuildwheel/util.py | 46 +++++++++----- noxfile.py | 16 ++++- pyproject.toml | 34 ++++++++++ setup.py | 1 - 16 files changed, 240 insertions(+), 85 deletions(-) create mode 100644 .github/matchers/pylint.json create mode 100644 cibuildwheel/functools_cached_property_38.py diff --git a/.github/matchers/pylint.json b/.github/matchers/pylint.json new file mode 100644 index 000000000..e3a6bd16b --- /dev/null +++ b/.github/matchers/pylint.json @@ -0,0 +1,32 @@ +{ + "problemMatcher": [ + { + "severity": "warning", + "pattern": [ + { + "regexp": "^([^:]+):(\\d+):(\\d+): ([A-DF-Z]\\d+): \\033\\[[\\d;]+m([^\\033]+).*$", + "file": 1, + "line": 2, + "column": 3, + "code": 4, + "message": 5 + } + ], + "owner": "pylint-warning" + }, + { + "severity": "error", + "pattern": [ + { + "regexp": "^([^:]+):(\\d+):(\\d+): (E\\d+): \\033\\[[\\d;]+m([^\\033]+).*$", + "file": 1, + "line": 2, + "column": 3, + "code": 4, + "message": 5 + } + ], + "owner": "pylint-error" + } + ] +} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0dcd29cf0..efabd2854 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,18 +15,23 @@ concurrency: cancel-in-progress: true jobs: - pre-commit: - name: Pre-commit checks (mypy, flake8, etc.) + lint: + name: Linters (mypy, flake8, etc.) runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 - uses: pre-commit/action@v2.0.3 - - run: pipx run nox -s check_manifest + - name: Check manifest + run: pipx run nox -s check_manifest + - name: PyLint checks + run: | + echo "::add-matcher::$GITHUB_WORKSPACE/.github/matchers/pylint.json" + pipx run nox -s pylint test: name: Test cibuildwheel on ${{ matrix.os }} - needs: pre-commit + needs: lint runs-on: ${{ matrix.os }} strategy: matrix: @@ -67,7 +72,7 @@ jobs: test-emulated: name: Test emulated cibuildwheel using qemu - needs: pre-commit + needs: lint runs-on: ubuntu-latest timeout-minutes: 180 steps: diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index d5323e69a..306e73ab4 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -237,7 +237,7 @@ def print_preamble(platform: str, options: Options, identifiers: List[str]) -> N print(f"Cache folder: {CIBW_CACHE_PATH}") - warnings = detect_warnings(platform=platform, options=options, identifiers=identifiers) + warnings = detect_warnings(options=options, identifiers=identifiers) if warnings: print("\nWarnings:") for warning in warnings: @@ -273,7 +273,7 @@ def get_build_identifiers( return [config.identifier for config in python_configurations] -def detect_warnings(platform: str, options: Options, identifiers: List[str]) -> List[str]: +def detect_warnings(*, options: Options, identifiers: List[str]) -> List[str]: warnings = [] # warn about deprecated {python} and {pip} diff --git a/cibuildwheel/architecture.py b/cibuildwheel/architecture.py index c6df9e364..437ff5e83 100644 --- a/cibuildwheel/architecture.py +++ b/cibuildwheel/architecture.py @@ -73,20 +73,18 @@ def auto_archs(platform: PlatformName) -> "Set[Architecture]": @staticmethod def all_archs(platform: PlatformName) -> "Set[Architecture]": - if platform == "linux": - return { + all_archs_map = { + "linux": { Architecture.x86_64, Architecture.i686, Architecture.aarch64, Architecture.ppc64le, Architecture.s390x, - } - elif platform == "macos": - return {Architecture.x86_64, Architecture.arm64, Architecture.universal2} - elif platform == "windows": - return {Architecture.x86, Architecture.AMD64, Architecture.ARM64} - else: - assert_never(platform) + }, + "macos": {Architecture.x86_64, Architecture.arm64, Architecture.universal2}, + "windows": {Architecture.x86, Architecture.AMD64, Architecture.ARM64}, + } + return all_archs_map[platform] @staticmethod def bitness_archs(platform: PlatformName, bitness: Literal["64", "32"]) -> "Set[Architecture]": diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index 20e5aacb8..bc313a7de 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -108,7 +108,9 @@ def __exit__( assert isinstance(self.name, str) - subprocess.run(["docker", "rm", "--force", "-v", self.name], stdout=subprocess.DEVNULL) + subprocess.run( + ["docker", "rm", "--force", "-v", self.name], stdout=subprocess.DEVNULL, check=False + ) self.name = None def copy_into(self, from_path: Path, to_path: PurePath) -> None: diff --git a/cibuildwheel/environment.py b/cibuildwheel/environment.py index ec8a8e360..ba66d6e29 100644 --- a/cibuildwheel/environment.py +++ b/cibuildwheel/environment.py @@ -66,7 +66,7 @@ def __init__(self, name: str, value: str): def __repr__(self) -> str: return f"{self.name}: {self.value}" - def evaluated_value(self, **kwargs: Any) -> str: + def evaluated_value(self, **_: Any) -> str: return self.value diff --git a/cibuildwheel/functools_cached_property_38.py b/cibuildwheel/functools_cached_property_38.py new file mode 100644 index 000000000..e1c45ac26 --- /dev/null +++ b/cibuildwheel/functools_cached_property_38.py @@ -0,0 +1,65 @@ +from threading import RLock +from typing import Any, Callable, Generic, Optional, Type, TypeVar, overload + +__all__ = ["cached_property"] + +_NOT_FOUND = object() + +_T = TypeVar("_T") + + +class cached_property(Generic[_T]): + def __init__(self, func: Callable[[Any], _T]): + self.func = func + self.attrname: Optional[str] = None + self.__doc__ = func.__doc__ + self.lock = RLock() + + def __set_name__(self, owner: Type[Any], name: str) -> None: + if self.attrname is None: + self.attrname = name + elif name != self.attrname: + raise TypeError( + "Cannot assign the same cached_property to two different names " + f"({self.attrname!r} and {name!r})." + ) + + @overload + def __get__(self, instance: None, owner: Optional[Type[Any]] = ...) -> "cached_property[_T]": + ... + + @overload + def __get__(self, instance: object, owner: Optional[Type[Any]] = ...) -> _T: + ... + + def __get__(self, instance: Optional[object], owner: Optional[Type[Any]] = None) -> Any: + if instance is None: + return self + if self.attrname is None: + raise TypeError( + "Cannot use cached_property instance without calling __set_name__ on it." + ) + try: + cache = instance.__dict__ + except AttributeError: # not all objects have __dict__ (e.g. class defines slots) + msg = ( + f"No '__dict__' attribute on {type(instance).__name__!r} " + f"instance to cache {self.attrname!r} property." + ) + raise TypeError(msg) from None + val = cache.get(self.attrname, _NOT_FOUND) + if val is _NOT_FOUND: + with self.lock: + # check if another thread filled cache while we awaited lock + val = cache.get(self.attrname, _NOT_FOUND) + if val is _NOT_FOUND: + val = self.func(instance) + try: + cache[self.attrname] = val + except TypeError: + msg = ( + f"The '__dict__' attribute on {type(instance).__name__!r} instance " + f"does not support item assignment for caching {self.attrname!r} property." + ) + raise TypeError(msg) from None + return val diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index 35791059b..8478bf092 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -303,11 +303,11 @@ def build_on_docker( log.step_end() -def build(options: Options, tmp_path: Path) -> None: +def build(options: Options, tmp_path: Path) -> None: # pylint: disable=unused-argument try: # check docker is installed subprocess.run(["docker", "--version"], check=True, stdout=subprocess.DEVNULL) - except Exception: + except subprocess.CalledProcessError: print( "cibuildwheel: Docker not found. Docker is required to run Linux builds. " "If you're building on Travis CI, add `services: [docker]` to your .travis.yml." diff --git a/cibuildwheel/logger.py b/cibuildwheel/logger.py index 6a12d782d..0a4be14d2 100644 --- a/cibuildwheel/logger.py +++ b/cibuildwheel/logger.py @@ -158,7 +158,8 @@ def _end_fold_group(self) -> None: sys.stdout.flush() self.active_fold_group_name = None - def _fold_group_identifier(self, name: str) -> str: + @staticmethod + def _fold_group_identifier(name: str) -> str: """ Travis doesn't like fold groups identifiers that have spaces in. This method converts them to ascii identifiers @@ -174,17 +175,11 @@ def _fold_group_identifier(self, name: str) -> str: @property def colors(self) -> "Colors": - if self.colors_enabled: - return Colors(enabled=True) - else: - return Colors(enabled=False) + return Colors(enabled=self.colors_enabled) @property def symbols(self) -> "Symbols": - if self.unicode_enabled: - return Symbols(unicode=True) - else: - return Symbols(unicode=False) + return Symbols(unicode=self.unicode_enabled) def build_description_from_identifier(identifier: str) -> str: @@ -263,8 +258,6 @@ def file_supports_unicode(file_obj: IO[AnyStr]) -> bool: return "utf" in codec_info.name -""" -Global instance of the Logger. -""" +# Global instance of the Logger. # (there's only one stdout per-process, so a global instance is justified) log = Logger() diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 420fa2a54..a58186123 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -1,3 +1,4 @@ +import functools import os import platform import re @@ -5,7 +6,7 @@ import subprocess import sys from pathlib import Path -from typing import Any, Dict, List, NamedTuple, Sequence, Set, Tuple, cast +from typing import Dict, List, NamedTuple, Sequence, Set, Tuple, cast from filelock import FileLock @@ -108,7 +109,7 @@ def install_cpython(tmp: Path, version: str, url: str) -> Path: return installation_path / "bin" / "python3" -def install_pypy(tmp: Path, version: str, url: str) -> Path: +def install_pypy(tmp: Path, url: str) -> Path: pypy_tar_bz2 = url.rsplit("/", 1)[-1] extension = ".tar.bz2" assert pypy_tar_bz2.endswith(extension) @@ -136,7 +137,7 @@ def setup_python( if implementation_id.startswith("cp"): base_python = install_cpython(tmp, python_configuration.version, python_configuration.url) elif implementation_id.startswith("pp"): - base_python = install_pypy(tmp, python_configuration.version, python_configuration.url) + base_python = install_pypy(tmp, python_configuration.url) else: raise ValueError("Unknown Python implementation") assert base_python.exists() @@ -460,17 +461,12 @@ def build(options: Options, tmp_path: Path) -> None: # rosetta2 will provide the emulation with just the arch prefix. arch_prefix = ["arch", "-x86_64"] else: - raise RuntimeError( - "don't know how to emulate {testing_arch} on {machine_arch}" - ) + msg = f"don't know how to emulate {testing_arch} on {machine_arch}" + raise RuntimeError(msg) # define a custom 'call' function that adds the arch prefix each time - def call_with_arch(*args: PathOrStr, **kwargs: Any) -> None: - call(*arch_prefix, *args, **kwargs) - - def shell_with_arch(command: str, **kwargs: Any) -> None: - command = " ".join(arch_prefix) + " " + command - shell(command, **kwargs) + call_with_arch = functools.partial(call, *arch_prefix) + shell_with_arch = functools.partial(shell, *arch_prefix) # Use --no-download to ensure determinism by using seed libraries # built into virtualenv diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index 0ef879902..75ee7f6be 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -1,3 +1,4 @@ +import functools import os import sys import traceback @@ -31,6 +32,7 @@ BuildSelector, DependencyConstraints, TestSelector, + cached_property, resources_dir, selector_matches, strtobool, @@ -139,7 +141,8 @@ def _dig_first(*pairs: Tuple[Mapping[str, Setting], str], ignore_empty: bool = F return value - raise KeyError(key) + last_key = pairs[-1][1] + raise KeyError(last_key) class OptionsReader: @@ -310,14 +313,16 @@ def get( if table is None: raise ConfigOptionError(f"{name} does not accept a table") return table["sep"].join(table["item"].format(k=k, v=v) for k, v in result.items()) - elif isinstance(result, list): + + if isinstance(result, list): if sep is None: raise ConfigOptionError(f"{name} does not accept a list") return sep.join(result) - elif isinstance(result, int): + + if isinstance(result, int): return str(result) - else: - return result + + return result class Options: @@ -345,12 +350,10 @@ def config_file_path(self) -> Optional[Path]: return None - @property + @cached_property def package_requires_python_str(self) -> Optional[str]: - if not hasattr(self, "_package_requires_python_str"): - args = self.command_line_arguments - self._package_requires_python_str = get_requires_python_str(Path(args.package_dir)) - return self._package_requires_python_str + args = self.command_line_arguments + return get_requires_python_str(Path(args.package_dir)) @property def globals(self) -> GlobalOptions: @@ -574,9 +577,7 @@ def compute_options( return options -_all_pinned_docker_images: Optional[ConfigParser] = None - - +@functools.lru_cache(maxsize=None) def _get_pinned_docker_images() -> Mapping[str, Mapping[str, str]]: """ This looks like a dict of dicts, e.g. @@ -585,13 +586,11 @@ def _get_pinned_docker_images() -> Mapping[str, Mapping[str, str]]: 'pypy_x86_64': {'manylinux2010': '...' } ... } """ - global _all_pinned_docker_images - if _all_pinned_docker_images is None: - pinned_docker_images_file = resources_dir / "pinned_docker_images.cfg" - _all_pinned_docker_images = ConfigParser() - _all_pinned_docker_images.read(pinned_docker_images_file) - return _all_pinned_docker_images + pinned_docker_images_file = resources_dir / "pinned_docker_images.cfg" + all_pinned_docker_images = ConfigParser() + all_pinned_docker_images.read(pinned_docker_images_file) + return all_pinned_docker_images def deprecated_selectors(name: str, selector: str, *, error: bool = False) -> None: diff --git a/cibuildwheel/projectfiles.py b/cibuildwheel/projectfiles.py index fece392f8..8a6311de7 100644 --- a/cibuildwheel/projectfiles.py +++ b/cibuildwheel/projectfiles.py @@ -23,11 +23,11 @@ class Analyzer(ast.NodeVisitor): def __init__(self) -> None: self.requires_python: Optional[str] = None - def visit(self, content: ast.AST) -> None: - for node in ast.walk(content): - for child in ast.iter_child_nodes(node): - child.parent = node # type: ignore[attr-defined] - super().visit(content) + def visit(self, node: ast.AST) -> None: + for inner_node in ast.walk(node): + for child in ast.iter_child_nodes(inner_node): + child.parent = inner_node # type: ignore[attr-defined] + super().visit(node) def visit_keyword(self, node: ast.keyword) -> None: self.generic_visit(node) @@ -46,7 +46,7 @@ def setup_py_python_requires(content: str) -> Optional[str]: analyzer = Analyzer() analyzer.visit(tree) return analyzer.requires_python or None - except Exception: + except Exception: # pylint: disable=broad-except return None diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index 265d3747b..18df677db 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -41,6 +41,20 @@ from cibuildwheel.typing import Final, Literal, PathOrStr, PlatformName +__all__ = [ + "resources_dir", + "MANYLINUX_ARCHS", + "call", + "shell", + "format_safe", + "prepare_command", + "get_build_verbosity_extra_flags", + "read_python_configs", + "selector_matches", + "strtobool", + "cached_property", +] + resources_dir: Final = Path(__file__).parent / "resources" install_certifi_script: Final = resources_dir / "install_certifi.py" @@ -118,8 +132,9 @@ def call( def shell( - command: str, env: Optional[Dict[str, str]] = None, cwd: Optional[PathOrStr] = None + *commands: str, env: Optional[Dict[str, str]] = None, cwd: Optional[PathOrStr] = None ) -> None: + command = " ".join(commands) print(f"+ {command}") subprocess.run(command, env=env, cwd=cwd, shell=True, check=True) @@ -152,11 +167,11 @@ def format_safe(template: str, **kwargs: Any) -> str: re.VERBOSE, ) - # we use a lambda for repl to prevent re.sub interpreting backslashes - # in repl as escape sequences + # we use a function for repl to prevent re.sub interpreting backslashes + # in repl as escape sequences. result = re.sub( pattern=find_pattern, - repl=lambda _: str(value), + repl=lambda _: str(value), # pylint: disable=cell-var-from-loop string=result, ) @@ -288,18 +303,14 @@ def download(url: str, dest: Path) -> None: repeat_num = 3 for i in range(repeat_num): try: - response = urllib.request.urlopen(url, context=context) - except Exception: + with urllib.request.urlopen(url, context=context) as response: + dest.write_bytes(response.read()) + return + + except urllib.error.URLError: if i == repeat_num - 1: raise sleep(3) - continue - break - - try: - dest.write_bytes(response.read()) - finally: - response.close() class DependencyConstraints: @@ -319,6 +330,7 @@ def get_for_python_version(self, version: str) -> Path: specific_stem = self.base_file_path.stem + f"-python{version_parts[0]}{version_parts[1]}" specific_name = specific_stem + self.base_file_path.suffix specific_file_path = self.base_file_path.with_name(specific_name) + if specific_file_path.exists(): return specific_file_path else: @@ -477,7 +489,7 @@ def _parse_constraints_for_virtualenv( assert dependency_constraint_flags[0] == "-c" constraint_path = Path(dependency_constraint_flags[1]) assert constraint_path.exists() - with constraint_path.open() as constraint_file: + with constraint_path.open(encoding="utf-8") as constraint_file: for line in constraint_file: line = line.strip() if len(line) == 0: @@ -543,3 +555,9 @@ def virtualenv( env = os.environ.copy() env["PATH"] = os.pathsep.join(paths + [env["PATH"]]) return env + + +if sys.version_info >= (3, 8): + from functools import cached_property +else: + from .functools_cached_property_38 import cached_property diff --git a/noxfile.py b/noxfile.py index 62908c046..4479ab60f 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1,15 +1,19 @@ +import os import shutil import sys from pathlib import Path import nox -nox.options.sessions = ["lint", "check_manifest", "tests"] +nox.options.sessions = ["lint", "pylint", "check_manifest", "tests"] PYTHON_ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9", "3.10"] DIR = Path(__file__).parent.resolve() +if os.environ.get("CI", None): + nox.options.error_on_missing_interpreters = True + @nox.session def tests(session: nox.Session) -> None: @@ -34,6 +38,16 @@ def lint(session: nox.Session) -> None: session.run("pre-commit", "run", "--all-files", *session.posargs) +@nox.session +def pylint(session: nox.Session) -> None: + """ + Run pylint. + """ + + session.install("pylint", ".") + session.run("pylint", "cibuildwheel", *session.posargs) + + @nox.session def check_manifest(session: nox.Session) -> None: """ diff --git a/pyproject.toml b/pyproject.toml index 3e4878669..6fc342a92 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -84,3 +84,37 @@ ignore = [ "requirements-dev.txt", "noxfile.py", ] + +[tool.pylint] +master.py-version = "3.6" +master.jobs = "0" +master.fail-on = ["E", "F"] +master.fail-under = "9.8" +reports.output-format = "colorized" +messages_control.enable = [ + "useless-suppression", +] +messages_control.disable = [ + "abstract-class-instantiated", # filelock triggers this + "duplicate-code", + "fixme", + "invalid-name", + "line-too-long", + "missing-class-docstring", + "missing-function-docstring", + "missing-module-docstring", + "no-else-break", + "no-else-return", + "protected-access", + "too-few-public-methods", + "too-many-arguments", + "too-many-branches", + "too-many-instance-attributes", + "too-many-lines", + "too-many-locals", + "too-many-nested-blocks", + "too-many-return-statements", + "too-many-statements", + "unsubscriptable-object", + "wrong-import-position", +] diff --git a/setup.py b/setup.py index 70fd3b0e6..621ccf273 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,6 @@ "types-pyyaml", "types-click", "types-requests", - "types-toml", ], } From a591d08c460492828afe94c2ff714e13a9422a37 Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Mon, 28 Feb 2022 10:54:11 -0500 Subject: [PATCH 0017/1105] Update dependencies (#1039) Co-authored-by: mayeut --- .../resources/constraints-python310.txt | 30 +++ .../resources/constraints-python36.txt | 2 +- .../resources/constraints-python37.txt | 4 +- .../resources/constraints-python38.txt | 2 +- .../resources/constraints-python39.txt | 2 +- cibuildwheel/resources/constraints.txt | 2 +- .../resources/pinned_docker_images.cfg | 54 ++--- cibuildwheel/resources/virtualenv.toml | 4 +- docs/working-examples.md | 184 +++++++++--------- 9 files changed, 157 insertions(+), 127 deletions(-) create mode 100644 cibuildwheel/resources/constraints-python310.txt diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt new file mode 100644 index 000000000..1ad8ab72e --- /dev/null +++ b/cibuildwheel/resources/constraints-python310.txt @@ -0,0 +1,30 @@ +# +# This file is autogenerated by pip-compile with python 3.10 +# To update, run: +# +# bin/update_dependencies.py +# +delocate==0.10.2 + # via -r cibuildwheel/resources/constraints.in +distlib==0.3.4 + # via virtualenv +filelock==3.6.0 + # via virtualenv +platformdirs==2.5.1 + # via virtualenv +six==1.16.0 + # via virtualenv +typing-extensions==4.1.1 + # via delocate +virtualenv==20.13.2 + # via -r cibuildwheel/resources/constraints.in +wheel==0.37.1 + # via + # -r cibuildwheel/resources/constraints.in + # delocate + +# The following packages are considered to be unsafe in a requirements file: +pip==22.0.3 + # via -r cibuildwheel/resources/constraints.in +setuptools==60.9.3 + # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python36.txt b/cibuildwheel/resources/constraints-python36.txt index dc1ff26de..047f916b3 100644 --- a/cibuildwheel/resources/constraints-python36.txt +++ b/cibuildwheel/resources/constraints-python36.txt @@ -22,7 +22,7 @@ typing-extensions==4.1.1 # via # delocate # importlib-metadata -virtualenv==20.13.1 +virtualenv==20.13.2 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via diff --git a/cibuildwheel/resources/constraints-python37.txt b/cibuildwheel/resources/constraints-python37.txt index efb098633..fcdba03bf 100644 --- a/cibuildwheel/resources/constraints-python37.txt +++ b/cibuildwheel/resources/constraints-python37.txt @@ -10,7 +10,7 @@ distlib==0.3.4 # via virtualenv filelock==3.6.0 # via virtualenv -importlib-metadata==4.11.1 +importlib-metadata==4.11.2 # via virtualenv platformdirs==2.5.1 # via virtualenv @@ -20,7 +20,7 @@ typing-extensions==4.1.1 # via # delocate # importlib-metadata -virtualenv==20.13.1 +virtualenv==20.13.2 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index 4f3a6e11e..741d6cab6 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.1 +virtualenv==20.13.2 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index 2ec337292..85b919bbd 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.1 +virtualenv==20.13.2 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index 2ec337292..85b919bbd 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.1 +virtualenv==20.13.2 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index ffcb0f03d..86ae4070a 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,43 +1,43 @@ [x86_64] -manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-02-20-044a1ea -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-24-3876535 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-24-3876535 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-24-3876535 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-02-24-3876535 +manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-02-27-5f4cccc +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-27-769bdbd +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-27-769bdbd +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-27-769bdbd +musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-02-27-769bdbd [i686] -manylinux1 = quay.io/pypa/manylinux1_i686:2022-02-20-044a1ea -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-24-3876535 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-24-3876535 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-24-3876535 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-02-24-3876535 +manylinux1 = quay.io/pypa/manylinux1_i686:2022-02-27-5f4cccc +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-27-769bdbd +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-27-769bdbd +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-27-769bdbd +musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-02-27-769bdbd [pypy_x86_64] -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-24-3876535 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-24-3876535 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-24-3876535 +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-27-769bdbd +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-27-769bdbd +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-27-769bdbd [pypy_i686] -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-24-3876535 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-24-3876535 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-24-3876535 +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-27-769bdbd +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-27-769bdbd +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-27-769bdbd [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-24-3876535 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-24-3876535 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-02-24-3876535 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-27-769bdbd +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-27-769bdbd +musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-02-27-769bdbd [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-02-24-3876535 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-02-24-3876535 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-02-24-3876535 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-02-27-769bdbd +manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-02-27-769bdbd +musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-02-27-769bdbd [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-02-24-3876535 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-02-24-3876535 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-02-24-3876535 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-02-27-769bdbd +manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-02-27-769bdbd +musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-02-27-769bdbd [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-24-3876535 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-24-3876535 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-27-769bdbd +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-27-769bdbd diff --git a/cibuildwheel/resources/virtualenv.toml b/cibuildwheel/resources/virtualenv.toml index 72051b9b7..418eabcde 100644 --- a/cibuildwheel/resources/virtualenv.toml +++ b/cibuildwheel/resources/virtualenv.toml @@ -1,2 +1,2 @@ -version = "20.13.1" -url = "https://github.com/pypa/get-virtualenv/blob/20.13.1/public/virtualenv.pyz?raw=true" +version = "20.13.2" +url = "https://github.com/pypa/get-virtualenv/blob/20.13.2/public/virtualenv.pyz?raw=true" diff --git a/docs/working-examples.md b/docs/working-examples.md index 379337631..ebf02f362 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -21,13 +21,13 @@ title: Working examples | [asyncpg][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A fast PostgreSQL Database Client Library for Python/asyncio. | | [Apache Beam][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Apache Beam is a unified programming model for Batch and Streaming | | [scikit-image][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Image processing library. Uses cibuildwheel to build and test a project that uses Cython with platform-native code. | -| [twisted-iocpsupport][] | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. | | [cmake][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | +| [twisted-iocpsupport][] | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. | | [duckdb][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System | | [websockets][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Library for building WebSocket servers and clients. Mostly written in Python, with a small C 'speedups' extension module. | | [cvxpy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A Python-embedded modeling language for convex optimization problems. | -| [Triton][] | ![github icon][] | ![linux icon][] | Self hosted runners | | [PyOxidizer][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A modern Python application packaging and distribution tool | +| [Triton][] | ![github icon][] | ![linux icon][] | Self hosted runners | | [River][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python | | [OpenSpiel][] | ![github icon][] | ![apple icon][] ![linux icon][] | OpenSpiel is a collection of environments and algorithms for research in general reinforcement learning and search/planning in games. | | [pyzmq][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython and CFFI. | @@ -43,8 +43,8 @@ title: Working examples | [h5py][] | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. | | [PyAV][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Pythonic bindings for FFmpeg's libraries. | | [OpenColorIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A color management framework for visual effects and animation. | -| [PyTables][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data | | [Line Profiler][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Line-by-line profiling for Python | +| [PyTables][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data | | [OpenTimelineIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Open Source API and interchange format for editorial timeline information. | | [pikepdf][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by qpdf | | [ruptures][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. | @@ -67,8 +67,8 @@ title: Working examples | [cyvcf2][] | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing | | [sourmash][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. | | [time-machine][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. | -| [matrixprofile][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. | | [CTranslate2][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit.html) and CUDA kernels compiled for multiple GPU architectures. | +| [matrixprofile][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. | | [jq.py][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq | | [iminuit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 | | [Tokenizer][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support | @@ -83,8 +83,8 @@ title: Working examples | [fathon][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms | | [Imagecodecs (fork)][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. | | [numpythia][] | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy | -| [pyjet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy | | [polaroid][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. | +| [pyjet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy | | [clang-format][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. | | [ninja][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | | [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 | @@ -108,13 +108,13 @@ title: Working examples [asyncpg]: https://github.com/MagicStack/asyncpg [Apache Beam]: https://github.com/apache/beam [scikit-image]: https://github.com/scikit-image/scikit-image -[twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport [cmake]: https://github.com/scikit-build/cmake-python-distributions +[twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport [duckdb]: https://github.com/duckdb/duckdb [websockets]: https://github.com/aaugustin/websockets [cvxpy]: https://github.com/cvxpy/cvxpy -[Triton]: https://github.com/openai/triton [PyOxidizer]: https://github.com/indygreg/PyOxidizer +[Triton]: https://github.com/openai/triton [River]: https://github.com/online-ml/river [OpenSpiel]: https://github.com/deepmind/open_spiel [pyzmq]: https://github.com/zeromq/pyzmq @@ -130,8 +130,8 @@ title: Working examples [h5py]: https://github.com/h5py/h5py [PyAV]: https://github.com/PyAV-Org/PyAV [OpenColorIO]: https://github.com/AcademySoftwareFoundation/OpenColorIO -[PyTables]: https://github.com/PyTables/PyTables [Line Profiler]: https://github.com/pyutils/line_profiler +[PyTables]: https://github.com/PyTables/PyTables [OpenTimelineIO]: https://github.com/PixarAnimationStudios/OpenTimelineIO [pikepdf]: https://github.com/pikepdf/pikepdf [ruptures]: https://github.com/deepcharles/ruptures @@ -154,8 +154,8 @@ title: Working examples [cyvcf2]: https://github.com/brentp/cyvcf2 [sourmash]: https://github.com/dib-lab/sourmash [time-machine]: https://github.com/adamchainz/time-machine -[matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile [CTranslate2]: https://github.com/OpenNMT/CTranslate2 +[matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile [jq.py]: https://github.com/mwilliamson/jq.py [iminuit]: https://github.com/scikit-hep/iminuit [Tokenizer]: https://github.com/OpenNMT/Tokenizer @@ -170,8 +170,8 @@ title: Working examples [fathon]: https://github.com/stfbnc/fathon [Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build [numpythia]: https://github.com/scikit-hep/numpythia -[pyjet]: https://github.com/scikit-hep/pyjet [polaroid]: https://github.com/daggy1234/polaroid +[pyjet]: https://github.com/scikit-hep/pyjet [clang-format]: https://github.com/ssciwr/clang-format-wheel [ninja]: https://github.com/scikit-build/ninja-python-distributions [pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example @@ -192,92 +192,92 @@ title: Working examples [apple icon]: data/readme_icons/apple.svg [linux icon]: data/readme_icons/linux.svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + From 8f6f3bc79d020bf517d950dd0ef7ed7ee03041eb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 17:32:22 -0500 Subject: [PATCH 0018/1105] [pre-commit.ci] pre-commit autoupdate (#1042) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/hadialqattan/pycln: v1.2.0 → v1.2.4](https://github.com/hadialqattan/pycln/compare/v1.2.0...v1.2.4) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4754bd04c..fdd5a4704 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: # Autoremoves unused imports - repo: https://github.com/hadialqattan/pycln - rev: v1.2.0 + rev: v1.2.4 hooks: - id: pycln args: [--config=pyproject.toml] From b07db4ef0813624faed48bc4d84ca38cf955da41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 17:32:32 -0500 Subject: [PATCH 0019/1105] chore(deps): bump actions/setup-python from 2 to 3 (#1040) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 3. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index efabd2854..f2296a915 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v3 - uses: pre-commit/action@v2.0.3 - name: Check manifest run: pipx run nox -s check_manifest @@ -40,7 +40,7 @@ jobs: timeout-minutes: 180 steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v3 name: Install Python ${{ matrix.python_version }} with: python-version: ${{ matrix.python_version }} @@ -77,7 +77,7 @@ jobs: timeout-minutes: 180 steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v3 - name: Install dependencies run: | python -m pip install ".[test]" From 2f2ef924d5f28d1ad4bc6d2baf6d2c5e830e4f2e Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 10:50:11 -0500 Subject: [PATCH 0020/1105] Update dependencies (#1043) Co-authored-by: mayeut --- .../resources/pinned_docker_images.cfg | 54 +++--- docs/working-examples.md | 174 +++++++++--------- 2 files changed, 114 insertions(+), 114 deletions(-) diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 86ae4070a..25031eb7c 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,43 +1,43 @@ [x86_64] -manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-02-27-5f4cccc -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-27-769bdbd -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-27-769bdbd -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-27-769bdbd -musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-02-27-769bdbd +manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-03-06-f52299e +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-06-4efbd88 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-06-4efbd88 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-06-4efbd88 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-03-06-4efbd88 [i686] -manylinux1 = quay.io/pypa/manylinux1_i686:2022-02-27-5f4cccc -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-27-769bdbd -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-27-769bdbd -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-27-769bdbd -musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-02-27-769bdbd +manylinux1 = quay.io/pypa/manylinux1_i686:2022-03-06-f52299e +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-06-4efbd88 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-06-4efbd88 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-06-4efbd88 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-03-06-4efbd88 [pypy_x86_64] -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-02-27-769bdbd -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-02-27-769bdbd -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-02-27-769bdbd +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-06-4efbd88 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-06-4efbd88 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-06-4efbd88 [pypy_i686] -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-02-27-769bdbd -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-02-27-769bdbd -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-02-27-769bdbd +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-06-4efbd88 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-06-4efbd88 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-06-4efbd88 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-27-769bdbd -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-27-769bdbd -musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-02-27-769bdbd +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-03-06-4efbd88 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-03-06-4efbd88 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-03-06-4efbd88 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-02-27-769bdbd -manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-02-27-769bdbd -musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-02-27-769bdbd +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-03-06-4efbd88 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-03-06-4efbd88 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-03-06-4efbd88 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-02-27-769bdbd -manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-02-27-769bdbd -musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-02-27-769bdbd +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-03-06-4efbd88 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-03-06-4efbd88 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-03-06-4efbd88 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-02-27-769bdbd -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-02-27-769bdbd +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-03-06-4efbd88 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-03-06-4efbd88 diff --git a/docs/working-examples.md b/docs/working-examples.md index ebf02f362..ab275e73d 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -51,8 +51,8 @@ title: Working examples | [aioquic][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python | | [DeepForest][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) | | [google neuroglancer][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data | -| [AutoPy][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | | [Parselmouth][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. | +| [AutoPy][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | | [Psycopg 3][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A modern implementation of a PostgreSQL adapter for Python | | [H3-py][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system | | [markupsafe][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. | @@ -138,8 +138,8 @@ title: Working examples [aioquic]: https://github.com/aiortc/aioquic [DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest [google neuroglancer]: https://github.com/google/neuroglancer -[AutoPy]: https://github.com/autopilot-rs/autopy [Parselmouth]: https://github.com/YannickJadoul/Parselmouth +[AutoPy]: https://github.com/autopilot-rs/autopy [Psycopg 3]: https://github.com/psycopg/psycopg [H3-py]: https://github.com/uber/h3-py [markupsafe]: https://github.com/pallets/markupsafe @@ -192,92 +192,92 @@ title: Working examples [apple icon]: data/readme_icons/apple.svg [linux icon]: data/readme_icons/linux.svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + From 13b65414ae34cfd36383e9779fc8905462005ae5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 10:50:33 -0500 Subject: [PATCH 0021/1105] chore(deps): bump actions/checkout from 2 to 3 (#1046) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 6 +++--- .github/workflows/update-dependencies.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d79d9d4b..1ab889194 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: dist: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Build SDist and wheel run: pipx run build diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f2296a915..bc2346f7a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: name: Linters (mypy, flake8, etc.) runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v3 - uses: pre-commit/action@v2.0.3 - name: Check manifest @@ -39,7 +39,7 @@ jobs: python_version: ['3.10'] timeout-minutes: 180 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v3 name: Install Python ${{ matrix.python_version }} with: @@ -76,7 +76,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 180 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v3 - name: Install dependencies run: | diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index bbce092e9..6bb9a0ddc 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -11,7 +11,7 @@ jobs: if: github.repository_owner == 'pypa' || github.event_name != 'schedule' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: excitedleigh/setup-nox@v2.0.0 - name: "Run update: dependencies" From f8f988ead93b15f1c1b025d4ef5935cd8fbb4477 Mon Sep 17 00:00:00 2001 From: Jin Zhu Date: Sat, 12 Mar 2022 20:46:51 +0800 Subject: [PATCH 0022/1105] Add abess A machine learning software using cibuildwheel. cibuildwheel is excellent and very helpful! --- docs/data/projects.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/data/projects.yml b/docs/data/projects.yml index ba49e9b1a..f43e270be 100644 --- a/docs/data/projects.yml +++ b/docs/data/projects.yml @@ -7,6 +7,12 @@ # ci: [appveyor, github, azurepipelines, circleci, gitlab, travisci] (optional) # notes: (text, optional) +- name: abess + gh: abess-team/abess + notes: A fast best-subset selection library. It uses cibuildwheel to build a large project with C++ extensions. + ci: [github] + os: [windows, apple, linux] + - name: Matplotlib gh: matplotlib/matplotlib notes: The venerable Matplotlib, a Python library with C++ portions @@ -30,8 +36,8 @@ - name: Parselmouth gh: YannickJadoul/Parselmouth - pypi: praat-parselmouth - notes: A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. + pypi: praat-parselmouthA Python interface to the Praat software package, using pybind + notes: 11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. ci: [github] os: [windows, apple, linux] From 02cc5bdaead2e5bf30a05f0a7510432ba1107577 Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Fri, 18 Mar 2022 00:13:35 -0400 Subject: [PATCH 0023/1105] [Bot] Update dependencies (#1050) * Update dependencies * chore: minor updates Co-authored-by: mayeut Co-authored-by: Henry Schreiner --- .pre-commit-config.yaml | 6 +- .../resources/constraints-python310.txt | 4 +- .../resources/constraints-python36.txt | 2 +- .../resources/constraints-python37.txt | 6 +- .../resources/constraints-python38.txt | 4 +- .../resources/constraints-python39.txt | 4 +- cibuildwheel/resources/constraints.txt | 4 +- .../resources/pinned_docker_images.cfg | 28 +-- cibuildwheel/resources/virtualenv.toml | 4 +- docs/working-examples.md | 182 +++++++++--------- pyproject.toml | 1 - 11 files changed, 122 insertions(+), 123 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fdd5a4704..115336688 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/asottile/pyupgrade - rev: v2.31.0 + rev: v2.31.1 hooks: - id: pyupgrade name: PyUpgrade 3.6+ @@ -27,7 +27,7 @@ repos: # Autoremoves unused imports - repo: https://github.com/hadialqattan/pycln - rev: v1.2.4 + rev: v1.2.5 hooks: - id: pycln args: [--config=pyproject.toml] @@ -48,7 +48,7 @@ repos: - id: setup-cfg-fmt - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.931 + rev: v0.941 hooks: - id: mypy name: mypy 3.6 on cibuildwheel/ diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index 1ad8ab72e..4019c047a 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.2 +virtualenv==20.13.3 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -24,7 +24,7 @@ wheel==0.37.1 # delocate # The following packages are considered to be unsafe in a requirements file: -pip==22.0.3 +pip==22.0.4 # via -r cibuildwheel/resources/constraints.in setuptools==60.9.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python36.txt b/cibuildwheel/resources/constraints-python36.txt index 047f916b3..e0282d508 100644 --- a/cibuildwheel/resources/constraints-python36.txt +++ b/cibuildwheel/resources/constraints-python36.txt @@ -22,7 +22,7 @@ typing-extensions==4.1.1 # via # delocate # importlib-metadata -virtualenv==20.13.2 +virtualenv==20.13.3 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via diff --git a/cibuildwheel/resources/constraints-python37.txt b/cibuildwheel/resources/constraints-python37.txt index fcdba03bf..56e691c51 100644 --- a/cibuildwheel/resources/constraints-python37.txt +++ b/cibuildwheel/resources/constraints-python37.txt @@ -10,7 +10,7 @@ distlib==0.3.4 # via virtualenv filelock==3.6.0 # via virtualenv -importlib-metadata==4.11.2 +importlib-metadata==4.11.3 # via virtualenv platformdirs==2.5.1 # via virtualenv @@ -20,7 +20,7 @@ typing-extensions==4.1.1 # via # delocate # importlib-metadata -virtualenv==20.13.2 +virtualenv==20.13.3 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -30,7 +30,7 @@ zipp==3.7.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -pip==22.0.3 +pip==22.0.4 # via -r cibuildwheel/resources/constraints.in setuptools==60.9.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index 741d6cab6..3d1498d47 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.2 +virtualenv==20.13.3 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -24,7 +24,7 @@ wheel==0.37.1 # delocate # The following packages are considered to be unsafe in a requirements file: -pip==22.0.3 +pip==22.0.4 # via -r cibuildwheel/resources/constraints.in setuptools==60.9.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index 85b919bbd..c628c8055 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.2 +virtualenv==20.13.3 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -24,7 +24,7 @@ wheel==0.37.1 # delocate # The following packages are considered to be unsafe in a requirements file: -pip==22.0.3 +pip==22.0.4 # via -r cibuildwheel/resources/constraints.in setuptools==60.9.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index 85b919bbd..c628c8055 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.2 +virtualenv==20.13.3 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -24,7 +24,7 @@ wheel==0.37.1 # delocate # The following packages are considered to be unsafe in a requirements file: -pip==22.0.3 +pip==22.0.4 # via -r cibuildwheel/resources/constraints.in setuptools==60.9.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 25031eb7c..955302714 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,26 +1,26 @@ [x86_64] manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-03-06-f52299e -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-06-4efbd88 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-06-4efbd88 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-06-4efbd88 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-03-06-4efbd88 +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-14-b2cd80b +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-14-b2cd80b +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-14-b2cd80b +musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-03-14-b2cd80b [i686] manylinux1 = quay.io/pypa/manylinux1_i686:2022-03-06-f52299e -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-06-4efbd88 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-06-4efbd88 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-06-4efbd88 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-03-06-4efbd88 +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-14-b2cd80b +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-14-b2cd80b +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-14-b2cd80b +musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-03-14-b2cd80b [pypy_x86_64] -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-06-4efbd88 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-06-4efbd88 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-06-4efbd88 +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-14-b2cd80b +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-14-b2cd80b +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-14-b2cd80b [pypy_i686] -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-06-4efbd88 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-06-4efbd88 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-06-4efbd88 +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-14-b2cd80b +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-14-b2cd80b +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-14-b2cd80b [aarch64] manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-03-06-4efbd88 diff --git a/cibuildwheel/resources/virtualenv.toml b/cibuildwheel/resources/virtualenv.toml index 418eabcde..4c781dbff 100644 --- a/cibuildwheel/resources/virtualenv.toml +++ b/cibuildwheel/resources/virtualenv.toml @@ -1,2 +1,2 @@ -version = "20.13.2" -url = "https://github.com/pypa/get-virtualenv/blob/20.13.2/public/virtualenv.pyz?raw=true" +version = "20.13.3" +url = "https://github.com/pypa/get-virtualenv/blob/20.13.3/public/virtualenv.pyz?raw=true" diff --git a/docs/working-examples.md b/docs/working-examples.md index ab275e73d..7aa3a86fc 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -18,8 +18,8 @@ title: Working examples | [psutil][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python | | [vaex][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Out-of-Core hybrid Apache Arrow/NumPy DataFrame for Python, ML, visualization and exploration of big tabular data at a billion rows per second 🚀 | | [Google Benchmark][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A microbenchmark support library | -| [asyncpg][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A fast PostgreSQL Database Client Library for Python/asyncio. | | [Apache Beam][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Apache Beam is a unified programming model for Batch and Streaming | +| [asyncpg][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A fast PostgreSQL Database Client Library for Python/asyncio. | | [scikit-image][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Image processing library. Uses cibuildwheel to build and test a project that uses Cython with platform-native code. | | [cmake][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | | [twisted-iocpsupport][] | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. | @@ -31,8 +31,8 @@ title: Working examples | [River][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python | | [OpenSpiel][] | ![github icon][] | ![apple icon][] ![linux icon][] | OpenSpiel is a collection of environments and algorithms for research in general reinforcement learning and search/planning in games. | | [pyzmq][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython and CFFI. | -| [vispy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Main repository for Vispy | | [aiortc][] | ![github icon][] | ![apple icon][] ![linux icon][] | WebRTC and ORTC implementation for Python using asyncio. | +| [vispy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Main repository for Vispy | | [Confluent client for Kafka][] | ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | setup in `tools/wheels/build-wheels.bat` | | [tinyobjloader][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Tiny but powerful single file wavefront obj loader | | [coverage.py][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python | @@ -55,8 +55,8 @@ title: Working examples | [AutoPy][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | | [Psycopg 3][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A modern implementation of a PostgreSQL adapter for Python | | [H3-py][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system | -| [markupsafe][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. | | [Rtree][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS ¶ | +| [markupsafe][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. | | [python-rapidjson][] | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson | | [python-snappy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for the snappy google library | | [pybind11 cmake_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system | @@ -105,8 +105,8 @@ title: Working examples [psutil]: https://github.com/giampaolo/psutil [vaex]: https://github.com/vaexio/vaex [Google Benchmark]: https://github.com/google/benchmark -[asyncpg]: https://github.com/MagicStack/asyncpg [Apache Beam]: https://github.com/apache/beam +[asyncpg]: https://github.com/MagicStack/asyncpg [scikit-image]: https://github.com/scikit-image/scikit-image [cmake]: https://github.com/scikit-build/cmake-python-distributions [twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport @@ -118,8 +118,8 @@ title: Working examples [River]: https://github.com/online-ml/river [OpenSpiel]: https://github.com/deepmind/open_spiel [pyzmq]: https://github.com/zeromq/pyzmq -[vispy]: https://github.com/vispy/vispy [aiortc]: https://github.com/aiortc/aiortc +[vispy]: https://github.com/vispy/vispy [Confluent client for Kafka]: https://github.com/confluentinc/confluent-kafka-python [tinyobjloader]: https://github.com/tinyobjloader/tinyobjloader [coverage.py]: https://github.com/nedbat/coveragepy @@ -142,8 +142,8 @@ title: Working examples [AutoPy]: https://github.com/autopilot-rs/autopy [Psycopg 3]: https://github.com/psycopg/psycopg [H3-py]: https://github.com/uber/h3-py -[markupsafe]: https://github.com/pallets/markupsafe [Rtree]: https://github.com/Toblerity/rtree +[markupsafe]: https://github.com/pallets/markupsafe [python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson [python-snappy]: https://github.com/andrix/python-snappy [pybind11 cmake_example]: https://github.com/pybind/cmake_example @@ -192,92 +192,92 @@ title: Working examples [apple icon]: data/readme_icons/apple.svg [linux icon]: data/readme_icons/linux.svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/pyproject.toml b/pyproject.toml index 6fc342a92..7b24f16b6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,6 @@ [build-system] requires = [ "setuptools>=42", - "wheel" ] build-backend = "setuptools.build_meta" From a603863afd37bd808e47d0a873b23442aaa1f5fd Mon Sep 17 00:00:00 2001 From: Jin Zhu Date: Fri, 18 Mar 2022 21:51:30 +0800 Subject: [PATCH 0024/1105] Update projects.yml --- docs/data/projects.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/data/projects.yml b/docs/data/projects.yml index f43e270be..e12bd99bc 100644 --- a/docs/data/projects.yml +++ b/docs/data/projects.yml @@ -36,8 +36,8 @@ - name: Parselmouth gh: YannickJadoul/Parselmouth - pypi: praat-parselmouthA Python interface to the Praat software package, using pybind - notes: 11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. + pypi: praat-parselmouth + notes: A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. ci: [github] os: [windows, apple, linux] From bc3ebefe354fdff736972518dcb562566160ffb1 Mon Sep 17 00:00:00 2001 From: mayeut Date: Mon, 21 Mar 2022 06:14:03 +0000 Subject: [PATCH 0025/1105] Update dependencies --- cibuildwheel/resources/build-platforms.toml | 22 +-- .../resources/constraints-python310.txt | 4 +- .../resources/constraints-python36.txt | 2 +- .../resources/constraints-python37.txt | 4 +- .../resources/constraints-python38.txt | 4 +- .../resources/constraints-python39.txt | 4 +- cibuildwheel/resources/constraints.txt | 4 +- .../resources/pinned_docker_images.cfg | 54 +++--- docs/working-examples.md | 175 +++++++++--------- 9 files changed, 138 insertions(+), 135 deletions(-) diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index 5bb0350e9..d9ba89a50 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -68,12 +68,12 @@ python_configurations = [ { identifier = "cp38-macosx_x86_64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" }, { identifier = "cp38-macosx_arm64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" }, { identifier = "cp38-macosx_universal2", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" }, - { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.10/python-3.9.10-macos11.pkg" }, - { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.10/python-3.9.10-macos11.pkg" }, - { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.10/python-3.9.10-macos11.pkg" }, - { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.2/python-3.10.2-macos11.pkg" }, - { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.2/python-3.10.2-macos11.pkg" }, - { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.2/python-3.10.2-macos11.pkg" }, + { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.11/python-3.9.11-macos11.pkg" }, + { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.11/python-3.9.11-macos11.pkg" }, + { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.11/python-3.9.11-macos11.pkg" }, + { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.3/python-3.10.3-macos11.pkg" }, + { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.3/python-3.10.3-macos11.pkg" }, + { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.3/python-3.10.3-macos11.pkg" }, { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-osx64.tar.bz2" }, { identifier = "pp38-macosx_x86_64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.8-osx64.tar.bz2" }, { identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.8-osx64.tar.bz2" }, @@ -87,12 +87,12 @@ python_configurations = [ { identifier = "cp37-win_amd64", version = "3.7.9", arch = "64" }, { identifier = "cp38-win32", version = "3.8.10", arch = "32" }, { identifier = "cp38-win_amd64", version = "3.8.10", arch = "64" }, - { identifier = "cp39-win32", version = "3.9.10", arch = "32" }, - { identifier = "cp39-win_amd64", version = "3.9.10", arch = "64" }, - { identifier = "cp310-win32", version = "3.10.2", arch = "32" }, - { identifier = "cp310-win_amd64", version = "3.10.2", arch = "64" }, + { identifier = "cp39-win32", version = "3.9.11.1", arch = "32" }, + { identifier = "cp39-win_amd64", version = "3.9.11.1", arch = "64" }, + { identifier = "cp310-win32", version = "3.10.3", arch = "32" }, + { identifier = "cp310-win_amd64", version = "3.10.3", arch = "64" }, { identifier = "cp39-win_arm64", version = "3.9.10", arch = "ARM64" }, - { identifier = "cp310-win_arm64", version = "3.10.2", arch = "ARM64" }, + { identifier = "cp310-win_arm64", version = "3.10.3", arch = "ARM64" }, { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-win64.zip" }, { identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.8-win64.zip" }, { identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.8-win64.zip" }, diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index 4019c047a..12e717901 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.3 +virtualenv==20.13.4 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==60.9.3 +setuptools==60.10.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python36.txt b/cibuildwheel/resources/constraints-python36.txt index e0282d508..a1a923301 100644 --- a/cibuildwheel/resources/constraints-python36.txt +++ b/cibuildwheel/resources/constraints-python36.txt @@ -22,7 +22,7 @@ typing-extensions==4.1.1 # via # delocate # importlib-metadata -virtualenv==20.13.3 +virtualenv==20.13.4 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via diff --git a/cibuildwheel/resources/constraints-python37.txt b/cibuildwheel/resources/constraints-python37.txt index 56e691c51..33087bb9d 100644 --- a/cibuildwheel/resources/constraints-python37.txt +++ b/cibuildwheel/resources/constraints-python37.txt @@ -20,7 +20,7 @@ typing-extensions==4.1.1 # via # delocate # importlib-metadata -virtualenv==20.13.3 +virtualenv==20.13.4 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -32,5 +32,5 @@ zipp==3.7.0 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==60.9.3 +setuptools==60.10.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index 3d1498d47..5dbea511d 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.3 +virtualenv==20.13.4 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==60.9.3 +setuptools==60.10.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index c628c8055..cefd67793 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.3 +virtualenv==20.13.4 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==60.9.3 +setuptools==60.10.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index c628c8055..cefd67793 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.3 +virtualenv==20.13.4 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==60.9.3 +setuptools==60.10.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 955302714..0508aa34a 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,43 +1,43 @@ [x86_64] -manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-03-06-f52299e -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-14-b2cd80b -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-14-b2cd80b -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-14-b2cd80b -musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-03-14-b2cd80b +manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-03-18-11e604c +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-19-a819637 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-19-a819637 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-19-a819637 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-03-19-a819637 [i686] -manylinux1 = quay.io/pypa/manylinux1_i686:2022-03-06-f52299e -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-14-b2cd80b -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-14-b2cd80b -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-14-b2cd80b -musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-03-14-b2cd80b +manylinux1 = quay.io/pypa/manylinux1_i686:2022-03-18-11e604c +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-19-a819637 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-19-a819637 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-19-a819637 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-03-19-a819637 [pypy_x86_64] -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-14-b2cd80b -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-14-b2cd80b -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-14-b2cd80b +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-19-a819637 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-19-a819637 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-19-a819637 [pypy_i686] -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-14-b2cd80b -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-14-b2cd80b -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-14-b2cd80b +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-19-a819637 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-19-a819637 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-19-a819637 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-03-06-4efbd88 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-03-06-4efbd88 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-03-06-4efbd88 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-03-19-a819637 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-03-19-a819637 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-03-14-b2cd80b [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-03-06-4efbd88 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-03-06-4efbd88 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-03-06-4efbd88 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-03-19-a819637 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-03-19-a819637 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-03-19-a819637 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-03-06-4efbd88 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-03-06-4efbd88 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-03-06-4efbd88 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-03-19-a819637 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-03-19-a819637 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-03-19-a819637 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-03-06-4efbd88 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-03-06-4efbd88 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-03-19-a819637 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-03-19-a819637 diff --git a/docs/working-examples.md b/docs/working-examples.md index 7aa3a86fc..9917f6d59 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -52,8 +52,8 @@ title: Working examples | [DeepForest][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) | | [google neuroglancer][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data | | [Parselmouth][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. | -| [AutoPy][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | | [Psycopg 3][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A modern implementation of a PostgreSQL adapter for Python | +| [AutoPy][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | | [H3-py][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system | | [Rtree][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS ¶ | | [markupsafe][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. | @@ -68,6 +68,7 @@ title: Working examples | [sourmash][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. | | [time-machine][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. | | [CTranslate2][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit.html) and CUDA kernels compiled for multiple GPU architectures. | +| [abess][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A fast best-subset selection library. It uses cibuildwheel to build a large project with C++ extensions. | | [matrixprofile][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. | | [jq.py][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq | | [iminuit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 | @@ -139,8 +140,8 @@ title: Working examples [DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest [google neuroglancer]: https://github.com/google/neuroglancer [Parselmouth]: https://github.com/YannickJadoul/Parselmouth -[AutoPy]: https://github.com/autopilot-rs/autopy [Psycopg 3]: https://github.com/psycopg/psycopg +[AutoPy]: https://github.com/autopilot-rs/autopy [H3-py]: https://github.com/uber/h3-py [Rtree]: https://github.com/Toblerity/rtree [markupsafe]: https://github.com/pallets/markupsafe @@ -155,6 +156,7 @@ title: Working examples [sourmash]: https://github.com/dib-lab/sourmash [time-machine]: https://github.com/adamchainz/time-machine [CTranslate2]: https://github.com/OpenNMT/CTranslate2 +[abess]: https://github.com/abess-team/abess [matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile [jq.py]: https://github.com/mwilliamson/jq.py [iminuit]: https://github.com/scikit-hep/iminuit @@ -192,92 +194,93 @@ title: Working examples [apple icon]: data/readme_icons/apple.svg [linux icon]: data/readme_icons/linux.svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + From 2141ab26a2ecce87e882054255dfcf4c2f59362e Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 21 Mar 2022 20:42:15 +0000 Subject: [PATCH 0026/1105] Reduce Gitlab testing to just the basic tests --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d6cd1763..5f6d0deb9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,11 @@ linux: DOCKER_DRIVER: overlay2 # See https://github.com/docker-library/docker/pull/166 DOCKER_TLS_CERTDIR: "" + + # skip all but the basic tests + # (comment the below line in a PR to debug a Gitlab-specific issue) + PYTEST_ADDOPTS: -k "unit_test or test_0_basic" --suppress-no-test-exit-code script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install -e ".[dev]" + - python -m pip install -e ".[dev]" pytest-custom-exit-code - python ./bin/run_tests.py From 985be06a61cad71cb3894983d7a094d180b4748c Mon Sep 17 00:00:00 2001 From: Anderson Bravalheri Date: Sat, 26 Mar 2022 10:29:22 +0000 Subject: [PATCH 0027/1105] docs: add note about opting into PEP 621 --- docs/options.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/options.md b/docs/options.md index 45f67873a..8e71e37c1 100644 --- a/docs/options.md +++ b/docs/options.md @@ -432,6 +432,12 @@ the package is compatible with all versions of Python that it can build. requires = ["setuptools>=42", "wheel"] build-backend = "setuptools.build_meta" + Note however, that adding a `[project]` table to your `pyproject.toml` may + trigger a series of validations as specified in + [PEP621](https://www.python.org/dev/peps/pep-0621/). Also consider that + adding `[project]`, if not done carefully, will change the behaviour of your + build (e.g. `setuptools` may ignore `install_requires` specified via + `setup.py` or `setup.cfg`). Currently, setuptools has not yet added support for reading this value from pyproject.toml yet, and so does not copy it to Requires-Python in the wheel From d76d019adab51c0e3ead081ccd47eb23ce1160a1 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sun, 27 Mar 2022 21:47:30 +0100 Subject: [PATCH 0028/1105] Reword requires-python section note --- docs/options.md | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/docs/options.md b/docs/options.md index 8e71e37c1..cda8500d6 100644 --- a/docs/options.md +++ b/docs/options.md @@ -420,39 +420,33 @@ the package is compatible with all versions of Python that it can build. !!! note Rather than using this option, it's recommended you set `project.requires-python` in `pyproject.toml` instead: - Example `pyproject.toml`: - [project] - requires-python = ">=3.6" + ```toml + [project] + requires-python = ">=3.6" + ``` - # Aside - in pyproject.toml you should always specify minimal build - # system options, like this: + A few things to note: + - If your project didn't already have a `pyproject.toml`, be sure to + set the build system to your build backend. + + ```toml [build-system] requires = ["setuptools>=42", "wheel"] build-backend = "setuptools.build_meta" - - Note however, that adding a `[project]` table to your `pyproject.toml` may - trigger a series of validations as specified in - [PEP621](https://www.python.org/dev/peps/pep-0621/). Also consider that - adding `[project]`, if not done carefully, will change the behaviour of your - build (e.g. `setuptools` may ignore `install_requires` specified via - `setup.py` or `setup.cfg`). - - Currently, setuptools has not yet added support for reading this value from - pyproject.toml yet, and so does not copy it to Requires-Python in the wheel - metadata. This mechanism is used by pip to scan through older versions of - your package until it finds a release compatible with the current version - of Python compatible when installing, so it is an important value to set if - you plan to drop support for a version of Python in the future. - - If you don't want to list this value twice, you can also use the setuptools - specific location in `setup.cfg` and cibuildwheel will detect it from - there. Example `setup.cfg`: - - [options] - python_requires = ">=3.6" - + ``` + + - If you didn't already have a `pyproject.toml` that had a `[project]` + table, you should migrate values from `setup.py` or `setup.cfg`, or + [list them in the the `dynamic` field](https://peps.python.org/pep-0621/#dynamic). + The values to include and the format is listed in + [PEP 621](https://peps.python.org/pep-0621/#details) + + - Adding `[project]` to `pyproject.toml` can + change the behaviour of your build (e.g. `setuptools` may ignore + `install_requires` specified via `setup.py` or `setup.cfg`). Make sure + to double-check the build after adding. This option is not available in `pyproject.toml` under `tool.cibuildwheel.project-requires-python`, since it should be set with the From 93477cab80bd0edd7f6e5cb3a7f33a46a62a69fe Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sun, 27 Mar 2022 21:58:57 +0100 Subject: [PATCH 0029/1105] Fix docs build --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 621ccf273..96b4d10c9 100644 --- a/setup.py +++ b/setup.py @@ -4,6 +4,7 @@ "docs": [ "mkdocs-include-markdown-plugin==2.8.0", "mkdocs==1.0.4", + "jinja2==3.0.3", "pymdown-extensions", "mkdocs-macros-plugin", ], From 1d6a1c020939945bd112c27ac7ee266c22009d2f Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 29 Mar 2022 09:31:39 -0400 Subject: [PATCH 0030/1105] Update docs/options.md Co-authored-by: CAM Gerlach --- docs/options.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/options.md b/docs/options.md index cda8500d6..17b5ea321 100644 --- a/docs/options.md +++ b/docs/options.md @@ -439,9 +439,10 @@ the package is compatible with all versions of Python that it can build. - If you didn't already have a `pyproject.toml` that had a `[project]` table, you should migrate values from `setup.py` or `setup.cfg`, or - [list them in the the `dynamic` field](https://peps.python.org/pep-0621/#dynamic). - The values to include and the format is listed in - [PEP 621](https://peps.python.org/pep-0621/#details) + list them in the [the `dynamic` field](https://packaging.python.org/en/latest/specifications/declaring-project-metadata/#dynamic). + The values to include and the format is listed in the + [project source metadata specification](https://packaging.python.org/en/latest/specifications/declaring-project-metadata/#dynamic) + (as originally defined in PEP 621). - Adding `[project]` to `pyproject.toml` can change the behaviour of your build (e.g. `setuptools` may ignore From 9e1a11cc8386ae45fb28d02ca3a60e8e97f9c2c3 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Tue, 29 Mar 2022 15:09:19 +0100 Subject: [PATCH 0031/1105] Fix docs build (#1068) --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 621ccf273..96b4d10c9 100644 --- a/setup.py +++ b/setup.py @@ -4,6 +4,7 @@ "docs": [ "mkdocs-include-markdown-plugin==2.8.0", "mkdocs==1.0.4", + "jinja2==3.0.3", "pymdown-extensions", "mkdocs-macros-plugin", ], From 7feee994a78306354b3e31319db992ad50a3b7c7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 10:10:47 -0400 Subject: [PATCH 0032/1105] [pre-commit.ci] pre-commit autoupdate (#1069) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/pre-commit/mirrors-mypy: v0.941 → v0.942](https://github.com/pre-commit/mirrors-mypy/compare/v0.941...v0.942) * fix: black update Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 115336688..e76509d25 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,7 @@ repos: - id: isort - repo: https://github.com/psf/black - rev: 22.1.0 + rev: 22.3.0 hooks: - id: black @@ -48,7 +48,7 @@ repos: - id: setup-cfg-fmt - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.941 + rev: v0.942 hooks: - id: mypy name: mypy 3.6 on cibuildwheel/ From e1bcc10600434384a698117de002afaf45801b63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 10:10:59 -0400 Subject: [PATCH 0033/1105] chore(deps): bump peter-evans/create-pull-request from 3 to 4 (#1067) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3 to 4. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v3...v4) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/update-dependencies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index 6bb9a0ddc..70f65e2a7 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -32,7 +32,7 @@ jobs: - name: Create Pull Request if: github.ref == 'refs/heads/main' && github.repository == 'pypa/cibuildwheel' - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: commit-message: Update dependencies title: '[Bot] Update dependencies' From 63a45ab2c0933087a8aed18a37642aafbc792bc5 Mon Sep 17 00:00:00 2001 From: Kjell Jorner <36157530+kjelljorner@users.noreply.github.com> Date: Tue, 29 Mar 2022 10:11:28 -0400 Subject: [PATCH 0034/1105] ci: change github.event.ref to github.ref (#1061) --- examples/github-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index 23180e140..7f4d46326 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -45,7 +45,7 @@ jobs: needs: [build_wheels, build_sdist] runs-on: ubuntu-latest # upload to PyPI on every tag starting with 'v' - if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') # alternatively, to publish when a GitHub Release is created, use the following rule: # if: github.event_name == 'release' && github.event.action == 'published' steps: From 23dc92c5f3c601f28995731de783a7bc9d942b2c Mon Sep 17 00:00:00 2001 From: mayeut Date: Mon, 28 Mar 2022 06:13:55 +0000 Subject: [PATCH 0035/1105] Update dependencies --- cibuildwheel/resources/build-platforms.toml | 22 +-- .../resources/constraints-python310.txt | 4 +- .../resources/constraints-python36.txt | 2 +- .../resources/constraints-python37.txt | 4 +- .../resources/constraints-python38.txt | 4 +- .../resources/constraints-python39.txt | 4 +- cibuildwheel/resources/constraints.txt | 4 +- docs/working-examples.md | 186 +++++++++--------- 8 files changed, 115 insertions(+), 115 deletions(-) diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index d9ba89a50..1216512c7 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -68,12 +68,12 @@ python_configurations = [ { identifier = "cp38-macosx_x86_64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" }, { identifier = "cp38-macosx_arm64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" }, { identifier = "cp38-macosx_universal2", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" }, - { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.11/python-3.9.11-macos11.pkg" }, - { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.11/python-3.9.11-macos11.pkg" }, - { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.11/python-3.9.11-macos11.pkg" }, - { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.3/python-3.10.3-macos11.pkg" }, - { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.3/python-3.10.3-macos11.pkg" }, - { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.3/python-3.10.3-macos11.pkg" }, + { identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.12/python-3.9.12-macos11.pkg" }, + { identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.12/python-3.9.12-macos11.pkg" }, + { identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.12/python-3.9.12-macos11.pkg" }, + { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.4/python-3.10.4-macos11.pkg" }, + { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.4/python-3.10.4-macos11.pkg" }, + { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.4/python-3.10.4-macos11.pkg" }, { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-osx64.tar.bz2" }, { identifier = "pp38-macosx_x86_64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.8-osx64.tar.bz2" }, { identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.8-osx64.tar.bz2" }, @@ -87,12 +87,12 @@ python_configurations = [ { identifier = "cp37-win_amd64", version = "3.7.9", arch = "64" }, { identifier = "cp38-win32", version = "3.8.10", arch = "32" }, { identifier = "cp38-win_amd64", version = "3.8.10", arch = "64" }, - { identifier = "cp39-win32", version = "3.9.11.1", arch = "32" }, - { identifier = "cp39-win_amd64", version = "3.9.11.1", arch = "64" }, - { identifier = "cp310-win32", version = "3.10.3", arch = "32" }, - { identifier = "cp310-win_amd64", version = "3.10.3", arch = "64" }, + { identifier = "cp39-win32", version = "3.9.12", arch = "32" }, + { identifier = "cp39-win_amd64", version = "3.9.12", arch = "64" }, + { identifier = "cp310-win32", version = "3.10.4", arch = "32" }, + { identifier = "cp310-win_amd64", version = "3.10.4", arch = "64" }, { identifier = "cp39-win_arm64", version = "3.9.10", arch = "ARM64" }, - { identifier = "cp310-win_arm64", version = "3.10.3", arch = "ARM64" }, + { identifier = "cp310-win_arm64", version = "3.10.4", arch = "ARM64" }, { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-win64.zip" }, { identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.8-win64.zip" }, { identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.8-win64.zip" }, diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index 12e717901..a7cb6ef6c 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.4 +virtualenv==20.14.0 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==60.10.0 +setuptools==61.2.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python36.txt b/cibuildwheel/resources/constraints-python36.txt index a1a923301..d78f95a1a 100644 --- a/cibuildwheel/resources/constraints-python36.txt +++ b/cibuildwheel/resources/constraints-python36.txt @@ -22,7 +22,7 @@ typing-extensions==4.1.1 # via # delocate # importlib-metadata -virtualenv==20.13.4 +virtualenv==20.14.0 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via diff --git a/cibuildwheel/resources/constraints-python37.txt b/cibuildwheel/resources/constraints-python37.txt index 33087bb9d..f59d2240c 100644 --- a/cibuildwheel/resources/constraints-python37.txt +++ b/cibuildwheel/resources/constraints-python37.txt @@ -20,7 +20,7 @@ typing-extensions==4.1.1 # via # delocate # importlib-metadata -virtualenv==20.13.4 +virtualenv==20.14.0 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -32,5 +32,5 @@ zipp==3.7.0 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==60.10.0 +setuptools==61.2.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index 5dbea511d..9a8bf014a 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.4 +virtualenv==20.14.0 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==60.10.0 +setuptools==61.2.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index cefd67793..10f68a89b 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.4 +virtualenv==20.14.0 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==60.10.0 +setuptools==61.2.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index cefd67793..10f68a89b 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -16,7 +16,7 @@ six==1.16.0 # via virtualenv typing-extensions==4.1.1 # via delocate -virtualenv==20.13.4 +virtualenv==20.14.0 # via -r cibuildwheel/resources/constraints.in wheel==0.37.1 # via @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==60.10.0 +setuptools==61.2.0 # via -r cibuildwheel/resources/constraints.in diff --git a/docs/working-examples.md b/docs/working-examples.md index 9917f6d59..9ab35b6e8 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -22,8 +22,8 @@ title: Working examples | [asyncpg][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A fast PostgreSQL Database Client Library for Python/asyncio. | | [scikit-image][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Image processing library. Uses cibuildwheel to build and test a project that uses Cython with platform-native code. | | [cmake][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | -| [twisted-iocpsupport][] | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. | | [duckdb][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System | +| [twisted-iocpsupport][] | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. | | [websockets][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Library for building WebSocket servers and clients. Mostly written in Python, with a small C 'speedups' extension module. | | [cvxpy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A Python-embedded modeling language for convex optimization problems. | | [PyOxidizer][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A modern Python application packaging and distribution tool | @@ -51,8 +51,8 @@ title: Working examples | [aioquic][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python | | [DeepForest][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) | | [google neuroglancer][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data | -| [Parselmouth][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. | | [Psycopg 3][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A modern implementation of a PostgreSQL adapter for Python | +| [Parselmouth][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. | | [AutoPy][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | | [H3-py][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system | | [Rtree][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS ¶ | @@ -67,8 +67,8 @@ title: Working examples | [cyvcf2][] | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing | | [sourmash][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. | | [time-machine][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. | -| [CTranslate2][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit.html) and CUDA kernels compiled for multiple GPU architectures. | | [abess][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A fast best-subset selection library. It uses cibuildwheel to build a large project with C++ extensions. | +| [CTranslate2][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit.html) and CUDA kernels compiled for multiple GPU architectures. | | [matrixprofile][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. | | [jq.py][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq | | [iminuit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 | @@ -83,8 +83,8 @@ title: Working examples | [etebase-py][] | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. | | [fathon][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms | | [Imagecodecs (fork)][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. | -| [numpythia][] | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy | | [polaroid][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. | +| [numpythia][] | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy | | [pyjet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy | | [clang-format][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. | | [ninja][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | @@ -110,8 +110,8 @@ title: Working examples [asyncpg]: https://github.com/MagicStack/asyncpg [scikit-image]: https://github.com/scikit-image/scikit-image [cmake]: https://github.com/scikit-build/cmake-python-distributions -[twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport [duckdb]: https://github.com/duckdb/duckdb +[twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport [websockets]: https://github.com/aaugustin/websockets [cvxpy]: https://github.com/cvxpy/cvxpy [PyOxidizer]: https://github.com/indygreg/PyOxidizer @@ -139,8 +139,8 @@ title: Working examples [aioquic]: https://github.com/aiortc/aioquic [DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest [google neuroglancer]: https://github.com/google/neuroglancer -[Parselmouth]: https://github.com/YannickJadoul/Parselmouth [Psycopg 3]: https://github.com/psycopg/psycopg +[Parselmouth]: https://github.com/YannickJadoul/Parselmouth [AutoPy]: https://github.com/autopilot-rs/autopy [H3-py]: https://github.com/uber/h3-py [Rtree]: https://github.com/Toblerity/rtree @@ -155,8 +155,8 @@ title: Working examples [cyvcf2]: https://github.com/brentp/cyvcf2 [sourmash]: https://github.com/dib-lab/sourmash [time-machine]: https://github.com/adamchainz/time-machine -[CTranslate2]: https://github.com/OpenNMT/CTranslate2 [abess]: https://github.com/abess-team/abess +[CTranslate2]: https://github.com/OpenNMT/CTranslate2 [matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile [jq.py]: https://github.com/mwilliamson/jq.py [iminuit]: https://github.com/scikit-hep/iminuit @@ -171,8 +171,8 @@ title: Working examples [etebase-py]: https://github.com/etesync/etebase-py [fathon]: https://github.com/stfbnc/fathon [Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build -[numpythia]: https://github.com/scikit-hep/numpythia [polaroid]: https://github.com/daggy1234/polaroid +[numpythia]: https://github.com/scikit-hep/numpythia [pyjet]: https://github.com/scikit-hep/pyjet [clang-format]: https://github.com/ssciwr/clang-format-wheel [ninja]: https://github.com/scikit-build/ninja-python-distributions @@ -194,93 +194,93 @@ title: Working examples [apple icon]: data/readme_icons/apple.svg [linux icon]: data/readme_icons/linux.svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + From 901f07b586939f12fc4996efe73a56ce382d969c Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Tue, 29 Mar 2022 20:45:23 +0100 Subject: [PATCH 0036/1105] Redraft to respond to comments --- docs/options.md | 47 +++++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/docs/options.md b/docs/options.md index 17b5ea321..71fc04438 100644 --- a/docs/options.md +++ b/docs/options.md @@ -402,7 +402,7 @@ This option can also be set using the [command-line option](#command-line) > Manually set the Python compatibility of your project By default, cibuildwheel reads your package's Python compatibility from -`pyproject.toml` following [PEP621](https://www.python.org/dev/peps/pep-0621/) +`pyproject.toml` following the [project metadata specification](https://packaging.python.org/en/latest/specifications/declaring-project-metadata/) or from `setup.cfg`; finally it will try to inspect the AST of `setup.py` for a simple keyword assignment in a top level function call. If you need to override this behaviour for some reason, you can use this option. @@ -416,43 +416,26 @@ Default: reads your package's Python compatibility from `pyproject.toml` `setup.py` `setup(python_requires="...")`. If not found, cibuildwheel assumes the package is compatible with all versions of Python that it can build. - !!! note - Rather than using this option, it's recommended you set - `project.requires-python` in `pyproject.toml` instead: - - ```toml - [project] - requires-python = ">=3.6" - ``` + Rather than using this option, it's recommended you set this value + statically in a way that your build backend can use it, too. This ensures + that your package's metadata is correct when published on PyPI. - A few things to note: - - - If your project didn't already have a `pyproject.toml`, be sure to - set the build system to your build backend. + - If you have a `pyproject.toml` containing a `[project]` table, you can + specify `requires-python` there. ```toml - [build-system] - requires = ["setuptools>=42", "wheel"] - build-backend = "setuptools.build_meta" + [project] + requires-python = ">=3.6" ``` - - If you didn't already have a `pyproject.toml` that had a `[project]` - table, you should migrate values from `setup.py` or `setup.cfg`, or - list them in the [the `dynamic` field](https://packaging.python.org/en/latest/specifications/declaring-project-metadata/#dynamic). - The values to include and the format is listed in the - [project source metadata specification](https://packaging.python.org/en/latest/specifications/declaring-project-metadata/#dynamic) - (as originally defined in PEP 621). - - - Adding `[project]` to `pyproject.toml` can - change the behaviour of your build (e.g. `setuptools` may ignore - `install_requires` specified via `setup.py` or `setup.cfg`). Make sure - to double-check the build after adding. - -This option is not available in `pyproject.toml` under -`tool.cibuildwheel.project-requires-python`, since it should be set with the -[PEP621](https://www.python.org/dev/peps/pep-0621/) location instead, -`project.requires-python`. + Note that build backend support for the `[project]` table is still patchy, and + adding `[project]` to `pyproject.toml` can change the behaviour of your build + (e.g. setuptools may ignore `install_requires` specified via `setup.py` or + `setup.cfg`). Make sure to double-check the build after adding. + + - If you're using setuptools, [you can set this value in `setup.cfg` or `setup.py`](https://setuptools.pypa.io/en/latest/userguide/dependency_management.html#python-requirement) + and cibuildwheel will read it from there. #### Examples From 9c046c26dbcc3481fdb7ab6047fa7e447c8b7e66 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 29 Mar 2022 16:58:32 -0400 Subject: [PATCH 0037/1105] fix: issue with typer breaking pycln --- .pre-commit-config.yaml | 3 ++- pyproject.toml | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e76509d25..61231e384 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -30,7 +30,8 @@ repos: rev: v1.2.5 hooks: - id: pycln - args: [--config=pyproject.toml] + args: [--all] + additional_dependencies: [click<8.1] # temporary workaround until typer updates - repo: https://github.com/PyCQA/isort rev: 5.10.1 diff --git a/pyproject.toml b/pyproject.toml index 7b24f16b6..a54d25a51 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,8 +66,6 @@ module = [ ] ignore_missing_imports = true -[tool.pycln] -all = true [tool.check-manifest] ignore = [ From cd808df0e9ad19ed36f19c6843400a48e61d6e3b Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 30 Mar 2022 09:13:17 +0100 Subject: [PATCH 0038/1105] Apply suggestions from code review Co-authored-by: Henry Schreiner --- docs/options.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/options.md b/docs/options.md index 71fc04438..973d5d850 100644 --- a/docs/options.md +++ b/docs/options.md @@ -417,24 +417,27 @@ Default: reads your package's Python compatibility from `pyproject.toml` the package is compatible with all versions of Python that it can build. !!! note - Rather than using this option, it's recommended you set this value + Rather than using this environment variable, it's recommended you set this value statically in a way that your build backend can use it, too. This ensures - that your package's metadata is correct when published on PyPI. + that your package's metadata is correct when published on PyPI. This + cibuildwheel-specific option is provided as an override, and therefore is only + available in environment variable form. - If you have a `pyproject.toml` containing a `[project]` table, you can specify `requires-python` there. ```toml [project] + ... requires-python = ">=3.6" ``` - Note that build backend support for the `[project]` table is still patchy, and - adding `[project]` to `pyproject.toml` can change the behaviour of your build - (e.g. setuptools may ignore `install_requires` specified via `setup.py` or - `setup.cfg`). Make sure to double-check the build after adding. + Note that not all build backends fully support using a `[project]` table yet; + specifically setuptools just added experimental support in version 61. + Adding `[project]` to `pyproject.toml` requires all the other supported + values to be specified there, or to be listed in `dynamic`. - - If you're using setuptools, [you can set this value in `setup.cfg` or `setup.py`](https://setuptools.pypa.io/en/latest/userguide/dependency_management.html#python-requirement) + - If you're using setuptools, [you can set this value in `setup.cfg` (preferred) or `setup.py`](https://setuptools.pypa.io/en/latest/userguide/dependency_management.html#python-requirement) and cibuildwheel will read it from there. #### Examples From 0ccd623e605e7527d49e9dacf7e90f6489981c70 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 30 Mar 2022 08:13:46 +0000 Subject: [PATCH 0039/1105] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/options.md b/docs/options.md index 973d5d850..c9d7b7425 100644 --- a/docs/options.md +++ b/docs/options.md @@ -419,7 +419,7 @@ the package is compatible with all versions of Python that it can build. !!! note Rather than using this environment variable, it's recommended you set this value statically in a way that your build backend can use it, too. This ensures - that your package's metadata is correct when published on PyPI. This + that your package's metadata is correct when published on PyPI. This cibuildwheel-specific option is provided as an override, and therefore is only available in environment variable form. From dc10f1a65421e3e67428d02e876224121fd1ae49 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sat, 2 Apr 2022 03:59:55 +0200 Subject: [PATCH 0040/1105] Revert "chore: skip PyPy 3.7 7.3.8 updates" (#1037) This reverts commit a0341ab06432b7fe7325a4d478fa3025feefea19. --- bin/update_pythons.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bin/update_pythons.py b/bin/update_pythons.py index e4939f799..30859259a 100755 --- a/bin/update_pythons.py +++ b/bin/update_pythons.py @@ -109,12 +109,7 @@ def __init__(self, arch_str: ArchStr): response = requests.get("https://downloads.python.org/pypy/versions.json") response.raise_for_status() - releases = [ - r - for r in response.json() - if r["pypy_version"] != "nightly" - and f'{r["python_version"]}-{r["pypy_version"]}' != "3.7.12-7.3.8" - ] + releases = [r for r in response.json() if r["pypy_version"] != "nightly"] for release in releases: release["pypy_version"] = Version(release["pypy_version"]) release["python_version"] = Version(release["python_version"]) From 7ef593c2adef982d6755f71f73bf6a09251e78ad Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 1 Apr 2022 22:00:07 -0400 Subject: [PATCH 0041/1105] fix: minor touchups based on stricter mypy settings (#1060) * fix: minor touchups based on stricter mypy settings * refactor: address review comments --- .pre-commit-config.yaml | 10 ++++------ cibuildwheel/options.py | 7 +++---- pyproject.toml | 5 +++++ unit_test/wheel_print_test.py | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 61231e384..f4058e786 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,7 +31,7 @@ repos: hooks: - id: pycln args: [--all] - additional_dependencies: [click<8.1] # temporary workaround until typer updates + stages: [manual] - repo: https://github.com/PyCQA/isort rev: 5.10.1 @@ -54,7 +54,7 @@ repos: - id: mypy name: mypy 3.6 on cibuildwheel/ exclude: ^(bin|cibuildwheel/resources|docs)/.*py$ - args: ["--python-version=3.6", "--show-error-codes"] + args: ["--python-version=3.6"] additional_dependencies: &mypy-dependencies - nox - packaging>=21.0 @@ -72,11 +72,11 @@ repos: - id: mypy name: mypy 3.7+ on bin/ files: ^((bin|docs)/.*py)$ - args: ["--python-version=3.7", "--show-error-codes"] + args: ["--python-version=3.7"] additional_dependencies: *mypy-dependencies - id: mypy name: mypy 3.10 - args: ["--python-version=3.10", "--show-error-codes"] + args: ["--python-version=3.10"] additional_dependencies: *mypy-dependencies - repo: https://github.com/asottile/yesqa @@ -98,8 +98,6 @@ repos: hooks: - id: python-check-blanket-noqa stages: [manual] - - id: python-check-blanket-type-ignore - stages: [manual] - id: python-no-log-warn - id: python-no-eval - id: python-use-type-annotations diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index 75ee7f6be..1c2509973 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -96,7 +96,7 @@ def architectures(self) -> Set[Architecture]: return self.globals.architectures -Setting = Union[Dict[str, str], List[str], str] +Setting = Union[Dict[str, str], List[str], str, int] class Override(NamedTuple): @@ -482,13 +482,12 @@ def build_options(self, identifier: Optional[str]) -> BuildOptions: if not config_value: # default to manylinux2014 - image = pinned_images.get("manylinux2014") + image = pinned_images["manylinux2014"] elif config_value in pinned_images: image = pinned_images[config_value] else: image = config_value - assert image is not None manylinux_images[build_platform] = image for build_platform in MUSLLINUX_ARCHS: @@ -496,7 +495,7 @@ def build_options(self, identifier: Optional[str]) -> BuildOptions: config_value = self.reader.get(f"musllinux-{build_platform}-image") - if config_value is None: + if not config_value: image = pinned_images["musllinux_1_1"] elif config_value in pinned_images: image = pinned_images[config_value] diff --git a/pyproject.toml b/pyproject.toml index a54d25a51..40f8dc5a6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,6 +38,8 @@ files = [ "noxfile.py", ] warn_unused_configs = true +show_error_codes = true + warn_redundant_casts = true no_implicit_reexport = true strict_equality = true @@ -49,6 +51,9 @@ disallow_any_generics = true warn_return_any = true no_implicit_optional = true +enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"] +warn_unreachable = true + [[tool.mypy.overrides]] module = "cibuildwheel.*" disallow_untyped_defs = true diff --git a/unit_test/wheel_print_test.py b/unit_test/wheel_print_test.py index 3fcadeb29..020600604 100644 --- a/unit_test/wheel_print_test.py +++ b/unit_test/wheel_print_test.py @@ -26,7 +26,7 @@ def test_no_printout_on_error(tmp_path, capsys): tmp_path.joinpath("example.1").touch() raise RuntimeError() - captured = capsys.readouterr() + captured = capsys.readouterr() # type: ignore[unreachable] assert captured.err == "" assert "example.0" not in captured.out From e88a29cbe7e1b764119d7b310e3dc8597703cace Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Fri, 1 Apr 2022 22:00:22 -0400 Subject: [PATCH 0042/1105] Update dependencies (#1070) Co-authored-by: joerick --- cibuildwheel/resources/build-platforms.toml | 12 +- .../resources/constraints-python310.txt | 2 +- .../resources/constraints-python37.txt | 2 +- .../resources/constraints-python38.txt | 2 +- .../resources/constraints-python39.txt | 2 +- cibuildwheel/resources/constraints.txt | 2 +- .../resources/pinned_docker_images.cfg | 54 +++--- docs/working-examples.md | 180 +++++++++--------- 8 files changed, 128 insertions(+), 128 deletions(-) diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index 1216512c7..3a54c74cd 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -74,9 +74,9 @@ python_configurations = [ { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.4/python-3.10.4-macos11.pkg" }, { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.4/python-3.10.4-macos11.pkg" }, { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.4/python-3.10.4-macos11.pkg" }, - { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-osx64.tar.bz2" }, - { identifier = "pp38-macosx_x86_64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.8-osx64.tar.bz2" }, - { identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.8-osx64.tar.bz2" }, + { 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.9-osx64.tar.bz2" }, + { identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.9-osx64.tar.bz2" }, ] [windows] @@ -93,7 +93,7 @@ python_configurations = [ { identifier = "cp310-win_amd64", version = "3.10.4", arch = "64" }, { identifier = "cp39-win_arm64", version = "3.9.10", arch = "ARM64" }, { identifier = "cp310-win_arm64", version = "3.10.4", arch = "ARM64" }, - { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.7-win64.zip" }, - { identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.8-win64.zip" }, - { identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.8-win64.zip" }, + { 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.9-win64.zip" }, + { identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.9-win64.zip" }, ] diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index a7cb6ef6c..b03dafb97 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==61.2.0 +setuptools==61.3.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python37.txt b/cibuildwheel/resources/constraints-python37.txt index f59d2240c..8cf831eca 100644 --- a/cibuildwheel/resources/constraints-python37.txt +++ b/cibuildwheel/resources/constraints-python37.txt @@ -32,5 +32,5 @@ zipp==3.7.0 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==61.2.0 +setuptools==61.3.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index 9a8bf014a..58090cae6 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==61.2.0 +setuptools==61.3.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index 10f68a89b..dabd78b76 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==61.2.0 +setuptools==61.3.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index 10f68a89b..dabd78b76 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==61.2.0 +setuptools==61.3.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 0508aa34a..cdb194787 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,43 +1,43 @@ [x86_64] -manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-03-18-11e604c -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-19-a819637 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-19-a819637 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-19-a819637 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-03-19-a819637 +manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-03-31-9afae1d +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-31-361e6b6 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-31-361e6b6 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-31-361e6b6 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-03-31-361e6b6 [i686] -manylinux1 = quay.io/pypa/manylinux1_i686:2022-03-18-11e604c -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-19-a819637 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-19-a819637 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-19-a819637 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-03-19-a819637 +manylinux1 = quay.io/pypa/manylinux1_i686:2022-03-31-9afae1d +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-31-361e6b6 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-31-361e6b6 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-31-361e6b6 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-03-31-361e6b6 [pypy_x86_64] -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-19-a819637 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-19-a819637 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-19-a819637 +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-31-361e6b6 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-31-361e6b6 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-31-361e6b6 [pypy_i686] -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-19-a819637 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-19-a819637 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-19-a819637 +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-31-361e6b6 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-31-361e6b6 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-31-361e6b6 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-03-19-a819637 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-03-19-a819637 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-03-14-b2cd80b +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-03-31-361e6b6 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-03-31-361e6b6 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-03-31-361e6b6 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-03-19-a819637 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-03-19-a819637 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-03-19-a819637 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-03-31-361e6b6 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-03-31-361e6b6 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-03-31-361e6b6 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-03-19-a819637 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-03-19-a819637 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-03-19-a819637 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-03-31-361e6b6 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-03-31-361e6b6 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-03-31-361e6b6 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-03-19-a819637 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-03-19-a819637 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-03-31-361e6b6 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-03-31-361e6b6 diff --git a/docs/working-examples.md b/docs/working-examples.md index 9ab35b6e8..0874868f4 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -35,8 +35,8 @@ title: Working examples | [vispy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Main repository for Vispy | | [Confluent client for Kafka][] | ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | setup in `tools/wheels/build-wheels.bat` | | [tinyobjloader][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Tiny but powerful single file wavefront obj loader | -| [coverage.py][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python | | [Dependency Injector][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI | +| [coverage.py][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python | | [PyCryptodome][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A self-contained cryptographic library for Python | | [PyYAML][] | ![github icon][] | ![apple icon][] | Canonical source repository for PyYAML | | [numexpr][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas, bcolz and more | @@ -55,8 +55,8 @@ title: Working examples | [Parselmouth][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. | | [AutoPy][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | | [H3-py][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system | -| [Rtree][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS ¶ | | [markupsafe][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. | +| [Rtree][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS ¶ | | [python-rapidjson][] | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson | | [python-snappy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for the snappy google library | | [pybind11 cmake_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system | @@ -123,8 +123,8 @@ title: Working examples [vispy]: https://github.com/vispy/vispy [Confluent client for Kafka]: https://github.com/confluentinc/confluent-kafka-python [tinyobjloader]: https://github.com/tinyobjloader/tinyobjloader -[coverage.py]: https://github.com/nedbat/coveragepy [Dependency Injector]: https://github.com/ets-labs/python-dependency-injector +[coverage.py]: https://github.com/nedbat/coveragepy [PyCryptodome]: https://github.com/Legrandin/pycryptodome [PyYAML]: https://github.com/yaml/pyyaml [numexpr]: https://github.com/pydata/numexpr @@ -143,8 +143,8 @@ title: Working examples [Parselmouth]: https://github.com/YannickJadoul/Parselmouth [AutoPy]: https://github.com/autopilot-rs/autopy [H3-py]: https://github.com/uber/h3-py -[Rtree]: https://github.com/Toblerity/rtree [markupsafe]: https://github.com/pallets/markupsafe +[Rtree]: https://github.com/Toblerity/rtree [python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson [python-snappy]: https://github.com/andrix/python-snappy [pybind11 cmake_example]: https://github.com/pybind/cmake_example @@ -194,93 +194,93 @@ title: Working examples [apple icon]: data/readme_icons/apple.svg [linux icon]: data/readme_icons/linux.svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1a5fec7075255d974a4adf330e507dbe4bce6cb7 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sat, 2 Apr 2022 14:52:27 +0100 Subject: [PATCH 0043/1105] Bump version: v2.4.0 --- README.md | 35 +++++++++++--------------- cibuildwheel/__init__.py | 2 +- docs/changelog.md | 13 ++++++++++ docs/faq.md | 4 +-- docs/setup.md | 4 +-- examples/appveyor-minimal.yml | 2 +- examples/azure-pipelines-minimal.yml | 6 ++--- examples/circleci-minimal.yml | 4 +-- examples/github-apple-silicon.yml | 2 +- examples/github-deploy.yml | 2 +- examples/github-minimal.yml | 2 +- examples/github-with-qemu.yml | 2 +- examples/gitlab-minimal.yml | 2 +- examples/travis-ci-deploy.yml | 2 +- examples/travis-ci-minimal.yml | 2 +- examples/travis-ci-test-and-deploy.yml | 4 +-- setup.cfg | 2 +- 17 files changed, 48 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 702b9baad..e128870c8 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ jobs: - uses: actions/setup-python@v2 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.3.1 + run: python -m pip install cibuildwheel==2.4.0 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -192,6 +192,19 @@ Changelog +### v2.4.0 + +_2 April 2022_ + +- ✨ cibuildwheel now supports running locally on Windows and macOS (as well as Linux). On macOS, you'll have to install the versions of Pythons that you want to use from Python.org, and cibuildwheel will use them. On Windows, cibuildwheel will install it's own versions of Python. Check out [the documentation](https://cibuildwheel.readthedocs.io/en/stable/setup/#local) for instructions. (#974) +- ✨ Added support for building PyPy 3.9 wheels. (#1031) +- ✨ Listing at the end of the build now displays the size of each wheel (#975) +- 🐛 Workaround a connection timeout bug on Travis CI ppc64le runners (#906) +- 🐛 Fix an encoding error when reading setup.py in the wrong encoding (#977) +- 🛠 Setuptools updated to 61.3.0, including experimental support for reading config from pyproject.toml(PEP 621). This could change the behaviour of your build if you have a pyproject.toml with a `[project]` table, because that takes precedence over setup.py and setup.cfg. Check out the [setuptools docs](https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html) and the [project metadata specification](https://packaging.python.org/en/latest/specifications/declaring-project-metadata/) for more info. +- 🛠 Many other dependency updates. +- 📚 Minor docs improvements + ### v2.3.1 _14 December 2021_ @@ -225,26 +238,6 @@ _26 October 2021_ - 🛠 Added a `config-file` option on the GitHub Action to specify something other than pyproject.toml in your GitHub Workflow file. (#883) - 🐛 Fix missing resources in sdist and released wheel on PyPI. We've also made some internal changes to our release processes to make them more reliable. (#893, #894) -### v2.2.0 - -_22 October 2021_ - -- 🌟 Added support for [musllinux](https://www.python.org/dev/peps/pep-0656/). Support for this new wheel format lets projects build wheels for Linux distributions that use [musl libc](https://musl.libc.org/), notably, [Alpine](https://alpinelinux.org/) Docker containers. (#768) - - Musllinux builds are enabled by default. If you're not ready to build musllinux, add `*-musllinux_*` to your [`CIBW_SKIP`/`skip`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip) option. Or, you might have to make some changes to your options - to simplify that process, you can use... - -- 🌟 TOML option overrides! This provides much greater flexibility in configuration via pyproject.toml. (#854) - - You can now set build options for any subset of your builds using a match pattern. So, for example, you can customise CPython 3.8 builds with an override on `cp38-*` or musllinux builds by selecting `*musllinux*`. Check out [the docs](https://cibuildwheel.readthedocs.io/en/latest/options/#overrides) for more info on the specifics. - -- 🛠 Added support for building PyPy wheels on macOS 11 CI runners. (#875) - -- 🛠 Setting an empty string for the [`CIBW_*_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) option will now fallthrough to the config file or cibuildwheel's default, rather than causing an error. This makes the option easier to use in CI build matricies. (#829) - -- 🛠 Support for TOML 1.0 when reading config files, via the `tomli` package. (#876) - -Note: This version is not available on PyPI due to some missing resources in the release files. Please use a later version instead. - --- diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index 3a5935a2d..3d67cd6bb 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1 +1 @@ -__version__ = "2.3.1" +__version__ = "2.4.0" diff --git a/docs/changelog.md b/docs/changelog.md index 2ad1d4fe2..79b03c762 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,6 +2,19 @@ title: Changelog --- +### v2.4.0 + +_2 April 2022_ + +- ✨ cibuildwheel now supports running locally on Windows and macOS (as well as Linux). On macOS, you'll have to install the versions of Pythons that you want to use from Python.org, and cibuildwheel will use them. On Windows, cibuildwheel will install it's own versions of Python. Check out [the documentation](https://cibuildwheel.readthedocs.io/en/stable/setup/#local) for instructions. (#974) +- ✨ Added support for building PyPy 3.9 wheels. (#1031) +- ✨ Listing at the end of the build now displays the size of each wheel (#975) +- 🐛 Workaround a connection timeout bug on Travis CI ppc64le runners (#906) +- 🐛 Fix an encoding error when reading setup.py in the wrong encoding (#977) +- 🛠 Setuptools updated to 61.3.0, including experimental support for reading config from pyproject.toml(PEP 621). This could change the behaviour of your build if you have a pyproject.toml with a `[project]` table, because that takes precedence over setup.py and setup.cfg. Check out the [setuptools docs](https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html) and the [project metadata specification](https://packaging.python.org/en/latest/specifications/declaring-project-metadata/) for more info. +- 🛠 Many other dependency updates. +- 📚 Minor docs improvements + ### v2.3.1 _14 December 2021_ diff --git a/docs/faq.md b/docs/faq.md index 82e45852b..e07fc1e53 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -127,7 +127,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: pypa/cibuildwheel@v2.3.1 +uses: pypa/cibuildwheel@v2.4.0 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. @@ -153,7 +153,7 @@ The second option, and the only one that supports other CI systems, is using a ` ```bash # requirements-cibw.txt -cibuildwheel==2.3.1 +cibuildwheel==2.4.0 ``` Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this: diff --git a/docs/setup.md b/docs/setup.md index 63f78aa12..fb1165fc3 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -183,7 +183,7 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/ - uses: actions/checkout@v2 - name: Build wheels - run: pipx run cibuildwheel==2.3.1 + run: pipx run cibuildwheel==2.4.0 - uses: actions/upload-artifact@v2 with: @@ -218,7 +218,7 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/ - uses: actions/setup-python@v2 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.3.1 + run: python -m pip install cibuildwheel==2.4.0 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse diff --git a/examples/appveyor-minimal.yml b/examples/appveyor-minimal.yml index 33f438182..b6162ada5 100644 --- a/examples/appveyor-minimal.yml +++ b/examples/appveyor-minimal.yml @@ -12,7 +12,7 @@ stack: python 3.7 init: - cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH% -install: python -m pip install cibuildwheel==2.3.1 +install: python -m pip install cibuildwheel==2.4.0 build_script: python -m cibuildwheel --output-dir wheelhouse diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index 50a53f136..c5c0ae8cf 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -6,7 +6,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - pip3 install cibuildwheel==2.3.1 + pip3 install cibuildwheel==2.4.0 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -20,7 +20,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - python3 -m pip install cibuildwheel==2.3.1 + python3 -m pip install cibuildwheel==2.4.0 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -34,7 +34,7 @@ jobs: - bash: | set -o errexit python -m pip install --upgrade pip - pip install cibuildwheel==2.3.1 + pip install cibuildwheel==2.4.0 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index 7de81a34f..19c45ad9d 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -11,7 +11,7 @@ jobs: - run: name: Build the Linux wheels. command: | - pip3 install --user cibuildwheel==2.3.1 + pip3 install --user cibuildwheel==2.4.0 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -25,7 +25,7 @@ jobs: - run: name: Build the OS X wheels. command: | - pip3 install cibuildwheel==2.3.1 + pip3 install cibuildwheel==2.4.0 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ diff --git a/examples/github-apple-silicon.yml b/examples/github-apple-silicon.yml index 9bb927b30..2f2705561 100644 --- a/examples/github-apple-silicon.yml +++ b/examples/github-apple-silicon.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v2 - name: Build wheels - uses: pypa/cibuildwheel@v2.3.1 + uses: pypa/cibuildwheel@v2.4.0 env: CIBW_ARCHS_MACOS: x86_64 universal2 diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index 7f4d46326..4f604eda6 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v2 - name: Build wheels - uses: pypa/cibuildwheel@v2.3.1 + uses: pypa/cibuildwheel@v2.4.0 - uses: actions/upload-artifact@v2 with: diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index fdcb775b0..3b9038c11 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - name: Build wheels - uses: pypa/cibuildwheel@v2.3.1 + uses: pypa/cibuildwheel@v2.4.0 # to supply options, put them in 'env', like: # env: # CIBW_SOME_OPTION: value diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index ad5c493d5..c46645ec5 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -25,7 +25,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.3.1 + uses: pypa/cibuildwheel@v2.4.0 env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index 447a4ad2f..de4cdb775 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -12,7 +12,7 @@ linux: DOCKER_TLS_CERTDIR: "" script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==2.3.1 + - python -m pip install cibuildwheel==2.4.0 - cibuildwheel --output-dir wheelhouse artifacts: paths: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index 104dbafeb..101f36dfd 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -19,7 +19,7 @@ jobs: - ln -s /c/Python38/python.exe /c/Python38/python3.exe install: - - python3 -m pip install cibuildwheel==2.3.1 + - python3 -m pip install cibuildwheel==2.4.0 script: # build the wheels, put them into './dist' diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index 42b921562..c0f4ab4b3 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -25,7 +25,7 @@ jobs: - ln -s /c/Python38/python.exe /c/Python38/python3.exe install: - - python3 -m pip install cibuildwheel==2.3.1 + - python3 -m pip install cibuildwheel==2.4.0 script: # build the wheels, put them into './wheelhouse' diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index 0ef18760e..37a24d99f 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -55,7 +55,7 @@ jobs: - stage: deploy name: Build and deploy Linux wheels services: docker - install: python3 -m pip install cibuildwheel==2.3.1 twine + install: python3 -m pip install cibuildwheel==2.4.0 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl # Deploy on windows @@ -63,7 +63,7 @@ jobs: name: Build and deploy Windows wheels os: windows language: shell - install: python3 -m pip install cibuildwheel==2.3.1 twine + install: python3 -m pip install cibuildwheel==2.4.0 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl diff --git a/setup.cfg b/setup.cfg index ad21db4ca..36daa02da 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = cibuildwheel -version = 2.3.1 +version = 2.4.0 description = Build Python wheels on CI with minimal configuration. long_description = file: README.md long_description_content_type = text/markdown From 989f21de166732343fbbe66c529b36d60dfc1fbe Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 00:53:33 -0400 Subject: [PATCH 0044/1105] [pre-commit.ci] pre-commit autoupdate (#1074) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/setup-cfg-fmt: v1.20.0 → v1.20.1](https://github.com/asottile/setup-cfg-fmt/compare/v1.20.0...v1.20.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f4058e786..08c218a2b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -44,7 +44,7 @@ repos: - id: black - repo: https://github.com/asottile/setup-cfg-fmt - rev: v1.20.0 + rev: v1.20.1 hooks: - id: setup-cfg-fmt From 5824aecc5ca2412ce04ea7772d5f74740ee46f46 Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 00:53:56 -0400 Subject: [PATCH 0045/1105] Update dependencies (#1073) Co-authored-by: mayeut --- .../resources/constraints-python310.txt | 2 +- .../resources/constraints-python37.txt | 4 +- .../resources/constraints-python38.txt | 2 +- .../resources/constraints-python39.txt | 2 +- cibuildwheel/resources/constraints.txt | 2 +- .../resources/pinned_docker_images.cfg | 54 +++--- docs/working-examples.md | 162 +++++++++--------- 7 files changed, 114 insertions(+), 114 deletions(-) diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index b03dafb97..0c016c32f 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==61.3.0 +setuptools==61.3.1 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python37.txt b/cibuildwheel/resources/constraints-python37.txt index 8cf831eca..f5834a1b8 100644 --- a/cibuildwheel/resources/constraints-python37.txt +++ b/cibuildwheel/resources/constraints-python37.txt @@ -26,11 +26,11 @@ wheel==0.37.1 # via # -r cibuildwheel/resources/constraints.in # delocate -zipp==3.7.0 +zipp==3.8.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==61.3.0 +setuptools==61.3.1 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index 58090cae6..3bbb3c3cc 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==61.3.0 +setuptools==61.3.1 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index dabd78b76..84f949c67 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==61.3.0 +setuptools==61.3.1 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index dabd78b76..84f949c67 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -26,5 +26,5 @@ wheel==0.37.1 # The following packages are considered to be unsafe in a requirements file: pip==22.0.4 # via -r cibuildwheel/resources/constraints.in -setuptools==61.3.0 +setuptools==61.3.1 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index cdb194787..0b30242ee 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,43 +1,43 @@ [x86_64] -manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-03-31-9afae1d -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-31-361e6b6 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-31-361e6b6 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-31-361e6b6 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-03-31-361e6b6 +manylinux1 = quay.io/pypa/manylinux1_x86_64:2022-04-03-9524524 +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-04-03-da6ecb3 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-04-03-da6ecb3 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-04-03-da6ecb3 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2022-04-03-da6ecb3 [i686] -manylinux1 = quay.io/pypa/manylinux1_i686:2022-03-31-9afae1d -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-31-361e6b6 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-31-361e6b6 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-31-361e6b6 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-03-31-361e6b6 +manylinux1 = quay.io/pypa/manylinux1_i686:2022-04-03-9524524 +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-04-03-da6ecb3 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-04-03-da6ecb3 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-04-03-da6ecb3 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2022-04-03-da6ecb3 [pypy_x86_64] -manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-03-31-361e6b6 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-03-31-361e6b6 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-03-31-361e6b6 +manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-04-03-da6ecb3 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2022-04-03-da6ecb3 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-04-03-da6ecb3 [pypy_i686] -manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-03-31-361e6b6 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-03-31-361e6b6 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-03-31-361e6b6 +manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-04-03-da6ecb3 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2022-04-03-da6ecb3 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-04-03-da6ecb3 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-03-31-361e6b6 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-03-31-361e6b6 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-03-31-361e6b6 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-04-03-da6ecb3 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-04-03-da6ecb3 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2022-04-03-da6ecb3 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-03-31-361e6b6 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-03-31-361e6b6 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-03-31-361e6b6 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2022-04-03-da6ecb3 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-04-03-da6ecb3 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2022-04-03-da6ecb3 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-03-31-361e6b6 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-03-31-361e6b6 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-03-31-361e6b6 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2022-04-03-da6ecb3 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-04-03-da6ecb3 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2022-04-03-da6ecb3 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-03-31-361e6b6 -manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-03-31-361e6b6 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2022-04-03-da6ecb3 +manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-04-03-da6ecb3 diff --git a/docs/working-examples.md b/docs/working-examples.md index 0874868f4..ae5f5702c 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -194,93 +194,93 @@ title: Working examples [apple icon]: data/readme_icons/apple.svg [linux icon]: data/readme_icons/linux.svg - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a7271b275088a54f5ba2cfd0675f8ca0f27aae1e Mon Sep 17 00:00:00 2001 From: Diego Ramirez Date: Mon, 11 Apr 2022 12:45:38 -0500 Subject: [PATCH 0046/1105] Fix a badly-formatted Python block in the docs The whole block is indented, though a code block with Python formatting is there. --- docs/faq.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/faq.md b/docs/faq.md index e07fc1e53..5d8aa71b6 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -206,30 +206,30 @@ these steps into your package's build process. For example, if you're using setuptools, you can add steps to your package's `setup.py` using a structure like this: - ```python - import subprocess - import setuptools - import setuptools.command.build_py +```python +import subprocess +import setuptools +import setuptools.command.build_py - class BuildPyCommand(setuptools.command.build_py.build_py): - """Custom build command.""" +class BuildPyCommand(setuptools.command.build_py.build_py): + """Custom build command.""" - def run(self): + def run(self): # your custom build steps here # e.g. # subprocess.run(['python', 'scripts/my_custom_script.py'], check=True) setuptools.command.build_py.build_py.run(self) - setuptools.setup( - cmdclass={ - 'build_py': BuildPyCommand, - }, - # Usual setup() args. - # ... - ) - ``` +setuptools.setup( + cmdclass={ + 'build_py': BuildPyCommand, + }, + # Usual setup() args. + # ... +) +``` #### Compiler flags From 75fd65fcf724a7c91ba7d6d811b991c42aec899a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Apr 2022 15:14:45 -0400 Subject: [PATCH 0047/1105] chore(deps): bump actions/download-artifact from 2 to 3 (#1081) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 3. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1ab889194..0e845626d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: if: github.event_name == 'release' && github.event.action == 'published' steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: artifact path: dist From 00ba73bf21fe4b83dd83caad1d9f3d6120a7b8bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Apr 2022 15:15:01 -0400 Subject: [PATCH 0048/1105] chore(deps): bump actions/upload-artifact from 2 to 3 (#1082) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e845626d..30772612f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Build SDist and wheel run: pipx run build - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: path: dist/* diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bc2346f7a..4954d0bac 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,7 +61,7 @@ jobs: env: CIBW_ARCHS_MACOS: x86_64 universal2 arm64 - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: sample_wheels path: wheelhouse From 9ae6ae275633a6d23874c3b224b2b202e430d0b9 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 15:33:49 -0400 Subject: [PATCH 0049/1105] [pre-commit.ci] pre-commit autoupdate (#1084) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/pre-commit/pre-commit-hooks: v4.1.0 → v4.2.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.1.0...v4.2.0) - [github.com/asottile/pyupgrade: v2.31.1 → v2.32.0](https://github.com/asottile/pyupgrade/compare/v2.31.1...v2.32.0) * chore: fix minor style msg Signed-off-by: Henry Schreiner * chore: use extend on flake8 Signed-off-by: Henry Schreiner Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner --- .pre-commit-config.yaml | 4 ++-- cibuildwheel/environment.py | 1 - setup.cfg | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 08c218a2b..3497b7f36 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.1.0 + rev: v4.2.0 hooks: - id: check-case-conflict - id: check-merge-conflict @@ -14,7 +14,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/asottile/pyupgrade - rev: v2.31.1 + rev: v2.32.0 hooks: - id: pyupgrade name: PyUpgrade 3.6+ diff --git a/cibuildwheel/environment.py b/cibuildwheel/environment.py index ba66d6e29..3bf982d29 100644 --- a/cibuildwheel/environment.py +++ b/cibuildwheel/environment.py @@ -51,7 +51,6 @@ def evaluated_value( executor: Optional[bashlex_eval.EnvironmentExecutor] = None, ) -> str: """Returns the value of this assignment, as evaluated in the environment""" - ... class EnvironmentAssignmentRaw: diff --git a/setup.cfg b/setup.cfg index 36daa02da..6e0307fa3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -56,8 +56,8 @@ console_scripts = cibuildwheel = resources/* [flake8] -ignore = E501,W503,E741,E226,B950,E203 -select = C,E,F,W,B,B9 +extend-ignore = E203,E501,B950 +extend-select = B,B9 application-import-names = cibuildwheel exclude = cibuildwheel/resources/, From 6d4431306eeeadb37b72fb32407288d3753cbe90 Mon Sep 17 00:00:00 2001 From: Shantanu <12621235+hauntsaninja@users.noreply.github.com> Date: Fri, 15 Apr 2022 21:00:57 -0700 Subject: [PATCH 0050/1105] chore: use tomllib on Python 3.11 (#1047) * Use tomllib on Python 3.11 * delint Co-authored-by: hauntsaninja <> --- bin/update_pythons.py | 10 ++++++++-- bin/update_virtualenv.py | 10 ++++++++-- cibuildwheel/options.py | 7 +++++-- cibuildwheel/projectfiles.py | 7 +++++-- cibuildwheel/util.py | 11 ++++++++--- setup.cfg | 2 +- unit_test/build_ids_test.py | 9 +++++++-- unit_test/main_tests/main_options_test.py | 8 ++++++-- 8 files changed, 48 insertions(+), 16 deletions(-) diff --git a/bin/update_pythons.py b/bin/update_pythons.py index 30859259a..6dac0b765 100755 --- a/bin/update_pythons.py +++ b/bin/update_pythons.py @@ -5,13 +5,19 @@ import copy import difflib import logging +import sys from pathlib import Path from typing import Any, Union import click import requests import rich -import tomli + +if sys.version_info >= (3, 11): + import tomllib +else: + import tomli as tomllib + from packaging.specifiers import Specifier from packaging.version import Version from rich.logging import RichHandler @@ -296,7 +302,7 @@ def update_pythons(force: bool, level: str) -> None: original_toml = toml_file_path.read_text() with toml_file_path.open("rb") as f: - configs = tomli.load(f) + configs = tomllib.load(f) for config in configs["windows"]["python_configurations"]: all_versions.update_config(config) diff --git a/bin/update_virtualenv.py b/bin/update_virtualenv.py index 6cd293a31..2e67007e0 100755 --- a/bin/update_virtualenv.py +++ b/bin/update_virtualenv.py @@ -5,12 +5,18 @@ import difflib import logging import subprocess +import sys from pathlib import Path from typing import NamedTuple import click import rich -import tomli + +if sys.version_info >= (3, 11): + import tomllib +else: + import tomli as tomllib + from packaging.version import InvalidVersion, Version from rich.logging import RichHandler from rich.syntax import Syntax @@ -78,7 +84,7 @@ def update_virtualenv(force: bool, level: str) -> None: original_toml = toml_file_path.read_text() with toml_file_path.open("rb") as f: - loaded_file = tomli.load(f) + loaded_file = tomllib.load(f) version = str(loaded_file["version"]) versions = git_ls_remote_versions(GET_VIRTUALENV_GITHUB) if versions[0].version > Version(version): diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index 1c2509973..ce4f5a77a 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -18,7 +18,10 @@ Union, ) -import tomli +if sys.version_info >= (3, 11): + import tomllib +else: + import tomli as tomllib from packaging.specifiers import SpecifierSet from .architecture import Architecture @@ -244,7 +247,7 @@ def _load_file(self, filename: Path) -> Tuple[Dict[str, Any], Dict[str, Any]]: Load a toml file, returns global and platform as separate dicts. """ with filename.open("rb") as f: - config = tomli.load(f) + config = tomllib.load(f) global_options = config.get("tool", {}).get("cibuildwheel", {}) platform_options = global_options.get(self.platform, {}) diff --git a/cibuildwheel/projectfiles.py b/cibuildwheel/projectfiles.py index 8a6311de7..90d388f6b 100644 --- a/cibuildwheel/projectfiles.py +++ b/cibuildwheel/projectfiles.py @@ -4,7 +4,10 @@ from pathlib import Path from typing import Any, Optional -import tomli +if sys.version_info >= (3, 11): + import tomllib +else: + import tomli as tomllib if sys.version_info < (3, 8): Constant = ast.Str @@ -56,7 +59,7 @@ def get_requires_python_str(package_dir: Path) -> Optional[str]: # Read in from pyproject.toml:project.requires-python try: with (package_dir / "pyproject.toml").open("rb") as f1: - info = tomli.load(f1) + info = tomllib.load(f1) return str(info["project"]["requires-python"]) except (FileNotFoundError, KeyError, IndexError, TypeError): pass diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index 18df677db..ef85a72c6 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -32,7 +32,12 @@ import bracex import certifi -import tomli + +if sys.version_info >= (3, 11): + import tomllib +else: + import tomli as tomllib + from filelock import FileLock from packaging.requirements import InvalidRequirement, Requirement from packaging.specifiers import SpecifierSet @@ -203,7 +208,7 @@ def get_build_verbosity_extra_flags(level: int) -> List[str]: def read_python_configs(config: PlatformName) -> List[Dict[str, str]]: input_file = resources_dir / "build-platforms.toml" with input_file.open("rb") as f: - loaded_file = tomli.load(f) + loaded_file = tomllib.load(f) results: List[Dict[str, str]] = list(loaded_file[config]["python_configurations"]) return results @@ -460,7 +465,7 @@ def get_pip_version(env: Dict[str, str]) -> str: def _ensure_virtualenv() -> Path: input_file = resources_dir / "virtualenv.toml" with input_file.open("rb") as f: - loaded_file = tomli.load(f) + loaded_file = tomllib.load(f) version = str(loaded_file["version"]) url = str(loaded_file["url"]) path = CIBW_CACHE_PATH / f"virtualenv-{version}.pyz" diff --git a/setup.cfg b/setup.cfg index 6e0307fa3..a6773844b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -37,8 +37,8 @@ install_requires = filelock packaging platformdirs - tomli dataclasses;python_version < '3.7' + tomli;python_version < '3.11' typing-extensions>=3.10.0.0;python_version < '3.8' python_requires = >=3.6 include_package_data = True diff --git a/unit_test/build_ids_test.py b/unit_test/build_ids_test.py index 927d110a0..60ac38748 100644 --- a/unit_test/build_ids_test.py +++ b/unit_test/build_ids_test.py @@ -1,6 +1,11 @@ +import sys from typing import Dict, List -import tomli +if sys.version_info >= (3, 11): + import tomllib +else: + import tomli as tomllib + from packaging.version import Version from cibuildwheel.extra import Printable, dump_python_configurations @@ -12,7 +17,7 @@ def test_compare_configs(): txt = f1.read() with open(resources_dir / "build-platforms.toml", "rb") as f2: - dict_txt = tomli.load(f2) + dict_txt = tomllib.load(f2) new_txt = dump_python_configurations(dict_txt) print(new_txt) diff --git a/unit_test/main_tests/main_options_test.py b/unit_test/main_tests/main_options_test.py index 0a345cb1f..2152ff3d5 100644 --- a/unit_test/main_tests/main_options_test.py +++ b/unit_test/main_tests/main_options_test.py @@ -3,7 +3,11 @@ from pathlib import Path import pytest -import tomli + +if sys.version_info >= (3, 11): + import tomllib +else: + import tomli as tomllib from cibuildwheel.__main__ import main from cibuildwheel.environment import ParsedEnvironment @@ -314,7 +318,7 @@ def test_defaults(platform, intercepted_build_args): build_options: BuildOptions = intercepted_build_args.args[0].build_options(identifier=None) defaults_config_path = resources_dir / "defaults.toml" with defaults_config_path.open("rb") as f: - defaults_toml = tomli.load(f) + defaults_toml = tomllib.load(f) root_defaults = defaults_toml["tool"]["cibuildwheel"] platform_defaults = defaults_toml["tool"]["cibuildwheel"][platform] From fe97589390e393961f880d84a9ed394db8194ed6 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Tue, 12 Apr 2022 14:15:42 +0100 Subject: [PATCH 0051/1105] fix: Don't error if no new wheels were built (this may happen if --allow-empty is active) --- cibuildwheel/util.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index ef85a72c6..0f262729b 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -435,6 +435,11 @@ class FileReport(NamedTuple): FileReport(wheel.name, f"{(wheel.stat().st_size + 1023) // 1024:,d}") for wheel in final_contents - existing_contents ] + + if len(new_contents) == 0: + print('No new wheels') + return + max_name_len = max(len(f.name) for f in new_contents) max_size_len = max(len(f.size) for f in new_contents) n = len(new_contents) From 07013d6bafc4cc9c308242bf6bf89b181ae9d42a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 12 Apr 2022 13:29:42 +0000 Subject: [PATCH 0052/1105] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- cibuildwheel/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index 0f262729b..e05aa4948 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -437,7 +437,7 @@ class FileReport(NamedTuple): ] if len(new_contents) == 0: - print('No new wheels') + print("No new wheels") return max_name_len = max(len(f.name) for f in new_contents) From 1e176a021bea2a86b8b43f5d7661bc3ee27bfc8e Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Wed, 13 Apr 2022 10:03:14 +0100 Subject: [PATCH 0053/1105] RF: Remove unnecessary message --- cibuildwheel/util.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index e05aa4948..5015d3487 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -437,7 +437,6 @@ class FileReport(NamedTuple): ] if len(new_contents) == 0: - print("No new wheels") return max_name_len = max(len(f.name) for f in new_contents) From 1f52f30fcf0df9d1f106f50850bc70d3a40b56fd Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Wed, 13 Apr 2022 10:15:36 +0100 Subject: [PATCH 0054/1105] TEST: Sanity check test for --allow-empty flag --- test/test_0_basic.py | 17 +++++++++++++++++ test/utils.py | 8 ++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/test/test_0_basic.py b/test/test_0_basic.py index ec72483a3..9c3e15882 100644 --- a/test/test_0_basic.py +++ b/test/test_0_basic.py @@ -59,3 +59,20 @@ def test_build_identifiers(tmp_path): assert len(expected_wheels) == len( build_identifiers ), f"{expected_wheels} vs {build_identifiers}" + + +def test_allow_empty(tmp_path, build_frontend_env): + project_dir = tmp_path / "project" + basic_project.generate(project_dir) + + # Sanity check - --allow-empty should cause a no-op build to complete + # without error + build_frontend_env["CIBW_BUILD"] = "BUILD_NOTHING_AT_ALL" + + # build the wheels + actual_wheels = utils.cibuildwheel_run( + project_dir, add_env=build_frontend_env, + add_args=["--allow-empty"]) + + # check that the expected wheels are produced + expected_wheels = utils.expected_wheels("spam", "0.1.0") diff --git a/test/utils.py b/test/utils.py index 0248a7c15..1e5bbca65 100644 --- a/test/utils.py +++ b/test/utils.py @@ -44,7 +44,7 @@ def cibuildwheel_get_build_identifiers(project_path, env=None, *, prerelease_pyt return cmd_output.strip().split("\n") -def cibuildwheel_run(project_path, package_dir=".", env=None, add_env=None, output_dir=None): +def cibuildwheel_run(project_path, package_dir=".", env=None, add_env=None, output_dir=None, add_args=None): """ Runs cibuildwheel as a subprocess, building the project at project_path. @@ -57,6 +57,7 @@ def cibuildwheel_run(project_path, package_dir=".", env=None, add_env=None, outp :param add_env: environment used to update env :param output_dir: directory where wheels are saved. If None, a temporary directory will be used for the duration of the command. + :param add_args: Additional command-line arguments to pass to cibuildwheel. :return: list of built wheels (file names). """ if env is None: @@ -64,6 +65,9 @@ def cibuildwheel_run(project_path, package_dir=".", env=None, add_env=None, outp # If present in the host environment, remove the MACOSX_DEPLOYMENT_TARGET for consistency env.pop("MACOSX_DEPLOYMENT_TARGET", None) + if add_args is None: + add_args = [] + if add_env is not None: env.update(add_env) @@ -77,7 +81,7 @@ def cibuildwheel_run(project_path, package_dir=".", env=None, add_env=None, outp "--output-dir", str(output_dir or tmp_output_dir), str(package_dir), - ], + ] + add_args, env=env, cwd=project_path, check=True, From 82c3d4a4b781f61ac2a438567fc790312aa46dee Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:16:22 +0000 Subject: [PATCH 0055/1105] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- test/test_0_basic.py | 4 ++-- test/utils.py | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/test_0_basic.py b/test/test_0_basic.py index 9c3e15882..e44058a91 100644 --- a/test/test_0_basic.py +++ b/test/test_0_basic.py @@ -71,8 +71,8 @@ def test_allow_empty(tmp_path, build_frontend_env): # build the wheels actual_wheels = utils.cibuildwheel_run( - project_dir, add_env=build_frontend_env, - add_args=["--allow-empty"]) + project_dir, add_env=build_frontend_env, add_args=["--allow-empty"] + ) # check that the expected wheels are produced expected_wheels = utils.expected_wheels("spam", "0.1.0") diff --git a/test/utils.py b/test/utils.py index 1e5bbca65..648794bdc 100644 --- a/test/utils.py +++ b/test/utils.py @@ -44,7 +44,9 @@ def cibuildwheel_get_build_identifiers(project_path, env=None, *, prerelease_pyt return cmd_output.strip().split("\n") -def cibuildwheel_run(project_path, package_dir=".", env=None, add_env=None, output_dir=None, add_args=None): +def cibuildwheel_run( + project_path, package_dir=".", env=None, add_env=None, output_dir=None, add_args=None +): """ Runs cibuildwheel as a subprocess, building the project at project_path. @@ -81,7 +83,8 @@ def cibuildwheel_run(project_path, package_dir=".", env=None, add_env=None, outp "--output-dir", str(output_dir or tmp_output_dir), str(package_dir), - ] + add_args, + ] + + add_args, env=env, cwd=project_path, check=True, From bb2d5bdab6db8a26589c513abdce2b8f8d6e4c8b Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Wed, 13 Apr 2022 10:19:43 +0100 Subject: [PATCH 0056/1105] TEST: Actually evaluate test outcome --- test/test_0_basic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_0_basic.py b/test/test_0_basic.py index e44058a91..720bf42f4 100644 --- a/test/test_0_basic.py +++ b/test/test_0_basic.py @@ -74,5 +74,5 @@ def test_allow_empty(tmp_path, build_frontend_env): project_dir, add_env=build_frontend_env, add_args=["--allow-empty"] ) - # check that the expected wheels are produced - expected_wheels = utils.expected_wheels("spam", "0.1.0") + # check that nothing was built + assert len(actual_wheels) == 0 From be9a635f9bbc97d9baf63ec82e1d24cedf5e77f5 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Wed, 13 Apr 2022 10:47:00 +0100 Subject: [PATCH 0057/1105] fix: don't assume that any configurations are active --- cibuildwheel/macos.py | 23 ++++++++++++----------- cibuildwheel/windows.py | 21 +++++++++++---------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index a58186123..839e25088 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -276,17 +276,18 @@ def build(options: Options, tmp_path: Path) -> None: ) try: - before_all_options_identifier = python_configurations[0].identifier - before_all_options = options.build_options(before_all_options_identifier) - - if before_all_options.before_all: - log.step("Running before_all...") - env = before_all_options.environment.as_dictionary(prev_environment=os.environ) - env.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.9") - before_all_prepared = prepare_command( - before_all_options.before_all, project=".", package=before_all_options.package_dir - ) - shell(before_all_prepared, env=env) + if len(python_configurations) > 0: + before_all_options_identifier = python_configurations[0].identifier + before_all_options = options.build_options(before_all_options_identifier) + + if before_all_options.before_all: + log.step("Running before_all...") + env = before_all_options.environment.as_dictionary(prev_environment=os.environ) + env.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.9") + before_all_prepared = prepare_command( + before_all_options.before_all, project=".", package=before_all_options.package_dir + ) + shell(before_all_prepared, env=env) for config in python_configurations: build_options = options.build_options(config.identifier) diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 86d01fa82..874445faf 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -235,16 +235,17 @@ def build(options: Options, tmp_path: Path) -> None: ) try: - before_all_options_identifier = python_configurations[0].identifier - before_all_options = options.build_options(before_all_options_identifier) - - if before_all_options.before_all: - log.step("Running before_all...") - env = before_all_options.environment.as_dictionary(prev_environment=os.environ) - before_all_prepared = prepare_command( - before_all_options.before_all, project=".", package=options.globals.package_dir - ) - shell(before_all_prepared, env=env) + if len(python_configurations) > 0: + before_all_options_identifier = python_configurations[0].identifier + before_all_options = options.build_options(before_all_options_identifier) + + if before_all_options.before_all: + log.step("Running before_all...") + env = before_all_options.environment.as_dictionary(prev_environment=os.environ) + before_all_prepared = prepare_command( + before_all_options.before_all, project=".", package=options.globals.package_dir + ) + shell(before_all_prepared, env=env) for config in python_configurations: build_options = options.build_options(config.identifier) From d061fc796725216a9e7163e8952bc67accaeb15a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:48:08 +0000 Subject: [PATCH 0058/1105] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- cibuildwheel/macos.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 839e25088..71eea5e71 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -285,7 +285,9 @@ def build(options: Options, tmp_path: Path) -> None: env = before_all_options.environment.as_dictionary(prev_environment=os.environ) env.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.9") before_all_prepared = prepare_command( - before_all_options.before_all, project=".", package=before_all_options.package_dir + before_all_options.before_all, + project=".", + package=before_all_options.package_dir, ) shell(before_all_prepared, env=env) From 945d4f66352109a0eaf383d85f851295ee058fa0 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Thu, 14 Apr 2022 10:21:21 +0100 Subject: [PATCH 0059/1105] test: don't modify build_frontend_env, as it appears to be global --- test/test_0_basic.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/test_0_basic.py b/test/test_0_basic.py index 720bf42f4..9080a30d3 100644 --- a/test/test_0_basic.py +++ b/test/test_0_basic.py @@ -67,11 +67,13 @@ def test_allow_empty(tmp_path, build_frontend_env): # Sanity check - --allow-empty should cause a no-op build to complete # without error - build_frontend_env["CIBW_BUILD"] = "BUILD_NOTHING_AT_ALL" - - # build the wheels actual_wheels = utils.cibuildwheel_run( - project_dir, add_env=build_frontend_env, add_args=["--allow-empty"] + project_dir, + add_env={ + "CIBW_BUILD": "BUILD_NOTHING_AT_ALL", + **build_frontend_env + }, + add_args=["--allow-empty"] ) # check that nothing was built From 30627ae04fa983c79e69291c27907647116b5933 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 09:22:13 +0000 Subject: [PATCH 0060/1105] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- test/test_0_basic.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/test_0_basic.py b/test/test_0_basic.py index 9080a30d3..733c65468 100644 --- a/test/test_0_basic.py +++ b/test/test_0_basic.py @@ -69,11 +69,8 @@ def test_allow_empty(tmp_path, build_frontend_env): # without error actual_wheels = utils.cibuildwheel_run( project_dir, - add_env={ - "CIBW_BUILD": "BUILD_NOTHING_AT_ALL", - **build_frontend_env - }, - add_args=["--allow-empty"] + add_env={"CIBW_BUILD": "BUILD_NOTHING_AT_ALL", **build_frontend_env}, + add_args=["--allow-empty"], ) # check that nothing was built From baf3ead650ea2750e0df6a7b5919088483dc6665 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Tue, 19 Apr 2022 16:00:12 +0100 Subject: [PATCH 0061/1105] style: exit early to reduce indentation --- cibuildwheel/macos.py | 30 ++++++++++++++++-------------- cibuildwheel/windows.py | 24 +++++++++++++----------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 71eea5e71..de6ee7ae5 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -275,21 +275,23 @@ def build(options: Options, tmp_path: Path) -> None: options.globals.build_selector, options.globals.architectures ) + if len(python_configurations) == 0: + return + try: - if len(python_configurations) > 0: - before_all_options_identifier = python_configurations[0].identifier - before_all_options = options.build_options(before_all_options_identifier) - - if before_all_options.before_all: - log.step("Running before_all...") - env = before_all_options.environment.as_dictionary(prev_environment=os.environ) - env.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.9") - before_all_prepared = prepare_command( - before_all_options.before_all, - project=".", - package=before_all_options.package_dir, - ) - shell(before_all_prepared, env=env) + before_all_options_identifier = python_configurations[0].identifier + before_all_options = options.build_options(before_all_options_identifier) + + if before_all_options.before_all: + log.step("Running before_all...") + env = before_all_options.environment.as_dictionary(prev_environment=os.environ) + env.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.9") + before_all_prepared = prepare_command( + before_all_options.before_all, + project=".", + package=before_all_options.package_dir, + ) + shell(before_all_prepared, env=env) for config in python_configurations: build_options = options.build_options(config.identifier) diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 874445faf..13b5c0c3d 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -234,18 +234,20 @@ def build(options: Options, tmp_path: Path) -> None: options.globals.build_selector, options.globals.architectures ) + if len(python_configurations) == 0: + return + try: - if len(python_configurations) > 0: - before_all_options_identifier = python_configurations[0].identifier - before_all_options = options.build_options(before_all_options_identifier) - - if before_all_options.before_all: - log.step("Running before_all...") - env = before_all_options.environment.as_dictionary(prev_environment=os.environ) - before_all_prepared = prepare_command( - before_all_options.before_all, project=".", package=options.globals.package_dir - ) - shell(before_all_prepared, env=env) + before_all_options_identifier = python_configurations[0].identifier + before_all_options = options.build_options(before_all_options_identifier) + + if before_all_options.before_all: + log.step("Running before_all...") + env = before_all_options.environment.as_dictionary(prev_environment=os.environ) + before_all_prepared = prepare_command( + before_all_options.before_all, project=".", package=options.globals.package_dir + ) + shell(before_all_prepared, env=env) for config in python_configurations: build_options = options.build_options(config.identifier) From abedb687838e7ea778ae03294ecb8698a21a3763 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Tue, 19 Apr 2022 16:02:23 +0100 Subject: [PATCH 0062/1105] test: build_frontend_env fixture not required for --allow-empy test. Small style tweak --- test/test_0_basic.py | 4 ++-- test/utils.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test_0_basic.py b/test/test_0_basic.py index 733c65468..2d2e8d97f 100644 --- a/test/test_0_basic.py +++ b/test/test_0_basic.py @@ -61,7 +61,7 @@ def test_build_identifiers(tmp_path): ), f"{expected_wheels} vs {build_identifiers}" -def test_allow_empty(tmp_path, build_frontend_env): +def test_allow_empty(tmp_path): project_dir = tmp_path / "project" basic_project.generate(project_dir) @@ -69,7 +69,7 @@ def test_allow_empty(tmp_path, build_frontend_env): # without error actual_wheels = utils.cibuildwheel_run( project_dir, - add_env={"CIBW_BUILD": "BUILD_NOTHING_AT_ALL", **build_frontend_env}, + add_env={"CIBW_BUILD": "BUILD_NOTHING_AT_ALL"}, add_args=["--allow-empty"], ) diff --git a/test/utils.py b/test/utils.py index 648794bdc..86df69a40 100644 --- a/test/utils.py +++ b/test/utils.py @@ -83,8 +83,8 @@ def cibuildwheel_run( "--output-dir", str(output_dir or tmp_output_dir), str(package_dir), - ] - + add_args, + *add_args, + ], env=env, cwd=project_path, check=True, From 496ea9bd565ba4edc4b08cb28c4aef47d9a7ba3f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 13:35:44 -0400 Subject: [PATCH 0063/1105] [pre-commit.ci] pre-commit autoupdate (#1092) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/hadialqattan/pycln: v1.2.5 → v1.3.1](https://github.com/hadialqattan/pycln/compare/v1.2.5...v1.3.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3497b7f36..c64525eef 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: # Autoremoves unused imports - repo: https://github.com/hadialqattan/pycln - rev: v1.2.5 + rev: v1.3.1 hooks: - id: pycln args: [--all] From f08f08c04df43d8e54d2e6e598d7909e4af00e01 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Thu, 21 Apr 2022 10:34:11 +0100 Subject: [PATCH 0064/1105] style: spurious comma --- cibuildwheel/macos.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index de6ee7ae5..d27703152 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -287,9 +287,7 @@ def build(options: Options, tmp_path: Path) -> None: env = before_all_options.environment.as_dictionary(prev_environment=os.environ) env.setdefault("MACOSX_DEPLOYMENT_TARGET", "10.9") before_all_prepared = prepare_command( - before_all_options.before_all, - project=".", - package=before_all_options.package_dir, + before_all_options.before_all, project=".", package=before_all_options.package_dir ) shell(before_all_prepared, env=env) From 986a50f8a0f238b4c0132242059aa0eaa59ffcd2 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 26 Apr 2022 00:29:32 -0400 Subject: [PATCH 0065/1105] docs: two minor additions (#1093) * docs: mention when msvcd140_1.dll is included in cpython * docs: mention maturin-action --- README.md | 4 ++-- docs/faq.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e128870c8..a621e4f59 100644 --- a/README.md +++ b/README.md @@ -283,6 +283,6 @@ Massive props also to- See also ======== -If you'd like to keep wheel building separate from the package itself, check out [astrofrog/autowheel](https://github.com/astrofrog/autowheel). It builds packages using cibuildwheel from source distributions on PyPI. - Another very similar tool to consider is [matthew-brett/multibuild](http://github.com/matthew-brett/multibuild). `multibuild` is a shell script toolbox for building a wheel on various platforms. It is used as a basis to build some of the big data science tools, like SciPy. + +If you are building Rust wheels, you can get by without some of the tricks required to make GLIBC work via manylinux; this is especially relevant for cross-compiling, which is easy with Rust. See [maturin-action](https://github.com/messense/maturin-action) for a tool that is optimized for building Rust wheels and cross-compiling. diff --git a/docs/faq.md b/docs/faq.md index 5d8aa71b6..97e65feb7 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -179,7 +179,7 @@ package 'sdist' will also benefit. #### Missing build dependencies {: #cibw-options-alternatives-deps} -If your build needs Python dependencies, rather than using CIBW_BEFORE_BUILD, it's best to add these to the +If your build needs Python dependencies, rather than using `CIBW_BEFORE_BUILD`, it's best to add these to the [`build-system.requires`](https://www.python.org/dev/peps/pep-0518/#build-system-table) section of your pyproject.toml. For example, if your project requires Cython to build, your pyproject.toml might include a section like this: @@ -201,7 +201,7 @@ You might need to run some other commands before building, like running a script that performs codegen or downloading some data that's not stored in your source tree. -Rather than using CIBW_BEFORE_ALL or CIBW_BEFORE_BUILD, you could incorporate +Rather than using `CIBW_BEFORE_ALL` or `CIBW_BEFORE_BUILD`, you could incorporate these steps into your package's build process. For example, if you're using setuptools, you can add steps to your package's `setup.py` using a structure like this: @@ -309,7 +309,7 @@ See [#816](https://github.com/pypa/cibuildwheel/issues/816), thanks to @phoeriou Visual Studio and MSVC link the compiled binary wheels to the Microsoft Visual C++ Runtime. Normally, these are included with Python, but when compiling with a newer version of Visual Studio, it is possible users will run into problems on systems that do not have these runtime libraries installed. The solution is to ask users to download the corresponding Visual C++ Redistributable from the [Microsoft website](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) and install it. Since a Python installation normally includes these VC++ Redistributable files for [the version of the MSVC compiler used to compile Python](https://wiki.python.org/moin/WindowsCompilers), this is typically only a problem when compiling a Python C extension with a newer compiler. -Additionally, Visual Studio 2019 started linking to an even newer DLL, `VCRUNTIME140_1.dll`, besides the `VCRUNTIME140.dll` that is included with recent Python versions (starting from Python 3.5; see [here](https://wiki.python.org/moin/WindowsCompilers) for more details on the corresponding Visual Studio & MSVC versions used to compile the different Python versions). To avoid this extra dependency on `VCRUNTIME140_1.dll`, the [`/d2FH4-` flag](https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64/) can be added to the MSVC invocations (check out [this issue](https://github.com/pypa/cibuildwheel/issues/423) for details and references). +Additionally, Visual Studio 2019 started linking to an even newer DLL, `VCRUNTIME140_1.dll`, besides the `VCRUNTIME140.dll` that is included with recent Python versions (starting from Python 3.5; see [here](https://wiki.python.org/moin/WindowsCompilers) for more details on the corresponding Visual Studio & MSVC versions used to compile the different Python versions). To avoid this extra dependency on `VCRUNTIME140_1.dll`, the [`/d2FH4-` flag](https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64/) can be added to the MSVC invocations (check out [this issue](https://github.com/pypa/cibuildwheel/issues/423) for details and references). CPython 3.8.3 and all versions after it have this extra DLL, so it is only needed for 3.8 and earlier. To add the `/d2FH4-` flag to a standard `setup.py` using `setuptools`, the `extra_compile_args` option can be used: From de0737093069f0ebeaaaa80cba0414ce780f7740 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Tue, 26 Apr 2022 19:29:00 +0200 Subject: [PATCH 0066/1105] fix: extract project as current user on linux (#1095) This allows git to work properly, e.g., `versioneer`/`setuptools_scm` with latest git versions. c.f. https://github.com/pypa/manylinux/issues/1309 --- cibuildwheel/docker_container.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py index bc313a7de..8ee8e5739 100644 --- a/cibuildwheel/docker_container.py +++ b/cibuildwheel/docker_container.py @@ -122,7 +122,7 @@ def copy_into(self, from_path: Path, to_path: PurePath) -> None: if from_path.is_dir(): self.call(["mkdir", "-p", to_path]) subprocess.run( - f"tar cf - . | docker exec -i {self.name} tar -xC {shell_quote(to_path)} -f -", + f"tar cf - . | docker exec -i {self.name} tar --no-same-owner -xC {shell_quote(to_path)} -f -", shell=True, check=True, cwd=from_path, From e3ff027131daedebf01cd8227c5872d1d83f7c0f Mon Sep 17 00:00:00 2001 From: mayeut Date: Mon, 18 Apr 2022 14:24:53 +0200 Subject: [PATCH 0067/1105] feature: add support for ABI3 wheels --- cibuildwheel/linux.py | 142 ++++++++++++++++++++---------------- cibuildwheel/macos.py | 153 +++++++++++++++++++++------------------ cibuildwheel/util.py | 41 ++++++++++- cibuildwheel/windows.py | 153 +++++++++++++++++++++------------------ setup.cfg | 2 +- test/test_limited_api.py | 50 +++++++++++++ test/test_projects/c.py | 3 + 7 files changed, 341 insertions(+), 203 deletions(-) create mode 100644 test/test_limited_api.py diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index 8478bf092..7be028a1c 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -12,6 +12,7 @@ from .util import ( BuildSelector, NonPlatformWheelError, + find_compatible_abi3_wheel, get_build_verbosity_extra_flags, prepare_command, read_python_configs, @@ -132,6 +133,8 @@ def build_on_docker( ) docker.call(["sh", "-c", before_all_prepared], env=env) + built_wheels: List[PurePath] = [] + for config in platform_configs: log.build_start(config.identifier) build_options = options.build_options(config.identifier) @@ -174,74 +177,83 @@ def build_on_docker( ) sys.exit(1) - if build_options.before_build: - log.step("Running before_build...") - before_build_prepared = prepare_command( - build_options.before_build, - project=container_project_path, - package=container_package_dir, - ) - docker.call(["sh", "-c", before_build_prepared], env=env) - - log.step("Building wheel...") - - temp_dir = PurePath("/tmp/cibuildwheel") - built_wheel_dir = temp_dir / "built_wheel" - docker.call(["rm", "-rf", built_wheel_dir]) - docker.call(["mkdir", "-p", built_wheel_dir]) - - verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity) - - if build_options.build_frontend == "pip": - docker.call( - [ - "python", - "-m", - "pip", - "wheel", - container_package_dir, - f"--wheel-dir={built_wheel_dir}", - "--no-deps", - *verbosity_flags, - ], - env=env, - ) - elif build_options.build_frontend == "build": - config_setting = " ".join(verbosity_flags) - docker.call( - [ - "python", - "-m", - "build", - container_package_dir, - "--wheel", - f"--outdir={built_wheel_dir}", - f"--config-setting={config_setting}", - ], - env=env, + abi3_wheel = find_compatible_abi3_wheel(built_wheels, config.identifier) + if abi3_wheel: + log.step_end() + print( + f"Found previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." ) + repaired_wheels = [abi3_wheel] else: - assert_never(build_options.build_frontend) - built_wheel = docker.glob(built_wheel_dir, "*.whl")[0] + if build_options.before_build: + log.step("Running before_build...") + before_build_prepared = prepare_command( + build_options.before_build, + project=container_project_path, + package=container_package_dir, + ) + docker.call(["sh", "-c", before_build_prepared], env=env) + + log.step("Building wheel...") + + temp_dir = PurePath("/tmp/cibuildwheel") + built_wheel_dir = temp_dir / "built_wheel" + docker.call(["rm", "-rf", built_wheel_dir]) + docker.call(["mkdir", "-p", built_wheel_dir]) + + verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity) + + if build_options.build_frontend == "pip": + docker.call( + [ + "python", + "-m", + "pip", + "wheel", + container_package_dir, + f"--wheel-dir={built_wheel_dir}", + "--no-deps", + *verbosity_flags, + ], + env=env, + ) + elif build_options.build_frontend == "build": + config_setting = " ".join(verbosity_flags) + docker.call( + [ + "python", + "-m", + "build", + container_package_dir, + "--wheel", + f"--outdir={built_wheel_dir}", + f"--config-setting={config_setting}", + ], + env=env, + ) + else: + assert_never(build_options.build_frontend) - repaired_wheel_dir = temp_dir / "repaired_wheel" - docker.call(["rm", "-rf", repaired_wheel_dir]) - docker.call(["mkdir", "-p", repaired_wheel_dir]) + built_wheel = docker.glob(built_wheel_dir, "*.whl")[0] - if built_wheel.name.endswith("none-any.whl"): - raise NonPlatformWheelError() + repaired_wheel_dir = temp_dir / "repaired_wheel" + docker.call(["rm", "-rf", repaired_wheel_dir]) + docker.call(["mkdir", "-p", repaired_wheel_dir]) - if build_options.repair_command: - log.step("Repairing wheel...") - repair_command_prepared = prepare_command( - build_options.repair_command, wheel=built_wheel, dest_dir=repaired_wheel_dir - ) - docker.call(["sh", "-c", repair_command_prepared], env=env) - else: - docker.call(["mv", built_wheel, repaired_wheel_dir]) + if built_wheel.name.endswith("none-any.whl"): + raise NonPlatformWheelError() - repaired_wheels = docker.glob(repaired_wheel_dir, "*.whl") + if build_options.repair_command: + log.step("Repairing wheel...") + repair_command_prepared = prepare_command( + build_options.repair_command, wheel=built_wheel, dest_dir=repaired_wheel_dir + ) + docker.call(["sh", "-c", repair_command_prepared], env=env) + else: + docker.call(["mv", built_wheel, repaired_wheel_dir]) + + repaired_wheels = docker.glob(repaired_wheel_dir, "*.whl") if build_options.test_command and build_options.test_selector(config.identifier): log.step("Testing wheel...") @@ -292,8 +304,12 @@ def build_on_docker( docker.call(["rm", "-rf", venv_dir]) # move repaired wheels to output - docker.call(["mkdir", "-p", container_output_dir]) - docker.call(["mv", *repaired_wheels, container_output_dir]) + if abi3_wheel is None: + docker.call(["mkdir", "-p", container_output_dir]) + docker.call(["mv", *repaired_wheels, container_output_dir]) + built_wheels.extend( + container_output_dir / repaired_wheel.name for repaired_wheel in repaired_wheels + ) log.build_end() diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index d27703152..aed483ad4 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -23,6 +23,7 @@ call, detect_ci_provider, download, + find_compatible_abi3_wheel, get_build_verbosity_extra_flags, get_pip_version, install_certifi_script, @@ -291,6 +292,8 @@ def build(options: Options, tmp_path: Path) -> None: ) shell(before_all_prepared, env=env) + built_wheels: List[Path] = [] + for config in python_configurations: build_options = options.build_options(config.identifier) log.build_start(config.identifier) @@ -318,84 +321,94 @@ def build(options: Options, tmp_path: Path) -> None: build_options.build_frontend, ) - if build_options.before_build: - log.step("Running before_build...") - before_build_prepared = prepare_command( - build_options.before_build, project=".", package=build_options.package_dir - ) - shell(before_build_prepared, env=env) - - log.step("Building wheel...") - built_wheel_dir.mkdir() - - verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity) - - if build_options.build_frontend == "pip": - # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org - # see https://github.com/pypa/cibuildwheel/pull/369 - call( - "python", - "-m", - "pip", - "wheel", - build_options.package_dir.resolve(), - f"--wheel-dir={built_wheel_dir}", - "--no-deps", - *verbosity_flags, - env=env, - ) - elif build_options.build_frontend == "build": - config_setting = " ".join(verbosity_flags) - build_env = env.copy() - if build_options.dependency_constraints: - constraint_path = build_options.dependency_constraints.get_for_python_version( - config.version - ) - build_env["PIP_CONSTRAINT"] = constraint_path.as_uri() - build_env["VIRTUALENV_PIP"] = get_pip_version(env) - call( - "python", - "-m", - "build", - build_options.package_dir, - "--wheel", - f"--outdir={built_wheel_dir}", - f"--config-setting={config_setting}", - env=build_env, + abi3_wheel = find_compatible_abi3_wheel(built_wheels, config.identifier) + if abi3_wheel: + log.step_end() + print( + f"Found previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." ) + repaired_wheel = abi3_wheel else: - assert_never(build_options.build_frontend) + if build_options.before_build: + log.step("Running before_build...") + before_build_prepared = prepare_command( + build_options.before_build, project=".", package=build_options.package_dir + ) + shell(before_build_prepared, env=env) + + log.step("Building wheel...") + built_wheel_dir.mkdir() + + verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity) + + if build_options.build_frontend == "pip": + # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org + # see https://github.com/pypa/cibuildwheel/pull/369 + call( + "python", + "-m", + "pip", + "wheel", + build_options.package_dir.resolve(), + f"--wheel-dir={built_wheel_dir}", + "--no-deps", + *verbosity_flags, + env=env, + ) + elif build_options.build_frontend == "build": + config_setting = " ".join(verbosity_flags) + build_env = env.copy() + if build_options.dependency_constraints: + constraint_path = ( + build_options.dependency_constraints.get_for_python_version( + config.version + ) + ) + build_env["PIP_CONSTRAINT"] = constraint_path.as_uri() + build_env["VIRTUALENV_PIP"] = get_pip_version(env) + call( + "python", + "-m", + "build", + build_options.package_dir, + "--wheel", + f"--outdir={built_wheel_dir}", + f"--config-setting={config_setting}", + env=build_env, + ) + else: + assert_never(build_options.build_frontend) - built_wheel = next(built_wheel_dir.glob("*.whl")) + built_wheel = next(built_wheel_dir.glob("*.whl")) - repaired_wheel_dir.mkdir() + repaired_wheel_dir.mkdir() - if built_wheel.name.endswith("none-any.whl"): - raise NonPlatformWheelError() + if built_wheel.name.endswith("none-any.whl"): + raise NonPlatformWheelError() - if build_options.repair_command: - log.step("Repairing wheel...") + if build_options.repair_command: + log.step("Repairing wheel...") - if config_is_universal2: - delocate_archs = "x86_64,arm64" - elif config_is_arm64: - delocate_archs = "arm64" + if config_is_universal2: + delocate_archs = "x86_64,arm64" + elif config_is_arm64: + delocate_archs = "arm64" + else: + delocate_archs = "x86_64" + + repair_command_prepared = prepare_command( + build_options.repair_command, + wheel=built_wheel, + dest_dir=repaired_wheel_dir, + delocate_archs=delocate_archs, + ) + shell(repair_command_prepared, env=env) else: - delocate_archs = "x86_64" - - repair_command_prepared = prepare_command( - build_options.repair_command, - wheel=built_wheel, - dest_dir=repaired_wheel_dir, - delocate_archs=delocate_archs, - ) - shell(repair_command_prepared, env=env) - else: - shutil.move(str(built_wheel), repaired_wheel_dir) + shutil.move(str(built_wheel), repaired_wheel_dir) - repaired_wheel = next(repaired_wheel_dir.glob("*.whl")) + repaired_wheel = next(repaired_wheel_dir.glob("*.whl")) - log.step_end() + log.step_end() if build_options.test_command and build_options.test_selector(config.identifier): machine_arch = platform.machine() @@ -521,7 +534,9 @@ def build(options: Options, tmp_path: Path) -> None: ) # we're all done here; move it to output (overwrite existing) - shutil.move(str(repaired_wheel), build_options.output_dir) + if abi3_wheel is None: + shutil.move(str(repaired_wheel), build_options.output_dir) + built_wheels.append(build_options.output_dir / repaired_wheel.name) # clean up shutil.rmtree(identifier_tmp_dir) diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index 5015d3487..1ebffee3e 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -13,7 +13,7 @@ import urllib.request from enum import Enum from functools import lru_cache -from pathlib import Path +from pathlib import Path, PurePath from time import sleep from typing import ( Any, @@ -26,6 +26,7 @@ Optional, Sequence, TextIO, + TypeVar, cast, overload, ) @@ -41,6 +42,7 @@ from filelock import FileLock from packaging.requirements import InvalidRequirement, Requirement from packaging.specifiers import SpecifierSet +from packaging.utils import parse_wheel_filename from packaging.version import Version from platformdirs import user_cache_path @@ -51,6 +53,7 @@ "MANYLINUX_ARCHS", "call", "shell", + "find_compatible_abi3_wheel", "format_safe", "prepare_command", "get_build_verbosity_extra_flags", @@ -566,6 +569,42 @@ def virtualenv( return env +T = TypeVar("T", bound=PurePath) + + +def find_compatible_abi3_wheel(wheels: Sequence[T], identifier: str) -> Optional[T]: + """ + Finds an ABI3 wheel in `wheels` compatible with the Python interpreter + specified by `identifier`. + """ + + interpreter, platform = identifier.split("-") + if not interpreter.startswith("cp3"): + return None + for wheel in wheels: + _, _, _, tags = parse_wheel_filename(wheel.name) + for tag in tags: + if tag.abi != "abi3": + continue + if not tag.interpreter.startswith("cp3"): + continue + if int(tag.interpreter[3:]) > int(interpreter[3:]): + continue + if platform.startswith(("manylinux", "musllinux", "macosx")): + # Linux, macOS + os_, arch = platform.split("_", 1) + if not tag.platform.startswith(os_): + continue + if not tag.platform.endswith("_" + arch): + continue + else: + # Windows + if not tag.platform == platform: + continue + return wheel + return None + + if sys.version_info >= (3, 8): from functools import cached_property else: diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 13b5c0c3d..85f76a04b 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -22,6 +22,7 @@ NonPlatformWheelError, call, download, + find_compatible_abi3_wheel, get_build_verbosity_extra_flags, get_pip_version, prepare_command, @@ -249,6 +250,8 @@ def build(options: Options, tmp_path: Path) -> None: ) shell(before_all_prepared, env=env) + built_wheels: List[Path] = [] + for config in python_configurations: build_options = options.build_options(config.identifier) log.build_start(config.identifier) @@ -274,83 +277,93 @@ def build(options: Options, tmp_path: Path) -> None: build_options.build_frontend, ) - # run the before_build command - if build_options.before_build: - log.step("Running before_build...") - before_build_prepared = prepare_command( - build_options.before_build, project=".", package=options.globals.package_dir + abi3_wheel = find_compatible_abi3_wheel(built_wheels, config.identifier) + if abi3_wheel: + log.step_end() + print( + f"Found previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." ) - shell(before_build_prepared, env=env) + repaired_wheel = abi3_wheel + else: + # run the before_build command + if build_options.before_build: + log.step("Running before_build...") + before_build_prepared = prepare_command( + build_options.before_build, project=".", package=options.globals.package_dir + ) + shell(before_build_prepared, env=env) - log.step("Building wheel...") - built_wheel_dir.mkdir() + log.step("Building wheel...") + built_wheel_dir.mkdir() - verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity) + verbosity_flags = get_build_verbosity_extra_flags(build_options.build_verbosity) - if build_options.build_frontend == "pip": - # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org - # see https://github.com/pypa/cibuildwheel/pull/369 - call( - "python", - "-m", - "pip", - "wheel", - options.globals.package_dir.resolve(), - f"--wheel-dir={built_wheel_dir}", - "--no-deps", - *get_build_verbosity_extra_flags(build_options.build_verbosity), - env=env, - ) - elif build_options.build_frontend == "build": - config_setting = " ".join(verbosity_flags) - build_env = env.copy() - if build_options.dependency_constraints: - constraints_path = build_options.dependency_constraints.get_for_python_version( - config.version - ) - # Bug in pip <= 21.1.3 - we can't have a space in the - # constraints file, and pip doesn't support drive letters - # in uhi. After probably pip 21.2, we can use uri. For - # now, use a temporary file. - if " " in str(constraints_path): - assert " " not in str(identifier_tmp_dir) - tmp_file = identifier_tmp_dir / "constraints.txt" - tmp_file.write_bytes(constraints_path.read_bytes()) - constraints_path = tmp_file - - build_env["PIP_CONSTRAINT"] = str(constraints_path) - build_env["VIRTUALENV_PIP"] = get_pip_version(env) + if build_options.build_frontend == "pip": + # Path.resolve() is needed. Without it pip wheel may try to fetch package from pypi.org + # see https://github.com/pypa/cibuildwheel/pull/369 call( "python", "-m", - "build", - build_options.package_dir, - "--wheel", - f"--outdir={built_wheel_dir}", - f"--config-setting={config_setting}", - env=build_env, + "pip", + "wheel", + options.globals.package_dir.resolve(), + f"--wheel-dir={built_wheel_dir}", + "--no-deps", + *get_build_verbosity_extra_flags(build_options.build_verbosity), + env=env, ) - else: - assert_never(build_options.build_frontend) - - built_wheel = next(built_wheel_dir.glob("*.whl")) - - # repair the wheel - repaired_wheel_dir.mkdir() - - if built_wheel.name.endswith("none-any.whl"): - raise NonPlatformWheelError() - - if build_options.repair_command: - log.step("Repairing wheel...") - repair_command_prepared = prepare_command( - build_options.repair_command, wheel=built_wheel, dest_dir=repaired_wheel_dir - ) - shell(repair_command_prepared, env=env) - else: - shutil.move(str(built_wheel), repaired_wheel_dir) + elif build_options.build_frontend == "build": + config_setting = " ".join(verbosity_flags) + build_env = env.copy() + if build_options.dependency_constraints: + constraints_path = ( + build_options.dependency_constraints.get_for_python_version( + config.version + ) + ) + # Bug in pip <= 21.1.3 - we can't have a space in the + # constraints file, and pip doesn't support drive letters + # in uhi. After probably pip 21.2, we can use uri. For + # now, use a temporary file. + if " " in str(constraints_path): + assert " " not in str(identifier_tmp_dir) + tmp_file = identifier_tmp_dir / "constraints.txt" + tmp_file.write_bytes(constraints_path.read_bytes()) + constraints_path = tmp_file + + build_env["PIP_CONSTRAINT"] = str(constraints_path) + build_env["VIRTUALENV_PIP"] = get_pip_version(env) + call( + "python", + "-m", + "build", + build_options.package_dir, + "--wheel", + f"--outdir={built_wheel_dir}", + f"--config-setting={config_setting}", + env=build_env, + ) + else: + assert_never(build_options.build_frontend) + + built_wheel = next(built_wheel_dir.glob("*.whl")) + + # repair the wheel + repaired_wheel_dir.mkdir() + + if built_wheel.name.endswith("none-any.whl"): + raise NonPlatformWheelError() + + if build_options.repair_command: + log.step("Repairing wheel...") + repair_command_prepared = prepare_command( + build_options.repair_command, wheel=built_wheel, dest_dir=repaired_wheel_dir + ) + shell(repair_command_prepared, env=env) + else: + shutil.move(str(built_wheel), repaired_wheel_dir) - repaired_wheel = next(repaired_wheel_dir.glob("*.whl")) + repaired_wheel = next(repaired_wheel_dir.glob("*.whl")) if build_options.test_command and options.globals.test_selector(config.identifier): log.step("Testing wheel...") @@ -405,7 +418,9 @@ def build(options: Options, tmp_path: Path) -> None: shell(test_command_prepared, cwd="c:\\", env=virtualenv_env) # we're all done here; move it to output (remove if already exists) - shutil.move(str(repaired_wheel), build_options.output_dir) + if abi3_wheel is None: + shutil.move(str(repaired_wheel), build_options.output_dir) + built_wheels.append(build_options.output_dir / repaired_wheel.name) # clean up # (we ignore errors because occasionally Windows fails to unlink a file and we diff --git a/setup.cfg b/setup.cfg index a6773844b..1fa219fc4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,7 +35,7 @@ install_requires = bracex certifi filelock - packaging + packaging>=20.9 platformdirs dataclasses;python_version < '3.7' tomli;python_version < '3.11' diff --git a/test/test_limited_api.py b/test/test_limited_api.py new file mode 100644 index 000000000..34978c92d --- /dev/null +++ b/test/test_limited_api.py @@ -0,0 +1,50 @@ +import textwrap + +from . import test_projects, utils + +limited_api_project = test_projects.new_c_project( + setup_py_add=textwrap.dedent( + r""" + cmdclass = {} + extension_kwargs = {} + if sys.version_info[:2] >= (3, 8): + from wheel.bdist_wheel import bdist_wheel as _bdist_wheel + + class bdist_wheel_abi3(_bdist_wheel): + def finalize_options(self): + _bdist_wheel.finalize_options(self) + self.root_is_pure = False + + def get_tag(self): + python, abi, plat = _bdist_wheel.get_tag(self) + return python, "abi3", plat + + cmdclass["bdist_wheel"] = bdist_wheel_abi3 + extension_kwargs["define_macros"] = [("Py_LIMITED_API", "0x03080000")] + extension_kwargs["py_limited_api"] = True + """ + ), + setup_py_extension_args_add="**extension_kwargs", + setup_py_setup_args_add="cmdclass=cmdclass", +) + + +def test(tmp_path): + project_dir = tmp_path / "project" + limited_api_project.generate(project_dir) + + # build the wheels + actual_wheels = utils.cibuildwheel_run( + project_dir, + add_env={ + "CIBW_SKIP": "pp* ", # PyPy does not have a Py_LIMITED_API equivalent + }, + ) + + # check that the expected wheels are produced + expected_wheels = [ + w.replace("cp38-cp38", "cp38-abi3") + for w in utils.expected_wheels("spam", "0.1.0") + if "-pp" not in w and "-cp39" not in w and "-cp310" not in w + ] + assert set(actual_wheels) == set(expected_wheels) diff --git a/test/test_projects/c.py b/test/test_projects/c.py index 41b729586..d4c37c694 100644 --- a/test/test_projects/c.py +++ b/test/test_projects/c.py @@ -54,6 +54,7 @@ 'spam', sources=['spam.c'], libraries=libraries, + {{ setup_py_extension_args_add | indent(8) }} )], {{ setup_py_setup_args_add | indent(4) }} ) @@ -73,6 +74,7 @@ def new_c_project( spam_c_top_level_add="", spam_c_function_add="", setup_py_add="", + setup_py_extension_args_add="", setup_py_setup_args_add="", setup_cfg_add="", ): @@ -91,6 +93,7 @@ def new_c_project( "spam_c_top_level_add": spam_c_top_level_add, "spam_c_function_add": spam_c_function_add, "setup_py_add": setup_py_add, + "setup_py_extension_args_add": setup_py_extension_args_add, "setup_py_setup_args_add": setup_py_setup_args_add, "setup_cfg_add": setup_cfg_add, } From 763cd15ae22a32c7babbaa706bfbdc6a62890e1e Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 30 Mar 2022 09:20:26 +0100 Subject: [PATCH 0068/1105] Add from_sdist script --- cibuildwheel/from_sdist.py | 102 +++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 cibuildwheel/from_sdist.py diff --git a/cibuildwheel/from_sdist.py b/cibuildwheel/from_sdist.py new file mode 100644 index 000000000..d0084b58a --- /dev/null +++ b/cibuildwheel/from_sdist.py @@ -0,0 +1,102 @@ +import argparse +import subprocess +import sys +import tarfile +import tempfile +import textwrap +from pathlib import Path + +from cibuildwheel.util import format_safe + + +def main() -> None: + parser = argparse.ArgumentParser( + description=textwrap.dedent( + """ + Build wheels from an sdist archive. + + Extracts the sdist to a temp dir and calls cibuildwheel on the + resulting package directory. Note that cibuildwheel will be + invoked with its working directory as the package directory, so + options aside from --output-dir and --config-file are relative to + the package directory. + """, + ), + epilog="""Any further arguments will be passed on to cibuildwheel.""", + formatter_class=argparse.RawDescriptionHelpFormatter, + ) + + parser.add_argument( + "--output-dir", + default="wheelhouse", + help=""" + Destination folder for the wheels. Default: wheelhouse. + """, + ) + + parser.add_argument( + "--config-file", + default="", + help=""" + TOML config file. To refer to a file inside the sdist, use the + `{project}` or `{package}` placeholder. e.g. `--config-file + {project}/config/cibuildwheel.toml` Default: "", meaning the + pyproject.toml inside the sdist, if it exists. + """, + ) + + parser.add_argument( + "package", + help=""" + Path to the sdist archive that you want wheels for. Must be a + tar.gz archive file. + """, + ) + + args, passthrough_args = parser.parse_known_args() + + output_dir = Path(args.output_dir).resolve() + + with tempfile.TemporaryDirectory(prefix="cibw-sdist-") as temp_dir_str: + temp_dir = Path(temp_dir_str) + + with tarfile.open(args.package) as tar: + tar.extractall(path=temp_dir) + + temp_dir_contents = list(temp_dir.iterdir()) + + if len(temp_dir_contents) != 1 or not temp_dir_contents[0].is_dir: + exit("invalid sdist: didn't contain a single dir") + + project_dir = temp_dir_contents[0] + + if args.config_file: + # expand the placeholders if they're used + config_file_path = format_safe( + args.config_file, + project=project_dir, + package=project_dir, + ) + config_file = Path(config_file_path).resolve() + else: + config_file = None + + exit( + subprocess.call( + [ + sys.executable, + "-m", + "cibuildwheel", + *(["--config-file", str(config_file)] if config_file else []), + "--output-dir", + output_dir, + *passthrough_args, + ".", + ], + cwd=project_dir, + ) + ) + + +if __name__ == "__main__": + main() From e887d4bbf8a86bea2da39648c594650bfbea7d12 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 30 Mar 2022 09:29:43 +0100 Subject: [PATCH 0069/1105] Add entrypoint --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index a6773844b..9642cf9f2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -51,6 +51,7 @@ include = [options.entry_points] console_scripts = cibuildwheel = cibuildwheel.__main__:main + cibuildwheel-from-sdist = cibuildwheel.from_sdist:main [options.package_data] cibuildwheel = resources/* From c6c5e6e59b214128b97661a96868d07468827f24 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Fri, 1 Apr 2022 16:50:01 +0100 Subject: [PATCH 0070/1105] Add test for cibuildwheel.from-sdist --- setup.py | 1 + test/test_from_sdist.py | 177 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+) create mode 100644 test/test_from_sdist.py diff --git a/setup.py b/setup.py index 96b4d10c9..7a9eee688 100644 --- a/setup.py +++ b/setup.py @@ -13,6 +13,7 @@ "pytest>=6", "pytest-timeout", "pytest-xdist", + "build", ], "bin": [ "click", diff --git a/test/test_from_sdist.py b/test/test_from_sdist.py new file mode 100644 index 000000000..c3eeda497 --- /dev/null +++ b/test/test_from_sdist.py @@ -0,0 +1,177 @@ +import os +import subprocess +import sys +import textwrap +from pathlib import Path +from tempfile import TemporaryDirectory +from test.test_projects.base import TestProject + +from . import test_projects, utils + +basic_project = test_projects.new_c_project() + + +# utilities + + +def make_sdist(project: TestProject, working_dir: Path) -> Path: + project_dir = working_dir / "project" + project_dir.mkdir(parents=True, exist_ok=True) + project.generate(project_dir) + + sdist_dir = working_dir / "sdist" + subprocess.run( + [sys.executable, "-m", "build", "--sdist", "--outdir", sdist_dir, project_dir], check=True + ) + + return next(sdist_dir.glob("*.tar.gz")) + + +def cibuildwheel_from_sdist_run(sdist_path, add_env=None, config_file=None): + env = os.environ.copy() + + if add_env: + env.update(add_env) + + with TemporaryDirectory() as tmp_output_dir: + subprocess.run( + [ + sys.executable, + "-m", + "cibuildwheel.from_sdist", + *(["--config-file", config_file] if config_file else []), + "--output-dir", + tmp_output_dir, + sdist_path, + ], + env=env, + check=True, + ) + return os.listdir(tmp_output_dir) + + +# tests + + +def test_simple(tmp_path): + # make an sdist of the project + sdist_dir = tmp_path / "sdist" + sdist_dir.mkdir() + sdist_path = make_sdist(basic_project, sdist_dir) + + # build the wheels from sdist + actual_wheels = cibuildwheel_from_sdist_run( + sdist_path, + add_env={ + "CIBW_BUILD": "cp39-*", + }, + ) + + # check that the expected wheels are produced + expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp39" in w] + assert set(actual_wheels) == set(expected_wheels) + + +def test_external_config_file_argument(tmp_path, capfd): + # make an sdist of the project + sdist_dir = tmp_path / "sdist" + sdist_dir.mkdir() + sdist_path = make_sdist(basic_project, sdist_dir) + + # add a config file + config_file = tmp_path / "config.toml" + config_file.write_text( + textwrap.dedent( + """ + [tool.cibuildwheel] + before-all = 'echo "test log statement from before-all"' + """ + ) + ) + + # build the wheels from sdist + actual_wheels = cibuildwheel_from_sdist_run( + sdist_path, + add_env={ + "CIBW_BUILD": "cp39-*", + }, + config_file=config_file, + ) + + # check that the expected wheels are produced + expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp39" in w] + assert set(actual_wheels) == set(expected_wheels) + + # check that before-all was run + captured = capfd.readouterr() + assert "test log statement from before-all" in captured.out + + +def test_config_in_pyproject_toml(tmp_path, capfd): + # make a project with a pyproject.toml + project = test_projects.new_c_project() + project.files["pyproject.toml"] = textwrap.dedent( + """ + [tool.cibuildwheel] + before-build = 'echo "test log statement from before-build 8419"' + """ + ) + + # make an sdist of the project + sdist_dir = tmp_path / "sdist" + sdist_dir.mkdir() + sdist_path = make_sdist(project, sdist_dir) + + # build the wheels from sdist + actual_wheels = cibuildwheel_from_sdist_run( + sdist_path, + add_env={"CIBW_BUILD": "cp39-*"}, + ) + + # check that the expected wheels are produced + expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp39" in w] + assert set(actual_wheels) == set(expected_wheels) + + # check that before-build was run + captured = capfd.readouterr() + assert "test log statement from before-build 8419" in captured.out + + +def test_internal_config_file_argument(tmp_path, capfd): + # make a project with a config file inside + project = test_projects.new_c_project( + setup_cfg_add="include_package_data = True", + ) + project.files["wheel_build_config.toml"] = textwrap.dedent( + """ + [tool.cibuildwheel] + before-all = 'echo "test log statement from before-all 1829"' + """ + ) + project.files["MANIFEST.in"] = textwrap.dedent( + """ + include wheel_build_config.toml + """ + ) + + # make an sdist of the project + sdist_dir = tmp_path / "sdist" + sdist_dir.mkdir() + sdist_path = make_sdist(project, sdist_dir) + + # build the wheels from sdist + actual_wheels = cibuildwheel_from_sdist_run( + sdist_path, + add_env={ + "CIBW_BUILD": "cp39-*", + }, + config_file="{project}/wheel_build_config.toml", + ) + + # check that the expected wheels are produced + expected_wheels = [w for w in utils.expected_wheels("spam", "0.1.0") if "cp39" in w] + assert set(actual_wheels) == set(expected_wheels) + + # check that before-all was run + captured = capfd.readouterr() + assert "test log statement from before-all 1829" in captured.out From 898dd620223d2726fe299b2a6bf7957b7c9ae513 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sun, 3 Apr 2022 10:46:10 +0100 Subject: [PATCH 0071/1105] Add test for argument passthrough --- test/test_from_sdist.py | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/test/test_from_sdist.py b/test/test_from_sdist.py index c3eeda497..fe312fd90 100644 --- a/test/test_from_sdist.py +++ b/test/test_from_sdist.py @@ -175,3 +175,44 @@ def test_internal_config_file_argument(tmp_path, capfd): # check that before-all was run captured = capfd.readouterr() assert "test log statement from before-all 1829" in captured.out + + +def test_argument_passthrough(tmp_path, capfd): + basic_project = test_projects.new_c_project() + + # make an sdist of a project + sdist_dir = tmp_path / "sdist" + sdist_dir.mkdir() + sdist_path = make_sdist(basic_project, sdist_dir) + + # make a call that should pass some args through to cibuildwheel + # this asks cibuildwheel to print the ppc64le build identifiers + process = subprocess.run( + [ + sys.executable, + "-m", + "cibuildwheel.from_sdist", + sdist_path, + "--platform", + "linux", + "--archs", + "ppc64le", + "--print-build-identifiers", + ], + env={ + **os.environ, + "CIBW_BUILD": "cp38-*", + }, + check=True, + stdout=subprocess.PIPE, + universal_newlines=True, + ) + + # fmt: off + assert process.stdout == textwrap.dedent( + """ + cp38-manylinux_ppc64le + cp38-musllinux_ppc64le + """ + ).lstrip() + # fmt: on From 8c77d5ed410ef9ac8c5aeab28cf121b41bff5456 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sun, 3 Apr 2022 10:51:59 +0100 Subject: [PATCH 0072/1105] Tidy ups, bug fixes --- cibuildwheel/from_sdist.py | 4 ++-- test/test_from_sdist.py | 21 ++++++++------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/cibuildwheel/from_sdist.py b/cibuildwheel/from_sdist.py index d0084b58a..8bff69a0a 100644 --- a/cibuildwheel/from_sdist.py +++ b/cibuildwheel/from_sdist.py @@ -22,7 +22,7 @@ def main() -> None: the package directory. """, ), - epilog="""Any further arguments will be passed on to cibuildwheel.""", + epilog="Any further arguments will be passed on to cibuildwheel.", formatter_class=argparse.RawDescriptionHelpFormatter, ) @@ -65,7 +65,7 @@ def main() -> None: temp_dir_contents = list(temp_dir.iterdir()) - if len(temp_dir_contents) != 1 or not temp_dir_contents[0].is_dir: + if len(temp_dir_contents) != 1 or not temp_dir_contents[0].is_dir(): exit("invalid sdist: didn't contain a single dir") project_dir = temp_dir_contents[0] diff --git a/test/test_from_sdist.py b/test/test_from_sdist.py index fe312fd90..73cc1c046 100644 --- a/test/test_from_sdist.py +++ b/test/test_from_sdist.py @@ -8,9 +8,6 @@ from . import test_projects, utils -basic_project = test_projects.new_c_project() - - # utilities @@ -54,6 +51,8 @@ def cibuildwheel_from_sdist_run(sdist_path, add_env=None, config_file=None): def test_simple(tmp_path): + basic_project = test_projects.new_c_project() + # make an sdist of the project sdist_dir = tmp_path / "sdist" sdist_dir.mkdir() @@ -62,9 +61,7 @@ def test_simple(tmp_path): # build the wheels from sdist actual_wheels = cibuildwheel_from_sdist_run( sdist_path, - add_env={ - "CIBW_BUILD": "cp39-*", - }, + add_env={"CIBW_BUILD": "cp39-*"}, ) # check that the expected wheels are produced @@ -73,6 +70,8 @@ def test_simple(tmp_path): def test_external_config_file_argument(tmp_path, capfd): + basic_project = test_projects.new_c_project() + # make an sdist of the project sdist_dir = tmp_path / "sdist" sdist_dir.mkdir() @@ -92,9 +91,7 @@ def test_external_config_file_argument(tmp_path, capfd): # build the wheels from sdist actual_wheels = cibuildwheel_from_sdist_run( sdist_path, - add_env={ - "CIBW_BUILD": "cp39-*", - }, + add_env={"CIBW_BUILD": "cp39-*"}, config_file=config_file, ) @@ -159,12 +156,10 @@ def test_internal_config_file_argument(tmp_path, capfd): sdist_dir.mkdir() sdist_path = make_sdist(project, sdist_dir) - # build the wheels from sdist + # build the wheels from sdist, referencing the config file inside actual_wheels = cibuildwheel_from_sdist_run( sdist_path, - add_env={ - "CIBW_BUILD": "cp39-*", - }, + add_env={"CIBW_BUILD": "cp39-*"}, config_file="{project}/wheel_build_config.toml", ) From 91fae8268eb35c67d63af3d4d46a51e507928e4c Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sun, 3 Apr 2022 11:01:01 +0100 Subject: [PATCH 0073/1105] Add prog arguments to ArgumentParser to prevent the wrong inferred name when calling like 'python -m cibuildwheel', we get errors like usage: __main__.py [-h] [--platform {auto,linux,macos,windows}] [--archs ARCHS] [--output-dir OUTPUT_DIR] [--config-file CONFIG_FILE] [--print-build-identifiers] [--allow-empty] [--prerelease-pythons] [package_dir] __main__.py: error: unrecognized arguments: --sad With this change, we get error outputs like: usage: cibuildwheel [-h] [--platform {auto,linux,macos,windows}] [--archs ARCHS] [--output-dir OUTPUT_DIR] [--config-file CONFIG_FILE] [--print-build-identifiers] [--allow-empty] [--prerelease-pythons] [package_dir] cibuildwheel: error: unrecognized arguments: --asda --- cibuildwheel/__main__.py | 1 + cibuildwheel/from_sdist.py | 1 + 2 files changed, 2 insertions(+) diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index 306e73ab4..5ddd2b63c 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -28,6 +28,7 @@ def main() -> None: platform: PlatformName parser = argparse.ArgumentParser( + prog="cibuildwheel", description="Build wheels for all the platforms.", epilog=""" Most options are supplied via environment variables or in diff --git a/cibuildwheel/from_sdist.py b/cibuildwheel/from_sdist.py index 8bff69a0a..f24834f53 100644 --- a/cibuildwheel/from_sdist.py +++ b/cibuildwheel/from_sdist.py @@ -11,6 +11,7 @@ def main() -> None: parser = argparse.ArgumentParser( + prog="cibuildwheel-from-sdist", description=textwrap.dedent( """ Build wheels from an sdist archive. From 958a7c32c1da6cc8adf50613e56eab75b1cb2e88 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 26 Apr 2022 22:21:27 -0400 Subject: [PATCH 0074/1105] refactor: use single entry for SDist builds Signed-off-by: Henry Schreiner --- cibuildwheel/__main__.py | 69 ++++++++++++-- cibuildwheel/from_sdist.py | 103 --------------------- cibuildwheel/options.py | 13 +-- cibuildwheel/util.py | 19 +++- setup.cfg | 1 - test/test_from_sdist.py | 15 +-- unit_test/conftest.py | 2 +- unit_test/main_tests/main_options_test.py | 6 +- unit_test/main_tests/main_platform_test.py | 4 +- unit_test/options_test.py | 6 +- unit_test/utils.py | 6 +- 11 files changed, 103 insertions(+), 141 deletions(-) delete mode 100644 cibuildwheel/from_sdist.py diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index 5ddd2b63c..0e407456c 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -2,6 +2,8 @@ import os import shutil import sys +import tarfile +import tempfile import textwrap from pathlib import Path from tempfile import mkdtemp @@ -20,15 +22,14 @@ CIBW_CACHE_PATH, BuildSelector, Unbuffered, + chdir, detect_ci_provider, + format_safe, ) def main() -> None: - platform: PlatformName - parser = argparse.ArgumentParser( - prog="cibuildwheel", description="Build wheels for all the platforms.", epilog=""" Most options are supplied via environment variables or in @@ -66,6 +67,7 @@ def main() -> None: parser.add_argument( "--output-dir", + type=Path, help="Destination folder for the wheels. Default: wheelhouse.", ) @@ -74,19 +76,24 @@ def main() -> None: default="", help=""" TOML config file. Default: "", meaning {package}/pyproject.toml, - if it exists. + if it exists. To refer to a project inside your project, use {package} + or {project}. """, ) parser.add_argument( "package_dir", - default=".", + default=Path("."), + type=Path, nargs="?", help=""" - Path to the package that you want wheels for. Must be a subdirectory of - the working directory. When set, the working directory is still - considered the 'project' and is copied into the Docker container on - Linux. Default: the working directory. + Path to the package that you want wheels for. Must be a + subdirectory of the working directory. When set, the working + directory is still considered the 'project' and is copied into the + Docker container on Linux. Default: the working directory. This can + also be a tar.gz file - if it is, then --config-file and + --output-dir are relative to the current directory, and other paths + are relative to the expanded SDist directory. """, ) @@ -110,6 +117,50 @@ def main() -> None: args = parser.parse_args(namespace=CommandLineArguments()) + # These are always relative to the base directory, even in SDist builds + args.package_dir = args.package_dir.resolve() + args.output_dir = Path( + args.output_dir + if args.output_dir is not None + else os.environ.get("CIBW_OUTPUT_DIR", "wheelhouse") + ).resolve() + + # Standard builds if a directory or non-existent path is given + if not args.package_dir.is_file() and not args.package_dir.name.endswith("tar.gz"): + build_in_directory(args) + return + + if not args.package_dir.name.endswith("tar.gz"): + raise SystemExit("Must be a tar.gz file if a file is given.") + + # Tarfile builds require extraction and changing the directory + with tempfile.TemporaryDirectory(prefix="cibw-sdist-") as temp_dir_str: + temp_dir = Path(temp_dir_str) + with tarfile.open(args.package_dir) as tar: + tar.extractall(path=temp_dir) + + # The extract directory is now the project dir + try: + (project_dir,) = temp_dir.iterdir() + except ValueError: + raise SystemExit("invalid sdist: didn't contain a single dir") from None + + args.package_dir = project_dir.resolve() + + if args.config_file: + # expand the placeholders if they're used + config_file_path = format_safe( + args.config_file, + project=project_dir, + package=project_dir, + ) + args.config_file = str(Path(config_file_path).resolve()) + + with chdir(temp_dir): + build_in_directory(args) + + +def build_in_directory(args: CommandLineArguments) -> None: if args.platform != "auto": platform = args.platform else: diff --git a/cibuildwheel/from_sdist.py b/cibuildwheel/from_sdist.py deleted file mode 100644 index f24834f53..000000000 --- a/cibuildwheel/from_sdist.py +++ /dev/null @@ -1,103 +0,0 @@ -import argparse -import subprocess -import sys -import tarfile -import tempfile -import textwrap -from pathlib import Path - -from cibuildwheel.util import format_safe - - -def main() -> None: - parser = argparse.ArgumentParser( - prog="cibuildwheel-from-sdist", - description=textwrap.dedent( - """ - Build wheels from an sdist archive. - - Extracts the sdist to a temp dir and calls cibuildwheel on the - resulting package directory. Note that cibuildwheel will be - invoked with its working directory as the package directory, so - options aside from --output-dir and --config-file are relative to - the package directory. - """, - ), - epilog="Any further arguments will be passed on to cibuildwheel.", - formatter_class=argparse.RawDescriptionHelpFormatter, - ) - - parser.add_argument( - "--output-dir", - default="wheelhouse", - help=""" - Destination folder for the wheels. Default: wheelhouse. - """, - ) - - parser.add_argument( - "--config-file", - default="", - help=""" - TOML config file. To refer to a file inside the sdist, use the - `{project}` or `{package}` placeholder. e.g. `--config-file - {project}/config/cibuildwheel.toml` Default: "", meaning the - pyproject.toml inside the sdist, if it exists. - """, - ) - - parser.add_argument( - "package", - help=""" - Path to the sdist archive that you want wheels for. Must be a - tar.gz archive file. - """, - ) - - args, passthrough_args = parser.parse_known_args() - - output_dir = Path(args.output_dir).resolve() - - with tempfile.TemporaryDirectory(prefix="cibw-sdist-") as temp_dir_str: - temp_dir = Path(temp_dir_str) - - with tarfile.open(args.package) as tar: - tar.extractall(path=temp_dir) - - temp_dir_contents = list(temp_dir.iterdir()) - - if len(temp_dir_contents) != 1 or not temp_dir_contents[0].is_dir(): - exit("invalid sdist: didn't contain a single dir") - - project_dir = temp_dir_contents[0] - - if args.config_file: - # expand the placeholders if they're used - config_file_path = format_safe( - args.config_file, - project=project_dir, - package=project_dir, - ) - config_file = Path(config_file_path).resolve() - else: - config_file = None - - exit( - subprocess.call( - [ - sys.executable, - "-m", - "cibuildwheel", - *(["--config-file", str(config_file)] if config_file else []), - "--output-dir", - output_dir, - *passthrough_args, - ".", - ], - cwd=project_dir, - ) - ) - - -if __name__ == "__main__": - main() diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index ce4f5a77a..6f249d7e8 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -46,9 +46,9 @@ class CommandLineArguments: platform: Literal["auto", "linux", "macos", "windows"] archs: Optional[str] - output_dir: Optional[str] + output_dir: Optional[Path] config_file: str - package_dir: str + package_dir: Path print_build_identifiers: bool allow_empty: bool prerelease_pythons: bool @@ -361,12 +361,9 @@ def package_requires_python_str(self) -> Optional[str]: @property def globals(self) -> GlobalOptions: args = self.command_line_arguments - package_dir = Path(args.package_dir) - output_dir = Path( - args.output_dir - if args.output_dir is not None - else os.environ.get("CIBW_OUTPUT_DIR", "wheelhouse") - ) + assert args.output_dir is not None, "Must be resolved" + package_dir = args.package_dir + output_dir = args.output_dir build_config = self.reader.get("build", env_plat=False, sep=" ") or "*" skip_config = self.reader.get("skip", env_plat=False, sep=" ") diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index 5015d3487..d15df3f27 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -19,13 +19,14 @@ Any, ClassVar, Dict, + Generator, Iterable, - Iterator, List, NamedTuple, Optional, Sequence, TextIO, + Union, cast, overload, ) @@ -58,6 +59,7 @@ "selector_matches", "strtobool", "cached_property", + "chdir", ] resources_dir: Final = Path(__file__).parent / "resources" @@ -414,7 +416,7 @@ def unwrap(text: str) -> str: @contextlib.contextmanager -def print_new_wheels(msg: str, output_dir: Path) -> Iterator[None]: +def print_new_wheels(msg: str, output_dir: Path) -> Generator[None, None, None]: """ Prints the new items in a directory upon exiting. The message to display can include {n} for number of wheels, {s} for total number of seconds, @@ -570,3 +572,16 @@ def virtualenv( from functools import cached_property else: from .functools_cached_property_38 import cached_property + + +# Can be replaced by contextlib.chdir in Python 3.11 +@contextlib.contextmanager +def chdir(new_path: Union[Path, str]) -> Generator[None, None, None]: + """Non thread-safe context manager to change the current working directory.""" + + cwd = os.getcwd() + try: + os.chdir(new_path) + yield + finally: + os.chdir(cwd) diff --git a/setup.cfg b/setup.cfg index 9642cf9f2..a6773844b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -51,7 +51,6 @@ include = [options.entry_points] console_scripts = cibuildwheel = cibuildwheel.__main__:main - cibuildwheel-from-sdist = cibuildwheel.from_sdist:main [options.package_data] cibuildwheel = resources/* diff --git a/test/test_from_sdist.py b/test/test_from_sdist.py index 73cc1c046..31eb718c2 100644 --- a/test/test_from_sdist.py +++ b/test/test_from_sdist.py @@ -18,7 +18,8 @@ def make_sdist(project: TestProject, working_dir: Path) -> Path: sdist_dir = working_dir / "sdist" subprocess.run( - [sys.executable, "-m", "build", "--sdist", "--outdir", sdist_dir, project_dir], check=True + [sys.executable, "-m", "build", "--sdist", "--outdir", str(sdist_dir), str(project_dir)], + check=True, ) return next(sdist_dir.glob("*.tar.gz")) @@ -35,11 +36,11 @@ def cibuildwheel_from_sdist_run(sdist_path, add_env=None, config_file=None): [ sys.executable, "-m", - "cibuildwheel.from_sdist", + "cibuildwheel", *(["--config-file", config_file] if config_file else []), "--output-dir", - tmp_output_dir, - sdist_path, + str(tmp_output_dir), + str(sdist_path), ], env=env, check=True, @@ -92,7 +93,7 @@ def test_external_config_file_argument(tmp_path, capfd): actual_wheels = cibuildwheel_from_sdist_run( sdist_path, add_env={"CIBW_BUILD": "cp39-*"}, - config_file=config_file, + config_file=str(config_file), ) # check that the expected wheels are produced @@ -186,8 +187,8 @@ def test_argument_passthrough(tmp_path, capfd): [ sys.executable, "-m", - "cibuildwheel.from_sdist", - sdist_path, + "cibuildwheel", + str(sdist_path), "--platform", "linux", "--archs", diff --git a/unit_test/conftest.py b/unit_test/conftest.py index 26a28c474..2f794a213 100644 --- a/unit_test/conftest.py +++ b/unit_test/conftest.py @@ -32,7 +32,7 @@ def fake_package_dir(monkeypatch): real_path_exists = Path.exists def mock_path_exists(path): - if path == MOCK_PACKAGE_DIR / "setup.py": + if str(path).endswith(str(MOCK_PACKAGE_DIR / "setup.py")): return True else: return real_path_exists(path) diff --git a/unit_test/main_tests/main_options_test.py b/unit_test/main_tests/main_options_test.py index 2152ff3d5..977fc378b 100644 --- a/unit_test/main_tests/main_options_test.py +++ b/unit_test/main_tests/main_options_test.py @@ -24,13 +24,13 @@ def test_output_dir(platform, intercepted_build_args, monkeypatch): main() - assert intercepted_build_args.args[0].globals.output_dir == OUTPUT_DIR + assert intercepted_build_args.args[0].globals.output_dir == OUTPUT_DIR.resolve() def test_output_dir_default(platform, intercepted_build_args, monkeypatch): main() - assert intercepted_build_args.args[0].globals.output_dir == Path("wheelhouse") + assert intercepted_build_args.args[0].globals.output_dir == Path("wheelhouse").resolve() @pytest.mark.parametrize("also_set_environment", [False, True]) @@ -43,7 +43,7 @@ def test_output_dir_argument(also_set_environment, platform, intercepted_build_a main() - assert intercepted_build_args.args[0].globals.output_dir == OUTPUT_DIR + assert intercepted_build_args.args[0].globals.output_dir == OUTPUT_DIR.resolve() def test_build_selector(platform, intercepted_build_args, monkeypatch, allow_empty): diff --git a/unit_test/main_tests/main_platform_test.py b/unit_test/main_tests/main_platform_test.py index 09f5b9db2..8974a27ec 100644 --- a/unit_test/main_tests/main_platform_test.py +++ b/unit_test/main_tests/main_platform_test.py @@ -60,14 +60,14 @@ def test_platform_argument(platform, intercepted_build_args, monkeypatch): options = intercepted_build_args.args[0] - assert options.globals.package_dir == MOCK_PACKAGE_DIR + assert options.globals.package_dir == MOCK_PACKAGE_DIR.resolve() def test_platform_environment(platform, intercepted_build_args, monkeypatch): main() options = intercepted_build_args.args[0] - assert options.globals.package_dir == MOCK_PACKAGE_DIR + assert options.globals.package_dir == MOCK_PACKAGE_DIR.resolve() def test_archs_default(platform, intercepted_build_args, monkeypatch): diff --git a/unit_test/options_test.py b/unit_test/options_test.py index 01a98f3b8..fd8a102f4 100644 --- a/unit_test/options_test.py +++ b/unit_test/options_test.py @@ -34,7 +34,7 @@ def test_options_1(tmp_path, monkeypatch): f.write(PYPROJECT_1) args = get_default_command_line_arguments() - args.package_dir = str(tmp_path) + args.package_dir = tmp_path monkeypatch.setattr(platform_module, "machine", lambda: "x86_64") @@ -77,7 +77,7 @@ def test_passthrough(tmp_path, monkeypatch): f.write(PYPROJECT_1) args = get_default_command_line_arguments() - args.package_dir = str(tmp_path) + args.package_dir = tmp_path monkeypatch.setattr(platform_module, "machine", lambda: "x86_64") monkeypatch.setenv("EXAMPLE_ENV", "ONE") @@ -105,7 +105,7 @@ def test_passthrough(tmp_path, monkeypatch): ) def test_passthrough_evil(tmp_path, monkeypatch, env_var_value): args = get_default_command_line_arguments() - args.package_dir = str(tmp_path) + args.package_dir = tmp_path monkeypatch.setattr(platform_module, "machine", lambda: "x86_64") monkeypatch.setenv("CIBW_ENVIRONMENT_PASS_LINUX", "ENV_VAR") diff --git a/unit_test/utils.py b/unit_test/utils.py index 61833fa2d..c2d94ed0e 100644 --- a/unit_test/utils.py +++ b/unit_test/utils.py @@ -1,3 +1,5 @@ +from pathlib import Path + from cibuildwheel.options import CommandLineArguments @@ -8,8 +10,8 @@ def get_default_command_line_arguments() -> CommandLineArguments: defaults.allow_empty = False defaults.archs = None defaults.config_file = "" - defaults.output_dir = None - defaults.package_dir = "." + defaults.output_dir = Path("wheelhouse") # This must be resolved from "None" before passing + defaults.package_dir = Path(".") defaults.prerelease_pythons = False defaults.print_build_identifiers = False From b1e8549bb1a7d32a21f98c2ae9167a5d4b72ee83 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 27 Apr 2022 12:31:42 -0400 Subject: [PATCH 0075/1105] fix: minor cleanup --- cibuildwheel/__main__.py | 29 ++++++++++------------------- cibuildwheel/options.py | 4 +++- docs/cpp_standards.md | 2 +- test/test_from_sdist.py | 2 +- 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index 0e407456c..af10eafed 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -24,7 +24,6 @@ Unbuffered, chdir, detect_ci_provider, - format_safe, ) @@ -75,9 +74,9 @@ def main() -> None: "--config-file", default="", help=""" - TOML config file. Default: "", meaning {package}/pyproject.toml, - if it exists. To refer to a project inside your project, use {package} - or {project}. + TOML config file. Default: "", meaning {package}/pyproject.toml, if + it exists. To refer to a project inside your project, use {package}; + this matters if you build from an SDist. """, ) @@ -87,8 +86,8 @@ def main() -> None: type=Path, nargs="?", help=""" - Path to the package that you want wheels for. Must be a - subdirectory of the working directory. When set, the working + Path to the package that you want wheels for. Must be a subdirectory + of the working directory. When set to a directory, the working directory is still considered the 'project' and is copied into the Docker container on Linux. Default: the working directory. This can also be a tar.gz file - if it is, then --config-file and @@ -117,8 +116,9 @@ def main() -> None: args = parser.parse_args(namespace=CommandLineArguments()) - # These are always relative to the base directory, even in SDist builds args.package_dir = args.package_dir.resolve() + + # This are always relative to the base directory, even in SDist builds args.output_dir = Path( args.output_dir if args.output_dir is not None @@ -130,9 +130,6 @@ def main() -> None: build_in_directory(args) return - if not args.package_dir.name.endswith("tar.gz"): - raise SystemExit("Must be a tar.gz file if a file is given.") - # Tarfile builds require extraction and changing the directory with tempfile.TemporaryDirectory(prefix="cibw-sdist-") as temp_dir_str: temp_dir = Path(temp_dir_str) @@ -145,22 +142,16 @@ def main() -> None: except ValueError: raise SystemExit("invalid sdist: didn't contain a single dir") from None + # This is now the new package dir args.package_dir = project_dir.resolve() - if args.config_file: - # expand the placeholders if they're used - config_file_path = format_safe( - args.config_file, - project=project_dir, - package=project_dir, - ) - args.config_file = str(Path(config_file_path).resolve()) - with chdir(temp_dir): build_in_directory(args) def build_in_directory(args: CommandLineArguments) -> None: + platform: PlatformName + if args.platform != "auto": platform = args.platform else: diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index 6f249d7e8..bf707b23b 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -22,6 +22,7 @@ import tomllib else: import tomli as tomllib + from packaging.specifiers import SpecifierSet from .architecture import Architecture @@ -36,6 +37,7 @@ DependencyConstraints, TestSelector, cached_property, + format_safe, resources_dir, selector_matches, strtobool, @@ -344,7 +346,7 @@ def config_file_path(self) -> Optional[Path]: args = self.command_line_arguments if args.config_file: - return Path(args.config_file.format(package=args.package_dir)) + return Path(format_safe(args.config_file, package=args.package_dir)) # return pyproject.toml, if it's available pyproject_toml_path = Path(args.package_dir) / "pyproject.toml" diff --git a/docs/cpp_standards.md b/docs/cpp_standards.md index 1f1406181..468e4eb17 100644 --- a/docs/cpp_standards.md +++ b/docs/cpp_standards.md @@ -14,7 +14,7 @@ The old `manylinux1` image (based on CentOS 5) contains a version of GCC and lib OS X/macOS allows you to specify a so-called "deployment target" version that will ensure backwards compatibility with older versions of macOS. One way to do this is by setting the `MACOSX_DEPLOYMENT_TARGET` environment variable. -However, to enable modern C++ standards, the deploment target needs to be set high enough (since older OS X/macOS versions did not have the necessary modern C++ standard library). +However, to enable modern C++ standards, the deployment target needs to be set high enough (since older OS X/macOS versions did not have the necessary modern C++ standard library). To get C++11 and C++14 support, `MACOSX_DEPLOYMENT_TARGET` needs to be set to (at least) `"10.9"`. By default, `cibuildwheel` already does this, building 64-bit-only wheels for macOS 10.9 and later. diff --git a/test/test_from_sdist.py b/test/test_from_sdist.py index 31eb718c2..4af67015f 100644 --- a/test/test_from_sdist.py +++ b/test/test_from_sdist.py @@ -161,7 +161,7 @@ def test_internal_config_file_argument(tmp_path, capfd): actual_wheels = cibuildwheel_from_sdist_run( sdist_path, add_env={"CIBW_BUILD": "cp39-*"}, - config_file="{project}/wheel_build_config.toml", + config_file="{package}/wheel_build_config.toml", ) # check that the expected wheels are produced From 35054666bb542eae0525c59941562ab785989cfc Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 27 Apr 2022 17:08:46 -0400 Subject: [PATCH 0076/1105] refactor: review comments --- cibuildwheel/__main__.py | 22 ++++++++++----------- cibuildwheel/options.py | 7 +++---- test/test_from_sdist.py | 41 ---------------------------------------- unit_test/utils.py | 2 +- 4 files changed, 14 insertions(+), 58 deletions(-) diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index af10eafed..f8158b313 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -67,6 +67,7 @@ def main() -> None: parser.add_argument( "--output-dir", type=Path, + default=Path(os.environ.get("CIBW_OUTPUT_DIR", "wheelhouse")), help="Destination folder for the wheels. Default: wheelhouse.", ) @@ -82,17 +83,18 @@ def main() -> None: parser.add_argument( "package_dir", + metavar="PACKAGE", default=Path("."), type=Path, nargs="?", help=""" - Path to the package that you want wheels for. Must be a subdirectory - of the working directory. When set to a directory, the working - directory is still considered the 'project' and is copied into the - Docker container on Linux. Default: the working directory. This can - also be a tar.gz file - if it is, then --config-file and - --output-dir are relative to the current directory, and other paths - are relative to the expanded SDist directory. + Path to the package that you want wheels for. Default: the working + directory. Can be a directory inside the working directory, or an + sdist. When set to a directory, the working directory is still + considered the 'project' and is copied into the Docker container + on Linux. When set to a tar.gz sdist file, --config-file + and --output-dir are relative to the current directory, and other + paths are relative to the expanded SDist directory. """, ) @@ -119,11 +121,7 @@ def main() -> None: args.package_dir = args.package_dir.resolve() # This are always relative to the base directory, even in SDist builds - args.output_dir = Path( - args.output_dir - if args.output_dir is not None - else os.environ.get("CIBW_OUTPUT_DIR", "wheelhouse") - ).resolve() + args.output_dir = args.output_dir.resolve() # Standard builds if a directory or non-existent path is given if not args.package_dir.is_file() and not args.package_dir.name.endswith("tar.gz"): diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index bf707b23b..5d9744af1 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -8,7 +8,7 @@ from typing import ( Any, Dict, - Iterator, + Generator, List, Mapping, NamedTuple, @@ -48,7 +48,7 @@ class CommandLineArguments: platform: Literal["auto", "linux", "macos", "windows"] archs: Optional[str] - output_dir: Optional[Path] + output_dir: Path config_file: str package_dir: Path print_build_identifiers: bool @@ -265,7 +265,7 @@ def active_config_overrides(self) -> List[Override]: ] @contextmanager - def identifier(self, identifier: Optional[str]) -> Iterator[None]: + def identifier(self, identifier: Optional[str]) -> Generator[None, None, None]: self.current_identifier = identifier try: yield @@ -363,7 +363,6 @@ def package_requires_python_str(self) -> Optional[str]: @property def globals(self) -> GlobalOptions: args = self.command_line_arguments - assert args.output_dir is not None, "Must be resolved" package_dir = args.package_dir output_dir = args.output_dir diff --git a/test/test_from_sdist.py b/test/test_from_sdist.py index 4af67015f..d1d4ff115 100644 --- a/test/test_from_sdist.py +++ b/test/test_from_sdist.py @@ -171,44 +171,3 @@ def test_internal_config_file_argument(tmp_path, capfd): # check that before-all was run captured = capfd.readouterr() assert "test log statement from before-all 1829" in captured.out - - -def test_argument_passthrough(tmp_path, capfd): - basic_project = test_projects.new_c_project() - - # make an sdist of a project - sdist_dir = tmp_path / "sdist" - sdist_dir.mkdir() - sdist_path = make_sdist(basic_project, sdist_dir) - - # make a call that should pass some args through to cibuildwheel - # this asks cibuildwheel to print the ppc64le build identifiers - process = subprocess.run( - [ - sys.executable, - "-m", - "cibuildwheel", - str(sdist_path), - "--platform", - "linux", - "--archs", - "ppc64le", - "--print-build-identifiers", - ], - env={ - **os.environ, - "CIBW_BUILD": "cp38-*", - }, - check=True, - stdout=subprocess.PIPE, - universal_newlines=True, - ) - - # fmt: off - assert process.stdout == textwrap.dedent( - """ - cp38-manylinux_ppc64le - cp38-musllinux_ppc64le - """ - ).lstrip() - # fmt: on diff --git a/unit_test/utils.py b/unit_test/utils.py index c2d94ed0e..ef158d551 100644 --- a/unit_test/utils.py +++ b/unit_test/utils.py @@ -10,7 +10,7 @@ def get_default_command_line_arguments() -> CommandLineArguments: defaults.allow_empty = False defaults.archs = None defaults.config_file = "" - defaults.output_dir = Path("wheelhouse") # This must be resolved from "None" before passing + defaults.output_dir = Path("wheelhouse") defaults.package_dir = Path(".") defaults.prerelease_pythons = False defaults.print_build_identifiers = False From 98fedb7e5142c9d4f591c65dffb6b21a276fb67c Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 28 Apr 2022 09:19:27 -0400 Subject: [PATCH 0077/1105] refactor: use dataclasses vs. NamedTuples --- .pre-commit-config.yaml | 4 ++-- bin/update_docker.py | 5 +++-- bin/update_virtualenv.py | 5 +++-- cibuildwheel/__main__.py | 2 +- cibuildwheel/bashlex_eval.py | 6 ++++-- cibuildwheel/linux.py | 9 ++++++--- cibuildwheel/macos.py | 6 ++++-- cibuildwheel/options.py | 31 +++++++++++++------------------ cibuildwheel/util.py | 19 ++++++++++--------- cibuildwheel/windows.py | 6 ++++-- unit_test/utils.py | 20 ++++++++++---------- 11 files changed, 60 insertions(+), 53 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c64525eef..da8b94a26 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: # Autoremoves unused imports - repo: https://github.com/hadialqattan/pycln - rev: v1.3.1 + rev: v1.3.2 hooks: - id: pycln args: [--all] @@ -49,7 +49,7 @@ repos: - id: setup-cfg-fmt - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.942 + rev: v0.950 hooks: - id: mypy name: mypy 3.6 on cibuildwheel/ diff --git a/bin/update_docker.py b/bin/update_docker.py index 73da5a1ba..105a32671 100755 --- a/bin/update_docker.py +++ b/bin/update_docker.py @@ -2,8 +2,8 @@ from __future__ import annotations import configparser +from dataclasses import dataclass from pathlib import Path -from typing import NamedTuple import requests @@ -11,7 +11,8 @@ RESOURCES = DIR.parent / "cibuildwheel/resources" -class Image(NamedTuple): +@dataclass(frozen=True) +class Image: manylinux_version: str platform: str image_name: str diff --git a/bin/update_virtualenv.py b/bin/update_virtualenv.py index 2e67007e0..8dd9c5efd 100755 --- a/bin/update_virtualenv.py +++ b/bin/update_virtualenv.py @@ -6,8 +6,8 @@ import logging import subprocess import sys +from dataclasses import dataclass from pathlib import Path -from typing import NamedTuple import click import rich @@ -36,7 +36,8 @@ ] = f"{GET_VIRTUALENV_GITHUB}/blob/{{version}}/public/virtualenv.pyz?raw=true" -class VersionTuple(NamedTuple): +@dataclass(frozen=True) +class VersionTuple: version: Version version_string: str diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index 306e73ab4..9f24f0006 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -107,7 +107,7 @@ def main() -> None: help="Enable pre-release Python versions if available.", ) - args = parser.parse_args(namespace=CommandLineArguments()) + args = CommandLineArguments(**vars(parser.parse_args())) if args.platform != "auto": platform = args.platform diff --git a/cibuildwheel/bashlex_eval.py b/cibuildwheel/bashlex_eval.py index 9eb5eac34..a8b4691c3 100644 --- a/cibuildwheel/bashlex_eval.py +++ b/cibuildwheel/bashlex_eval.py @@ -1,5 +1,6 @@ import subprocess -from typing import Callable, Dict, List, NamedTuple, Optional, Sequence +from dataclasses import dataclass +from typing import Callable, Dict, List, Optional, Sequence import bashlex @@ -13,7 +14,8 @@ def local_environment_executor(command: List[str], env: Dict[str, str]) -> str: ).stdout -class NodeExecutionContext(NamedTuple): +@dataclass(frozen=True) +class NodeExecutionContext: environment: Dict[str, str] input: str executor: EnvironmentExecutor diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index 8478bf092..a1862d774 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -1,8 +1,9 @@ import subprocess import sys import textwrap +from dataclasses import dataclass from pathlib import Path, PurePath -from typing import Iterator, List, NamedTuple, Set, Tuple +from typing import Iterator, List, Set, Tuple from .architecture import Architecture from .docker_container import DockerContainer @@ -18,7 +19,8 @@ ) -class PythonConfiguration(NamedTuple): +@dataclass(frozen=True) +class PythonConfiguration: version: str identifier: str path_str: str @@ -28,7 +30,8 @@ def path(self) -> PurePath: return PurePath(self.path_str) -class BuildStep(NamedTuple): +@dataclass(frozen=True) +class BuildStep: platform_configs: List[PythonConfiguration] platform_tag: str docker_image: str diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index d27703152..cf9adba1e 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -5,8 +5,9 @@ import shutil import subprocess import sys +from dataclasses import dataclass from pathlib import Path -from typing import Dict, List, NamedTuple, Sequence, Set, Tuple, cast +from typing import Dict, List, Sequence, Set, Tuple, cast from filelock import FileLock @@ -53,7 +54,8 @@ def get_macos_sdks() -> List[str]: return [m.group(1) for m in re.finditer(r"-sdk (macosx\S+)", output)] -class PythonConfiguration(NamedTuple): +@dataclass(frozen=True) +class PythonConfiguration: version: str identifier: str url: str diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index ce4f5a77a..0385fc3eb 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -4,24 +4,15 @@ import traceback from configparser import ConfigParser from contextlib import contextmanager +from dataclasses import asdict, dataclass from pathlib import Path -from typing import ( - Any, - Dict, - Iterator, - List, - Mapping, - NamedTuple, - Optional, - Set, - Tuple, - Union, -) +from typing import Any, Dict, Iterator, List, Mapping, Optional, Set, Tuple, Union if sys.version_info >= (3, 11): import tomllib else: import tomli as tomllib + from packaging.specifiers import SpecifierSet from .architecture import Architecture @@ -43,6 +34,7 @@ ) +@dataclass class CommandLineArguments: platform: Literal["auto", "linux", "macos", "windows"] archs: Optional[str] @@ -54,7 +46,8 @@ class CommandLineArguments: prerelease_pythons: bool -class GlobalOptions(NamedTuple): +@dataclass(frozen=True) +class GlobalOptions: package_dir: Path output_dir: Path build_selector: BuildSelector @@ -62,7 +55,8 @@ class GlobalOptions(NamedTuple): architectures: Set[Architecture] -class BuildOptions(NamedTuple): +@dataclass(frozen=True) +class BuildOptions: globals: GlobalOptions environment: ParsedEnvironment before_all: str @@ -102,7 +96,8 @@ def architectures(self) -> Set[Architecture]: Setting = Union[Dict[str, str], List[str], str, int] -class Override(NamedTuple): +@dataclass(frozen=True) +class Override: select_pattern: str options: Dict[str, Setting] @@ -550,12 +545,12 @@ def check_for_deprecated_options(self) -> None: def summary(self, identifiers: List[str]) -> str: lines = [ f"{option_name}: {option_value!r}" - for option_name, option_value in sorted(self.globals._asdict().items()) + for option_name, option_value in sorted(asdict(self.globals).items()) ] build_option_defaults = self.build_options(identifier=None) - for option_name, default_value in sorted(build_option_defaults._asdict().items()): + for option_name, default_value in sorted(asdict(build_option_defaults).items()): if option_name == "globals": continue @@ -563,7 +558,7 @@ def summary(self, identifiers: List[str]) -> str: # if any identifiers have an overridden value, print that too for identifier in identifiers: - option_value = self.build_options(identifier=identifier)._asdict()[option_name] + option_value = getattr(self.build_options(identifier=identifier), option_name) if option_value != default_value: lines.append(f" {identifier}: {option_value!r}") diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index 5015d3487..5ce85bf8e 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -1,5 +1,4 @@ import contextlib -import dataclasses import fnmatch import itertools import os @@ -11,6 +10,7 @@ import textwrap import time import urllib.request +from dataclasses import dataclass from enum import Enum from functools import lru_cache from pathlib import Path @@ -22,7 +22,6 @@ Iterable, Iterator, List, - NamedTuple, Optional, Sequence, TextIO, @@ -228,7 +227,7 @@ def selector_matches(patterns: str, string: str) -> bool: # Once we require Python 3.10+, we can add kw_only=True -@dataclasses.dataclass +@dataclass(frozen=True) class IdentifierSelector: """ This class holds a set of build/skip patterns. You call an instance with a @@ -266,14 +265,14 @@ def __call__(self, build_id: str) -> bool: return should_build and not should_skip -@dataclasses.dataclass +@dataclass(frozen=True) class BuildSelector(IdentifierSelector): pass # Note that requires-python is not needed for TestSelector, as you can't test # what you can't build. -@dataclasses.dataclass +@dataclass(frozen=True) class TestSelector(IdentifierSelector): build_config: str = "*" @@ -413,6 +412,12 @@ def unwrap(text: str) -> str: return re.sub(r"\s+", " ", text) +@dataclass(frozen=True) +class FileReport: + name: str + size: str + + @contextlib.contextmanager def print_new_wheels(msg: str, output_dir: Path) -> Iterator[None]: """ @@ -427,10 +432,6 @@ def print_new_wheels(msg: str, output_dir: Path) -> Iterator[None]: yield final_contents = set(output_dir.iterdir()) - class FileReport(NamedTuple): - name: str - size: str - new_contents = [ FileReport(wheel.name, f"{(wheel.stat().st_size + 1023) // 1024:,d}") for wheel in final_contents - existing_contents diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 13b5c0c3d..ef9742eef 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -2,9 +2,10 @@ import shutil import subprocess import sys +from dataclasses import dataclass from functools import lru_cache from pathlib import Path -from typing import Dict, List, NamedTuple, Optional, Sequence, Set +from typing import Dict, List, Optional, Sequence, Set from zipfile import ZipFile from filelock import FileLock @@ -45,7 +46,8 @@ def get_nuget_args(version: str, arch: str, output_directory: Path) -> List[str] ] -class PythonConfiguration(NamedTuple): +@dataclass(frozen=True) +class PythonConfiguration: version: str arch: str identifier: str diff --git a/unit_test/utils.py b/unit_test/utils.py index 61833fa2d..32e9331f5 100644 --- a/unit_test/utils.py +++ b/unit_test/utils.py @@ -2,15 +2,15 @@ def get_default_command_line_arguments() -> CommandLineArguments: - defaults = CommandLineArguments() - - defaults.platform = "auto" - defaults.allow_empty = False - defaults.archs = None - defaults.config_file = "" - defaults.output_dir = None - defaults.package_dir = "." - defaults.prerelease_pythons = False - defaults.print_build_identifiers = False + defaults = CommandLineArguments( + platform="auto", + allow_empty=False, + archs=None, + config_file="", + output_dir=None, + package_dir=".", + prerelease_pythons=False, + print_build_identifiers=False, + ) return defaults From de44c88c753da5f13a7806c0812834b20d7e6ce2 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 28 Apr 2022 19:18:49 -0400 Subject: [PATCH 0078/1105] docs: add some projects (#1097) * docs: add some projects * chore: update docs --- README.md | 18 +-- docs/data/projects.yml | 65 ++++++++++- docs/working-examples.md | 242 ++++++++++++++++++++++----------------- 3 files changed, 211 insertions(+), 114 deletions(-) diff --git a/README.md b/README.md index a621e4f59..56da09c41 100644 --- a/README.md +++ b/README.md @@ -142,25 +142,25 @@ 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. | | [Tornado][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed. | +| [NumPy][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The fundamental package for scientific computing with Python. | | [pytorch-fairseq][] | ![github icon][] | ![apple icon][] ![linux icon][] | Facebook AI Research Sequence-to-Sequence Toolkit written in Python. | | [Matplotlib][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The venerable Matplotlib, a Python library with C++ portions | -| [MyPy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | MyPyC, the compiled component of MyPy. | +| [Kivy][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Open source UI framework written in Python, running on Windows, Linux, macOS, Android and iOS | +| [NCNN][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | ncnn is a high-performance neural network inference framework optimized for the mobile platform | +| [Prophet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Tool for producing high quality forecasts for time series data that has multiple seasonality with linear or non-linear growth. | +| [MyPy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | The compiled version of MyPy using MyPyC. | | [pydantic][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Data parsing and validation using Python type hints | -| [uvloop][] | ![github icon][] | ![apple icon][] ![linux icon][] | Ultra fast asyncio event loop. | -| [psutil][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python | -| [vaex][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Out-of-Core hybrid Apache Arrow/NumPy DataFrame for Python, ML, visualization and exploration of big tabular data at a billion rows per second 🚀 | -| [Google Benchmark][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A microbenchmark support library | [scikit-learn]: https://github.com/scikit-learn/scikit-learn [Tornado]: https://github.com/tornadoweb/tornado +[NumPy]: https://github.com/numpy/numpy [pytorch-fairseq]: https://github.com/pytorch/fairseq [Matplotlib]: https://github.com/matplotlib/matplotlib +[Kivy]: https://github.com/kivy/kivy +[NCNN]: https://github.com/Tencent/ncnn +[Prophet]: https://github.com/facebook/prophet [MyPy]: https://github.com/mypyc/mypy_mypyc-wheels [pydantic]: https://github.com/samuelcolvin/pydantic -[uvloop]: https://github.com/MagicStack/uvloop -[psutil]: https://github.com/giampaolo/psutil -[vaex]: https://github.com/vaexio/vaex -[Google Benchmark]: https://github.com/google/benchmark [appveyor icon]: docs/data/readme_icons/appveyor.svg [github icon]: docs/data/readme_icons/github.svg diff --git a/docs/data/projects.yml b/docs/data/projects.yml index e12bd99bc..7e8c544a5 100644 --- a/docs/data/projects.yml +++ b/docs/data/projects.yml @@ -287,7 +287,7 @@ pypi: mypy ci: [github] os: [apple, linux, windows] - notes: MyPyC, the compiled component of MyPy. + notes: The compiled version of MyPy using MyPyC. - name: Imagecodecs (fork) gh: czaki/imagecodecs_build @@ -521,10 +521,71 @@ gh: arbor-sim/arbor ci: [github] os: [apple, linux] - pypi: arbor notes: > Arbor is a multi-compartment neuron simulation library; compatible with next-generation accelerators; best-practices applied to research software; focused on community-driven development. Includes a [small script](https://github.com/arbor-sim/arbor/blob/master/scripts/patchwheel.py) patching `rpath` in bundled libraries. + +- name: Kivy + gh: kivy/kivy + ci: [github] + os: [windows, apple, linux] + +- name: NCNN + gh: Tencent/ncnn + ci: [github] + os: [windows, apple, linux] + +- name: Prophet + gh: facebook/prophet + ci: [github] + os: [windows, apple, linux] + +- name: MemRay + gh: bloomberg/memray + ci: [github] + os: [linux] + +- name: PyGame + gh: pygame/pygame + ci: [github] + os: [apple, linux] + +- name: UltraJSON + gh: ultrajson/ultrajson + ci: [github] + os: [windows, apple, linux] + +- name: NumPy + gh: numpy/numpy + ci: [github, travisci] + os: [windows, apple, linux] + +- name: Wrapt + gh: GrahamDumpleton/wrapt + ci: [github] + os: [windows, apple, linux] + +- name: SimpleJSON + gh: simplejson/simplejson + ci: [github] + os: [windows, apple, linux] + +- name: Implicit + gh: benfred/implicit + ci: [github] + os: [windows, apple, linux] + notes: Includes GPU support for linux wheels + +- name: power-grid-model + gh: alliander-opensource/power-grid-model + ci: [github] + os: [windows, apple, linux] + notes: Python/C++ library for distribution power system analysis + +- name: Python-WebRTC + gh: MarshalX/python-webrtc + ci: [github] + os: [windows, apple, linux] diff --git a/docs/working-examples.md b/docs/working-examples.md index ae5f5702c..0f4017f9e 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -10,22 +10,29 @@ title: Working examples |-----------------------------------|----|----|:------| | [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. | | [Tornado][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed. | +| [NumPy][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The fundamental package for scientific computing with Python. | | [pytorch-fairseq][] | ![github icon][] | ![apple icon][] ![linux icon][] | Facebook AI Research Sequence-to-Sequence Toolkit written in Python. | | [Matplotlib][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The venerable Matplotlib, a Python library with C++ portions | -| [MyPy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | MyPyC, the compiled component of MyPy. | +| [Kivy][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Open source UI framework written in Python, running on Windows, Linux, macOS, Android and iOS | +| [NCNN][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | ncnn is a high-performance neural network inference framework optimized for the mobile platform | +| [Prophet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Tool for producing high quality forecasts for time series data that has multiple seasonality with linear or non-linear growth. | +| [MyPy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | The compiled version of MyPy using MyPyC. | | [pydantic][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Data parsing and validation using Python type hints | | [uvloop][] | ![github icon][] | ![apple icon][] ![linux icon][] | Ultra fast asyncio event loop. | | [psutil][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python | +| [MemRay][] | ![github icon][] | ![linux icon][] | Memray is a memory profiler for Python | | [vaex][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Out-of-Core hybrid Apache Arrow/NumPy DataFrame for Python, ML, visualization and exploration of big tabular data at a billion rows per second 🚀 | | [Google Benchmark][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A microbenchmark support library | -| [Apache Beam][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Apache Beam is a unified programming model for Batch and Streaming | +| [Apache Beam][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Apache Beam is a unified programming model for Batch and Streaming data processing. | | [asyncpg][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A fast PostgreSQL Database Client Library for Python/asyncio. | | [scikit-image][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Image processing library. Uses cibuildwheel to build and test a project that uses Cython with platform-native code. | -| [cmake][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | | [duckdb][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System | +| [PyGame][] | ![github icon][] | ![apple icon][] ![linux icon][] | pygame (the library) is a Free and Open Source python programming language library for making multimedia applications like games built on top of the excellent SDL library. C, Python, Native, OpenGL. | +| [cmake][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | | [twisted-iocpsupport][] | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. | | [websockets][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Library for building WebSocket servers and clients. Mostly written in Python, with a small C 'speedups' extension module. | | [cvxpy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A Python-embedded modeling language for convex optimization problems. | +| [UltraJSON][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Ultra fast JSON decoder and encoder written in C with Python bindings | | [PyOxidizer][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A modern Python application packaging and distribution tool | | [Triton][] | ![github icon][] | ![linux icon][] | Self hosted runners | | [River][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python | @@ -33,6 +40,7 @@ title: Working examples | [pyzmq][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython and CFFI. | | [aiortc][] | ![github icon][] | ![apple icon][] ![linux icon][] | WebRTC and ORTC implementation for Python using asyncio. | | [vispy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Main repository for Vispy | +| [Implicit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes GPU support for linux wheels | | [Confluent client for Kafka][] | ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | setup in `tools/wheels/build-wheels.bat` | | [tinyobjloader][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Tiny but powerful single file wavefront obj loader | | [Dependency Injector][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI | @@ -41,12 +49,14 @@ title: Working examples | [PyYAML][] | ![github icon][] | ![apple icon][] | Canonical source repository for PyYAML | | [numexpr][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas, bcolz and more | | [h5py][] | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. | +| [Wrapt][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python module for decorators, wrappers and monkey patching. | | [PyAV][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Pythonic bindings for FFmpeg's libraries. | +| [SimpleJSON][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | simplejson is a simple, fast, extensible JSON encoder/decoder for Python | | [OpenColorIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A color management framework for visual effects and animation. | | [Line Profiler][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Line-by-line profiling for Python | | [PyTables][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data | -| [OpenTimelineIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Open Source API and interchange format for editorial timeline information. | | [pikepdf][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by qpdf | +| [OpenTimelineIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Open Source API and interchange format for editorial timeline information. | | [ruptures][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. | | [aioquic][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python | | [DeepForest][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) | @@ -55,8 +65,8 @@ title: Working examples | [Parselmouth][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. | | [AutoPy][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | | [H3-py][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system | -| [markupsafe][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. | | [Rtree][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS ¶ | +| [markupsafe][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. | | [python-rapidjson][] | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson | | [python-snappy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for the snappy google library | | [pybind11 cmake_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system | @@ -65,10 +75,10 @@ title: Working examples | [pybind11 python_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a Python-based build system | | [dd-trace-py][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub | | [cyvcf2][] | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing | -| [sourmash][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. | | [time-machine][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. | -| [abess][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A fast best-subset selection library. It uses cibuildwheel to build a large project with C++ extensions. | +| [sourmash][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. | | [CTranslate2][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit.html) and CUDA kernels compiled for multiple GPU architectures. | +| [abess][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A fast best-subset selection library. It uses cibuildwheel to build a large project with C++ extensions. | | [matrixprofile][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. | | [jq.py][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq | | [iminuit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 | @@ -78,6 +88,7 @@ title: Working examples | [boost-histogram][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. | | [iDynTree][] | ![github icon][] | ![linux icon][] | Uses manylinux_2_24 | | [TgCrypto][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | +| [Python-WebRTC][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | a Python extension that provides bindings to WebRTC M92 | | [pybase64][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python | | [Arbor][] | ![github icon][] | ![apple icon][] ![linux icon][] | Arbor is a multi-compartment neuron simulation library; compatible with next-generation accelerators; best-practices applied to research software; focused on community-driven development. Includes a [small script](https://github.com/arbor-sim/arbor/blob/master/scripts/patchwheel.py) patching `rpath` in bundled libraries. | | [etebase-py][] | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. | @@ -85,10 +96,11 @@ title: Working examples | [Imagecodecs (fork)][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. | | [polaroid][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. | | [numpythia][] | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy | -| [pyjet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy | | [clang-format][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. | -| [ninja][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | +| [pyjet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy | +| [power-grid-model][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python/C++ library for distribution power system analysis | | [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 | +| [ninja][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | | [GSD][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Cython and NumPy project with 64-bit wheels. | | [pillow-heif][] | ![github icon][] | ![apple icon][] ![linux icon][] | Python CFFI binding to libheif library with third party dependencies like `libde265`, `x265`, `libaom` with test & publishing on PyPi. | | [pyinstrument_cext][] | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies | @@ -98,22 +110,29 @@ title: Working examples [scikit-learn]: https://github.com/scikit-learn/scikit-learn [Tornado]: https://github.com/tornadoweb/tornado +[NumPy]: https://github.com/numpy/numpy [pytorch-fairseq]: https://github.com/pytorch/fairseq [Matplotlib]: https://github.com/matplotlib/matplotlib +[Kivy]: https://github.com/kivy/kivy +[NCNN]: https://github.com/Tencent/ncnn +[Prophet]: https://github.com/facebook/prophet [MyPy]: https://github.com/mypyc/mypy_mypyc-wheels [pydantic]: https://github.com/samuelcolvin/pydantic [uvloop]: https://github.com/MagicStack/uvloop [psutil]: https://github.com/giampaolo/psutil +[MemRay]: https://github.com/bloomberg/memray [vaex]: https://github.com/vaexio/vaex [Google Benchmark]: https://github.com/google/benchmark [Apache Beam]: https://github.com/apache/beam [asyncpg]: https://github.com/MagicStack/asyncpg [scikit-image]: https://github.com/scikit-image/scikit-image -[cmake]: https://github.com/scikit-build/cmake-python-distributions [duckdb]: https://github.com/duckdb/duckdb +[PyGame]: https://github.com/pygame/pygame +[cmake]: https://github.com/scikit-build/cmake-python-distributions [twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport [websockets]: https://github.com/aaugustin/websockets [cvxpy]: https://github.com/cvxpy/cvxpy +[UltraJSON]: https://github.com/ultrajson/ultrajson [PyOxidizer]: https://github.com/indygreg/PyOxidizer [Triton]: https://github.com/openai/triton [River]: https://github.com/online-ml/river @@ -121,6 +140,7 @@ title: Working examples [pyzmq]: https://github.com/zeromq/pyzmq [aiortc]: https://github.com/aiortc/aiortc [vispy]: https://github.com/vispy/vispy +[Implicit]: https://github.com/benfred/implicit [Confluent client for Kafka]: https://github.com/confluentinc/confluent-kafka-python [tinyobjloader]: https://github.com/tinyobjloader/tinyobjloader [Dependency Injector]: https://github.com/ets-labs/python-dependency-injector @@ -129,12 +149,14 @@ title: Working examples [PyYAML]: https://github.com/yaml/pyyaml [numexpr]: https://github.com/pydata/numexpr [h5py]: https://github.com/h5py/h5py +[Wrapt]: https://github.com/GrahamDumpleton/wrapt [PyAV]: https://github.com/PyAV-Org/PyAV +[SimpleJSON]: https://github.com/simplejson/simplejson [OpenColorIO]: https://github.com/AcademySoftwareFoundation/OpenColorIO [Line Profiler]: https://github.com/pyutils/line_profiler [PyTables]: https://github.com/PyTables/PyTables -[OpenTimelineIO]: https://github.com/PixarAnimationStudios/OpenTimelineIO [pikepdf]: https://github.com/pikepdf/pikepdf +[OpenTimelineIO]: https://github.com/PixarAnimationStudios/OpenTimelineIO [ruptures]: https://github.com/deepcharles/ruptures [aioquic]: https://github.com/aiortc/aioquic [DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest @@ -143,8 +165,8 @@ title: Working examples [Parselmouth]: https://github.com/YannickJadoul/Parselmouth [AutoPy]: https://github.com/autopilot-rs/autopy [H3-py]: https://github.com/uber/h3-py -[markupsafe]: https://github.com/pallets/markupsafe [Rtree]: https://github.com/Toblerity/rtree +[markupsafe]: https://github.com/pallets/markupsafe [python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson [python-snappy]: https://github.com/andrix/python-snappy [pybind11 cmake_example]: https://github.com/pybind/cmake_example @@ -153,10 +175,10 @@ title: Working examples [pybind11 python_example]: https://github.com/pybind/python_example [dd-trace-py]: https://github.com/DataDog/dd-trace-py [cyvcf2]: https://github.com/brentp/cyvcf2 -[sourmash]: https://github.com/dib-lab/sourmash [time-machine]: https://github.com/adamchainz/time-machine -[abess]: https://github.com/abess-team/abess +[sourmash]: https://github.com/dib-lab/sourmash [CTranslate2]: https://github.com/OpenNMT/CTranslate2 +[abess]: https://github.com/abess-team/abess [matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile [jq.py]: https://github.com/mwilliamson/jq.py [iminuit]: https://github.com/scikit-hep/iminuit @@ -166,6 +188,7 @@ title: Working examples [boost-histogram]: https://github.com/scikit-hep/boost-histogram [iDynTree]: https://github.com/robotology/idyntree [TgCrypto]: https://github.com/pyrogram/tgcrypto +[Python-WebRTC]: https://github.com/MarshalX/python-webrtc [pybase64]: https://github.com/mayeut/pybase64 [Arbor]: https://github.com/arbor-sim/arbor [etebase-py]: https://github.com/etesync/etebase-py @@ -173,10 +196,11 @@ title: Working examples [Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build [polaroid]: https://github.com/daggy1234/polaroid [numpythia]: https://github.com/scikit-hep/numpythia -[pyjet]: https://github.com/scikit-hep/pyjet [clang-format]: https://github.com/ssciwr/clang-format-wheel -[ninja]: https://github.com/scikit-build/ninja-python-distributions +[pyjet]: https://github.com/scikit-hep/pyjet +[power-grid-model]: https://github.com/alliander-opensource/power-grid-model [pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example +[ninja]: https://github.com/scikit-build/ninja-python-distributions [GSD]: https://github.com/glotzerlab/gsd [pillow-heif]: https://github.com/bigcat88/pillow_heif [pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext @@ -194,93 +218,105 @@ title: Working examples [apple icon]: data/readme_icons/apple.svg [linux icon]: data/readme_icons/linux.svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 46702f581da2dde13ea3d2a49dfa55df226db9f8 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Fri, 29 Apr 2022 13:32:03 +0100 Subject: [PATCH 0079/1105] Space out the log statements a little --- cibuildwheel/linux.py | 2 +- cibuildwheel/macos.py | 2 +- cibuildwheel/windows.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py index 7be028a1c..036eb36f0 100644 --- a/cibuildwheel/linux.py +++ b/cibuildwheel/linux.py @@ -181,7 +181,7 @@ def build_on_docker( if abi3_wheel: log.step_end() print( - f"Found previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." + f"\nFound previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." ) repaired_wheels = [abi3_wheel] else: diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index aed483ad4..7100cd05a 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -325,7 +325,7 @@ def build(options: Options, tmp_path: Path) -> None: if abi3_wheel: log.step_end() print( - f"Found previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." + f"\nFound previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." ) repaired_wheel = abi3_wheel else: diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 85f76a04b..1e95c225e 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -281,7 +281,7 @@ def build(options: Options, tmp_path: Path) -> None: if abi3_wheel: log.step_end() print( - f"Found previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." + f"\nFound previously built wheel {abi3_wheel.name}, that's compatible with {config.identifier}. Skipping build step..." ) repaired_wheel = abi3_wheel else: From 75998410e05a2e00ff2d842ed2590830fc600b99 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Fri, 29 Apr 2022 14:11:35 +0100 Subject: [PATCH 0080/1105] Add tips+tricks entry for ABI3 building --- docs/faq.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/faq.md b/docs/faq.md index 97e65feb7..2364be729 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -103,6 +103,12 @@ Linux), and the other architectures are emulated automatically. {% include "../examples/github-with-qemu.yml" %} ``` +### Building CPython ABI3 wheels (Limited API) {: #abi3} + +The CPython Limited API is a subset of the Python C Extension API that's declared to be forward-compatible, meaning you can compile wheels for one version of Python, and they'll be compatible with future versions. Wheels that use the Limited API are known as ABI3 wheels. + +To create a package that builds ABI3 wheels, you'll need to configure your build backend to compile libraries correctly create wheels with the right tags. [Check this repo](https://github.com/joerick/python-abi3-package-sample) for an example of how to do this with setuptools. + ### Building packages with optional C extensions `cibuildwheel` defines the environment variable `CIBUILDWHEEL` to the value `1` allowing projects for which the C extension is optional to make it mandatory when building wheels. From 0b6307072a15a35debbb73215c012cf29c672908 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Fri, 29 Apr 2022 14:46:08 +0100 Subject: [PATCH 0081/1105] Bump version: v2.5.0 --- README.md | 19 +++++++++++-------- cibuildwheel/__init__.py | 2 +- docs/changelog.md | 10 ++++++++++ docs/faq.md | 4 ++-- docs/setup.md | 4 ++-- examples/appveyor-minimal.yml | 2 +- examples/azure-pipelines-minimal.yml | 6 +++--- examples/circleci-minimal.yml | 4 ++-- examples/github-apple-silicon.yml | 2 +- examples/github-deploy.yml | 2 +- examples/github-minimal.yml | 2 +- examples/github-with-qemu.yml | 2 +- examples/gitlab-minimal.yml | 2 +- examples/travis-ci-deploy.yml | 2 +- examples/travis-ci-minimal.yml | 2 +- examples/travis-ci-test-and-deploy.yml | 4 ++-- setup.cfg | 2 +- 17 files changed, 42 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 56da09c41..0e2dbac30 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ jobs: - uses: actions/setup-python@v2 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.4.0 + run: python -m pip install cibuildwheel==2.5.0 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -192,6 +192,16 @@ Changelog +### v2.5.0 + +_29 April 2022_ + +- ✨ Added support for building ABI3 wheels. cibuildwheel will now recognise when an ABI3 wheel was produced, and skip subsequent build steps where the previously built wheel is compatible. Tests still will run on all selected versions of Python, using the ABI3 wheel. (#1091) +- ✨ You can now build wheels directly from sdist archives, in addition to source directories. Just call cibuildwheel with an sdist argument on the command line, like `cibuildwheel mypackage-1.0.0.tar.gz` (#1096) +- 🐛 Fix a bug where cibuildwheel would crash when no builds are selected and `--allow-empty` is passed (#1086) +- 🐛 Workaround a permissions issue on Linux relating to newer versions of git and setuptools_scm (#1095) +- 📚 Minor docs improvements + ### v2.4.0 _2 April 2022_ @@ -231,13 +241,6 @@ _26 October 2021_ - 🐛 Fix bug in the GitHub Action step causing a syntax error (#895) -### v2.2.1 - -_26 October 2021_ - -- 🛠 Added a `config-file` option on the GitHub Action to specify something other than pyproject.toml in your GitHub Workflow file. (#883) -- 🐛 Fix missing resources in sdist and released wheel on PyPI. We've also made some internal changes to our release processes to make them more reliable. (#893, #894) - --- diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index 3d67cd6bb..50062f87c 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1 +1 @@ -__version__ = "2.4.0" +__version__ = "2.5.0" diff --git a/docs/changelog.md b/docs/changelog.md index 79b03c762..80a3148e6 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,6 +2,16 @@ title: Changelog --- +### v2.5.0 + +_29 April 2022_ + +- ✨ Added support for building ABI3 wheels. cibuildwheel will now recognise when an ABI3 wheel was produced, and skip subsequent build steps where the previously built wheel is compatible. Tests still will run on all selected versions of Python, using the ABI3 wheel. (#1091) +- ✨ You can now build wheels directly from sdist archives, in addition to source directories. Just call cibuildwheel with an sdist argument on the command line, like `cibuildwheel mypackage-1.0.0.tar.gz` (#1096) +- 🐛 Fix a bug where cibuildwheel would crash when no builds are selected and `--allow-empty` is passed (#1086) +- 🐛 Workaround a permissions issue on Linux relating to newer versions of git and setuptools_scm (#1095) +- 📚 Minor docs improvements + ### v2.4.0 _2 April 2022_ diff --git a/docs/faq.md b/docs/faq.md index 2364be729..b40fc1840 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -133,7 +133,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: pypa/cibuildwheel@v2.4.0 +uses: pypa/cibuildwheel@v2.5.0 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. @@ -159,7 +159,7 @@ The second option, and the only one that supports other CI systems, is using a ` ```bash # requirements-cibw.txt -cibuildwheel==2.4.0 +cibuildwheel==2.5.0 ``` Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this: diff --git a/docs/setup.md b/docs/setup.md index fb1165fc3..fec8515ef 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -183,7 +183,7 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/ - uses: actions/checkout@v2 - name: Build wheels - run: pipx run cibuildwheel==2.4.0 + run: pipx run cibuildwheel==2.5.0 - uses: actions/upload-artifact@v2 with: @@ -218,7 +218,7 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/ - uses: actions/setup-python@v2 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.4.0 + run: python -m pip install cibuildwheel==2.5.0 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse diff --git a/examples/appveyor-minimal.yml b/examples/appveyor-minimal.yml index b6162ada5..cad09a141 100644 --- a/examples/appveyor-minimal.yml +++ b/examples/appveyor-minimal.yml @@ -12,7 +12,7 @@ stack: python 3.7 init: - cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH% -install: python -m pip install cibuildwheel==2.4.0 +install: python -m pip install cibuildwheel==2.5.0 build_script: python -m cibuildwheel --output-dir wheelhouse diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index c5c0ae8cf..2c7da5c6c 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -6,7 +6,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - pip3 install cibuildwheel==2.4.0 + pip3 install cibuildwheel==2.5.0 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -20,7 +20,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - python3 -m pip install cibuildwheel==2.4.0 + python3 -m pip install cibuildwheel==2.5.0 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -34,7 +34,7 @@ jobs: - bash: | set -o errexit python -m pip install --upgrade pip - pip install cibuildwheel==2.4.0 + pip install cibuildwheel==2.5.0 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index 19c45ad9d..98c057453 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -11,7 +11,7 @@ jobs: - run: name: Build the Linux wheels. command: | - pip3 install --user cibuildwheel==2.4.0 + pip3 install --user cibuildwheel==2.5.0 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -25,7 +25,7 @@ jobs: - run: name: Build the OS X wheels. command: | - pip3 install cibuildwheel==2.4.0 + pip3 install cibuildwheel==2.5.0 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ diff --git a/examples/github-apple-silicon.yml b/examples/github-apple-silicon.yml index 2f2705561..4b70087d8 100644 --- a/examples/github-apple-silicon.yml +++ b/examples/github-apple-silicon.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v2 - name: Build wheels - uses: pypa/cibuildwheel@v2.4.0 + uses: pypa/cibuildwheel@v2.5.0 env: CIBW_ARCHS_MACOS: x86_64 universal2 diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index 4f604eda6..11014602f 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v2 - name: Build wheels - uses: pypa/cibuildwheel@v2.4.0 + uses: pypa/cibuildwheel@v2.5.0 - uses: actions/upload-artifact@v2 with: diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index 3b9038c11..442bcdd04 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - name: Build wheels - uses: pypa/cibuildwheel@v2.4.0 + uses: pypa/cibuildwheel@v2.5.0 # to supply options, put them in 'env', like: # env: # CIBW_SOME_OPTION: value diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index c46645ec5..ca541f9ba 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -25,7 +25,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.4.0 + uses: pypa/cibuildwheel@v2.5.0 env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index de4cdb775..53516f7b9 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -12,7 +12,7 @@ linux: DOCKER_TLS_CERTDIR: "" script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==2.4.0 + - python -m pip install cibuildwheel==2.5.0 - cibuildwheel --output-dir wheelhouse artifacts: paths: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index 101f36dfd..6d6d550a1 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -19,7 +19,7 @@ jobs: - ln -s /c/Python38/python.exe /c/Python38/python3.exe install: - - python3 -m pip install cibuildwheel==2.4.0 + - python3 -m pip install cibuildwheel==2.5.0 script: # build the wheels, put them into './dist' diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index c0f4ab4b3..7d1766db2 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -25,7 +25,7 @@ jobs: - ln -s /c/Python38/python.exe /c/Python38/python3.exe install: - - python3 -m pip install cibuildwheel==2.4.0 + - python3 -m pip install cibuildwheel==2.5.0 script: # build the wheels, put them into './wheelhouse' diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index 37a24d99f..5c6efece6 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -55,7 +55,7 @@ jobs: - stage: deploy name: Build and deploy Linux wheels services: docker - install: python3 -m pip install cibuildwheel==2.4.0 twine + install: python3 -m pip install cibuildwheel==2.5.0 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl # Deploy on windows @@ -63,7 +63,7 @@ jobs: name: Build and deploy Windows wheels os: windows language: shell - install: python3 -m pip install cibuildwheel==2.4.0 twine + install: python3 -m pip install cibuildwheel==2.5.0 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl diff --git a/setup.cfg b/setup.cfg index 1fa219fc4..cc0d2fbf6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = cibuildwheel -version = 2.4.0 +version = 2.5.0 description = Build Python wheels on CI with minimal configuration. long_description = file: README.md long_description_content_type = text/markdown From 1f1c8008d8d99248acf1d0e9ae51c7db876a52f4 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Fri, 29 Apr 2022 14:54:25 +0100 Subject: [PATCH 0082/1105] Changelog tweak --- README.md | 4 ++-- docs/changelog.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0e2dbac30..8fe169eea 100644 --- a/README.md +++ b/README.md @@ -196,8 +196,8 @@ Changelog _29 April 2022_ -- ✨ Added support for building ABI3 wheels. cibuildwheel will now recognise when an ABI3 wheel was produced, and skip subsequent build steps where the previously built wheel is compatible. Tests still will run on all selected versions of Python, using the ABI3 wheel. (#1091) -- ✨ You can now build wheels directly from sdist archives, in addition to source directories. Just call cibuildwheel with an sdist argument on the command line, like `cibuildwheel mypackage-1.0.0.tar.gz` (#1096) +- ✨ Added support for building ABI3 wheels. cibuildwheel will now recognise when an ABI3 wheel was produced, and skip subsequent build steps where the previously built wheel is compatible. Tests still will run on all selected versions of Python, using the ABI3 wheel. Check [this entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#abi3) in the docs for more info. (#1091) +- ✨ You can now build wheels directly from sdist archives, in addition to source directories. Just call cibuildwheel with an sdist argument on the command line, like `cibuildwheel mypackage-1.0.0.tar.gz`. For more details, check the [`--help` output](https://cibuildwheel.readthedocs.io/en/stable/options/#command-line) (#1096) - 🐛 Fix a bug where cibuildwheel would crash when no builds are selected and `--allow-empty` is passed (#1086) - 🐛 Workaround a permissions issue on Linux relating to newer versions of git and setuptools_scm (#1095) - 📚 Minor docs improvements diff --git a/docs/changelog.md b/docs/changelog.md index 80a3148e6..721b57258 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -6,8 +6,8 @@ title: Changelog _29 April 2022_ -- ✨ Added support for building ABI3 wheels. cibuildwheel will now recognise when an ABI3 wheel was produced, and skip subsequent build steps where the previously built wheel is compatible. Tests still will run on all selected versions of Python, using the ABI3 wheel. (#1091) -- ✨ You can now build wheels directly from sdist archives, in addition to source directories. Just call cibuildwheel with an sdist argument on the command line, like `cibuildwheel mypackage-1.0.0.tar.gz` (#1096) +- ✨ Added support for building ABI3 wheels. cibuildwheel will now recognise when an ABI3 wheel was produced, and skip subsequent build steps where the previously built wheel is compatible. Tests still will run on all selected versions of Python, using the ABI3 wheel. Check [this entry](https://cibuildwheel.readthedocs.io/en/stable/faq/#abi3) in the docs for more info. (#1091) +- ✨ You can now build wheels directly from sdist archives, in addition to source directories. Just call cibuildwheel with an sdist argument on the command line, like `cibuildwheel mypackage-1.0.0.tar.gz`. For more details, check the [`--help` output](https://cibuildwheel.readthedocs.io/en/stable/options/#command-line) (#1096) - 🐛 Fix a bug where cibuildwheel would crash when no builds are selected and `--allow-empty` is passed (#1086) - 🐛 Workaround a permissions issue on Linux relating to newer versions of git and setuptools_scm (#1095) - 📚 Minor docs improvements From 6d9a16376efdd664126543ce3b6ab4e5d805dd32 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Fri, 29 Apr 2022 12:03:08 +0100 Subject: [PATCH 0083/1105] Add interactive diagram to the docs --- README.md | 11 +- docs/data/how-it-works.png | Bin 0 -> 77591 bytes docs/diagram.md | 455 +++++++++++++++++++++++++++++++++++++ docs/index.md | 11 + docs/options.md | 2 +- 5 files changed, 477 insertions(+), 2 deletions(-) create mode 100644 docs/data/how-it-works.png create mode 100644 docs/diagram.md diff --git a/README.md b/README.md index 8fe169eea..b346a91b7 100644 --- a/README.md +++ b/README.md @@ -102,6 +102,15 @@ jobs: For more information, including PyPI deployment, and the use of other CI services or the dedicated GitHub Action, check out the [documentation](https://cibuildwheel.readthedocs.org) and the [examples](https://github.com/pypa/cibuildwheel/tree/main/examples). +How it works +------------ + +The following diagram summarises the steps that cibuildwheel takes on each platform. + +![](docs/data/how-it-works.png) + +Explore an interactive version of this diagram [in the docs](https://cibuildwheel.readthedocs.io/en/stable/#how-it-works). + Options ------- @@ -117,7 +126,7 @@ Options | | [`CIBW_ENVIRONMENT_PASS_LINUX`](https://cibuildwheel.readthedocs.io/en/stable/options/#environment-pass) | Set environment variables on the host to pass-through to the container during the build. | | | [`CIBW_BEFORE_ALL`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-all) | Execute a shell command on the build system before any wheels are built. | | | [`CIBW_BEFORE_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-build) | Execute a shell command preparing each wheel's build | -| | [`CIBW_REPAIR_WHEEL_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#repair-wheel-command) | Execute a shell command to repair each (non-pure Python) built wheel | +| | [`CIBW_REPAIR_WHEEL_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#repair-wheel-command) | Execute a shell command to repair each built wheel | | | [`CIBW_MANYLINUX_*_IMAGE`
`CIBW_MUSLLINUX_*_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#linux-image) | Specify alternative manylinux / musllinux Docker images | | | [`CIBW_DEPENDENCY_VERSIONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#dependency-versions) | Specify how cibuildwheel controls the versions of the tools it uses | | **Testing** | [`CIBW_TEST_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-command) | Execute a shell command to test each built wheel | diff --git a/docs/data/how-it-works.png b/docs/data/how-it-works.png new file mode 100644 index 0000000000000000000000000000000000000000..0306280a5f003005fc70c0adb2d0847c202b5c79 GIT binary patch literal 77591 zcmeFZbyQYc7d}b~C`d|oBl*%GCEcac-AMNf($cMTmxM|xDF{e6NSAae4T7|Hy`Il= z{5(7LH;He;!NFn3$x5oj!67HW!6DS4 z-T-G-(x8WMaOn2d5)!I%5)zcE&JGsVw&rkfvf+uEC|VDC@UwKE$Hie$`uisgr&FpU z%A(~W#~C1zP@&N#5aI?#yl1&v=Z+0e^6qZll!n;$RH9Vnw~oMwH*8-_B-WH<#U_2$ zo@`vK&x=|PUKY)z&OL$4@mrKD@GRzqJA00xEe_>yan%uw|B9C*hC3WU!?AI&rtYq% z$L-JQ_`RXA0Um4Z>ebulTiHk7AGson3sAtBv9zZm2#8WFufQ!n@_tzY2bZVrz*8^w zs{Jk1MEnOhDuaUd>AQ{k;arbS9h;TZ5m1)<;H*?Vg|vC$biUMu{O?5Ol4Bf z9m{w8on_#A(xp&`Kc+5!F}1d2Ag7;Jn{GXBenQGkr({|#dJS!xFwrpNSML!0)g>ds z%o2qkw znB(G(H4UG$5QUabWUus`U)}W)R$ZlkJAUaPDPERFF?tt=u0UKdVCtP}1`c8+emmRY zTsvd+KsPlugGGyUp{#1B1BO$eDh_$ca@WnbX2xibFP?j!i8W10KT9FW@4UDvDTn>) z+^FcZ@%q%5ZOS}1C{w6~CLuP4yjzMA9qrLtj4*-xbKG$uiWkTq&|X#ZOQjJM)pW52 zdoIbpr)wuaY?VCL5h{SQSH2^fMaLSZpxzNqu(nUV^6+4>PmFufAFBoFCO_u~$vDLJ zQhf~l{p82====WYW{6ad8a6jHUYrccF7jaG1&C7OAe=3}TfEk$VhlQGf2uP+PGojG zgnv@rjjTd7h@wV`d9Cra{5iUp0=!C&^d;t=5dSI1ybyoF(RTyUoU1}(38gBXe8Te=sg>V0Z`E^$)YTYFpi5j-vx^BEsfDXv_aUN^zb=lfQ*6xYkPz<4`=tZXQzgqG1Th(0e;1Uqo7%bZq0H<^r|kDb83s^O;F*mukDL$6U zRI$)Z?&HWJt{5juIcE2@m~oKx!*}H1u^_&_k30p(`*g>MUg(l~M4w1_>@v|$LTG5r$q&+f<~ zzd?I>|AZRl8E&`d3yk_`AxXh!eBBIq5-*F%A4kmOwW;CvO6L#Lx{{_vD~m@CpKan) zk(Nq(b6^oAG&ICO0tJUD%HNi`qsM>mX0kHiqj9-u&|)J?BQ zkB8ffs*8q#TC}A7g|d+bC;W!wy*xglNb7deW$tB@Wx-|pWhWDo14w14BsI~q4B6`! zS~#%}#qQFV((TZa(dbjT#fey1Jx;NyvktO;VI#}E{y4#Udzk-~lhjJ8G`n`Xt;7jk z*K_36m#YPc>TOzLL$-z_oF6si@gm3?&1zmb2@Sy!3w)OcXFa@<)I-4OBxad^I5U=Mfv06iXNLqB?dV83&}Mk*Q47Pn;zN=oE_ zW-0}j--j{FH>sZe&g)DTwZY+1LBXvi@lvm)$_p~h->m8NeMS%WFGyN3V{)e62Yd+%G$9>KQTZsKkFec!uR2 z=woq4dUCe8wWhn+F!W7D)UsKxnap=cW+oahW{&f)vbjKX$S>aS2^<$CjghI?lN>2Z z_6os$wYW!dlvXywTs4UILf^+<-JRmm!uO^;74Ayrdg>yCbPElW3C$W~97E}LDXI^a z1yK^22FV23E|Cc9B@~H@`mTv*yHXib@=)oLyNs92V3^Pysc8AAS7BawJA|x}_Qb(4 z5v0}5WA6#m3FQSQ79t?WzhvMA(`*udQ3dfb;p6qtwKp_)JiqH5 zeHnH66h~jKY;{cXZTJKF8oA6D9U~`lP4OBkUy`JHYI?EH_&rSn$S;c>)TWqy)rDBl z8B16$IRwlPubBiN&_2*96javdKGs&#`p7=IZ+&S!Fv?mulzQ!W<4I>>YIlEs>cHC) zi-GKM$UX0q6A&lrU3}BG1U)+Dn%4^kZPFYB{Z1~sM1#LS)Gc|$!rWBf;_x9P_*DF$ zbwX-4a)Rw#hnlfo^^1;<#(`vP1Q#!RnLDoS-i?1H z^=NMrZ9-q0qN>UM>F1CUjBMTrzWEuvrk71KHScV>oLrXHi*(g%GOmJ;6$Ug`N(*$G zZR2fi7P2a?9!7g84cv|=Q?U7{BW1TSSb2|q@8L{A*H zBWETXv#XnTHPa1W-{!cTFh+CyV5@;d5@RRYI@%6}29uZXjE9VW)!Ay+II=BK=4&jA zu)KiacdLcUJX7JWg02Q-vux;`Q101o&qs#x%m~qOFTpQg>$!|Am9xyVh200g&n+D_ zZD1N0>08xpx>YuHyj^Q?$Z96DI(}T*yz2Av;LXrlVa+o;nQ|lp0Vkf-FR3INY54rfBNe$@{kvA{!TAwyG z)mB*2lp-zmy=iKi|I*aNo^D)G;UUDPcAO(m)tY5&+MnEiskrYTIiBsCyb|k?6V-xv z3H?q$&>c6L{mBa%5RfEuEjbG%CAhob7!?i~9tRE)9KnOXaPY)%usgsJoIE_qpU3L( zjQ_a@0S+$I8V>0{_vnD1us?C&AFRzEKM|jYz@dQu;edZZIS4=RMo!2<{CSK}2d=^0 ze;^?z2Yx;GCZJiFH04LBKWwl-4;PB~S|KR1+Y4-tpnzDYV<*KEmC}`?n z$7XEiU}DY&wR40$2Tlko2oCMcU5zQBcDD8|f>2@VA9o0XW7uhSYRVtCxY`I)YbmKx zN;o*1Q}VKLuyIg}+@z$W6mmAR5LB0x{!er8KVfPsS64?tc6JXB4>k`jHV0=*c8Gw0 z06PaKJ0~YAxP#Tj)85q>%4+XI^T$JeK1b5r#njo_(bd|)o)Y$4V-p8AS7B;u*o*%B z^G83;q1J!B$=>BZ!vX_jhh1TZuyL^eQ!`g1VOMmtBkEV}Y%$+41>_AIbk-sMEKaGFA_pXbo%#J+J7|zFl3+y80{oH#K# z@DhbqGwS~_SXI>%(tkANAMXfwj>^cG9MmKE^OgVbx}2PCf&Vorbl9q@Y-sV}|6{OX z_orR{*PO{y=j7<&(BsPekDCJDZ2Xf;{Oovwq}cs>T1EQj|KlcP^P&GS=l?%)3`KT? zU+0{gA;6*Oj9%#K>*z7B@w?B3w-9fj7xU@s%I|lQI0QXV7NG0rUx`{W{C=*vIh-q@ z`^6x-NocmYksTKx{ z01_)04gTbOkod;Z5gXUhhxnI#eg_;_Y-=vS{V{L zQY7TH)%sY)dfc+w6W<1pLW)JNm=b409q0tPf3}$)J6OP6_2zg&H&ox_6HmX$#dh%R zPK`^DKdYCjWOy)eNR@}-Cvfd z6&nHyIn+qYspC%iYp*RkdIXn#hzviN+kCzqX%f3J#ZoJ+Y7i_PS&XuMPSBtP$&a7j zz=+7|X1e;e;71X1n~XRFlY)GIu4ywbGH=60&|vWJ{kM5$hI(tdpX(Te4q{ObO}PP% z|BgSyS!gT`+i#4&ee#Gsc&bZ+B5BmBV5GqQ-t}pkXd5~glH}(mpNmfCuxh=R=4}oS zbwbYmT=rrj@WKg4;dQKkdI0V4T~v-|3oEgrMsQo7@#^dU%7A2RNJtG?!zl4 zBs-Khoj)cN_Hs2k1K!xxvzB6J-$R$&uR>gF-Sc8}NlbSX5~ zawyBVvIGBCy8S!r6t@X&7xN17^sv5Y#(U9jL24!+Y`Gi$Hw=-lEg`s8(K zjSi_pW8GOlXG}px^O>Ei?tff2An87cx8_k#OMh`)#%C>KFCVmtULVBz$0b)M8+b9z zxsEES?cZCClMs)nSJcyyRBl(Jm%I1<^2lX+ijAI;MvvV0bcu?D7Y>^ko6rfbvPLGB zypqLa-oWt#^3r;`!(igTP4T-4_@;au`isMT$H1IrT7A+-_wTxwS|1+N7Z$*@cKje~M!p2HzNeXQyebFn(&K@9=$; zN}y2cJNM8z313OrHm=0ndpv$TEP*Kn@vdJ>x&`dvbb8pw{vau%`@EYbHmLb($D#hJ zgp!fkclS*n8)Tm2ViAcwsI%l$X|^X@$X~9HpK{L7=XiW62v@n7O0kHSDu`J=)T|_3(M#p&65)2t6o-_8| zt>0L8*F2xjXXzw>2xv2HILL3Q|2bb$u=$D(Eqw+yNL6fjp)qb)6#O>-#G%1|Kl}S7 z0|PxxVcFY3!2q-Y@T4rqPi~VPbmS#riP~+WxDbHbswZ@q`*~+=)iU}D<+c(+bHY-h zx;E5g$nLyZ1<{?b_6&vWu){t}B(v!+S8j{8E1DcF2VZ@Zq3GzDVI&E_b#f`IU+<-l-Aah& z<6T~TJ0zm3AS+4OweQ@CNKh#h-cwN^f~3?gWQ>qKCqX z2Nm>~xT^zv3*G@kD43*Jg+v78f_Pk=B#_jm?@O3|VOJe1mm>=7(WFEkLdyq2mbM2- zA_wibrcMpJ?`(D(TWQ|mH73 zB&KLzz#HU48Nog}SMPXpn?dqMAT4=6)C>m!0h{|6p55&HS(GaAMbxTs%~X z`&uYb9LT6OXCZ`g_pBJ)EF{QUo_lK@LZ!Gn8AZ2_8xJ~3WKN(bt(du-3)hz$qM?^) z$5=`6mXIs6Lt*p)&hUh@HM3gw#{E{tFly&z_-MjtstRiFQTr)p`|a8V-|3PAcsOwn zoC9MOS&T+=Y>P-DQ%rXBO8yScbt+_omgb93d#!a&E3F{f5zR{KVy(nOq&vhjUT}9L zWspRn1@c_AhA~GU_y@Vu@Z!=VtE`v_1+^q;Tci@+4ssjp!8;6U0s&=ao6XAcg<%iY zIa>OClH$n9$D5Yr&yV=3y9$1Sb=F8=^*&-uT^eBZ9BKp+>~hrfR9eaad|678EXvtN zT6vra>ggn1`&11Vg+?yy1SXWdUfPyIq%QI&w(m_it+PGXQ&W)HEs*5e7fY}M;nbd` zw4l~#<<@nzlXlvqo-}^HzED$Dre^azY}2VIPr)ALwYkOK==ilJ1jC$wtG#tp`5voR zm~xho0PQm}2YvL|M@VKt@<>WiDYa)loqYuP3un@zM;&G(wD76NAiA-6Au|Ld`5Y4& zj1y+Pl~Yvq+(enrZ5L2pNsOtK)KfBXo{9C~3*;2{fGC(#O>NZPDPJUWpP~wx7IURH zlfPN2Ueb7eLKAYN*}Y$;yuo4Gj)*}&Ljv%bvTEl=G6w~rQw4M7Lz!L$(E}}dMd`Gu z^4#qA@>E{a&$GnlK74#GgAXmN5Rp7+Sp^ zY8{5sdm7rs6G(yEeTR#_xh)-EE&cQZfP+5h*v@^dwe2iHR4rB>Zz9>=G45-2H=Qm= z>NG@pu2L7$q|x}}d`k&GC!`U|ddbJkzd<0Mt!``5ek7iBGD%l#d9(zHx%0&FL#1m> z!JFx1o}hKJppI_)qN_x-o-O2@sicy?5jP!&GuS(HI%|*!^sh|DrD4SYqw+;u;nn_Q&ZCP2pR? z?W+l4j`*m(VILB8x?;#oCw#BYgT=FkU(VU0FUnB(aChQ#j@Gg%_{dUw>RZ2dLMIPm z7ZdAbCc2;6bGmOU-6A>Hp`NYHz~%%QnzeMrHLW}WOVyoEnfisM22dlV#9=7p5*@}vQVnp< z!l-m#J|kc^ZM{pmJZ_08a%#kXeY#@GX+ng14Ue68shE;HBN=#pu4<^CNXo#*705~6 z9KaaTe4?;xi;nRdCMrtzaN+TMIYEbC|SPjf2oi93d+M5j4cQQ zgprT*VQ2#2->@xfP7z-9I;@EY{OA*}t@YozhC{-DnHIHdBZhQKV(_xhv!3iSrI@XD zKXdZqX;Xet$uQx3*gK$+^@X-dzJ7jY+WD@&3i(ln=x3_V#Sc#-y__CkV(Jh-Ryv-x zvAQ?F{-4c5Yz0?U)!w^v;wMpnfdx8*_AmObAEivK88ThfqX|2JyDOvTw%iw2qmAvA ze?`u1rD`NDBG~|T9nKJI*){Luam}UWNcP(@WNr`H*qm|5-x{-E9bh@Uo$pBq_~w8k zmdX;#-`KNHS*S;!_PWNdVW+0Dn<3kqlMOpH9-8)L2JottySb3(j%hK%04qAFzju~& zB*gl%3{a9>N4t4Mmu@zJ=VMG;87Qh8aOeVvjL75t7G9c zjg<~UNTZd``~>}O5GQV$)_D8l0pMV_pdUGjh_~92=^r8((`NaeeAz~s$gx8HfmeF6sV)q;?R)e5L5$226 zT%T`s_1qys=}Zz~sUA~bDtSA2H=%LfN9kbtbuBjiPa=>rjkcLPw=H3W_|uYcVi)xO zacL|KSto1k*p3I6`gYah2*xN_&(BOVPdiArrr%n!=`xwG<5+57DSbc6{@$+Doe;nP zG2z?-N=BGLZx!+^7=?^*y8@sVQC1?`+MNhcAos;^D5(hWu{JkUB|HV$RQ_j)e78ZKRmSgtvN^ z#aS~SS2Ly8Or3|2*b@rSIzT(gAVl~>e!PCymFG1L9(!2|>XT;P zUrhmOkFh3_5TOy$DjrMw@>bLOqMzaC`WwaC+y`0%Bia>IR zKS>{IrT+#bKF@7uh9{yU_zU${WMe`rg_k>W<_~t!x%yR$rz~b={KBY|HiNi54GW@E z1>GKhWsyehjBLb7KbfUFEI{wfV`7QM%%#6;=TSY|BY{iqPWc9tgtugVnMkJn^s%ym zY{8Ftb@^*vdtm#NfHQN#U;7kn&Q*!vCEZ%R7Ylpkn2H!uJc^@QoirLMbH*+}$CX?VK; zTfwB;4i~eNX-mwDy=K1@poY$J$1SymhCZW_2^rVWW!(mHg5A4vcV*x}Vmx4aG~)}+ zf7AM{Ob`I|(&68&TQMp94nl4#!YvlneB|0WX9fO??YB1D5~^$#Dxz1enQd)vwh4;eNwGz>m_gY99SQTzQ0` z`WA~+^CZU^>!RS#MdcR^lvI$kwzSvt>zg(TuUy*0uqy>z26!}2C!4Py?VWvmK4Y)@ zW69*4q4F~s9#z&_{1(chseQ zV#+E%`f=5HBzsesHGsKf-?+jJfS z?C_ZkIU1(WzSxvmypnjc?^P=hy(wUNl^BchIj`eli=G#KInBvFb9p09 z6X4Jl!{WC(RscMZWK+^-h6%GQ*#}gj@e2^hoP+OCI`Q--pPe5-*{y&kk_me3l4_5- zpFgV}yM}2sNiwqnDErq2X3wNdD6~x2-+xsn6!rCHiMQ*dkLH`z&R2qRFkGC>I)Kj2 zVPyf=-#_T0=rRSU1(ms^LYz(UhEtBHa!jCOy=N z9_P-O?gKCv3VI+cbkxrUvEVcoo&b`$o~|BDuA>Y%M0EvHF@-N1d*sXCgJVtsme`!| zVKJ6T?7^g~!^2WrkCyBgntB@4S3a6cVo@A|Uj2 zSfYN#I@lRNL^ZFlOA`r3qCoy@Y|gfc1V3Z$Y zV{9t9*=eVGG6Y7#{XFIjtP2tmDqr7o-Nfpcpo!t9=5W%Zx(AX|67J3&W4P*nWvoAWucz4DZ`fvd z2CW37rhwZQajkR%nBLE=~q4Zpm3?KH06$ zC)ffjJM(B*x={u8(yYGy59vhn`x1E4W2|P-#|)5qzwg&-867qxmGPBnK%aFnXo68Q zym%%GNIK_|^gEDr;{|+3AV8HK>TQX!XL?Av-bPxkHxrB+W#t7{f9S&1uE#UsWuB|H zdtM-`(T9%AO%nDg%p4zf*S1eOngH?c(2q7I*Z76qZk-zo|$S$kukTSspNwev6fBeqUe zn&vyogxv_zXuWR)WnsY7Y~_yQ)n+MKS zy$Sahuw9QZ?%$D^8}Oob0JitX`$A*&fmZHjtyNk_u-_#wL7 z2VPHgk|!tIL`PJpu_SzK8GvS0#xhYT&>Kls?S9Ocnfp|vlFj&qrfj7;s*5e~``y44I!EmD5`TN; z_x+on@yH9g01lGU>C0;?qWsCECQ+RmYPugs&|GalV^sP4j(dhLk+2Hmmr^4p9Z%T9 zvrsb$vuX(g$qf3AgXO})Z(Z8R3P4BJyNIQ~DptmX-^p}X?q7YZQ{Cy$Khy);T&vP_apHA;NMHenfG_HaaJl@7%X3~K zeYJgcSNWC=ErKF#a!K4`S`6d^iL|$2>rF~pLy*`#z*I4BOg@NV9e<^ETbu)Tma1?> zgubrrutV#FN^D4QtE6OtqkYy43Rg6I$J$Vb^P>@!f}1moQj8`e*#%Z{B@kBl*^a(b zaWl|#I=kQ78Dc{#cvhk+^x3tfiO!&>eSvqQy`|x6p*Y~f%OyvbU~B>8ydQHcT)5qT&^3n784fQXU` zhoo|s;k|y50RueSASDV3;f$ZO0|_Z(kS2>fc#$d;*Mr)yODexi6H9`ocM#RID3@TQE(U43J}dG?GDd{CRWf-!N*>Mq!JheY)@ zc%A&PDPizYx?BUN86cqQL%dgf>BVEt-A^^S?dWO_0NABSX)MvLwRh`e8=OdNR-QsK zxiEp@%1*dnuew8~Dd%J-2rWAc^_V@-)i3QD+a8=o+Gb|^o?E+*y8Xaw zjL!fO3eQpeMOOO3eoAp+DemoM5VH{TD8xy#nx+D8u@Q#lMrHz>xl}!A5V>{PhIl-9 zZx0=X%vF``>UDV&aT&;05VtM?yOI|wrs5pY#ai-yc~zU?Z1UmzMY1>q%YgbG{QRhj zC>c4}XKY8FPl8A@lyXv-Zhup5Oer-LE@o<^qqh(vD7?kK>1>_&bD?r3@gT_hFxI(v zN3zz0A+YKl6e{=ghj{RnK$!NHY^Umi z6#JG-D?fq&l>}BHbER{q5zssa(LNPrILq6c$UBHjA#OB zk{DE$Y|qsvu!B;Oq6u436QClvhXGjl9BpA|m+1?ag+@;8giU)*7t50FKx=nR0h_L= z7yZ&x3i3J_yf8cO61|2fdxydewg(0E=fvPO1%#j0d~%-+Jm#KI7K)bvB_WYALW4KE zx6R%(!C)Y)?f`Oq)DnQ$21-}%WI>n1H#;)4p5gC(aUHDCf0f8}qdiC36(;48dIWiO zGE}D@@sWtU7~@U(!J?ipz6dgLDaexlWKS(k$>NVfuj@sy>LWvOC%Bux?mIOddM|J2j6& zyWFxAh3D$CX%?P|RK-}in|yPQZQYp0xB*W>h%Cb9$^gUU0F16n=tVBuvZ(1wS8S{a zC&G1E!!9vf-C`hdE0k#`7TNsT{33f=-;^gYGVVRld^!X_uKu_Fgh<@)`>oUzeP!8FT;fV3rSH8EC;J%UcvTQB}fq5i-jMANoj_hX9baf z(g)qhv(cxv@HtM>QLZ6d@cZs_3M_|U!glrY^|fu2`UKhn9O5$a$_M>2D*I)rbjekd zGvh8KADC|cIkLc}|4K-$NC&NW5jb zU5$mQ)_|{W5{v?@!*sOu7Y?6(3xYb7@RDY&xMP;n;getFBjdCp#x)&Yu9BQABt=y%>Sq7!& z3jyAz*jxOAvWm6A)Lh4qq~D|^u-jRUBGD^n5T;MFmI-hd1Bw+H`WyY< zsKqb#RK)-|cs$37=;veqZ2hNJHUkedICqY2ceVePE&kHifU*K=IW?c=ng6}@&rw>T zz^38@<*d}-O!?=7#)0wlFd~xvD&+gw`ltE+uVMbh!vCKdW>hmDs}D>GvGgLyHa*sY zU;jr1*Dga0R6x!`F?D6WeO0w5TQOt)cX#H#2TJ(TeNb)vk$mYE<7*7H>wZHif2|CTS7oM_*qf(i#PvrIBWvbVyAK|jsM-Vb?|{_C-IQiNdLQMN5bS~lhDqP-&C}p z9tn#w+Q7ASC!kZr|L)qXNno``k`a^q4T~GUEJ%7~@Zom^4;%Xpgn=RpZVAg$b%fH)7LaHp@db&; z;Y!o43ZTgZ5m}_<&a*wcPO~WsU#1Gj#!P?E%`&kl7f&AyDk<-J16iS-7O;ieFkx-Z z7gVaYHC^nc-4R-(8<=#sRkVR8t3Zavcu5UgT1aQdrfkg#SKKndrm zKj7r+#hE!#!nL2=buTXuj9z%`%^L%ygq@~V?(a_bR}BrQLcatGi!mrGHU_}*HQyE2 zkWf5s{Fc&OD~_4e#J1Nh8;kb?JvYI9VRg_n8XXY;VvV<_DvbdTxdjw6mG|bUIo7D4 za_H6)sQkOdTw0~BtBYCIfbT%qFb0VAHmH-j+q(!vZOowOR;3{f8z6IT+8qfB18S<>X|{p({qeQX zYyhZE<@GXb2Gvag$6I9$Y?mjs%@|Ntn*kL#%-zS+KtIEUDTAAtLbJASAHCM<`=ROm z8QNif$9)Sd0*ep!1vpmx@Iv}~K+miI$d`b1J2#a4CX}nzf@YV+&u#!F7>kuyHO3Rk zbbj7#*t-oY8r9u;{CXRcO6!$5OfJ^4%yfJ8C}RycFsRMUk}Y){wte%*_LS3$~w{W?$xHF>@p=tp%^GQZYSadf#*)(%IaR)Iwf9HEFk_^R=P60IDN`F@!NR zeAOb&x)7G{CYgCbTg;X{?oe-xrLkK z7pw6qA%KLjvw)d_@kQnY+FhCu&K(oZx3D^5A6V(57z+bAcUIq5m$^EpB>*g=$!FW? z*4c@iQYk=bC_fXd3N#BKy7t0rAo;byWIt_40CD5ycUacdBFl4KPe)_%7>KZ4J;(BB z_ta@z=5NH);utIe{u<>rf>K8(VMWi<3Aif>mH-jO>FAybE|>ZQsK_O)GX_#H9NW9i zyj;U(-%q4mXWmtnfJo38Xhsi>wamn(C@EIL z4Rpe|dk>WxoKp)+IhqoBPH_Z--C04EZ}pb~Z^GNe+>Gl>LU{v?<1J4kfk?%pTe9`H zu>02sA0S{R={ff>n)m>@?PG%*2tDQFVv_e8Q?M^Iw9OM4HP#u#v6=wM%cD$=QKQcz zMwkLcCaJi$7!*^mIv8X8jt2PPmmoyTJP6DtRIPLfET7LLkYG}mJaKZuGjS&t5Gi?L z)*LAD9#8}t<0N2LGLhWJz+BjlH<$_33frvNeYe%QjKv^l*q`DZeccZ@r<$s?zaNl8 zX`1itHFDVkkEt&~jUsK^wBfM@nsE#+gF5~i!~N8XTYywZZ2Q%aOX?z-cHRjPwL#rD zi-%VqJhes;Fea!0gdq}ec=d1DA6dD3LGxwnxP0}xTx+vmi6EzR(%~vP>DW0=-wQESz?N5(TAgMK@B8>r&o)6<0#_wP3 zdnq>_+>k+6sSL#qdO&e-O2<0i7uNa}`(x5j2Vj$FY0q_^Cx_mE>bvZI6hX2%Z#fI3 zY?#oo>3~2%N^=Df`8wCVv8!GhB{~K^oB>>_4-6m8Kfi(q=nhXIu zaBA~oetvOc+NJL5J1d~Bx zK(O7by97If32M;ePQeiPR!Z_J>k_P!gVj#LB5vuhPx~-U0nZO@GJruq8j2OQfBS`8 zh?QZsBlzZLQs!Ao<(&JhUA_$enWvV2aWu9de83%vl=j&(umWN>Zf;O*m`-3l`v#(4 z9wxWCPSEh!q!RD+3+aAar0tS}VT7lMSs#0*q=jVmH$EUx+hvRRj4ahjo+=qkZd1Zzjg*T-v&BzGKHI@|-COIj~`>!KBy-WPKJ5(G+71$XbLXCB6NxCMULWHsFdJER|M4gDMQjGV25U9XdRuJerV-h+2Cd3`}E|jxBRiNTb88Xl(LjLQ_dA zG|4AOKIlW^>d`J6KwgV5sEQV56U9La6Rtw`Q`eF*bEci% zllR}MhAiDlwN$d@$dT4a492D*1ERY%f42oGf)``5L|+w-l`#_5v;Ed~l6bVyl(`tf z3PSR9w{Vx~GRhIE7OFrhS?s5TZRvG*eab0Ghgf-Vm`dW(ivbZuTqe2^FC$MUw8}rx zoKRO3)+CICid%0IP+`HoaN2~ICx+5&J{rX;!49sZb)<&~p#`5EFJY&nvmen`y_lF4On%bt~G8H6U_bHt*dv$f3QF6?qcZ&1ft19A7uZpxt=eK=@;vabRc9WYnu+a$J zz$J3NUR+b23bnmnb&6C~I887~+B4T>(a*g?{i0PfFaG&C3UAkQ24~-QtJs-$rjAA* znx@ySwQCPLmrK`o^vbTZ9DH>wRGqmzs#Ycb2KWu@Q#i~wbx8?FVv&3_@;+K~oL)rB z-)>cYN6T(Me$As_1Z7kvgv^h~#n;y0mDNc68GN`Iz@UE!M8yd3jo#t85gQIS)j+u= z1at5q9m4WjvLU&!C-&05y~QD_ENs880VwWJv^NJ zrpB=6idG?1MsK1|6~aP7P>ZL%uyOYNJFzh0zi~zFzp;2;FP?OaN}q9GLu?=I- zA=YUR5S_Y{85>g~*!CP%n?BMH=_37jgkQe*4rwi+={cRx+T6g&OI3mC3JfR`!+~%* zug{GLPj|~vjd#kn``i{4G@YE;0^;si@dBRdnmWF@-qTGhP8pxr66Qf(3uIehplD84 zs-Px`&yrX|b^Tt@9`C&4(mO*Xnx=aPr;snx;A5HIyG@W;4MPd651yN^e&LK`v_|M_ zX+m?)#a`1^^xl0vw!d4#?#`L%4G?UeQO`Muo8kN!zG+frdxB$!M)Ofi^wk4H?AEPU zG$c4Q$D)(N*34mhOxu!oxt=sWKNin=swftI0B5mPT6-I$expsC>DH3dP_UVVQRR-4 z(-VxcI7V}8Ch3c;LKEM9`o=WpFIVi+N~a%zYoFYt>l}B(lkkv@fBXt zuz{VGCtVFz=s6Zx% zUR3^h?u9QsGLV{?X}CsSxP%_aVKU0fkRO_Olkd+sgcZmU5HUxgP(!0kty$h=lbpno z3%^rqjAtU*T4?su8*%7lv}qS>2Fmy2s3#|N07#4V(X_Z(fEuM&$H`@^jc0Lw8GE^% z6?iePAie7i<}Lp42gFJAxNJpP|72ry&jaRLlQ4aLKkW-}A46w~6b@FjBv?^Fh8QNM ziqOOOI!$NeV_M0tilDBYJm+P!*CTLN8X-1b+T5fZNeKi==W(bXr~Uf}UIicN@xlpm8gi14sd=C{dW0Qkyn7 zPD@HqG=50TwhS!=NRw|9m?kxbTRT(|_PJHlJc;TdK)VXe=|4Td3g95-SbF=kII%SRTdATdqU8WwGmSbRkA_TNA8Fk^T|> z;gGDb?yyGdsH46}G=ZUi9aih6RmlyP9wW3s513_mm|P*lIJdO_Mcx}O8b?lzOi zuO^CVuO60~0Q=5q_yl$TiW_`5d5VuQNnIA-uCZ~!1LglA?7ic${NMNSl0uQaHyI(^HjzEDHDq;Lk(r$t$=(T}5ZR@S zDB}*Ye&^MzdcQvJ&*S^~{io7BuIqW7<2aAwILD}|K25uRjkuU|I8`+d zUpDNM0{iFo>f`Z!tA{Eno(${uz)C{ddj$mI_?~Z)BCPe`Z!U}QCX}Ntj4x4M1L z-Ww);^)LjT+U6uQebXd=nVn&_Dtt+h&@|5Ja9Se+7*0$A<20w`+gffXt&;`rH}L#?_Ei&yE0%kObWVm*HwHy?AU;tLeUL=3aa(&>( zmeSj1pIm!rE-O5KhIR(lO?dN-mFFNVmx;=y*Jl79F+G|n@2u~VbGWqDgbxF_WuO9F z=jNM8AkyFcHiQgG59iXn@2EFR9oxpDa;Rovdea%8%Fx0##mut5XiGaO@<3orSw5%J z?V&IgvBBxg)Kbc+4+8e;6A_bLKM$u2+T`0^`2tNk>dlvHPY@m$zc7|#{0eZN4q4aA z!I&yZ5v8GB@kj=6hd5quY^jMDT~&S96tLpFnK`$Vy(;(e&VTn^8Fyt9;KT)f;y% zE^@u>LHV{MdTFjt)u0*&D%+4DviW?x+&!!Cdv0Z~&M&?LSw9FP#}~r2+vc9V)5QHy z@6O{ezDg7uh9(Y21!_0k3j7MvPDwA)Df)fDYa58-nfsS+MVT+GoU2~K#c8@n zVjl8t6S#5I`)G~op}m{`VKfgSZWtFHJqB$d*}2*nZhXQ%GKvfnIrl%~EbaJX6RuZU zGGqfzfmop-Fts+0%E2h`GPWuvqQBlK@avDms#>fw*hi0IqievM;aqqD2%;Rwg!>N)N~q@tTar8Pbb9I6ehiMsjzS7d)FfpM@3q~>B$op?8&(r z9L#81v`7+vISvz<2#m#A#^4Y!7C(~Eu=*I2RAJ2HH>9MKVfTRFr)Y@~EXm?&103EG zy#C9s_O}7wmMA$Mq*j$-#yXF|Mk{-)TK$1Jt|=YMAZ48<8hwSEzCgH^w0cqRG-+%d zz0~HwRa7Z9mZLC!p&|R_#*z)fqNvdDiBv-yz4N1Va!d|fQ)%b8*>k<{-uq|oo}N_l z_p_!G3lw|S#B?FfBgQJ#!TQquQpO4TUOF|@+RIMS!I?jL=;L_T;(+ltm}Lz-T^Rzb z1C>y$`e!^W`ZswsF}A0xEtc%^X!PIsQl*VJYX3OmU65kG&hO6M3veOS9lI=UvK*_7qiXtzGy z+IV*GbN2`?Gzd29uXK`W|6B@{bX6$FUSju|{d?%vqldj}*%*3gc*AFM`lK4qE%pUk za6gDt>@bv9S7~N64{1b zwW(V94Y2iiZ$(T%ykaOg_FP8t&$veBDIB|zoZ$Yhe@(Ya6|p)LW%RJwr(ddRcWu$@ zxIlSJp#FFpinRv3IihO-;I z!qzzi+%`r|%v3&fBXYG%p(t?4M6P-dq2W}V%Z`@km8a&u5avMLDU$!EHeCsnnQ@O@ z!G8Gl-;+}r7g805!l53L?6-JpWd4s@_a9{^y|;d9kzdDSO&q=Uk&Td{CbSH908A@{ zLSEhp8h$*fL~1hyD1M>N?IRH!;+nM=O?QFyCuYrniV0J@`GR=#L}rb7bMysa!=Z&I zPaK8_gaZD4h$k>Is$%fH_(vg!&{b$~3ySJa>+C4#(WA^1c+n{PX89zs*7^{_7}VpT zZBY0%OMi^BnEFW~!Agzp);oPdR(;|eCP!#jjs2_nx)hHFc6kd+L_Ay9Y@)tZ)$6xx zv8g^VX7V8O)K_+86tSavDQvemkncpxOcyIf?G%s1x>EhQM~)2ElkcH+;8RcHXHH~@ z_3TJOO#m@Av^d!XhfB|ztD0P>ljrYYVmk2RV8j0(^RRS95*ZUCsQR8eM!K&7m;VGq zWoV|c-=UkG;1a@8GI=g)#$k^8O3Ld;=yMm6`2Ec#%8f?s{-e!>evV)t8SP7;$1@L& z1Qv$iGAOUkU;e;mD%cdm`0S#R-K>q_P5Y_O2ql{+94XXc9>b@QkyOMGROd@NJ}D#FrO?|d>r~R&`U;0 z@fO>iRmho!nV*)`NEe75l3hJ$KiwXV!7?A4iFf zit&JSZ0H5IfdlSXIF}HjI{4=+aK_4nSc^tUCnkNo1yP5Ucn2(O%vy(Th|=bBMI`(l z!Ka7e3TSzzJ$IJYUl`B&?(< zj}|(0z5RbYT&$!_Jc{>%KiP-x8X6l+lIJEhZf4srPHmP&J!Hz>BK=T7=dif9_XJbA zq&DaD_hj|x;sSx|RbwTE~-^#(S{QrKK9Ea)k3uvq|T!dLxwpF%GkNBl1^o$O< zejBNH|LpV@a7h4eUpbT*>DV!J-HbY)$Bx&q)8z8Aaai zA#-|qivPrm|KsD50qxZ&B})0<|Lwo-6_dP-toVug>;K2c<-ysZHinOX<8Sf*_dNZ5-E=Ydl}S5EmjB}pP(w#a zP4)Uu9rj;e7`c!#PVg&@LmvMym;Qc>|M7ML*g4$=RsVITnSP0;fi+Md`&>Tc>@PtK z4A_hjPN+#$_7~7rlR!UJQ3PY=5TGuXXN!K?`VDOjllh;&niB|!CU+!6C?6Q$Bfdv? zAYeM1deQyP)kC|OR2}U*F`0Ls{rd`NIKn*u;;Rb01@#2-!2 z>U_pgm;tFqo|WH!N`*~a3=A43A_co}f#blZHxDU~@#sgc^vTBtO9)TxqxhY-2LC>U z8gj=Rp2Ivf1X28Sz;Lg)t2K@z1Vqnc6X2&}|48K8mCMc1HAe&11fv59KYAtqxiS8a zm3}!YA%s@~R0ZOd1QHBFgh|&4u$y~5I6KjK#HrY(VgtJ+b;|PPzrSG5IqWUKg^IxC zY-Vu}Q5E5FK#A_Vzv2i;T5y!eFz2d#aW=KIK@6A(t-=Qh0t2SpY~k*$-$!Sd&Od~~ zi_-`OSH;GN@adPV0EUX_Df=9-i4jCp6UX^xmk$-62J|*v%t{|=!ukB|Uznpx`V;I* zwvb+HCFQHoaAZT-=#bPM}Wo?V8ml6()3M*{@pMXqjT@~^;U3X1;;$T_&A9Gdt*CW$GuM~te}L2e>!pjc3i z3^q?an-f;!eFBNr<`tu`mgJg(Pp3J;>|F~$Q2bS3r8MQbVazHgf@yzoJRV0;_JBPB z1qC?d6hXK7F^|vwmlqd6$Y&8kiyp9E`|l+F=h?BrF2_+7fkXtn{v2=iZ-%Q@-v(da z&;xBx9gS^4tXjRQ__pj&WMR#bm&bB(GnU$-u~i17PuYOUd-@_@fs;!6J%3dj4dzr+ z8Hn)E_H_mOs4+@^42ber+s5iNrJx!(DOn=?C!DmgA`V50u}MaVT^i>(_SZF0i}JeN4K}H5hz_Oc*KU0%WqiXe zOeiAb*pX;P`k9!Gfn^|kgf0#Fc{C%&X{I1p!_7^-Yk+Cdp}dPIr9OBf+^L1hyFkIR zeADcPi9=bU3#YLd1oyT62BQJl`#9qVU(OKgS#+@~1IIbZ8A6{U11`p0;5HH*8_0x4%OyCT-_@uJX(+b>D!91Mkl=RtI zt>u1vIgp*8(3|Pp?e{)AvQ3Rd4%EDkp?wIK=)g31PJlruKk}L1k@yG%%3_H=@u!|F z-~Tku{=r1!30Hha)>sK0j3vEM-y)9I6KeuNONY84Ia)vR&e7OqJ|iSJ+49MG21Bq{ zt0z{bBktcYxd*-s-7}`y1N%(h;<~_&vZu`U6Q_1uqPEF`zqB;N7|e!ya~;%Y3+(+RoozgTrdSgs}6Gi+s>8lC_AgOYVWzdI6p2jAVyrOl1ASDodBYi1%Bi)f=H}@k zXHR>fAqdT+>{@Abej~)jDt|nEWUvOAYNbw@Rw+f%B#_3f&09>S3U$lB2>Em!g?(!j zGpTH}r&dh3E89ZYU6A0#sE{`L-g~ZL`r4^C4Y`hH1BNe973pTq`K9W=ogp~Ynf4vU zX-l3vE)IM5AD-A?K8F&|t_!;Zz;gIg530E@5Ui3&D*Qd5j3PV z1Ghul;-C7`>6{`RMiip{9JZK8{-Vy6xXuNyGpf+}?#8@MA&U z|EXnIk7FCwnGio=5wA~Zn}GZkPC6Hx7Sa^NBR9DZ%9KYwW+6cv%h$zkvQq0d9%*CT*SWHSk{5?C&o{zxSGX zDxZY0-P>9*drW7;$=7TR{8eQTX=k|u}I4!5!4T$5U|H_PY~o4lDZ z94Qd{I(6Z-(es2Ggn3<`JulvtcG$1*sG;+=fVzvW%wD3|A% zjnSr7KQL_R^PSb^Z0tc>;XEF^@)qLK&RcTAW`GwKR>4ZKK}c-HdWM)k*x3`K{#6q% z>l3fX;2U1G1rM7oV3~YW-Gf{p^C!eg{@09HEdF zy#gZa)){)90$2W7mxB5gxQg7LhF5uNX4}B8PgI zhLhsDe^BJSS>Qqb19;nQI)Kq{*MZ3+(Yr(goBa8TxQk-;L1L{#5gaq9tLK%H@GaRo zX$o&;MF{U-bXz3THL%XMBl*`9V-T+ZPzuDuG;D?>!VwUm3W?Bnk<229NU}FhoW9|g zo}TcA@jaOF7(Vu5jIWEZFbyp>E>t_ozcFBlrw7rZWq~V8w3%b(c1c?*6-ye zYg`;yf`vMc6Vr8}>4@`0h&0Ig*4(rtJyxebs6?!BH6QJNXZ*DBGZiXtog((TgruEW zJDpJVIJ~-i6neEKh|lvBvB@RcD*hU~cYluRLzyyM$C~;>ylq)Th2~>*2~ux^=!>L* z;G{tJuWmQW5qXys=|bPR=D^0!koa6O1g<<)tstCC!!Lfak3##+REM|zM0lF*YTKIm z>VK2_dPa zq34+s>qg9!-(LT-=UZ|+7qBhxn=y#WIyt_k0E{o6OhD-xzQWpRVEgJichtp2MDcYP zsm|=LaxB)P!`Cc7uu{g5IC6fYT~vY6l)epN2AO=tC=MW zp*5UPbke%x> z9kvUp!R9&d@i~#9fJ z^T_sIfVt=9bL*FL3=H*PRP2;w|8{8dy~d?b)$aj28DTdBrmieAaM!&4SbnqB^ApX! z{)))E!S1VN;$`pFY4$g!JwJ_h%ka<{jKGl)z$YCfYTOZh5-GPQL6ie9RmwT<;gk8lei}&#^uTlGE zEfGywwnO%hj|qk)+F*|KqbDrl(jE^cd`Emxz;zPWJ>x%j`mxe|M*rQ>%Wh@GP?TX( zcl-aOJ*y$?a>{vV;Pj&!Y|DF|esv?4lggHCsF{6YYlgyH*QDZoC4f~^O{lBy>jE#> zsbI3RI#Fzip5fe{98uSJYw)K_`}2wjtklDUy&A6>hX;r7V`pFR+bj7DZT1%DR+L|| z)!H&*UWkL?cl-zrdWP!aUAxE&rC=VLkkTFapVY-hoHu+@ zd{csnL}2o~8iaP7;V@R+*}p1s>KpErBv^E+RTT(>pb`e27EfFk^i3SpL;vFiC^Q5v7ue?N_{65;nn9HYsFmpBwOjq}ee|b6m zJ@M+sz^Ky55x`~kQTIQsy%l-B_1pTqM+};2?(uNSN$@n)7C!#s0eg}n7D*n-aml!_ z5F?FDjL?LfaC;dKUa2dVZ<@g#?$9rPFgMaw3A89<%pU{}1j2XuI9c%>N_&;o5Onq^FM~^u2k!(RJQHy=^2{sqoDrgIW5ORePICYaZetT7l-Z+%I|M@-vfs0Ng z+su_}cKB}+E&4CBx_%4FQS{#98DF__T<@^n4C&CS6Q!>gu_dAG2to%d9B;f=hL;DEQc zS{mS$N+4I|>%$=vyizf&PA9E_NhTrl08F$ftItbB2i8-EhXHV7V&&afwBLn{d<1w& z;y0DU7ak%RzG_2@0koY89G1qpRp=~C*3+gWhtz+w(D_=x8*%Q@ze&}N% z55=7~`Rq>K5RvP^28jw$D;s@Xahd`9AFD@qM6XL}^igxi$`E5|xTV3L6e}0*z_}#G z6Ka;yVZEC>NdEQOr%yRAat8_S6Z}%C`HN^A3mE`n7w??*X9|fg-=yN(=@l>pAz)l@ zYyn0}-W5X{eEu}pxXD{? z7`6cRfuzMR1pS(Ny7;#+t~++L?elJ!D1yAN|G4N-D31dOW9MXVV-*0$k13RYAX7Q! zwDS{1c+!z7s?1$vlHue`&n+`&8YKmbF-sL8qqo9X8k>&nP8%EXD&_GqUs!tvwiWDS zOf00fg&P&HPL-wOzCn?T-*I2kr1riT%2>j6Ku1}zd!`2Jr;Mw) zniIeaz%y@(#6xT}BdMT0@b zLe5jUCo&Jij)Np5iE|Y^BfTRXpaI=zSUoi~_4=pWI0DIfB*QCr`6tOVeDek(*c27g z!I(mgbs7OM&r-(Cp%~zGy%8%fDqv-KOvftMsS9?JZNaI77W|o!f!P$YOu`ftIj9R$ zO*?#G_gEoRz<<0GaaP`5fkB%8S{sd1xDr@DA=dt@F!F0IZ$9{J0B%ktt(?T>zQfG$V-Ov?OunGsM1M{U;2B=eiUb9`eB4rNVi5@3a%v)4n_{*^2XF zhBvN~K=6n!eWixgsWpx$x&XMd!Zd$|4&GKMbm=(hw&SzXPiXI%>izOD00F!w@1eGP zM%;;%qTjvglRVM*Ev)>;tgkJ=oVZfnTlk2w4P%^1_su~BWP3ee$4Ikc60n~NH=TR5 z%E_T)gcuNE^lOa<{vTDlly>N5+tf?H)-v=g;-#NS*LMZ4MKBu5Qu5nDW593pc_#Uu z(z`ofZRl>VOO+NR=o*|afTB$}8s)zP2qa|>DQC#{N#O2?*q8{DXnrx#%m5n+C8+?P z_gH78=d>IL;T>{tB zu7`^xD7UIP?a&2K0{FLw*gy@KLeS0T(kl+ z2%di`)xE0y+GM&Znw}PMZG+%cO;b_fWbqRQ2~-ZQ&^CP;acYnZ97pWl5LD20c}H!> z=1y>P3?pN|lVBof6O<%0JIDiDH$NFmgKUV+-<%`GQ4U$p5k+ejXs2mr2jy?L+Rs7u z`}ZS18~{I{AohL)ZgH@d_)I)M2;UmbjgF0i(2VnRoG&mSDkK51j(o6=EDS(Ev7LGj z_!6h*ngC=Y=2JqPuOg6IBipQ#x(iNItc2nn%m_kCTsR9a!~-d zK)H)7R0y9{=S+@z+Tk^fpvYem(o@(!s;AI+4-ISz-}U1$#?r^qxaTYCc5kS<60%-k z?LGc&-tRR(eOoBw@lqdtvn9GuY?pknr{%YIH7d-QZoLGd zXISufU0KfeTMF&V^*5^9Kx;Lsrbu!t5CbsZcey95&cb-b zK@1+_Ixv)ry^E8wtSPaOrKdR@mR9G!hghT0bHwr1tvUaQxrV;G3z$QL<8!e|wy7#c zocGWP3#I@s!`l57o52?ZV&&LtXUHNP(L$7ook5(PHe$F1odhXYAV+hYxD?CRkQmo@DcT-@l`@!e&d?*GS9z+8pAE1q%dS+p4lhx3rNVxaTo~Iw3GIHE0c0pXb+0f#2FWXmz zG+9KgaX>P{Ct~DNq3xoR*?G9P8PRA2LQip&CrCjfrY=I9c5bevDMGMOBceRK|wBYcR?s zg(bqyh8MPbP17 zuGnU4WxzY;F5k*kG|e{LeIdBz?C22>W{b07m)VoEUPQ>xN%Em1yI2X85^jQx99{_i zu#%XoN$4OmJF5o-(#2hiEl4Qm-%BDjkmt1CbsUCCg~5@F0T;}22d7r&2gdqM3f2q_!)bgw@-9q>S=g8>UoyZbi8XCMz z%vy)V0MYKaSo0ey?FBgwQ*ONZ&nm4cqTDOXo zM+)Cc1_+gz5t+vAt8~Q1w$)jMvuQ8m`LH~t)Cp(2w0YW3#C(j?l*k`A5%_W+78gCX z!kGOaAyCq0k5Q!1Klci#So$eSLg%!6mp!aZ@Tb1OvXAwWpL^^wtX{zI=Vg2Td`2-O z?VQ56vutwU#g)>2PBSTVo5u6hfP<3dEAXW+@-zFGa z)0`7SkdN07Jy7yJ(L|hdZ}iZCR!4Ptm@dfP2UyJ~awLsZvzC5zTZXq5*=?;!9PWAg zzEVsd+ID{v^U0v}LKOCJ%rU+kD*I2kg^lf_ND%99C87z?T%+o2%#&ISKf&`h}97bpetSyfyCZ; zbKyO-51cRTDbr;hkgie5m&RCONq!ec8=pEOk%!om2WX=r+A>yMQ2>X=&f!qZA4 z7BqdGB?ew%p%(qBy61hh@HNsy&U{Zci92>b+sxc ztFyD!EJvsZ0usc#Om|4SDGM#+g!vbrJS2(?WG`T+c;M{0eCzGR0=c?z({gh>J1-zwBgUx zR~e6Zs&x z5M{P4FdXtd@U@J#(yFC`knW1rEbdM6ZqrNhOzfvne($NfEgDveY<|Q* z;AmA@fx1R)uGvV>iZA7aiv+*8u>*y~*$2*S+^?0B+ynb>#FNF>nDwq^D}|~CDx@cd zUY@R-m+d{JJP!EPVy^!&qo~GnkqK}yrLkwsvZ=pJzVUcA9)#vm%bFlPP8~57tgMM% zsJVn!TROZnd|T=Io#ho8-HNK#b3J|72U2A}W{Mq2sGPAdRsz%n6O~C)sfh-Xi97Z6 z9*7pimU>N_rAr{rWJ<>soDZiDrYdRxD327tyL{$mKO0PAdh{BcE!Snz_Q7q|{fMF5fvkO0fC(3VZkf z6TDu6g{*`7OfeXWs8bj{9l7x_6H!6`MwJ9J9*T>pk@P=I)>uhMTX71AMAo@%+Ev z`|ho;ox_^g^E5C>W{Qc2yUEC?qqWgEv~yWdTb?sVklLT-)$=Q%y=J2sw~JoW9A=g~ z>S?e+=2A$cn%7)DF_vLRI;$O?2ivsxpjk#y-@_;o3;?8Qtj7 zlXIW@a`k=~MP{5Fq(~YiHe)mY!Gr2&S5kBWYR#O*PlCu}QXW(cjg1rW_hyD#8orpmVpZIXQ=I7TFihibFR}EOwCZXp?pYCsrT-y|4pNnub z4Gg|Gn`FLj#M&{8K4Q`9o_gzo?tFdY={?NdYLUmkFc%ZN4q%z+8_V#?=r!WH6H`3k z%M8V(3{ou5Q@Oe{2g{98-1C(ZUtIs0m&4;4?~Lvcrug`DiqTY>-?h~7SmeDO9vgYr zhpb5<{5LOeFBD!FxQs;XHBIUV7VP+V++C&AOW~xi8!LAtVQ-bHY)2S*{c3gSVZ=+n zVh*;gHJ58x4eQ=OC{m-HZ#AQEv;(yN!mIBN{;RAyPIb~)-`+5iq69`rGv)ZU>Shuw zeun-GfCfv$GgQfG1D3kQLJe5+$U~hE9okm2H(01jDp*38N`@(2bHqL4e*lxbu9xLn z9=nU|wBWP(#H+IN68frESAd(8zvb8%{NaGwO(Eu zv3P`7BJkb>3@LlrwpUv9V#0;=+yq-2)EL=iys+!7xIz9hk>kEVa+&Qhij5{>${+|j z!STh6Z2zlq;6P~aO6167N?SXTr(%IMrhzyC@3`(IQ`0Q_L@jwV*=w@*C{(6}shf4I zm_skAj)8bf5D`=BED#@BWP29~o^MY>XQd9ZsOyca<0~{Q6Q^kH9uf%_BSv^yea$ic zO@ehfA4QK#+PxjNc}ZtPZz?X?n5^Lg#E50@xsq21q1D&P)T0^bNDrUa-)APHVxUGA zs12breQ%ma2|Jq{AXeb1&_9TuWlBAHO_$l16(4ego;?1F32i$j#i_7K-oMQrycybY zCMW#o&TjW04jtPQN3tH@D5fmp5|d#&VbMfxhf_G;I|Au+oQE=TkV|X?90@u6nb~C` z<O57}K$7RLfCb|9H0q@+h45gNj84e(dr$eoGC$CN_DFFJUoVMaq1N9dLO_9IIK z&!Z_0=g8H!T$Yi!0yBMAx74^kPBm85TOd$#s`7nsXe+Jl;jAN${VsWeDB<5>|x? z*hdt*#v}YZ4xeWmfxz8!K=?V2rrSLE#7<~!_~W2EIxmlio5Qr~{Q8_CZvyaU4S-2^ zGx%n_~T)VLMzKdHRVbfcV@Eo#z1f|0qtW&r?-Mw zr&mHZo`047f>m5T(qjtt1C>UvpNnbeMZ@yPTuDzupBvh|M(lUi=kIYA@PaUJrL5wE zk%3OgNrex{Vzn_nR^@2*5ISd-7$f3S5%0O|rj@BC841i9dicTiu%20Ssx^GB1(;_H zPY(-Z5RcsMNuSU{3_fu=gKRm~{r6A0u+6r5PPi}T=gziq2Hsj%I6$_Byr>NE7<%p= zsd>^;Y3|8J$Qntr)Kz>gt)M7(fdozz-c(w~BTL<@-@=NJg*Q^*;y5H9B01$_?)}b3 zpfrd2fiphAH;UJ3x7|rrw+B)`eSPyy6ASaO_pHS!w*~{bd%eLo!Dfzxbd-63g5xvu z3Ov$jN!zSwOXhbS0`1cxb`E?VvhO}>>MNz8s0lNKJ!Ge|qvxc$Xb_u)Z$-D)nfvhX zsyM_KlU{n&d~t%y>nxHixk%FmsiaPPc=PB|DF}7rv1f4obvp8CE@UO8&0MIaVr!to z3mlTMYt%nW>ptT2=8a)!Yr)IwKRF#}(_ccPVyYkU!IY@m6#rGgRC?GC3#)UXO;%j6 z+eh`XmaH8bI!00~0SkPDphC*B9F<%mcT*n2 zdKGlgx4!5L82({O*(_;?iFIL&l@Jd%LHA2n6R#WPyQ0HZnRG=@(`e-g1Ho?FYd2?d zHvDr_aa8vSLP>rc@m$fo`O%o|d9Yy7b^r~M-2vnIxF zA|XvSS-zUd9*HGt*J~w4dh{TDGV4P-b$6^T3N2yq;Um0)5k96e-(*6G@0x==^QkMA zT-4}zFH&-GOMIM(y)BXR1ZyR&5#c2@qujw-+Z!chVJcd21iI;rk~cR`=D`zrn>$=l{A%G-MvN^>Zk|3RfCQ%6o2Asu7y2Y1_zUN<0(^+wRU-c^Tgs0Nr`sDn3(VdIoi7Jw@9{T3kjPh0yx_0iUCwA~; z@!q-9I^#d$9v~j8nb$1t=cg4=aYn*@OzCGD=DWo9X#Q-+i;5Z>Ysv=H`@#o-&t|Y+ zRLr$)=g+yzqX*(I$onY^}2jAd^w|oV`9q6T+o^+?zmZK z=i4eSW9Ox{HY20If(b3)B1?Jhyo$hOn)D@J&wgQwzu6>b^o%GjZ14>X%tdd_-+tfz zHEfsI53k$ND`IIPKk~K!pZSbaszhw++&O<|tfREHupOvGtVE8>^`ml6W=w|$?11s@ z3=2P9f>?LQIcXTZiB{>^yGSmry{))LaqXWuGJh5}z9%Ycr)p#T?9k47B`Kv9Vg=wj zlA>7|5$x5{WMYnU#n+tOy^nsO0zX)$>L|@eiD34H`&Kn_4+KgFy$ey>gd65ek90|K zicxG-Mz2p)d_U#hP`GvHlUIu1>h_O8H`fJjtY59!y~aw~#D6Y4w*2>(OcS@o{cXNg ztlwMQy$R4kpAaA3fJ}N#>!wXhTb3KkeX0)Z$M|6uN;@`DttXQ_ifa(!vw?XLvu+-XR_qgXRE+zE>g92tUpiP=+~;iR9wB7cm0DU1xS!XM$5$7C#@N5 zW5AZVl=!%U873N;!uo$8UfmWF^Zkabb}`Ar(~BY8BwyY6{eM2P@O#;kH~0M+g8m`N zAusrcdH51pr83BEUh(&@{`If_{8&nLTpnHe`DC$J0-g^*^$U<&G$Hiep#e~rW^ssz zJF%p)3}GnJT=MZ4h6SqqfVt>?)eKPC1lLt@Fl4u|hDSmZQrRaaXXhJ#XTGa!$7iWN z0|c~@XnZh98HP7fM2YrbMr5N4V5e(o08w|N((M`yZ?9fROs|*=D>u3{SOScF@kL_!D$AeX!m7lg`IC zSQl>RBwMz*5MNjC2~2?ZHT44KLO*QvNcad=yXsbswkBC{7vcL*n9ITz3SCfcmKP9vqAN)K^_=WgeLB1LMbRuu|jr3YU+Po)B>}@QsbqNBhakk^4+Lniqh0R}0iF0M1#Ds~1#39b zn?{Jo-^K>DsUa;QUGRV7(#=jn1;~$@viX&VA3g)fpL`Z}#FfH`FBjp;^XpfD&iU^V z@vr?SKYzXTqDq^vzqQnb*~*Z||~rGzo*St6D(Y3DopGdWltP9TlQ$Co&{wQT zv2bf~Yd!;XCN+PhzXAh1k{mcPuLgQMj7~IIeH;z}LFtOitIEo(Ydpws#1gRu&pw}< zBESb8!G{aTV8H+$mVVev@zlEl_eisYA=tRbg~G`xbV&JN5+X9+_lP1NU;@ur$k`xs zF;DR$;@i8xpH^@9L~UQ%>ukp)nLP)0R;6!_0~MSUKMT-*hrGnR{Ze<;9^=m)T|_S|WO{`T3V7^#Mkj_0~gHL3Qqoq_51@Eqns znaYvN%+4}{jO{jh1`tLs^L#f@v!&L{!A67B0%3ExFd$1-*Egwb3yS+dYo1^U{*Vj{ zhksNvGKY8=c(n>CnTsJ|e$?o_)bBnV7ht7$cECM2t_$$?-DA`*B%nu3cw6iUWZdby zgexg9;HqeTi?FWOB6Bt5pZagr0{gs=Rl}zOPK%3S#8wN?pc2e4^uyZHj1Xs%Vb|Ux zvy;tL;G#@oj~XVOA>|u`r)mLU`4$VVZO2I;2iX2CGR;jxrGeSC=dvgW#9eeqFs?z+RR8SXOEShN=jemZUyLdo8SI`TkaC zm-6`A2oe6E7^XJ$+if>ija!Gt%1HlBsC}8Qz|T5l->X!DXWF{m1&4rZSDPlCrl=7N zKnmefwb^60U9QTedJGM((=HNhfhTYF#4P-LiRfKBa}w!cfesv5DqT5WWRMspBHwFe zo6&wSuPoi>^u#&>jy7wB{aXN+vhdiG(vvW+63OGg?5(?LO?cuxXQ?N$kk`&(j$u-r zA@!4;0jKOXdET&3&1Z1s*5OtXKYeq|dv76k?)#62LFpZ5TKM4e_pOZPzdowD`q}t zM&G&NN&3aG#@qS>Yc1<)${E$?Rfra#dvx{${sP=cx|C3>Y z4C)89=&;zdlD>uaFx$>Xh8ntaTgQx(93S$Vn3i_FATDLSchQH7^IiS*lE_1n@tKo4 zNuw7m$(q%Y!=p{9k*w+4J82P+#)7d~t4%cxrtT{;t#=-6^zcO%nqO8&LlfK&t^>)& zbwmN4#p7`kDRwV!VT#tw9+azABj^AFMV)pxsE@e4B@@3Z$6OC>y`}^fK6mQslPG1; zB%V5^kFTLk>hd@#d^OX z@6Gdcbq-J58QeM#`XC&^CF^dJvHj6)ma2ox`!Or`%FbL?c^XBjGIU9|a^=&Fho|L9}bB@qCstr_!xz*huQ)l zB{3DXLol&=$%Uck>$O)auLS*o1x*HvzVg(Ciy4w_bJJTr9)c+D{!BJxNY4fC6PTeRaRnu@>A5SXJ?rhce?}H`28pmWJBcsghhpX- zX_{JSYl<3{B(d|_%Ud=6BdVST;SDHC53>#r2Lp%s$fRy~EAz6ul| zv;K)XqX|DE%y!p=l$L7ejnKfc-ViY8LyFi$;y%_=@)c$w$~N_j{yH-W>|9w$#5$@}Iea%>?qq@+iH||WdswpbY=(Mipe3%d7 z^7Eg{=0G=@8GH53U#REulp=j=R?^De{$&l*G)Z+0qlglBSe{`-ogvO%u+KcebRaG< z*#nKvL^wpf?{}Ju`6UC}qV&SUTW78v{FZ81NgkKH6=5czeD1Arhc|yxYbbFhN}{*@ z3txi7pv&a(gZ+>1suO}t?^=|SDH#S;FcbllA>qezEQI(ab!O&!vA#&R!MA5JZw56J zp;97N7$l!evhfdJnjnt4-=XG!x)*p>ek4~T`!^%XAXY|7D8}pAjljJ0erj43YU<6X z-ZeTiXLN6K4J`5#>Rwufv?!5_Fvh)Hy(rs1ys6n4xt&ZrtXE39p7`^yUY2i|xN$SJ zv>?QptGNxH;WFf5{x#n{48$In`{s>=Qrwe}44aq3WwHW<(Gv!=3lY1rx=hP)sS zGG;lhDD?;*&=4Onq^^2MZ;IT&_S~9fBHG>kPXZmZ!aKBP*yOpmcR8>U7ghdIfPx;^ zyZ;(jLUQbQq_&w5CH*k*Bv+r(#p7R3exDgFFnqS3K%P0uS%Jo)*Sv4C`Wa>mH`mlX zKZH>x;VKxXJ*1NNz?sl7iXsn@9Y20GUm%>JP>g*htK_8x6?d9IgPG-{WZ*q=94_9d zQS}g0&ZeK!OkU97_AQ*1RR1g5bHQ81Y6@jl(p*zF219MqNsbK>qA4+qN4whfs80fX zTCPePk3Je!9+i}|(u1CK;WBS2n!Kj;>{HXV}7t*Dr zP!UrW7kS1jmQQA@)8;?EfHzx_Q7b{%Agg)resjkv-^@Y8>!!?3v4g2 zb~(EGW)235-PEAQW2}U_dam_Buj3YU69sV!%3fB2r9nR5VpIpH+A;;4G!lu@pYyz< z>T7N9fKm!wUC|t&kKfFxr7&_S@-RZmqQG442~pN=G-?e^CFfAFHd)txmSQGCn-c#p zaw2bLe{(Cfbwe&Gr!Eo?3ok%c>)c(W*m_&F^tS~f#)=eq-dQJ!gWD4NTK&>hIyW-K z#`aVGR4)gb&U>9}zJ!~n*B~6d>9e)PVxWGtU7(I13)R%lHWx(c*dUAWZZ|~aOcf4p zb-D9{U4|#3RXwyMUnzu+redu0&#K{47XKcyQ<(PxCn+%n_5-!Q2rH6PpmEHP6ZcQFvH7VfzND*tzxgpCdw5?$>0?lK| z9hG>}ayl!KYZ-)C8n6XX=}1*e_s5gQt({1Il4);{k2WkGJg>tapLrm_cMml*21K`K zEJ>0V1qP-7UFh;$eNOIKSlXwWomiI{Ey0x=ae`RP7n+~Te3(_ag2lDg_Gwuh`gkcX z&UUCNue{(F9l8~l@;F)DJkNUh0Lqo=AszDvDSF@k*}4gUhP*t}Fd6iA z(Rg<~o0{i2%-D?KLgkB1+)U9>FONt!>Okz^)espBtN!(8xL>LGEFxQ;6HuT?SOZp% zOq*N_IH?5jm|R49^rb=HiFq$}+y$*ORf9MrdJDzQL3sU`8FvKK*N%{gwdXSPRnDk-r?Funl9zti>X<0yf-DN^+k^6)uX+9p{8c~DgknR4 zuH-j%ED)m~wB3Qll{_mqs%2)H8S90S2G7W|cS+HK(u@}sTF))E^%dM*ojVw!{c9uU zJ0nOFE|8NW4O4uu8%ebptkY@55^dg{AoNS}?)E5-biP6yJf}g&aVa@z_Wp^pEeVVX zlhE$Q-PSfn24Q0Oll*Bg23z?5*n7*cEYme?R1g&mQbI~Pq(kYFZV&}TN{|v2De07y z7LbsV5L5(F6j4f2xZSCS>M0 z5z6~w4iU;P{yfDZEAR=vG6t#{GlgA#9*_O4;)PgARER7ERM1GoPHb1>tIJ*B2|jlH zSg(LX0BIOLdAGj3Dv1xOQ;0s|%6O_E-}i2DxyGY0ZXz@yKD01H*W63g$HdO4Bywov z?lyg&?67~u7IYqm^9x^^C|tdkzY=Z#(4(f9hx{6B&L+O+L(Npt( zEey64z@ME0u|-w5ATN2!Wkk#;jTWoOpP30%3UET2Qujon^Pz6jcjm!0%d;^Do|-}W zt^yvSE*~9k3T8%AO1rU!i{{68G3Rwk7Zc@QB~8|{A*x&P--kDRLHlCX@;PZn@As4` zVkO*P9nZ2$7~ab9{%)F(Ao1y=k(tjSZkKab3(sZJTnz82ff1gc<)s_WB(z_V!CA50 zpe&c+6?lYKGB&zLS3*4!@B<9RPVpOJxe%l$IiIxMLKUGXelI!6bzMc5vt-DPVdn+7G3>{Eq(A~Jw_zUEE>t?|O@<#`% z(>ndrB$iUXTZPiMDoT#tj zLzRNvgvBlriLkp_baJL2Q)Cu3;mx%iiqeU(r5QOflBxg0jwgrDNAGlm$))tf^lJNO z=k#6?DEYQ`7mAS?7;rMZFnVfs@%lSS=EH)*xU~v5 zD=&X5b%!p}$Sb@={8smr?LrL8lLT`7a(Bn5-i{Ag8Xf&ceme3RDaQQy`|8G^F3~Ju z=}*7ND{WSBM9PSmIu@Ilg(txJbbtKHdoL{?=!bUxZHa>R|pcGmc0@A*!hwW!%T?2%k=JS%2+ zRgi?bs8Hy!)e-zf-{r0p(z+nhCuJ=eiPsCm$O>u}F4d=hsXfA!QoC)N$$=y9H-A;= zqib1ML(xaO!b=pk!;=fql#VaJTJKPkG^SR1GMZw2WgX;+6uV2<2rcFObr&k~uDM`J8_>QIr8&X^ zkx-I%Yfb?DjnDg!4xhNt7?QDO__?3_7{_q|*0R>bBvKQ+9CGj4_?^=x)j{s_j~*so9Y6dn>Sypp#*6tXBH(E0p*;c(w2Rm= zJ|8kNAa{(;*Db8POWpAFCNcZ3e#CEcxc8&a85&qs2TAMcesZUNu7Y37&+-6F_WwTS z*MR&si2oa#|E-(fmc##l_mq*1|5;t2jsCh+98UQ_Thn3kk&7Xrr6MM1FsdovYdm|5 z!$+>Wrr$~0%_DGQJglrdU}H} zo*TL`$2j+|!2xzq289;;ds~x*?@MM(U735^Qs%WG@>XuZXq#$a2Eh%$h)%U{=-+Q9 zOD#C8uDgC?|4-kGpReX)j$FOY*hc&)+Wvk1;JMON;btnD@PEM?N z{mMRr4C)?|wwU}EalWzUb@V=p72x|NPe2KsQnDz-vZWDyeBy3it z&;zwaR{%%JHE;g@-oqWm@qs>`g+ln0)TPu4K-cwc_!k0$T9V1wU^Yx67{=Om?yb^? zw-yE&bNREhpLP?}PIsN(X6BXs!{@V_`k%iS{i~z}J~;mI^oEqA0&^yz=eWi3 zvdo0>H!E>O779g~aU2*hrWV6Xa&L=2lItGoce-6Bb3IuKzVKCm={J$PusEn(E{d`K z+dE2Pt{`UWr(4&ZA*lZ>9zeE&>BfXuFnDOuP77n3HUsPOI^xc0v^wEOR z@Is-M#nteCpEu#V@I~^5+UiRG9%^l)P%HJ3(7&Ie;|eI$`hRC&D!Qjqv;OuhV5ETW z3#CXbELcHFw1STVuQ_6d22d$UR%FfTn-`0<64s1KE^gI5TO#lcpmr}$CUkn1{!1Lp3}fbqX?5nmOinUPPPWnI)?X4}zdg|2kCMqCzS)hF`RVWf zo__XC?91U;i8>cqLf18^o(y|7Fz%!}BIfCWig{ zs#Qat^Zy%||Cn>1{|(GPADI7V4vc$gr+VAo;m~#rOD>%9)3NLcp^pm20Ibcm#fyfk zSX#Ei)jj8Z(W>p!x=WiIy25{KUdbXtxX3Q$myG?Fi&hRc{Ao9ib2}mX5KaYdGOSK4)db1zd=3M?gbjXQ6g*K-=C@NDX4P1U1@OZ|NH;>l`CFF$v!h45 z12B0ffVDa%YhJqlIVNcwaHka2m_3jD^PgbEEUA6IRRv~4=lfyzel_lQSXR-hXB1I; zukmmr09Mq5p~t@{L~|+?bZARcA}D^F=*K815@XZ)J%UJ^!fpbIOe=&XM^Fq`5LxU5 z=O zA!SZR%H6FoiB9Mu+(X2AhpJ-&nSj?4QUwBS*38rA-0d<%S%{=31}4Z>z-7N4YjP31 zIDWcdT zFH-;doL5NU_p`FayWbZLH$T=L%o(7kiYU>-5s-j9BbR~C!z7xR4FuX{&@mI?09J`u z2O5#!;H8i7ef(8N`7#0P!X^fostME(^6N!XwH<(M>@+=DCJOx63Fu8Vrc$B?i5ik8 z1CDjEYi21(-rE^Evp~zfGJgx~@ei zihhpBA1jX-o2D#)7K=0tXCAe&mQ#1PvI`TJy|#uVv9aG%OT*WEl`XzD5*|>F0&ev4q}}F8JF{V;r_5~ z`2yP|-A7+{9d1zJ42pmH+c%z9hl{{f`{7@d|GNo#06%GebP)C9Tq;HPal06Rr@}|t zQNnag`fy%A`+Q>pbpV?Q{8)mR#u}@Rq2Mi0%pKzfSD|%t)+2*-I@Vo>Tf0Ure%!Kf z-@&~M7s|I&ZhuLh$Y^|Eu}XZyC;{YkHo(XkOTo}~0$QXhpy6-{PtygI4A`iU1-BaV z_MULFy$m7+>VA)MYRh(3xQuk}&@CVkIJl)2F2lTCi1xSoZNE(-i+~o%<{#LKKNfhh zf_Hp95(y-UU62zWj+6%V)thC1s9(CkVW|$DA6c){fam&fTJfCR^f^abAdyM zIQj+gcQ2r}JHbICsb;vO!|S(g zsR{!9eaD-qf2quWh}#FOD-Z@@@j_aau7Kg4ntW7`brrB&x1eYDqyw-RhQd*BCbDjW zPdcuD(=9SUa5 z46j#i%^u+>)Yw41Tk|B_+Wx!eUs7{@Kwyq+GrCt<_w-J2(c{x$$t8Wh$_xKGMo9D= zVfMQi1XM!^dr&VKTy5j_ZbeXI$^uO*dR5Vd>QB+m0N_*R^xFZNmI+lxk>OL} z1SF;a_+#;J2+|TAiP7o+yiepFRQMY;9dWH~EwrXfnyz>Ubs?xC9Lz0zQx1@oJO0t6 z5l)5LNU~R$nDoy>OgO0mwsZ`B1i|Ncmg~@@Z?@P1b*W4QWMddUc3irhqL5_4IjzpV z`~h>@fTP^kFR++8u!vM5cR&_7W{_NK5w#V!;R;trt=fJhu{!D&xoH=6`lEugAl(j0 zmqh7;7q{lROztj;(FtcX%t1Zfryv#ziKMSXuZ7y$1ajpJzhA9T%BH|AwNS# zQKdsyhb3Ti&09Ob`M^Ex(`zFN0vhuL7_cuE!4oBd;5Ebc@S;PzERh#>6*_0g0TbEb zN2I39!@&mBl&0mOle>a5K#aKP&UC$ip8l51do;=R&PPh_DhfbkGSVEv{#-#1GzaOd zb`Zze)qSiH-SczBVb7!47}{#F8cKsde?QOuW-mS|#D;r>q!^#%rx6qe&WDhF)c29> z{TrCfrA+gqn$)4RgHNFie7nBV<892ol=sf$I@Wz}wN!Xy%j*|z;i_+W65W@?G*I)N zm-%5)oR$Jd;gn)$$)5+6hu9?YpRzj+pC#=>R2qQ(tDu+>w?-=Ek8cT8`U(Jh_3E5~E77Wi$=-er z4|b~GdI7ja1<6T8+~gdVWFG=?Qd)>xl#zCwGV&SNm~|?@KMIm??%qL8TV5b@#fr z1}U0Kun=2?P2{cNbAd2scRo;JIC4Ka02MXN&t~^zlS`ezNc{e$ral4x`5Z`#u>_C9jtGxPf5u3T<3Nv5Z8!~(CN*$1(89yQF2yc`c*wzO8(7b&%+>5qznft2#7D7W zzoWQbs44u_d;hth`pgVd?rRXaHSjcp8T<_8{%yFB!&TR#bw>eAE`N4B1<=v1*Oo$l zgr!oS-1hRZ1DH*f+rZQxmHW<|>VEfoc;HEC+k~%yx)Db)>Z~(6{3M8OBCv-#rb0yaJ`bw3$F)^M&XI=g&ZxqA&{DrSf^R7%7cgZ?Z^c8X9FPFvKCh z-U2Z@rEi9n|AHiky75Yvj{26>Q`HLB5|?f;IajMd-t7?#@Aj`h2&8T>;YnX4RA!Gl zVvhv>Tan!Bbp$iG-XN2k2>`qGr87)Vs@>K>Hm-gE(UZ@O9qVr*tK>J~r4m7+s+|xI zr@S8n)OY>NR~UD`?g^oSpAy%*^l53+PthHjCb^Fb`G<3b)cbd3$@&qRzW_-Rq-Pa5LC&gx!wx&e8D3P&cuOZJhZ$fmCDtl z_(`9qX`v)kGT}~ z9cIgoECUuyoajCK!Be|Dk52Z#M@oD*NQsU}gu0#mQDr?2N%fBhrNSV8AH;E#J~xn- zC3*l7iHsb5ytL7FZKR9xaU|V-idkY^5fDSAc2sLc<=Y${Q<*95RXNWWpJKG?0kIO1SR<@L4KWPS?~`AgnIsmw7}~C*XXz(S1saW#|JiFS zMf11Vj3nacY@32IMB_{PbRg;Gghv=%q@Hd^$VV;$pi8^d<|9Umw27sXV zDib7U@C7Sh%R}0g@qIEIO9{)e+YpRuCLjz{tpZ_!w#e;s=A1`^yjQ+^KYLlNrqU1y z#MfM;Q%%jGqx$Zq61vgsJ0SHO!|@SrdR;G-Zkr0?$#yA$S@-CXq&k(RL>W5OVzks0 zfsQFRTTOFsO@o|@M`H6+s~rIZRYjUi`IHUMU9RC2BG+{$qZ8D<%d5P{AKm?C)-nOz&6}>n)%}p|0{u>xRn5iqH~%-1tmdLz>3Ubpy;VD&7eN6kjx$yvSF9 zHgiiLW3}(CHypDc-@M1R$Clnpjp6vadjvr%V-3Tx>xtyD`Dd^ywP=i)L8j+NxCrRWDICkcE&c5m~9Pt#K%6*}g3 zDHy*{l3Rlix#z`gO*uB#?veP!ImO8h8%)F(9>D(qm?cr9F~~;T_*@~)4EC15LWetu z>sdj_*y3wTc?+qZ0j1Ch7?lZj>b!XCD5!N?-U2SB8e&hGkP*HpA`Nq-Wm=+BILaX! zO%QDZ9=gjAt&JY4gq-AJUo&W6eD%UQ$QFP8$lami6ysg9kc1Ty!D%h+^%7TfzQXW` z&l=um`IFm?3gCH1yCDvi4pwl!Hb)1`w4IrH za%<*O&}h*WhG4G~j>`Bc_~f^{dXeGY-7GKQTyjTSW5^nhoclXzJh8&`HEzC_ zd=w(lV>D+^+Ex>|2r3kiAq(Igr6G)nF)}({h*pLJDiA$bX1da3&cW6zjV`2*8xn-2h3z;P2A&);ZKp0r;{Nv7jn_5 zzG8UQ3GO)=-Msm0;qGovs$ALj&%_%6u6&Q=xq4=Vk(lcZ3ZZZwq>JtfhNpf}_KtFK zW~9HC2g%r%BPQ4_eQ?{ig$x>(lph-&A6Rd3>Hr2_{1nR5#1{g2$o)5{Fp4dakUR-1 z0t9abvz$n2_Im?1GD7(M&ozyfQWPySO^V&zsEv&_%V1T3o0y`*MWC^rgi#fat*E(Ur_+>tSp~aM zbh)5(tzX2As34RjY>YRc&c5J~aQ<>CoXX4?hT8XqE*=ltG->J(KO#^O7KS^(Q(;p4 z8K20qR#_o?JLSzxQMEEd#{HnRa8lb+4kqe{)YGc&d22iru>+Ex>fctvUJs-?elG1k ziC5&MXiT$a@N`=EDfQUa+le)qYp(rxwz`v3+k~9@)_&7UYhAFBqk+SGdrOohpx(G# ztw3qapw<3KorlixnAS~`=QVP12}{{jl7|lX+Px5sNwCJqw+x-en;xbxTLvkq-bT2<=q>W~cL7b}Wmx#Es_R@abgvy-7S9$@TdTO=j zo9*qmW=M+e29jwK@Jw4mINu_zkP$c6UB2Tu;S5)Uayg#csSk*@rZYXQ5OgFU+oUD{ za|FO~KE2rZqeiy z;b9MSZwvJ`AWDhgHP<~!iE=K9>C8ih52@xGCe?<;1a@#+-B48VRHg8Oc5u`62^J!* zodW$bn<9@QYMVJWH4EdH8Rs_Nj4kNhI4|hG%GBqY#ax18&-vg$n!H9i2e7Rf^OsD5 z+gU+bF>e{@uI9FhuJ#b?wo)AmRWm-%|1JMn&J)vJcmXEjDuRNPVp1eZO=&H(9IUVl zvQgP^DhjkVdh;2yzewh9dNTjrom(gzbCD#kHX(~i{mdfr_ADmhc(ml_!wvj|34J3Fn>GmKSPj?eKY6ICg9u0-aI8Mon%ZA zurJiv|3yu!=jsdUXs-5vokpXbyPtasV_n|KFNb*$Bxcb2p5Z52A=KXqG+U%3~g|#X?#%%OJ_{u+BwOo!1CM z&5`GB0v4(nr5HVmkJs&0IT&P0&69`+ws#%olh&0H*0PQYb7L>S?RccW(xfJZ==As07yAUro_*?$t$+&Q=M4Ltyab*1p|$E6 zUi8Rv%Afx2(juW;6fGh zPbY52c~MF}UJ0sB@Vm8%_~c6!$_e;(&fUE2J#dO8T%_0Yix2%8MoLcY4l97P0-q)5 zQy;E&b17fX(s-dOC3W(K8~OCh+0|`|ZMUn-9)bAeCcGw7$c1l8R`^TKp+}n}dX^9T z@IyU)YJD_q(uwBPDp~O4t_(d2%^(lI6;$Lbs-?a=%q+qBg~_k#R1xd~VQYpDPd+qK zvgP(z$$NrOsn@kr!4*M04rH}`=NRBd(hoY;;wqO)kEvA`SbJ8ODMm)+VN&RZc?xz* z@N&`=)Z3$z_til-lUsxT#@Agi0zy==2Tvn+Q4uzo@C5Pg9DS}QqdSkY3^elX5+VR) zhHqU?{c+Wo*M#?&g89+997!udxmE#U6P0NnGUbfu0FM4rB*JGxjKvt!BwZO)Gh$3tF=q|RD z3+UN3^B6x8<&m*-Wn3S6R{<7};7neTgVhjd6qcA?W}WC!vT?7!kD*QAha}yA#hf;z z%MzG8N_hDN@hnHBFf1bVLfgo|1<0h{J|U9g!=X@>YWswqd?;FYR&M?wQ5CHqc(Lt_ zc@N)pbGd!@+`e?3yQil7dD`{mr@E=asgZRDE)1a15|GHYenCAQ>;2Uda_1i|aq?qN zs-4|`*-u`o?Wkt7qhJSZ1Kqx*&kTJQMgj6%UV;O(vjJ&MPCJ!7wK64_zZHkl7~H7Q zWJ;n)tVhhlq|m4V?B)+kw2^qAtSc*?MARBx4r$;;2Bw3j#~Kx8QHOBM#}Z_0UyO~+ zH`Gc+j1eVAisLop2MsW4Q2D$fjUmtlEt?oCe!5egjR8C#(k^vWdBNwh?Xp5Y;xo@9qj}z!! zOpAqDmcUz#uoK+mN$R~>ZHjd`{mfa;M(iS8?04&pyE`1OzxvkX!}kkGeZrBtL(3k> z(~-5c)$Z7KZE)*Ejc5k&3#vAR?7;{1#@3@gjxIJz^uv`;ICR^giaGDfEH8gIXSQM$!8g z%Yv|#(~xQt=(##a@(|wSCdoKlPfsa$ll@%^)Rfq-`q|^)GSV^yX6vbqm$R3A=3JDE zl(Z(o-u5|1xZzW-M3R0crOcApd3Nw<-AQ2_HHR&NGbU*PETOaBhLsF%q2v)aNmU*O z5>b6SOOWu$M*6-~Tiz`?W8r;Zc)4=!i{S^&RX79;L#Q*}(~A`(R(&q+P>VrTnuBs_ z^dM*RK*42D#J6u?TUP(UIL;IY7gK#zj_4+zYd5yE)QDj}-^YP6{(!1eI1L41>H+t; z_5JDD;#c+RpL~pVKm>*G^_I>bjXTu{5+^S39mG`8WQHOaqM3aR~< z6P_L4`gXY~iD8A`#EdX}7E!&RV(BgnMQOX$g+At4rszx7Mg-5OcklQs6Ix!tls!Z| z8Z9Mc)UJP+aaPF?z`yG|Pe@5YKrs~W zS6p#BA*xfCac;Qe!5uH24vOn$fmFA~9V4($kWZYr-mk;bW|A~!$ma+cegM#(s@r{r zui*()EVdfM6mX}r$9HjU&tb?2WMc`Cq^wdi@vuof`VM(F*y$b?4LZTpk!st7Bu$uy zoV#%G7(DrSMnN<0iT4+ygg#CmHJXYXU+02rwd>0QcOINDnU1oPU%?D|ec5@Nq`YopQGK!udaYmGpae1|6o(&o5!i-djZTj?L|hME z4#f`{a>4iIN#|V=*TbQ8L>#*$o73b9HV3dD#J989CiQnbPvIsJ9HULti7v}8>4Wmt zc_wbxk*+T!q}#bmE#tCAfhHo<7Lu5;X^5 z*KYyHV43n2rcXk6sgK@tNcbXT^{e-f5fzzKpYw!v-lnPzCR{bQ08wMaok19Sa3185 z66w-BzB0_J71ywL`4t4k*Nj-v-J_VY63qu$I3b)(?gxf8v4T=lUeE!G!)%56MUz;7 z6}QYyD516TU5GmwJr~2wG){l(E)48412;_0ihlc78yK3~>UGnMZMT06Os}~#}xa%T;ymmBsEzUgzsKmn$ zADJ+&f5Fd~I(_0CaUItxw zD?^!F#)sS!8x#|vay|;7QTOWS?u0wj3KCVFpvaBmZoPxFX@s~am+6eO+wMWZSEK{F z#|DQD-hkKQFmFNF%`{P`$~L8O=S+J(xx(r*5{xuHlQ?9HgGaPA34D*)x}aPR>yZXv z2&O4Fne$n;Or5a{0`b!y1(B&e2Q8veMGj|LVW`I~;U8JW^VvXhCDgrvX)5G0mt{s# zSN_m@<{Nx`(Fn_tB`2`HGe}xK&ZB(VkOb>KGgAi&mm$q5mGKXsZw`GNXXt9h$y(Ko zKr3e-89>9HrlOIFi?4m5L*W!<_IJC_?@bemumXIcNcJF2eBQJ}dwh=3_G>ZTwN{o^ z@X(NWcC_!wBP{0!%xXMDeFSfOd)^;qHMg{PZY4hA2ZF0sshn@d(_Nl3Rn{-uRaX!k zy!5ei-qQehq0bLd)UmY46V|=cim;nt-DD(~T6oRZJH}VZL-;1GKbd#`1IapqmUAlU z4^M|zpy-mh+zk}ji0H%%2Ek&lA@^7{UrfEyBkKuCq__j7XDZrCO{OJ|#TGeF65_e8 zLGIKz)h2NZnwljlC2q?H3-9zFjUuz9U~^?&N`8|pe9!&a;*5(~*zWwZT8zk7N2!KH zL)z@{>sduW+@Lbf?wZMHM)Eu*%`0(7iGtXS{S;6AHF*itGHM6o^)U?quQ z7Kz;j@1ztPadA^2m}h!PQNDP>x?;;^(M9?Ep@E&%BK?5DTlZKG5iK9%Z}W8V^o*0t zCNS>N<--~wBk!}?5l#JQa^R9* z&NO?^clIC=zdr|b|AjIy*``10(ca2^skI8|idGZejQs?1_3 zIPIsJA;+obE6xbq_BI)tCIA}J1rtad7zuq5(b-|w2R%VeKfUWOyB1jqUZmhCEc9i~ z9+4ieX+QQ&DAXOUme14eDq}R{*b{fG=&mokU||^|(C44LC1Y)JI?jzNnv7ZWP}@wDO_XDon*J1VnelQ^+xdQ#TvD@; z>ow}+b;}C835uXTBVt&OOth)(WNfm~0jK7@;T`u??nJo-xl{8qxfFT6hB+Q`X>Ye@ z7eBI=XRGaU@G#uNwU~bVByW-j^YO(sr3Jx~!aS%}x)5K+nG_Scw4i(2fcpKM75HVY zKhsh@eW5(irp_&5m8JhiXzi3b*};7)SkjMN&S*!M8Cja)yiTnN%AI$xdOu1R>-TU}GK%wf#fBcdR{UN?c<|k~cF71z z>Z9iyWLv)~ZB~0ONAeV$tYVyZcz7sJB11k@;%F-_`H=I$hsG;3l$Rr6kDq2GS| zQci+21QX-(S2Aite$ieN!U}9#oxc8=#*af^JP$eV%*gGVNh9Chm+W1B^(fcZTRi;t zuZE4?#&zoI;7!JQOyBm(*Um9p$L*BslkZQu$e#0n)Kd4GOKR#iEeJs)D z-lvZFMPXk)&tR!+-&0rauL1@jq$(C}MonnR2yq~}(`hnZrBEf&cBJb|eJGtiNmJRu z5~;#u9HlQs@?APDc%JjOsW%r!;CfKS6I<3Wc`n{dS1pJXEaVmI4m0tE6gq$BE^&ZX zW^PYHSRhLQ1#%GXn@|lD=&wT{GHTTe3;Xh7Drj)pm}>2pz@7O$b%Q&h5ecmifd>z3 zCurxL&Uv*)6Y{C!?WG8T*+u+YUm@2pxTV)S7=l9|60kN5O~|OK7u>wBN|yZVXLD|& zjh!7o&Aw`ZOD(K{?f+ikqTCb0jkI$L7$zV2d_*?eR!6Ap0P8t*TI~kMif2rn`W}pA z92Ws{ZIi{6A(SA+45I5);ZrsFt|=xOyPz^^misY2qV#xc7ojEF-tZKYbtrCK6lHf= z=W;dahe~2rPhqv68Eyc#95;^-7qasm3BG1Ru_P%97u~{X^^fu_9A`DI0cb00qQs-M*G;eNZV`+iv3<24}BvSA=O#=M}ZZ}x2nAT96H?P99baX#GN zXP-MC=m9O?;^-o(L7$KJt0b3RP@iNeE?di>za7N@3ZL@lx=;~7`a`uQ{u-Ek2_5pGw7rWyC2KBkf@aH#(_R#{!|~pfXzBwu^e|cn{2<4{`^nnK~5GlAA&&QhB&a;izz1 z{D;tBzlB6oGJybm!WTKw1JG?tVBUAO&3w@m>nIk!X!dCw{@eQuAKa-S=K`_Q=Ou5q!Wg?o1(McV#vyqovk5VIxX7Hj3%PnBRknv+kS`$xUYl zCrQI@ogz{rEMu9p4X>(RBIAi~oH9$I?$!g{0B#ATp05)je%3W*kzbba?GG= zB>K7YgsBv;l0N+qnoK6Ea$LgqCy3dF=x9W7H9lA@K#?zjnuwdH??luIsS{Ed_pd## zf3Bg~To4~0AFPyc9`A^c59*r4Mck2lf0Vt0K70$ngiqt|#Uf|n{Lg&=Bq^kZcKe1t z(OD&#Ix3!p1$;Tl+Mp+*ppQ2^_hAORAyo1~OC4RP@=ixxdAzasq^(JCAVGs~xl+J< zsH|9v-RTwai9ZD6#>LUW<(m{PM!0THfk1!6P25NYH_Q(ETMI>sZM0(dJs~Hv(+6F0&kAdwNC=`v}Ik|iPs&UhUY+yC;IW)MD-337#A!P2TyRpyf# z;vpq`xW`Mb8Quwf>OdM$^IJgCB^TaUCF^99v>J ze2nK?C&DIIY142IeLABN;*sDy2NJW>0u%w(rhn$0z8~r4k!q0!Bh>l7dLNM++y71N zdk9(o{+1>x#x@@;3re!Y7=Qy=>Sc6=|1?W$uFk|8bKX% zc`rY1Zkt;|Dhm*+|KvFeM^zvrlhQ~b0VZveMG?`K%Ck3Xr;Z)DO!umLBe>31Wy4`G znAzOs&HMd4!_X#G0Iar?)gp6%jTX}@r1t-5iL(Qh7lm$(LE9^ZSvYLP^A#?JNsgV7 zztg6qvK;kRDJU)PZ%+TViQMf!MVEg&w78Fug~tc^DH zSnu)lH&$1k480C$Z3D;6gqPlO@vM1g`%L!wue_ujYORrPC!pZ)}!tPw!~(Liyo%)njXphzUk+T}%}^7q}fPzUAdB)*W=C zT#J*m!OD4yW96gD*UWDPHbm@;)`lC(@W}IM^zJb)@=wwJB5F zSru~^5I|IR7G`6LyIBl`Q&b*8gwvP`9W1hSspOywi4_juXwS;X`Eflf_B5x)8bTjh zfs{`Jl`p7Ac7Bakt3>LAAR2xnOCR>hDu-1TyE!n`r&&WyW7Dig#`M|&so z{Is&B3B`rS(p|lJCXcBfi)v|6Yncgu;Ek|g?@H+S*g&6O}6Z#B7DNGC*h`7|OBe2=+nu0fW zU@@68V74?J(KQLI8g*Bg8hi3s-KS;m4pL;cdM;}`&-46-kCC`AR5!Nu1uV7n?tI;X zj`4ky0~Q69eB{AKb~0*nWa_zT5xb@*@gz1o;>yl%*2sS#o~eDEQG#Hsuml=E^8}1b zYfhf-PZ!U}N>rrreg6fAfz)HRe$CT1Oa~L*Cg+tmaYI*%Q3kzankrUqkY#l6>^JVW zFV3Y0UeMlgNX=?cx6MD)bH7zfU7Ie}ajxd^0@xc1ZqM!R%(-)n8a|*L5(G4h{p?gR z7rChO&6Wg%+)Bf?!z0L2S|Z+dR(Q}u^yVT2atZ`FoDInP=;W;K@FeGIo%L3Nr|4H6 z!(F&5vmpO{(J4(6Vn6g9aC!G{H`Fu?59-!+mw9YH1knGfxygEGk&o>`GyQ!|VdL^o zx-Nbkd(@@hTUs8rBU(JyyNNs1vfUNE%V}w&nqhMQgDvLL<$KFf`!LW;!jwr;Va);` zN{?G;(PR#eW-CYtlu-@?g`SX6D_YF9s5f-fnPl%iL4?B;MlB{>Q&j@VYElW^cO;LF zd#csmHjoP3S#u9WgZI?ZGNkxIvfLXeJ0Taip>KEr=|^P&<44Sh*e3zoMBZCiTLVFF zgvKdngGD+{*-LMee<4{H3o5XZx0}Sq3XG zgzym?UAN;f$*k@yAXm1GYkHi(e(52y)j7FS%`6_J1|UxdI5Nl5>@uGR?VH(Z02$^@Hworp911TD69sQ+V7%D`*EK!MDak7`PO&Cx*Sw^E}>~oF}m;E;S&0o7ZK(h z--E8~{a=E4%M_`FgXBoutq?_v+2?EW@E0-R$c>C#DPQUQVxf zXyBhywa>@pz~DQ*g69HCSh{1J`w!tJx#_q zCyMXBy>w@l)U4#o^+uPU`&yg$+1cU?7HZ`ayflfNJF=mqMBB!z zElCMG>#4ggW!Y-U!j5HiCM$NDgS74ju{|g8zQ8>;X4f06aDiYXI(6%cPPS9=9Ks%= z_Tp02DqRoNXH9V^^>Vh(U9}La{d}Qx_2(2mW}r#a&-%nq@?&sdOqK|oVMSb(zXyz< z-c{c-_jCt$chYzkiRAS{*JHue*wQnw1A63IA|LaO%6o6sh3T46GGcZ|2^6y|iIfXc z=MyOGATJ#zmH0MWr~Fq_JpG2Jr|EtU{}CK)mZG*R6Q_Relzl$^hhUT`o&F;fyTjn1T?&I{*rK3eBYsMCf{K zA%39*Kliy?)zSwMY#=F4h#GpaU?Mfw!MWCLT4JDmjrqqHrk%yKW6`nXJ?8)C3aHq^ z($=%e>U{us_QF>N*JK)kiWhO~Oj+PjEolgkGmnnWc( zp?tfNh_djL65`2#nqBYJt)Vo7I=+g>=4$ijg&`;cDC!t_IL>&~h0#g}3>QT+sWz<0 zHiVimI>72F;Q0J=@t!)&zNNEvf$}BK&-H|jZz=6_8&{ac1K@AX6Aa;?u*i@0#-bo* zZ4@Rw=4&ctESCu3$sBYs4_~N8PFsc;l*Iudfitq)Ymn_v^Tx_*cB7Mu+I{|={w~Ur z>2fGAW?$#MPoSJRUL1p9r^tI_tmHjNRZ72s;G+Wxl;?Xv4Zwb%3mjuYlGHQuRJPm5 z5v}to((GSPO5YC8PhD@a=m-<&k55l2Fs=KDYXBy5tai$KqXvq79mEE zBkh5M(HSWSxzSw!{r#->j+9oMcf6O!+cWH`E?s|lq5X;{;Ll7uA@0|2%!ZS0SLjfs zK#%cl2iVgOA%77#M$XTInq0*Loex!&0nVlD3WsV30JBnS!zdtvkqaY_MT`~qX`o@K zFL3!b72Fkub$6d_@z=@iBYtw*rMINM>Xfi<6&>787Y@KfYj!<2(M^XflO{Wn;N5zz zwWN1qy5Bv8Zsu$Z(4)CxuG;pwp@h=#lZf;DSO3*~LE3X_)wfsZUnng%VYYMnCblMrJ#9B*xEVg z=f3YckXd56a^i#6uif`!C8OVnK}R8Bq4}>#|Mh(|ZIhUo4Nt{yZ>ayc`To2D_oB1A zSXeR2z8{bN_@=-9j-G*}WO0{;#_q2p{G?IlKS( z$t;TSLJXG8zrO3YXHM%nfE9DeC#`8aM8AFD zpM#mk;FG0vRsQ$4ZIU-`OOsj>G7 zF}}u)y!AGUe|$dvr|^88YGL8Oj=SF;G_4p`!F_A-<$oSiRW=yYLahwbKgZ(tAAlTz zF*2HnSNhNEpz|;`i@?l>ak4+(^Y%E1`aphZ#*Gm>^tw8Jc zV&-Iu=f=b`V!c8q`;nHI)-D=%cK`d>f^#+}D!>q`jtMlZ}d|+XpU1OHI$E21O(mYmX zZ(mcP8WjS^SP}U;(1C`vU_&4SabB;|5fcKx0Dt zu_Jp+GWX@PH#Q+0P{@!AQ$nsQdQcj&9_#tFlKz+hVK|1JR_DXfizyKX8Qa9{*^0pk zChK`XHe&Z|&23=Q@cJ%5Qes*F=+V2`gVGVi>*<8R@jfm9cM(E4n-1c{d??O4*N>nA zS1<4xI&v?*=m68td!8##jEDmlt+AeDsH5r=GGq{@TKfBO@?8Q0!^{bDZ_KrQu$d4I z#l`XFK$*wV;bHhYhC?By2NnRnki6*x3FUA%;!L3GoD~!S)F7d38nb~W(RvTC##42; z5UF8(TL)Z$dmj($Hd6xK-?0AOFyc2t=iSo^80jidk#TC`r@7Aq%~D52l1%& zMMiR8v?vXHuNCNku*`bX^$iawqPcJajl=O=uHFtnf$ZL5HZ0+PlJb`1IxxsZe;gC5 zfk+o(u10GWWe)nb@i~(uFAIxAN>b8=U|wGdT`pk+L0y%abgwBG zF-s96WKU)tm<$OHfVs%R=ADBu-wGni{HMAt%xhoeb7fLQUF_6uFF;lDV_uS&+pX)L z52E4x?ZTZe@b+G;BYCxV76c!l>yphSF9W8%z30e8XZF~>CDeIBDFSs?jx#deL%JmC zxG3cbBP0VO!Hmb+To{-~@Z)(*Yca!xKjeXfquQ;3ms80rUPCvQx4Zh^$PI+T{%#gz z+mJ!8VQ@I~1RqmP`FA{ICM_nRz@^O-K_S2?dn$A`27%B$z$C9VyLSH$BA*t*!(?OZ zKbVP}SDTZBUWjxF{+4p1*D1_`>-3V^TPe8i(_S7JeBh4i$+(zxN<-+J`n>-Q#N128 zM&Bz*JCJz(%v6%XZo*k40X`xqPXFFT^MpcFc>~BX9f%gVOk_)JTe+fEq!1Fh=mqf9-kzab zTm0}yODky?uvu9M=_|37?~HG(nYvdK`)vz-HHAu&#H(kr==&W>bWMUIb}b&Nr;3;6 zdBD0=l&7?nA?LlKkO(WJB~{d_BNL@p%gEmCP^5^qIP5U~s~>Vo*nI14zX(s|Mi0oR z3}c^?FNPD;-k`k*kkH~Y<-0pBUUi;aFJlHu&5uj`zOE#_E95af%v)2$0M%rty-5u5)*1xQMNMF_ti0@n)o;4a$`Rnxkyf7`LA)Gps zljeb%5=7IvvN6@V9k_O3H9h-eFD&=6Qp=}g{_O!hip_jdq{pSN`auJA=ssTmiw z=RY&dpW{CM(mRH<^r1a1dgdl|V;~c%E^uid#-kGEPbFcCR~H(IIsPPwG%LxWLlIGX zjbcveEB|d%FQ2P8JYrZ`9E#q2lB;_a<5hq2$z$-M`2B!QHmCG9ai{1?>v#MkT9AEK)3$)L1(U=j<>DSqkU zbDaEeBWVQA_P=b0G)+ux76B#gQuNPliZmTY$48(7sQUl3cb!pDAj=wXP)rDtlq3#| zk^}=FIEbSX3`h_Ok`+OL6(uv|Syxd;Km-(tBRL}qA{hfgP(Xr6R&o#!Mv|mgJ?y=@ z+<8CWIrqG?{#0kCySlo&>Z`B5hHF$6y^7Zg#0*3t(dJDls(Ex^H*_{D5wt1r;P(TI z_hBLYgx)~+1?c%v1vJZGv>i1Mp=&s!D8LW(_%HrwE>S}`T>}uW?o(5F=xvmO3rKCC zEF9t&G4vDy?DCUTeJsSz;y&!^&IV|vM*~SH$iz%5FjS&AB~0e3{#6r97KmWfu*-$w6zaxNYczV@ zh1rH{_YoB8zWQ_h5bD)K4|4kcAZ?xRnFU^C^!yGFkt!6}@xD=jkGqD{$0k)!!^xlH zzM=!W#v*e2BEl`oFg6g@w%+~-O+?g_7miuUbrw($>SRy7i+g}XHA;}p8jwktqjQmbYp zJ^}{?KL@xy6VcvUg!23uBpc)kr6$S^3@{1m2|A)GN4moROG-e}2pwQ}IXeEUCWO9_ zA)c;TWt-Pq7%;860-kyCECL$ErR`ou=RCJ$f4aMJ+e-JOJ#0>lYB!l!-pS7JYu0_` zB2lkw9yDSSmI3!Y34xf~m}T5eJrtBgD|p!H-#KxBRg8#R8*DZ;sil56q_zt#&jut= zfqlYjDUQ9zGcKrIzEA}ibPz(K;K>}ZJ}s<|y`epTMSa@Uf!!BNz3GRbDhTMhOJx`0 zTCq1Pore>?0m=|TYwGvif||>6P21e(qt5T;b6WU zIn9;pjW9u^NY?NEhs?~M9fK`?tn^geu~%Y5I}8H3)Q;<0iV&5(xC+Mghn)36D7RId(aPWHW0NzVzA&6G^N@f)jtly@D$Na{E(fR5c;LWtnv8|WBq zNOyI$N9lsq!}mq?FJv|1N^c9~!i=dm#J^7WxJx&m7Eu3=Gqn^D#kqxhMT2k9W#H>G zF$!dcoJGGuQw)jZJpnOE!S6Ajx@@%_AMS3Y#ymgA*s2J3*_mCfd*LptOJiVdMDz>$ z8Puy7p)S{{XxyXx5C!4~Z6U03YH0+ei;x+vWXXK_w`zYsMeCH|&b%tsatp#?q6Nn% zII|8pUIop9GdI?59?q8ROndTb1HmMYe7os2L~$n}KYcV%I5sw0rCWSo-2)|d&{C>Z zAU=%ravHKN8zzepeCyxxuQ~s9T8xSd_}JlUi?dKfc@hKK3lC)AiCZb#?l#R(dabLt?QqP_Q9MGd4fX z8mSCGyNMnO;gHaiU7a)dj2iMG1+V0I*Cn@lM2;VVr>@ijcM||UAe7l-f&?o)P^y6X z?6pid9U~$|S7$oeq4?+)Km;ta6hgu>+hf3C;^5TH zftwy76LE{}^<0?cRUPXp@oI&$xu8i8<1u1%@g@a`(uU(!O)7u0Bt}$Fpijv>p&pO! z+%Sd-xbvNcrPKZv1?8{N*!7)+SgLk zu%Di-uZgcB=|o6-Ky-+|iGlTugw?vg!LL%|ZI1CLO6t-v9TV@|R1U(}k^tlY zX+xO902S&w+xStVr(Zs`vQ->8;Di=Stoo0CK)CAEKcQFJjKSKR!>Sd$x0FKP_^{qScWFZXJTOKm%?||qzw{$TvvUjakxLV-_w!vH8<32V5(l15&lh^M$%0)eS@ocC< z^(Ag_D?I~A#k4is(z5*S_QN*v4Am3Yphjm2CE~-yos5_i;m?$FW#^@LF-)<3Th!Q5 zq1=2iihEC*Cv|LfXhqU-&aP_S_(;sfoC&!2!+_XOq?EGnj}Mv^r^M2K+gy%4ng1e$ z(LG9^F#SCeZ^r0;MCxO%aZY%m>&cWAjPaaq>G8P~>Xm{&i0NLIDgrqw60fR6n6I~8 zBiEEDru9teKyrsgyUTh96EM+CI_JQneoNb7>u_pNm+gdP49}dv{m;lX*IUmj>N7E7SW3UH5$0X#1n&`%MCYkK4lVDI#AKl+j zev&-EP`ty{=DBRfUUkxOqwtl3UYc>3TZ8|Ag(`|askH}SS!Lq`0bAG~&9&ueK8T}m zxs0I}$PvFF1WD{V6BeB5H#1@Iy;ELMEJGVALncHQD?)4uE@tV9%1#YO`sl=z+9wmN zgGJyPooyk6c!H>wfx*fTPN5&{1W_I|za)ANDO+Z=C^ zgl1`*%bb+p2B;fS&Gv=KT)teF-CJvud7D#}9Up(%HnNte#l#XCfNzOze%cmZ`^3P;xy8mj zx7m&@=JkpV7^y#BUH~#DiO~zay9tAc3;LtNYoS7IQ)bDMtMN--9MYIUqIm;NZ&@$- zulwpK4q8iH^&2G%?>VPKHy)CfPv=tr3DW7U0!#*H++XlSC&+5WepZ`j6~A z%p?S|Mfz8~UT4;x6@&1r%H{4qkpODhjg64Cw-gTB0jc@zRj*NNlha60Ht|s5PP{-! zRI}{l)>H3$YEo11?Oo=a(TV$Wa+FLzVBC+0hnbw$4NrU;mvfxDnNtKcX1piiGz!*b z1~9Z*?wcIohiWg|fD;y*z(wCMYyS;(SeFqXXED?VH9+f%9WI}VtxkbsF`roJyFnRE zF#UO}RawRYx1*xz6woNouo`-TLY7rU&jljeF4ao<9;VXr4FfTXMo0xckrI0i$@Uxq zn~@s&34Z7JmM0~b?^m==n8q#M_Cm~{AGu!hx!KUq6tC{y%_hghFZVe1n*F-q*mR`w zmKVnKdo7=aKRcH7tN;GrKRsD+1s;4nP$-XF<2n+fK5-3j4XUbTtV)0cGeHRdS&%p@ zA^a@3!}yU|1LumH9ROeYZcP4KYuz$BWt@Nk$bvo>{!3y63FO3=I*I<5d!p#=4 zXN$+E`57`?W9f8khf*55|GE)GYLg@L?pCBj$Xt44+rEyn%LEv>OdaV*Iu63v8=gq*K$YKqR|f@uUQ`{K$qB$wj+VV zoONqHO3Ypn)Y-H=QnF;dC$tdIrapn|Q1G$Cu@3ruwvAvDi#IFGvO2UWrc-Y-ODdUU z2WS#kxSTM*SO_j-uRlkZCRN%Va3gjv2^~z3nUG^P+tCp{BR;VNGa(AF_cc?W1@a(t zNHA6RATfW#8|TKYryCFV)Vj~l!if>D?4^u!2e`ZS+8M5(V;klEaHd}^X-V2|Ny4d1dzoLqjtPLOoOv%U z@ygn)NenYE1@fgn-n)IOA|!|J#w*0pW_D5rEN-rLfL?L=`k z{E1D4&v=fgfxb4i(1`S>uY$7s5Nx!nqa81#>P^{&bfhY(`h*b`4QXvmzGjTQ7Wk?M za7PKX(eJL%=#`*%hp!K$sVt1&@@^5jD`129Ab5gLh~X2`e(3b4bJavToSfluvK=2p znc3-kyW_e&?(VibQ6V}S!wVF3LXHzAJa)^z=^cxMD*PB7I)YH$QSv)eJ1GMvH@;g| zLHO5tU ztoDT^m2$CZtbIsg!)-k!!?>c`pKW?~_X7))~`+0571Mb9W0VguGi^EFxf67)O zf1NM*I{j`hJwp+f@H|D|$*t(2WrkR_lUPAffBnZ5x|POe;w{EtK`vd*i$XSO8GcO_ zn!X&*=iURte$*4H^}eOUsON2qN(u=pq-^V1WMTsJO+)hvj*N2s+9wE-2_TGQGWi&)i<|?c3{E|e$;RCAP_;JRnrNRdt#^dH;BUMj3 zs%$dzvZq#RdgqRlFVOetJu+CRIEGQe^{b49n&p{_>-3f180>D>`@j<)l^R5P-tXz> z)29UPQ|saGIWE|w6pVe+-b83fRL>mc2hh3GpL`v2BlgXyuP%5K%tJF1UeeiZHq1N)bU zW*;T9P={Z1F~WE~%V6G0j4+aS0v@P;ZqPC+otSS-#e9e#Ij`seZ63#-ydA6O3USG$ zFL*Sm=`A*^3U^SnUc_T|_U6JHRUdO===`2b-OMbRz&c zOv$;MPus*CuX9_wtz0@9 zt)q>YDCv7T>R+^FLN_4N73R&W7g@Q>+HgVSOSR{~C$u#JjfQbZvdYv&qyO#3G`Ev zIso^s2OK;I>!_&P2a#49qX+7g1bDyuf=kx^x#*>#Xsd^OP;$%}{Uoe&t-=XYhf659 z?XhnRDAE!#)0Tbd6#MTUT3q6Vn3gwufgyJr^ftHz;eWUwntSD3R&Py6B=ehPSFGR3p66n@p*iofkdkOv}u9v;o9A#?j(UQ8rp0#41 zPCIKxu;kqpbm0-w`Re(jAzFg@Jw<6rLduk%d{y7lXsIl)lACeDCc~+7ekimzLK8>fIv8`uCv%i@C45U2%K9kdl z3RB6g$ET5?teOXj4Fv!W@Ag&1A$?0FJdU9nsOHaSpc?G}VPlO}A|G|tAh2UEX}46o z;~MLE6JLPlSFOskn;5lm)^jkgrTfJz`8~{zSE*zG;z#yDie}26a_KEo6VbqUjpUq_8y3NZ7RoMWpCQKrSfR2R8WkMazb)2j z#u9ShYf)qs} z3q<49eGUisOLOUd^J!IsZyQZ$_g?Q{08m42GUv#he#@*$>j)~;Ae94njFx&p4Xc30 zb3Eo|k4Y~}gq*#FE98Op#@_=b-zP#ZNgSeixV*S5|L1|4k*<;wj<@FO_owxh;j7IP zPN}SiymS7s!=$nFl_=M;{*`VU4FbU5Rq9#vTLtQPh_m*!m5Kbzz;NIM?8EZIg5eo* z6(9uqW=`+5tltG0ueiihOs|H-X?+}Zrqsym7ij&8Eqo(qG`@p2sr)>kH|8g;SMj|5 zD$eaer1EaIq;Avg_Q++3RPN5;NSjn{j!5M~>3r0~=O?_kGWhHl zU|y0sd5pTFSJ!dK;xM6qr**%~6#Y7plM5VWVtu0r&2J7Cf|AFBY^PP9TKS2(Zm`83 z1!6w!j)AAZK&rm~k$LrasAJYQ1Y4Bt)|jEmBKnEntzI1j5Rg#Ez$|81f#x??p^kxn z7WbdUU9|`C|A#yGfz`y)2-O|kf7^SdPJkKcW=BgeCo|tpfpsXo$ob8vICMApOt^Db z&d?hk8KMm8i9EBr^9fD&uhW7Z8|5oU`zW{yCE4}_wri`H>VNH&!DKiK)XO4h?@1Y` z2ii2;Iruxx-TwU?Y|6xoHMCE@aDcya(dcPzJ6ANSe+3n*{|EUD9Byq6-J4gC=hX+` zVHnj|awvtiF%saExq4{g)(XbF>LemY!Kh}=y_;LL+SF?Y=>1?wnMjw{v^kRMFe*3E zes`M2fNFrZ9km*Ow$gvhC=o_=n8Tj-8Ptjl`OotHwa)*g%UgQ(>LHt7JVV2`6jHvk zr*Paq*%unOfGce-Y`vNUy5bTXEQ1FC=#}Hx=CgCPPp|kR{syosZ1z4Grs>)m9N?ZQ z@8WD}ewh3cTx|1Nox`hrkLrynSh$%(9!W9NbY3YvaKM+PDYSR8Hr&jq`-A>MomTIt zwQ#*2+@?20b4Mll!miM^sFz*!sg*I-nZktDu1SshkNtwitPRaQ8C9y>>u64hTO1A$ zQ`08eF^nkKLi^Fl9$I_R8?1~8=Gm0yO4AnSl)x6E2P}DMPUy-Ln9vQPHtqBBS1##) keta{c7ys{zOI%*(BoR4q-p##`4*r}}Qd7)0X8Onf0QC$x>i_@% literal 0 HcmV?d00001 diff --git a/docs/diagram.md b/docs/diagram.md new file mode 100644 index 000000000..c7d0ecd3f --- /dev/null +++ b/docs/diagram.md @@ -0,0 +1,455 @@ +
+
+ + +
+
+
+ +
+
+ Manylinux Docker container +
+
+ +
+
Test virtualenv
+
+
+
+ + +
Linux
+
macOS
+
Windows
+ +
+
For each version of Python
+
+
+
If tests are configured
+
+ +
+ +
+
+
+
+
+
+
+ {{action.label}} +
+
+ +
+
+
+ + + + diff --git a/docs/index.md b/docs/index.md index 6cc7ccfd5..897eaa10f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,3 +9,14 @@ title: Home %} To get started, head over to the [setup guide](setup.md). + +How it works +------------ + +This diagram summarises the steps that cibuildwheel takes on each platform to build your package's wheels. + +{% + include-markdown "diagram.md" +%} + +This isn't exhaustive, for a full list of the things cibuildwheel can do, check the [options](options.md) page. diff --git a/docs/options.md b/docs/options.md index c9d7b7425..baf4bfb9b 100644 --- a/docs/options.md +++ b/docs/options.md @@ -783,7 +783,7 @@ Platform-specific environment variables are also available:
### `CIBW_REPAIR_WHEEL_COMMAND` {: #repair-wheel-command} -> Execute a shell command to repair each (non-pure Python) built wheel +> Execute a shell command to repair each built wheel Default: From 960b069eb91dd122fcdb2e4898d041b068e8531b Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 2 May 2022 11:11:02 +0100 Subject: [PATCH 0084/1105] Add mobile/touch support (where hover doesn't exist) --- docs/diagram.md | 22 ++++++++++++++++++---- docs/extra.css | 1 + 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/docs/diagram.md b/docs/diagram.md index c7d0ecd3f..53856cd11 100644 --- a/docs/diagram.md +++ b/docs/diagram.md @@ -37,7 +37,6 @@
@@ -260,7 +259,7 @@ const tooltip = action.tooltip if (tooltip) { - tippy(el, { + const tippyInstance = tippy(el, { content: `
${tooltip.title || ''} @@ -277,6 +276,21 @@ maxWidth: 'none', appendTo: document.getElementById('flow-diagram'), offset: [0, 10], + onShow() { + const stepEl = el.closest('.action') + stepEl.classList.add('tooltip-open') + }, + onHide() { + const stepEl = el.closest('.action') + stepEl.classList.remove('tooltip-open') + } + }) + + el.addEventListener('touchend', e => { + e.preventDefault() + e.stopPropagation() + tippy.hideAll() + tippyInstance.show() }) } } @@ -329,10 +343,10 @@ a.action { color: inherit; } - .action.hasHoverState:hover .dot-graphic { + .action.tooltip-open .dot-graphic { background-color: #416EDA; } - .action.hasHoverState:hover .block { + .action.tooltip-open .block { background-color: #416EDA; color: white; } diff --git a/docs/extra.css b/docs/extra.css index e3599627e..a971d3980 100644 --- a/docs/extra.css +++ b/docs/extra.css @@ -3,6 +3,7 @@ body { overflow-wrap: break-word; + overflow-x: hidden; } p { From 99d6c378dbf9587555424f68c2c596750dea12c7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 7 May 2022 20:42:17 -0400 Subject: [PATCH 0085/1105] [pre-commit.ci] pre-commit autoupdate (#1102) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/hadialqattan/pycln: v1.3.1 → v1.3.2](https://github.com/hadialqattan/pycln/compare/v1.3.1...v1.3.2) - [github.com/pre-commit/mirrors-mypy: v0.942 → v0.950](https://github.com/pre-commit/mirrors-mypy/compare/v0.942...v0.950) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c64525eef..da8b94a26 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: # Autoremoves unused imports - repo: https://github.com/hadialqattan/pycln - rev: v1.3.1 + rev: v1.3.2 hooks: - id: pycln args: [--all] @@ -49,7 +49,7 @@ repos: - id: setup-cfg-fmt - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.942 + rev: v0.950 hooks: - id: mypy name: mypy 3.6 on cibuildwheel/ From 2d1ad70d06148c8dab0ded921d41f012168cacd3 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Mon, 9 May 2022 08:27:30 +0200 Subject: [PATCH 0086/1105] chore: use bot email for dependency update Pull Requests (#1105) --- .github/workflows/update-dependencies.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index 70f65e2a7..f9516e676 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -41,5 +41,7 @@ jobs: PR generated by "Update dependencies" [workflow](https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}). branch: update-dependencies-pr + committer: "cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com>" + author: "cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com>" token: ${{ steps.generate-token.outputs.token }} delete-branch: true From a37367fb86229608e62cab8985c1b1eac74745c3 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 9 May 2022 13:31:47 +0100 Subject: [PATCH 0087/1105] Improve the touch support (tap the tooltip to follow link) --- docs/diagram.md | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/docs/diagram.md b/docs/diagram.md index 53856cd11..19328ad54 100644 --- a/docs/diagram.md +++ b/docs/diagram.md @@ -255,30 +255,35 @@ info: { inserted(el, binding) { const action = binding.value - const {env, label, optional=false, description=''} = action + const {env, label, optional=false, description='', href=''} = action const tooltip = action.tooltip if (tooltip) { const tippyInstance = tippy(el, { content: ` -
- ${tooltip.title || ''} -
-
- ${tooltip.tag || ''} -
-
- ${tooltip.description} -
+
+ ${tooltip.title || ''} +
+
+ ${tooltip.tag || ''} +
+
+ ${tooltip.description} +
+ `, placement: 'right-start', allowHTML: true, maxWidth: 'none', appendTo: document.getElementById('flow-diagram'), offset: [0, 10], - onShow() { + onShow(instance) { const stepEl = el.closest('.action') stepEl.classList.add('tooltip-open') + instance.setProps({ + interactive: tippy.currentInput.isTouch + }) }, onHide() { const stepEl = el.closest('.action') @@ -286,11 +291,11 @@ } }) - el.addEventListener('touchend', e => { - e.preventDefault() - e.stopPropagation() - tippy.hideAll() - tippyInstance.show() + el.addEventListener('click', e => { + // click event should just open the tooltip on touch devices + if (tippy.currentInput.isTouch) { + e.preventDefault() + } }) } } @@ -451,6 +456,11 @@ .tippy-box[data-placement^='right'] > .tippy-arrow::before { border-right-color: white; } + a.tooltip-contents { + color: inherit; + text-decoration: none; + display: block; + } .tooltip-title { font-weight: 600; font-size: 1.1em; From dcb5be78d0c6f002ee3fec16ccb8dd2851df7f19 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 9 May 2022 14:24:03 +0100 Subject: [PATCH 0088/1105] Add noscript fallback --- docs/diagram.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/diagram.md b/docs/diagram.md index 19328ad54..d0557b4fb 100644 --- a/docs/diagram.md +++ b/docs/diagram.md @@ -62,6 +62,11 @@
+ + diff --git a/docs/configuration.md b/docs/configuration.md new file mode 100644 index 000000000..0a0ce985f --- /dev/null +++ b/docs/configuration.md @@ -0,0 +1,238 @@ +# Configuration methods + +cibuildwheel can either be configured using environment variables, or from +config file such as `pyproject.toml`. + +This page describes how to set options. For a full list of available options, see the [options reference](options.md). + +## Environment variables {: #environment-variables} + +Environment variables can be set in your CI config. For example, to configure +cibuildwheel to run tests, add the following YAML to your CI config file: + +!!! tab "GitHub Actions" + + > .github/workflows/*.yml ([docs](https://help.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables)) (can be global, in job, or in step) + + ```yaml + env: + CIBW_TEST_REQUIRES: pytest + CIBW_TEST_COMMAND: "pytest ./tests" + ``` + +!!! tab "Azure Pipelines" + + > azure-pipelines.yml ([docs](https://docs.microsoft.com/en-us/azure/devops/pipelines/process/variables)) + + ```yaml + variables: + CIBW_TEST_REQUIRES: pytest + CIBW_TEST_COMMAND: "pytest ./tests" + ``` + +!!! tab "Travis CI" + + > .travis.yml ([docs](https://docs.travis-ci.com/user/environment-variables/)) + + ```yaml + env: + global: + - CIBW_TEST_REQUIRES=pytest + - CIBW_TEST_COMMAND="pytest ./tests" + ``` + +!!! tab "AppVeyor" + + > appveyor.yml ([docs](https://www.appveyor.com/docs/build-configuration/#environment-variables)) + + ```yaml + environment: + global: + CIBW_TEST_REQUIRES: pytest + CIBW_TEST_COMMAND: "pytest {project}\\tests" + ``` + +!!! tab "CircleCI" + + > .circleci/config.yml ([docs](https://circleci.com/docs/2.0/configuration-reference/#environment)) + + ```yaml + jobs: + job_name: + environment: + CIBW_TEST_REQUIRES: pytest + CIBW_TEST_COMMAND: "pytest ./tests" + ``` + +!!! tab "Gitlab CI" + + > .gitlab-ci.yml ([docs](https://docs.gitlab.com/ee/ci/variables/README.html#create-a-custom-variable-in-gitlab-ciyml)) + + ```yaml + linux: + variables: + CIBW_TEST_REQUIRES: pytest + CIBW_TEST_COMMAND: "pytest ./tests" + ``` + +!!! tab "Cirrus CI" + + > .cirrus.yml ([docs](https://cirrus-ci.org/guide/writing-tasks/#environment-variables)) + + ```yaml + env: + CIBW_TEST_REQUIRES: pytest + CIBW_TEST_COMMAND: "pytest ./tests" + ``` + +## Configuration file {: #configuration-file} + +You can configure cibuildwheel with a config file, such as `pyproject.toml`. +Options have the same names as the environment variable overrides, but are +placed in `[tool.cibuildwheel]` and are lower case, with dashes, following +common [TOML][https://toml.io] practice. Anything placed in subsections `linux`, `windows`, +`macos`, or `pyodide` will only affect those platforms. Lists can be used +instead of strings for items that are naturally a list. Multiline strings also +work just like in the environment variables. Environment variables will take +precedence if defined. + +The example above using environment variables could have been written like this: + +```toml +[tool.cibuildwheel] +test-requires = "pytest" +test-command = "pytest ./tests" +``` + +The complete set of defaults for the current version of cibuildwheel are shown below: + +```toml +{% include "../cibuildwheel/resources/defaults.toml" %} +``` + + +!!! tip + Static configuration works across all CI systems, and can be used locally if + you run `cibuildwheel --platform linux`. This is preferred, but environment + variables are better if you need to change per-matrix element + (`CIBW_BUILD` is often in this category, for example), or if you cannot or do + not want to change a `pyproject.toml` file. You can specify a different file to + use with `--config-file` on the command line, as well. + +## Configuration overrides {: #overrides } + +One feature specific to the configuration files is the ability to override +settings based on selectors. To use, add a ``tool.cibuildwheel.overrides`` +array, and specify a ``select`` string. Then any options you set will only +apply to items that match that selector. These are applied in order, with later +matches overriding earlier ones if multiple selectors match. Environment +variables always override static configuration. + +A few of the options below have special handling in overrides. A different +`before-all` will trigger a new container to launch on Linux, and cannot be +overridden on macOS or Windows. Overriding the image on linux will also +trigger new containers, one per image. Some commands are not supported; +`output-dir`, build/skip/test_skip selectors, and architectures cannot be +overridden. + +You can specify a table of overrides in `inherit={}`, any list or table in this +list will inherit from previous overrides or the main configuration. The valid +options are `"none"` (the default), `"append"`, and `"prepend"`. + +#### Examples: + +```toml +[tool.cibuildwheel.linux] +before-all = "yum install mylib" +test-command = "echo 'installed'" + +[[tool.cibuildwheel.overrides]] +select = "*-musllinux*" +before-all = "apk add mylib" +``` + +This example will override the before-all command on musllinux only, but will +still run the test-command. Note the double brackets, this is an array in TOML, +which means it can be given multiple times. + +```toml +[tool.cibuildwheel] +# Normal options, etc. +manylinux-x86_64-image = "manylinux_2_34" + +[[tool.cibuildwheel.overrides]] +select = "cp38-*" +manylinux-x86_64-image = "manylinux2014" + +[[tool.cibuildwheel.overrides]] +select = "cp3{9,10}-*" +manylinux-x86_64-image = "manylinux_2_28" +``` + +This example will build CPython 3.8 wheels on manylinux2014, CPython 3.9-3.10 +wheels on manylinux_2_28, and manylinux_2_34 wheels for any newer Python +(like 3.10). + +```toml +[tool.cibuildwheel] +environment = {FOO="BAR", "HAM"="EGGS"} +test-command = ["pyproject"] + +[[tool.cibuildwheel.overrides]] +select = "cp311*" + +inherit.test-command = "prepend" +test-command = ["pyproject-before"] + +inherit.environment="append" +environment = {FOO="BAZ", "PYTHON"="MONTY"} + +[[tool.cibuildwheel.overrides]] +select = "cp311*" +inherit.test-command = "append" +test-command = ["pyproject-after"] +``` + +This example will provide the command `"pyproject-before && pyproject && pyproject-after"` +on Python 3.11, and will have `environment = {FOO="BAZ", "PYTHON"="MONTY", "HAM"="EGGS"}`. + + +## Extending existing options {: #inherit } + +In the TOML configuration, you can choose how tables and lists are inherited. +By default, all values are overridden completely (`"none"`) but sometimes you'd +rather `"append"` or `"prepend"` to an existing list or table. You can do this +with the `inherit` table in overrides. For example, if you want to add an environment +variable for CPython 3.11, without `inherit` you'd have to repeat all the +original environment variables in the override. With `inherit`, it's just: + +```toml +[[tool.cibuildwheel.overrides]] +select = "cp311*" +inherit.environment = "append" +environment.NEWVAR = "Added!" +``` + +For a table, `"append"` will replace a key if it exists, while `"prepend"` will +only add a new key, older keys take precedence. + +Lists are also supported (and keep in mind that commands are lists). For +example, you can print a message before and after a wheel is repaired: + +```toml +[[tool.cibuildwheel.overrides]] +select = "*" +inherit.repair-wheel-command = "prepend" +repair-wheel-command = "echo 'Before repair'" + +[[tool.cibuildwheel.overrides]] +select = "*" +inherit.repair-wheel-command = "append" +repair-wheel-command = "echo 'After repair'" +``` + +As seen in this example, you can have multiple overrides match - they match top +to bottom, with the config being accumulated. If you need platform-specific +inheritance, you can use `select = "*-????linux_*"` for Linux, `select = +"*-win_*"` for Windows, and `select = "*-macosx_*"` for macOS. As always, +environment variables will completely override any TOML configuration. diff --git a/docs/cpp_standards.md b/docs/cpp_standards.md index 3b49481ee..b22b2ff72 100644 --- a/docs/cpp_standards.md +++ b/docs/cpp_standards.md @@ -15,11 +15,10 @@ The past end-of-life `manylinux2014` image (based on CentOS 7) contains a versio ## macOS and deployment target versions -OS X/macOS allows you to specify a so-called "deployment target" version that will ensure backwards compatibility with older versions of macOS. One way to do this is by setting the `MACOSX_DEPLOYMENT_TARGET` environment variable. +The [`MACOSX_DEPLOYMENT_TARGET` environment variable](platforms.md#macos-version-compatibility) is used to set the minimum deployment target for macOS. However, to enable modern C++ standards, the deployment target needs to be set high enough (since older OS X/macOS versions did not have the necessary modern C++ standard library). - To get C++17 support, Xcode 9.3+ is needed, requiring at least macOS 10.13 on the build machine. To use C++17 library features and link against the C++ runtime library, set `MACOSX_DEPLOYMENT_TARGET` to `"10.13"` or `"10.14"` (or higher) - macOS 10.13 offers partial C++17 support (e.g., the filesystem header is in experimental, offering `#include ` instead of `#include `); macOS 10.14 has full C++17 support. CPython 3.12+ require 10.13+ anyway. However, if only C++17 compiler and standard template library (STL) features are used (not needing a C++17 runtime) it might be possible to set `MACOSX_DEPLOYMENT_TARGET` to a lower value, such as `"10.9"`. To find out if this is the case, try compiling and running with a lower `MACOSX_DEPLOYMENT_TARGET`: if C++17 features are used that require a more recent deployment target, building the wheel should fail. diff --git a/docs/deliver-to-pypi.md b/docs/deliver-to-pypi.md index d03e2d6f9..6453ff6f8 100644 --- a/docs/deliver-to-pypi.md +++ b/docs/deliver-to-pypi.md @@ -6,42 +6,23 @@ title: Delivering to PyPI After you've built your wheels, you'll probably want to deliver them to PyPI. -## Manual method - -On your development machine, install [pipx](https://pypa.github.io/pipx/) and do the following: - -```bash -# Either download the SDist from your CI, or make it: -# Clear out your 'dist' folder. -rm -rf dist -# Make a source distribution -pipx run build --sdist - -# 🏃🏻 -# Go and download your wheel files from wherever you put them. e.g. your CI -# provider can be configured to store them for you. Put them all into the -# 'dist' folder. - -# Upload using 'twine' -pipx run twine upload dist/* -``` - ## Automatic method If you don't need much control over the release of a package, you can set up -cibuildwheel to deliver the wheels straight to PyPI. You just need to bump the +your CI provider to deliver the wheels straight to PyPI. You just need to bump the version and tag it. -### Generic instructions +The exact way to set it up varies, depending on which CI provider you're using. But generally, the process goes like this: -Make your SDist with the [build](https://github.com/pypa/build) tool, and your wheels with cibuildwheel. If you can make the files available as -downloadable artifacts, this make testing before releases easier (depending on your CI provider's options). The "publish" job/step should collect the -files, and then run `twine upload ` (possibly via [pipx](https://github.com/pypa/pipx)); this should only happen on tags or "releases". +- Build your wheels with cibuildwheel +- Build an sdist with the [build](https://github.com/pypa/build) tool +- Check that the current CI run is happening during a release (e.g. it's in response to a vXX tag) +- Collect these assets together onto one runner +- Upload them to PyPI using `twine upload ` ### GitHub Actions -GitHub actions has pipx in all the runners as a supported package manager, as -well as several useful actions. Alongside your existing job(s) that runs cibuildwheel to make wheels, you will probably want to build an SDist: +GitHub actions has pipx in all the runners as a supported package manager, as well as `pypa/gh-action-pypi-publish`, which can be used instead of twine. Alongside your existing job(s) that runs cibuildwheel to make wheels, you will probably want to build an sdist: ```yaml make_sdist: @@ -64,8 +45,6 @@ well as several useful actions. Alongside your existing job(s) that runs cibuild Then, you need to publish the artifacts that the previous jobs have built. This final job should run only on release or tag, depending on your preference. It gathers the artifacts from the sdist and wheel jobs and uploads them to PyPI. The release environment (`pypi` in the example below) will be created the first time this workflow runs. -This requires setting this GitHub workflow in your project's PyPI settings (for a [new project](https://docs.pypi.org/trusted-publishers/creating-a-project-through-oidc)/[existing project](https://docs.pypi.org/trusted-publishers/adding-a-publisher)). - ```yaml upload_all: needs: [build_wheels, make_sdist] @@ -84,13 +63,11 @@ This requires setting this GitHub workflow in your project's PyPI settings (for - uses: pypa/gh-action-pypi-publish@release/v1 ``` -You should use Dependabot to keep the publish action up to date. In the above -example, the same name (the default, "artifact" is used for all upload-artifact -runs, so we can just download all of them in one step into a common directory. +The above example uses PyPI Trusted Publishing to deliver the wheels, which requires some configuration on the PyPI side for a [new project](https://docs.pypi.org/trusted-publishers/creating-a-project-through-oidc) or an [existing project](https://docs.pypi.org/trusted-publishers/adding-a-publisher). You can use Dependabot to keep the publish action up to date. See [`examples/github-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml) -for an example configuration that automatically upload wheels to PyPI. Also see +for an example configuration that automatically uploads wheels to PyPI. Also see [scikit-hep.org/developer/gha_wheels](https://scikit-hep.org/developer/gha_wheels) for a complete guide. @@ -99,3 +76,23 @@ for a complete guide. See [`examples/travis-ci-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/travis-ci-deploy.yml) for an example configuration. + +## Manual method + +On your development machine, install [pipx](https://pypa.github.io/pipx/) and do the following: + +```bash +# Either download the SDist from your CI, or make it: +# Clear out your 'dist' folder. +rm -rf dist +# Make a source distribution +pipx run build --sdist + +# 🏃🏻 +# Go and download your wheel files from wherever you put them. e.g. your CI +# provider can be configured to store them for you. Put them all into the +# 'dist' folder. + +# Upload using 'twine' +pipx run twine upload dist/* +``` diff --git a/docs/extra.css b/docs/extra.css index 9cd1c17f4..df7103cea 100644 --- a/docs/extra.css +++ b/docs/extra.css @@ -269,62 +269,13 @@ h1, h2, h3, h4, h5, h6 { } -/* expand all the toctree entries */ -.wy-menu-vertical .toctree-l1.current .toctree-l2>ul, -.wy-menu-vertical .toctree-l2.current .toctree-l3>ul, -.wy-menu-vertical .toctree-l3.current .toctree-l4>ul, -.wy-menu-vertical .toctree-l4.current .toctree-l5>ul, -.wy-menu-vertical .toctree-l5.current .toctree-l6>ul, -.wy-menu-vertical .toctree-l6.current .toctree-l7>ul, -.wy-menu-vertical .toctree-l7.current .toctree-l8>ul, -.wy-menu-vertical .toctree-l8.current .toctree-l9>ul, -.wy-menu-vertical .toctree-l9.current .toctree-l10>ul, -.wy-menu-vertical .toctree-l10.current .toctree-l11>ul { - display: block; -} - -/* hide all the buttons */ -.wy-menu-vertical li.current>a button.toctree-expand, -.wy-menu-vertical li.on a button.toctree-expand, -.wy-menu-vertical li.toctree-l2 button.toctree-expand, -.wy-menu-vertical li a button.toctree-expand { +/* hide the l1 buttons */ +.wy-menu-vertical li.toctree-l1.current>a button.toctree-expand, +.wy-menu-vertical li.toctree-l1.on>a button.toctree-expand, +.wy-menu-vertical li.toctree-l1>a button.toctree-expand { display: none; } -/* toctree layout improvements */ -.wy-menu-vertical a { - padding: 0.4em 1.2em; -} -.wy-menu-vertical li.current>a, -.wy-menu-vertical li.on a { - font-weight: normal; - padding: 0.4em 1.2em; - /* border-right: 1px solid #f0f0f0; */ -} -.wy-menu-vertical li.current a { - padding: 0.4em 1.2em; -} -.wy-menu-vertical li.toctree-l3 a, -.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a { - padding-left: 1.8em; -} -.wy-menu-vertical li.toctree-l2.current>a { - padding: 0.4em 1.2em; -} -.wy-menu-vertical li.toctree-l2.current>a, -.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a { - background: transparent; -} -.wy-menu-vertical li.toctree-l2.current>a:hover, -.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a:hover { - background: #d6d6d6; -} -.wy-menu-vertical li.current>a.current { - background: #fafafa !important; -} -.wy-menu-vertical li.current a { - -} /* word wrap in table cells */ .wy-table-responsive table td, .wy-table-responsive table th { diff --git a/docs/extra.js b/docs/extra.js index 23bed98ce..c6013f535 100644 --- a/docs/extra.js +++ b/docs/extra.js @@ -58,3 +58,54 @@ while (true) { // this will catch infinite loops which can occur when editing the above if (tabConversionIterations++ > 1000) throw 'too many iterations' } + +/** + * Redirects the current page based on the path and fragment identifier (hash) in the URL. + * + * Example usage: + * fragmentRedirect([ + * { source: 'setup/#github-actions', destination: 'ci-services' } + * { source: 'faq/#macosx', destination: 'platforms#apple' } + * ]) + */ +function fragmentRedirect(redirects) { + const href = window.location.href; + const hash = window.location.hash; + + for (const redirect of redirects) { + const source = redirect.source; + const destination = redirect.destination; + + if (endswith(href, source)) { + // Redirect to the destination path, with the same fragment identifier + // specified in the destination path, otherwise, keep the same hash + // from the current URL. + const destinationIncludesHash = destination.includes('#'); + let newUrl = href.replace(source, destination); + if (!destinationIncludesHash) { + newUrl += hash; + } + console.log('Redirecting to:', newUrl); + window.location.replace(newUrl); + return + } + } +} + +function endswith(str, suffix) { + return str.indexOf(suffix, str.length - suffix.length) !== -1; +} + +fragmentRedirect([ + { source: 'setup/#github-actions', destination: 'ci-services/' }, + { source: 'setup/#azure-pipelines', destination: 'ci-services/' }, + { source: 'setup/#travis-ci', destination: 'ci-services/' }, + { source: 'setup/#appveyor', destination: 'ci-services/' }, + { source: 'setup/#circleci', destination: 'ci-services/' }, + { source: 'setup/#gitlab-ci', destination: 'ci-services/' }, + { source: 'setup/#cirrus-ci', destination: 'ci-services/' }, + + { source: 'faq/#linux-builds-in-containers', destination: 'platforms/#linux-containers' }, + { source: 'faq/#apple-silicon', destination: 'platforms/#macos-architectures' }, + { source: 'faq/#windows-arm64', destination: 'platforms/#windows-arm64' }, +]); diff --git a/docs/faq.md b/docs/faq.md index 3f74d89d6..40beea950 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -6,88 +6,6 @@ title: Tips and tricks ## Tips -### Linux builds in containers - -Linux wheels are built in [`manylinux`/`musllinux` containers](https://github.com/pypa/manylinux) to provide binary compatible wheels on Linux, according to [PEP 600](https://www.python.org/dev/peps/pep-0600/) / [PEP 656](https://www.python.org/dev/peps/pep-0656/). Because of this, when building with `cibuildwheel` on Linux, a few things should be taken into account: - -- Programs and libraries are not installed on the CI runner host, but rather should be installed inside the container - using `yum` for `manylinux2014`, `apt-get` for `manylinux_2_31`, `dnf` for `manylinux_2_28` and `apk` for `musllinux_1_1` or `musllinux_1_2`, or manually. The same goes for environment variables that are potentially needed to customize the wheel building. - - `cibuildwheel` supports this by providing the [`CIBW_ENVIRONMENT`](options.md#environment) and [`CIBW_BEFORE_ALL`](options.md#before-all) options to setup the build environment inside the running container. - -- The project directory is copied into the container as `/project`, the output directory for the wheels to be copied out is `/output`. In general, this is handled transparently by `cibuildwheel`. For a more finegrained level of control however, the root of the host file system is mounted as `/host`, allowing for example to access shared files, caches, etc. on the host file system. Note that `/host` is not available on CircleCI and GitLab CI due to their Docker policies. - -- Alternative Docker images can be specified with the `CIBW_MANYLINUX_*_IMAGE`/`CIBW_MUSLLINUX_*_IMAGE` options to allow for a custom, preconfigured build environment for the Linux builds. See [options](options.md#linux-image) for more details. - -### Building macOS wheels for Apple Silicon {: #apple-silicon} - -`cibuildwheel` supports both native builds and cross-compiling between `arm64` (Apple Silicon) and `x86_64` (Intel) architectures, including the cross-compatible `universal2` format. - -#### Overview of Mac architectures - -You have several choices for wheels for Python 3.8+: - -##### `x86_64` - -The traditional wheel for Apple, loads on Intel machines, and on -Apple Silicon when running Python under Rosetta 2 emulation. - -Due to a change in naming, Pip 20.3+ (or an installer using packaging 20.5+) -is required to install a binary wheel on macOS Big Sur. - -##### `arm64` - -The native wheel for macOS on Apple Silicon. - -Requires Pip 20.3+ (or packaging 20.5+) to install. - -##### `universal2` - -This wheel contains both architectures, causing it to be up to twice the -size (data files do not get doubled, only compiled code). It requires -Pip 20.3 (Packaging 20.6+) to load on Intel, and Pip 21.0.1 (Packaging 20.9+) -to load on Apple Silicon. - -The dual-architecture `universal2` has a few benefits, but a key benefit -to a universal wheel is that a user can bundle these wheels into an -application and ship a single binary. - -However, if you have a large library, then you might prefer to ship -the two single-arch wheels instead - `x86_64` and `arm64`. In rare cases, -you might want to build all three, but in that case, pip will not download -the universal wheels, because it prefers the most specific wheel -available. - -#### What to provide? - -Generally speaking, because Pip 20.3 is required for the `universal2` wheel, -most packages should provide both `x86_64` and one of `universal2`/`arm64` -wheels. When Pip 20.3+ is common on macOS, then it might be possible to ship -only the `universal2` wheel. - -Opinions vary on which of arch-specific or `universal2` wheels are best - some packagers prefer `universal2` because it's one wheel for all Mac users, so simpler, and easier to build into apps for downstream users. However, because they contain code for both architectures, their file size is larger, meaning they consume more disk space and bandwidth, and are harder to build for some projects. - -See [GitHub issue 1333](https://github.com/pypa/cibuildwheel/issues/1333) for more discussion. - -#### How? - -It's easiest to build `x86_64` wheels on `x86_64` runners, and `arm64` wheels on `arm64` runners. - -On GitHub Actions, `macos-14` runners are `arm64`, and `macos-13` runners are `x86_64`. So all you need to do is ensure both are in your build matrix. - -#### Cross-compiling - -If your CI provider doesn't offer arm64 runners yet, or you want to create `universal2`, you'll have to cross-compile. Cross-compilation can be enabled by adding extra archs to the [`CIBW_ARCHS_MACOS` option](options.md#archs) - e.g. `CIBW_ARCHS_MACOS="x86_64 universal2"`. Cross-compilation is provided by Xcode toolchain v12.2+. - -Regarding testing, - -- On an arm64 runner, it is possible to test x86_64 wheels and both parts of a universal2 wheel using Rosetta 2 emulation. -- On an x86_64 runner, arm64 code can be compiled but it can't be tested. `cibuildwheel` will raise a warning to notify you of this - these warnings can be silenced by skipping testing on these platforms: `CIBW_TEST_SKIP: "*_arm64 *_universal2:arm64"`. - -!!! note - If your project uses **Poetry** as a build backend, cross-compiling on macOS [does not currently work](https://github.com/python-poetry/poetry/issues/7107). In some cases arm64 wheels can be built but their tags will be incorrect, with the platform tag showing `x86_64` instead of `arm64`. - - As a workaround, the tag can be fixed before running delocate to repair the wheel. The [`wheel tags`](https://wheel.readthedocs.io/en/stable/reference/wheel_tags.html) command is ideal for this. See [this workflow](https://gist.github.com/anderssonjohan/49f07e33fc5cb2420515a8ac76dc0c95#file-build-pendulum-wheels-yml-L39-L53) for an example usage of `wheel tags`. - ### Building Linux wheels for non-native archs using emulation {: #emulation} cibuildwheel supports building non-native architectures on Linux, via @@ -247,15 +165,11 @@ Your build might need some compiler flags to be set through environment variable Consider incorporating these into your package, for example, in `setup.py` using [`extra_compile_args` or `extra_link_args`](https://docs.python.org/3/distutils/setupscript.html#other-options). -### Python 2.7 / PyPy2 wheels - -See the [cibuildwheel version 1 docs](https://cibuildwheel.pypa.io/en/1.x/) for information about building Python 2.7 or PyPy2 wheels. There are lots of tricks and workaround there that are no longer required for Python 3 in cibuildwheel 2. - ## Troubleshooting If your wheel didn't compile, you might have a mistake in your config. -To quickly test your config without doing a git push and waiting for your code to build on CI, you can [test the Linux build in a local Docker container](setup.md#local). +To quickly test your config without doing a git push and waiting for your code to build on CI, you can [test the Linux build in a local Docker container](platforms.md#linux). ### Missing dependencies @@ -312,10 +226,6 @@ skip = ["*-musllinux_i686"] Also see [maturin-action](https://github.com/PyO3/maturin-action) which is optimized for Rust wheels, builds the non-Python Rust modules once, and can cross-compile (and can build 32-bit musl, for example). -### macOS: ModuleNotFoundError - -Calling cibuildwheel from a python3 script and getting a `ModuleNotFoundError`? Due to a (fixed) [bug](https://bugs.python.org/issue22490) in CPython, you'll need to [unset the `__PYVENV_LAUNCHER__` variable](https://github.com/pypa/cibuildwheel/issues/133#issuecomment-478288597) before activating a venv. - ### macOS: 'No module named XYZ' errors after running cibuildwheel `cibuildwheel` on Mac installs the distributions from Python.org system-wide during its operation. This is necessary, but it can cause some confusing errors after cibuildwheel has finished. @@ -420,11 +330,3 @@ To add the `/d2FH4-` flag to a standard `setup.py` using `setuptools`, the `extr ``` To investigate the dependencies of a C extension (i.e., the `.pyd` file, a DLL in disguise) on Windows, [Dependency Walker](http://www.dependencywalker.com/) is a great tool. For diagnosing a failing import, the [dlltracer](https://pypi.org/project/dlltracer/) tool may also provide additional details. - -### Windows ARM64 builds {: #windows-arm64} - -`cibuildwheel` supports cross-compiling `ARM64` wheels on all Windows runners, but a native ARM64 runner is required for testing. On non-native runners, tests for ARM64 wheels will be automatically skipped with a warning. Add `"*-win_arm64"` to your `CIBW_TEST_SKIP` setting to suppress the warning. - -Cross-compilation on Windows relies on a supported build backend. Supported backends use an environment variable to specify their target platform (the one they are compiling native modules for, as opposed to the one they are running on), which is set in [cibuildwheels/windows.py](https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/windows.py) before building. Currently, `setuptools>=65.4.1` and `setuptools_rust` are the only supported backends. - -By default, `ARM64` is not enabled when running on non-ARM64 runners. Use [`CIBW_ARCHS`](options.md#archs) to select it. diff --git a/docs/options.md b/docs/options.md index cee3b6d7c..de4317b4d 100644 --- a/docs/options.md +++ b/docs/options.md @@ -1,244 +1,5 @@ # Options -## Setting options - -cibuildwheel can either be configured using environment variables, or from -config file such as `pyproject.toml`. - -### Environment variables {: #environment-variables} - -Environment variables can be set in your CI config. For example, to configure -cibuildwheel to run tests, add the following YAML to your CI config file: - -!!! tab "GitHub Actions" - - > .github/workflows/*.yml ([docs](https://help.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables)) (can be global, in job, or in step) - - ```yaml - env: - CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: "pytest {project}/tests" - ``` - -!!! tab "Azure Pipelines" - - > azure-pipelines.yml ([docs](https://docs.microsoft.com/en-us/azure/devops/pipelines/process/variables)) - - ```yaml - variables: - CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: "pytest {project}/tests" - ``` - -!!! tab "Travis CI" - - > .travis.yml ([docs](https://docs.travis-ci.com/user/environment-variables/)) - - ```yaml - env: - global: - - CIBW_TEST_REQUIRES=pytest - - CIBW_TEST_COMMAND="pytest {project}/tests" - ``` - -!!! tab "AppVeyor" - - > appveyor.yml ([docs](https://www.appveyor.com/docs/build-configuration/#environment-variables)) - - ```yaml - environment: - global: - CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: "pytest {project}\\tests" - ``` - -!!! tab "CircleCI" - - > .circleci/config.yml ([docs](https://circleci.com/docs/2.0/configuration-reference/#environment)) - - ```yaml - jobs: - job_name: - environment: - CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: "pytest {project}/tests" - ``` - -!!! tab "Gitlab CI" - - > .gitlab-ci.yml ([docs](https://docs.gitlab.com/ee/ci/variables/README.html#create-a-custom-variable-in-gitlab-ciyml)) - - ```yaml - linux: - variables: - CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: "pytest {project}/tests" - ``` - -!!! tab "Cirrus CI" - - > .cirrus.yml ([docs](https://cirrus-ci.org/guide/writing-tasks/#environment-variables)) - - ```yaml - env: - CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: "pytest {project}/tests" - ``` - -### Configuration file {: #configuration-file} - -You can configure cibuildwheel with a config file, such as `pyproject.toml`. -Options have the same names as the environment variable overrides, but are -placed in `[tool.cibuildwheel]` and are lower case, with dashes, following -common [TOML][] practice. Anything placed in subsections `linux`, `windows`, -`macos`, or `pyodide` will only affect those platforms. Lists can be used -instead of strings for items that are naturally a list. Multiline strings also -work just like in the environment variables. Environment variables will take -precedence if defined. - -The example above using environment variables could have been written like this: - -```toml -[tool.cibuildwheel] -test-requires = "pytest" -test-command = "pytest {project}/tests" -``` - -The complete set of defaults for the current version of cibuildwheel are shown below: - -```toml -{% include "../cibuildwheel/resources/defaults.toml" %} -``` - - -!!! tip - Static configuration works across all CI systems, and can be used locally if - you run `cibuildwheel --platform linux`. This is preferred, but environment - variables are better if you need to change per-matrix element - (`CIBW_BUILD` is often in this category, for example), or if you cannot or do - not want to change a `pyproject.toml` file. You can specify a different file to - use with `--config-file` on the command line, as well. - -### Configuration overrides {: #overrides } - -One feature specific to the configuration files is the ability to override -settings based on selectors. To use, add a ``tool.cibuildwheel.overrides`` -array, and specify a ``select`` string. Then any options you set will only -apply to items that match that selector. These are applied in order, with later -matches overriding earlier ones if multiple selectors match. Environment -variables always override static configuration. - -A few of the options below have special handling in overrides. A different -`before-all` will trigger a new container to launch on Linux, and cannot be -overridden on macOS or Windows. Overriding the image on linux will also -trigger new containers, one per image. Some commands are not supported; -`output-dir`, build/skip/test_skip selectors, and architectures cannot be -overridden. - -You can specify a table of overrides in `inherit={}`, any list or table in this -list will inherit from previous overrides or the main configuration. The valid -options are `"none"` (the default), `"append"`, and `"prepend"`. - -##### Examples: - -```toml -[tool.cibuildwheel.linux] -before-all = "yum install mylib" -test-command = "echo 'installed'" - -[[tool.cibuildwheel.overrides]] -select = "*-musllinux*" -before-all = "apk add mylib" -``` - -This example will override the before-all command on musllinux only, but will -still run the test-command. Note the double brackets, this is an array in TOML, -which means it can be given multiple times. - -```toml -[tool.cibuildwheel] -# Normal options, etc. -manylinux-x86_64-image = "manylinux_2_34" - -[[tool.cibuildwheel.overrides]] -select = "cp38-*" -manylinux-x86_64-image = "manylinux2014" - -[[tool.cibuildwheel.overrides]] -select = "cp3{9,10}-*" -manylinux-x86_64-image = "manylinux_2_28" -``` - -This example will build CPython 3.8 wheels on manylinux2014, CPython 3.9-3.10 -wheels on manylinux_2_28, and manylinux_2_34 wheels for any newer Python -(like 3.10). - -```toml -[tool.cibuildwheel] -environment = {FOO="BAR", "HAM"="EGGS"} -test-command = ["pyproject"] - -[[tool.cibuildwheel.overrides]] -select = "cp311*" - -inherit.test-command = "prepend" -test-command = ["pyproject-before"] - -inherit.environment="append" -environment = {FOO="BAZ", "PYTHON"="MONTY"} - -[[tool.cibuildwheel.overrides]] -select = "cp311*" -inherit.test-command = "append" -test-command = ["pyproject-after"] -``` - -This example will provide the command `"pyproject-before && pyproject && pyproject-after"` -on Python 3.11, and will have `environment = {FOO="BAZ", "PYTHON"="MONTY", "HAM"="EGGS"}`. - - -### Extending existing options {: #inherit } - -In the TOML configuration, you can choose how tables and lists are inherited. -By default, all values are overridden completely (`"none"`) but sometimes you'd -rather `"append"` or `"prepend"` to an existing list or table. You can do this -with the `inherit` table in overrides. For example, if you want to add an environment -variable for CPython 3.11, without `inherit` you'd have to repeat all the -original environment variables in the override. With `inherit`, it's just: - -```toml -[[tool.cibuildwheel.overrides]] -select = "cp311*" -inherit.environment = "append" -environment.NEWVAR = "Added!" -``` - -For a table, `"append"` will replace a key if it exists, while `"prepend"` will -only add a new key, older keys take precedence. - -Lists are also supported (and keep in mind that commands are lists). For -example, you can print a message before and after a wheel is repaired: - -```toml -[[tool.cibuildwheel.overrides]] -select = "*" -inherit.repair-wheel-command = "prepend" -repair-wheel-command = "echo 'Before repair'" - -[[tool.cibuildwheel.overrides]] -select = "*" -inherit.repair-wheel-command = "append" -repair-wheel-command = "echo 'After repair'" -``` - -As seen in this example, you can have multiple overrides match - they match top -to bottom, with the config being accumulated. If you need platform-specific -inheritance, you can use `select = "*-????linux_*"` for Linux, `select = -"*-win_*"` for Windows, and `select = "*-macosx_*"` for macOS. As always, -environment variables will completely override any TOML configuration. - -## Options summary -
## Build selection @@ -265,13 +26,13 @@ This option can also be set using the [command-line option](#command-line) `--pl ```bash export CIBW_BUILD='cp37-*' - export CIBW_TEST_COMMAND='pytest {package}/tests' + export CIBW_TEST_COMMAND='pytest ./tests' cibuildwheel --platform linux . ``` Linux builds are the easiest to test locally, because all the build tools are supplied in the container, and they run exactly the same locally as in CI. - This is even more convenient if you store your cibuildwheel config in [`pyproject.toml`](#configuration-file). + This is even more convenient if you store your cibuildwheel config in [`pyproject.toml`](configuration.md#configuration-file). You can also run a single identifier with `--only `. This will not require `--platform` or `--arch`, and will override any build/skip @@ -310,7 +71,7 @@ Windows arm64 platform support is experimental. For an experimental WebAssembly build with `--platform pyodide`, `cp312-pyodide_wasm32` is the only platform identifier. -See the [cibuildwheel 1 documentation](https://cibuildwheel.pypa.io/en/1.x/) for past end-of-life versions of Python, and PyPy2.7. +See the [cibuildwheel 2 documentation](https://cibuildwheel.pypa.io/en/2.x/) for past end-of-life versions of Python. #### Examples @@ -409,14 +170,11 @@ See the [cibuildwheel 1 documentation](https://cibuildwheel.pypa.io/en/1.x/) for A list of architectures to build. -On macOS, this option can be used to [cross-compile](faq.md#cross-compiling) -between `x86_64`, `universal2` and `arm64`. +On macOS, this option can be used to [cross-compile](platforms.md#macos-architectures) between `x86_64`, `universal2` and `arm64`. -On Linux, this option can be used to build non-native architectures under -emulation. See [this guide](faq.md#emulation) for more information. +On Linux, this option can be used to build [non-native architectures under emulation](faq.md#emulation). -On Windows, this option can be used to compile for `ARM64` from an Intel -machine, provided the cross-compiling tools are installed. +On Windows, this option can be used to [compile for `ARM64` from an Intel machine](platforms.md#windows-arm64), provided the cross-compiling tools are installed. Options: @@ -649,19 +407,19 @@ This option can also be set using the [command-line option](#command-line) ## Build customization ### `CIBW_BUILD_FRONTEND` {: #build-frontend} -> Set the tool to use to build, either "build" (default), "build/[uv/]", or "pip" +> Set the tool to use to build, either "build" (default), "build\[uv\]", or "pip" Options: -- `pip[;args: ...]` - `build[;args: ...]` +- `build[uv][;args: ...]` +- `pip[;args: ...]` -Default: `pip` +Default: `build` -Choose which build frontend to use. Can either be "build", which will run -`python -m build --wheel`, or "pip", which will run `python -m pip wheel`. +Choose which build frontend to use. -You can also use "build\[uv\]", which will use an external [uv][] everywhere +You can use "build\[uv\]", which will use an external [uv][] everywhere possible, both through `--installer=uv` passed to build, as well as when making all build and test environments. This will generally speed up cibuildwheel. Make sure you have an external uv on Windows and macOS, either by @@ -672,15 +430,9 @@ setuptools on Python < 3.12 and pip are not installed if using uv. Pyodide ignores this setting, as only "build" is supported. -You can specify extra arguments to pass to `pip wheel` or `build` using the +You can specify extra arguments to pass to the build frontend using the optional `args` option. -!!! tip - Until v2.0.0, [pip][] was the only way to build wheels, and is still the - default. However, we expect that at some point in the future, cibuildwheel - will change the default to [build][], in line with the PyPA's recommendation. - If you want to try `build` before this, you can use this option. - !!! warning If you are using `build[uv]` and are passing `--no-isolation` or `-n`, we will detect this and avoid passing `--installer=uv` to build, but still @@ -1471,13 +1223,18 @@ automatically and available for import from the tests. If this variable is not set, your wheel will not be installed after building. By default, tests are executed from your project directory. When specifying -`CIBW_TEST_COMMAND`, you can use the placeholders `{project}` and `{package}` to -pass in the location of your test code: +`CIBW_TEST_COMMAND`, you can optionally use the placeholders `{package}` and +`{project}` to pass in the location of your test code: -- `{project}` is an absolute path to the project root - the working directory - where cibuildwheel was called. - `{package}` is the path to the package being built - the `package_dir` argument supplied to cibuildwheel on the command line. +- `{project}` is an absolute path to the project root - the working directory + where cibuildwheel was called. + +Using `{package}` or `{project}` used to be required, but since cibuildwheel +3.0, tests are run from the project root by default. This means that you can +use relative paths in your test command, and they will be relative to the +project root. Alternatively, you can use the [`CIBW_TEST_SOURCES`](#test-sources) setting to create a temporary folder populated with a specific subset of project files to @@ -1496,15 +1253,15 @@ Platform-specific environment variables are also available:
```yaml # Run the package tests using `pytest` - CIBW_TEST_COMMAND: pytest {package}/tests + CIBW_TEST_COMMAND: pytest ./tests # Trigger an install of the package, but run nothing of note CIBW_TEST_COMMAND: "echo Wheel installed" # Multi-line example - join with && on all platforms CIBW_TEST_COMMAND: > - pytest {package}/tests && - python {package}/test.py + pytest ./tests && + python ./test.py ``` !!! tab examples "pyproject.toml" @@ -1512,28 +1269,20 @@ Platform-specific environment variables are also available:
```toml [tool.cibuildwheel] # Run the package tests using `pytest` - test-command = "pytest {package}/tests" + test-command = "pytest ./tests" # Trigger an install of the package, but run nothing of note test-command = "echo Wheel installed" # Multiline example test-command = [ - "pytest {package}/tests", - "python {package}/test.py", + "pytest ./tests", + "python ./test.py", ] ``` In configuration files, you can use an array, and the items will be joined with `&&`. -!!! note - - It isn't recommended to `cd` to your project directory before running tests, - because Python might resolve `import yourpackage` relative to the working dir, - and we want to test the wheel you just built. However, if you're sure that's not - an issue for you and your workflow requires it, on Windows you should do `cd /d`, - because the CWD and project dir might be on different drives. - ### `CIBW_BEFORE_TEST` {: #before-test} > Execute a shell command before testing each wheel @@ -1873,8 +1622,8 @@ Some options support placeholders, like `{project}`, `{package}` or `{wheel}`, t .options-toc { display: grid; grid-template-columns: fit-content(20%) 1fr; - grid-gap: 16px 32px; - gap: 16px 32px; + grid-gap: 10px 20px; + gap: 10px 20px; font-size: 90%; margin-bottom: 28px; margin-top: 28px; @@ -1894,8 +1643,11 @@ Some options support placeholders, like `{project}`, `{package}` or `{wheel}`, t margin-top: 0; } .options-toc a.option { - display: block; - margin-bottom: 5px; + display: inline-block; + margin-bottom: 3px; + } + .options-toc a.option code { + font-size: 80%; } h3 code { font-size: 100%; @@ -1994,5 +1746,3 @@ Some options support placeholders, like `{project}`, `{package}` or `{wheel}`, t console.log('readme options markdown\n', markdown) }); - -[TOML]: https://toml.io diff --git a/docs/platforms.md b/docs/platforms.md new file mode 100644 index 000000000..115e91455 --- /dev/null +++ b/docs/platforms.md @@ -0,0 +1,236 @@ +--- +title: Platforms +--- +# Platforms + +## Linux + +### System requirements + +If you've got [Docker](https://www.docker.com/get-started/) installed on your development machine, you can run a Linux build. + +!!! tip + You can run the Linux build on any platform. Even Windows can run + Linux containers these days, but there are a few hoops to jump + through. Check [this document](https://docs.microsoft.com/en-us/virtualization/windowscontainers/quick-start/quick-start-windows-10-linux) + for more info. + +Because the builds are happening in manylinux Docker containers, they're perfectly reproducible. + +The only side effect to your system will be docker images being pulled. + +### Build containers {: #linux-containers} + +Linux wheels are built in [`manylinux`/`musllinux` containers](https://github.com/pypa/manylinux) to provide binary compatible wheels on Linux, according to [PEP 600](https://www.python.org/dev/peps/pep-0600/) / [PEP 656](https://www.python.org/dev/peps/pep-0656/). Because of this, when building with `cibuildwheel` on Linux, a few things should be taken into account: + +- Programs and libraries are not installed on the CI runner host, but rather should be installed inside the container - using `yum` for `manylinux2014`, `apt-get` for `manylinux_2_31`, `dnf` for `manylinux_2_28` and `apk` for `musllinux_1_1` or `musllinux_1_2`, or manually. The same goes for environment variables that are potentially needed to customize the wheel building. + + `cibuildwheel` supports this by providing the [`CIBW_ENVIRONMENT`](options.md#environment) and [`CIBW_BEFORE_ALL`](options.md#before-all) options to setup the build environment inside the running container. + +- The project directory is copied into the container as `/project`, the output directory for the wheels to be copied out is `/output`. In general, this is handled transparently by `cibuildwheel`. For a more finegrained level of control however, the root of the host file system is mounted as `/host`, allowing for example to access shared files, caches, etc. on the host file system. Note that `/host` is not available on CircleCI and GitLab CI due to their Docker policies. + +- Alternative Docker images can be specified with the `CIBW_MANYLINUX_*_IMAGE`/`CIBW_MUSLLINUX_*_IMAGE` options to allow for a custom, preconfigured build environment for the Linux builds. See [options](options.md#linux-image) for more details. + +## macOS + +### System requirements + +You need to have native build tools installed. Use `xcode-select --install` to install the Xcode command line tools. + +Because the builds are happening without full isolation, there might be some differences compared to CI builds (Xcode version, OS version, local files, ...) that might prevent you from finding an issue only seen in CI. + +In order to speed-up builds, cibuildwheel will cache the tools it needs to be reused for future builds. The folder used for caching is system/user dependent and is reported in the printed preamble of each run (e.g. `Cache folder: /Users/Matt/Library/Caches/cibuildwheel`). You can override the cache folder using the `CIBW_CACHE_PATH` environment variable. + +!!! warning + cibuildwheel uses official python.org macOS installers for CPython but those can only be installed globally. + + In order not to mess with your system, cibuildwheel won't install those if they are missing. Instead, it will error out with a message to let you install the missing CPython: + + ```console + Error: CPython 3.9 is not installed. + cibuildwheel will not perform system-wide installs when running outside of CI. + To build locally, install CPython 3.9 on this machine, or, disable this version of Python using CIBW_SKIP=cp39-macosx_* + + Download link: https://www.python.org/ftp/python/3.9.8/python-3.9.8-macosx10.9.pkg + ``` + +### macOS Version Compatibility + +macOS allows you to specify a "deployment target" version that will ensure backwards compatibility with older versions of macOS. For most projects, the way to do this is to set the `MACOSX_DEPLOYMENT_TARGET` environment variable. + +macOS builds will honor the `MACOSX_DEPLOYMENT_TARGET` environment variable to control the minimum supported macOS version for generated wheels. The lowest value you can set `MACOSX_DEPLOYMENT_TARGET` is as follows: + +| Arch | Python version range | Minimum target | +|-------|----------------------|----------------| +| Intel | CPython 3.8-3.11 | 10.9 | +| Intel | CPython 3.12+ | 10.13 | +| AS | CPython or PyPy | 11 | +| Intel | PyPy 3.8 | 10.13 | +| Intel | PyPy 3.9+ | 10.15 | + +If you set the value lower, cibuildwheel will cap it to the lowest supported value for each target as needed. + +!!! note + For Rust-based extensions, `Rustc` requires `MACOSX_DEPLOYMENT_TARGET` to be at + least 10.12. However, `cibuildwheel` defaults to 10.9 for + **Intel / CPython 3.8-3.11** builds. Users must manually set + `MACOSX_DEPLOYMENT_TARGET` to 10.12 or higher when building Rust extensions. + +### macOS architectures + +`cibuildwheel` supports both native builds and cross-compiling between `arm64` (Apple Silicon) and `x86_64` (Intel) architectures, including the cross-compatible `universal2` format. By default, macOS builds will build a single architecture wheel, using the build machine's architecture. + +If you need to support both x86_64 and Apple Silicon, you can use the `CIBW_ARCHS` environment variable to specify the architectures you want to build, or the value `universal2` to build a multi-architecture wheel. cibuildwheel _will_ test x86_64 wheels (or the x86_64 slice of a `universal2` wheel) when running on Apple Silicon hardware using Rosetta 2 emulation, but it is *not* possible to test Apple Silicon wheels on x86_64 hardware. + +#### Overview of Mac architectures + +##### `x86_64` + +The traditional wheel for Apple, loads on Intel machines, and on +Apple Silicon when running Python under Rosetta 2 emulation. + +Due to a change in naming, Pip 20.3+ (or an installer using packaging 20.5+) +is required to install a binary wheel on macOS Big Sur. + +##### `arm64` + +The native wheel for macOS on Apple Silicon. + +##### `universal2` + +This wheel contains both architectures, causing it to be up to twice the +size (data files do not get doubled, only compiled code). + +The dual-architecture `universal2` has a few benefits, but a key benefit +to a universal wheel is that a user can bundle these wheels into an +application and ship a single binary. + +However, if you have a large library, then you might prefer to ship +the two single-arch wheels instead - `x86_64` and `arm64`. In rare cases, +you might want to build all three, but in that case, pip will not download +the universal wheels, because it prefers the most specific wheel +available. + +#### What to provide? + +Opinions vary on which of arch-specific or `universal2` wheels are best - some packagers prefer `universal2` because it's one wheel for all Mac users, so simpler, and easier to build into apps for downstream users. However, because they contain code for both architectures, their file size is larger, meaning they consume more disk space and bandwidth, and are harder to build for some projects. + +See [GitHub issue 1333](https://github.com/pypa/cibuildwheel/issues/1333) for more discussion. + +#### How? + +It's easiest to build `x86_64` wheels on `x86_64` runners, and `arm64` wheels on `arm64` runners. + +On GitHub Actions, `macos-14` runners are `arm64`, and `macos-13` runners are `x86_64`. So all you need to do is ensure both are in your build matrix. + +#### Cross-compiling + +If your CI provider doesn't offer arm64 runners yet, or you want to create `universal2`, you'll have to cross-compile. Cross-compilation can be enabled by adding extra archs to the [`CIBW_ARCHS_MACOS` option](options.md#archs) - e.g. `CIBW_ARCHS_MACOS="x86_64 universal2"`. Cross-compilation is provided by Xcode toolchain v12.2+. + +Regarding testing, + +- On an arm64 runner, it is possible to test x86_64 wheels and both parts of a universal2 wheel using Rosetta 2 emulation. +- On an x86_64 runner, arm64 code can be compiled but it can't be tested. `cibuildwheel` will raise a warning to notify you of this - these warnings can be silenced by skipping testing on these platforms: `CIBW_TEST_SKIP: "*_arm64 *_universal2:arm64"`. + +!!! note + If your project uses **Poetry** as a build backend, cross-compiling on macOS [does not currently work](https://github.com/python-poetry/poetry/issues/7107). In some cases arm64 wheels can be built but their tags will be incorrect, with the platform tag showing `x86_64` instead of `arm64`. + + As a workaround, the tag can be fixed before running delocate to repair the wheel. The [`wheel tags`](https://wheel.readthedocs.io/en/stable/reference/wheel_tags.html) command is ideal for this. See [this workflow](https://gist.github.com/anderssonjohan/49f07e33fc5cb2420515a8ac76dc0c95#file-build-pendulum-wheels-yml-L39-L53) for an example usage of `wheel tags`. + + +## Windows + +### System requirements + +You must have native build tools (i.e., Visual Studio) installed. + +Because the builds are happening without full isolation, there might be some differences compared to CI builds (Visual Studio version, OS version, local files, ...) that might prevent you from finding an issue only seen in CI. + +In order to speed-up builds, cibuildwheel will cache the tools it needs to be reused for future builds. The folder used for caching is system/user dependent and is reported in the printed preamble of each run (e.g. `Cache folder: C:\Users\Matt\AppData\Local\pypa\cibuildwheel\Cache`). You can override the cache folder using the ``CIBW_CACHE_PATH`` environment variable. + +### Windows ARM64 builds {: #windows-arm64} + +`cibuildwheel` supports cross-compiling `ARM64` wheels on all Windows runners, but a native ARM64 runner is required for testing. On non-native runners, tests for ARM64 wheels will be automatically skipped with a warning. Add `"*-win_arm64"` to your `CIBW_TEST_SKIP` setting to suppress the warning. + +Cross-compilation on Windows relies on a supported build backend. Supported backends use an environment variable to specify their target platform (the one they are compiling native modules for, as opposed to the one they are running on), which is set in [cibuildwheels/windows.py](https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/windows.py) before building. Currently, `setuptools>=65.4.1` and `setuptools_rust` are the only supported backends. + +By default, `ARM64` is not enabled when running on non-ARM64 runners. Use [`CIBW_ARCHS`](options.md#archs) to select it. + +## Pyodide/WebAssembly {: #pyodide} + +Pyodide is offered as an experimental feature in cibuildwheel. + +### Prerequisites + +You need to have a matching host version of Python (unlike all other cibuildwheel platforms). Linux host highly recommended; macOS hosts may work (e.g. invoking `pytest` directly in [`CIBW_TEST_COMMAND`](options.md#test-command) is [currently failing](https://github.com/pyodide/pyodide/issues/4802)) and Windows hosts will not work. + +### Specifying a pyodide build + +You must target pyodide with `--platform pyodide` (or use `--only` on the identifier). + +## iOS + +### System requirements + +You must be building on a macOS machine, with Xcode installed. The Xcode installation must have an iOS SDK available, with all license agreements agreed to by the user. To check if an iOS SDK is available, open the Xcode settings panel, and check the Platforms tab. This will also ensure that license agreements have been acknowledged. + +Building iOS wheels also requires a working macOS Python installation. See the notes on [macOS builds](#macos) for details about configuration of the macOS environment. + +### Specifying an iOS build + +iOS is effectively 2 platforms - physical devices, and simulators. While the API for these two platforms are identical, the ABI is not compatible, even when dealing with a device and simulator with the same CPU architecture. For this reason, the architecture specification for iOS builds includes *both* the CPU architecture *and* the ABI that is being targeted. There are three possible values for architecture on iOS; the values match those used by `sys.implementation._multiarch` when running on iOS (with hyphens replaced with underscores, matching wheel filename normalization): + +* `arm64_iphoneos` (for physical iOS devices); +* `arm64_iphonesimulator` (for iOS simulators running on Apple Silicon macOS machines); and +* `x64_64_iphonesimulator` (for iOS simulators running on Intel macOS machines). + +By default, cibuildwheel will build wheels for all three of these targets. + +If you need to specify different compilation flags or other properties on a per-ABI or per-CPU basis, you can use [configuration overrides](configuration.md#overrides) with a `select` clause that targets the specific ABI or architecture. For example, consider the following example: + +``` +[tool.cibuildwheel.ios] +test-sources = ["tests"] +test-requires = ["pytest"] + +[[tool.cibuildwheel.overrides]] +select = "*_iphoneos" +environment.PATH = "/path/to/special/device/details:..." + +[[tool.cibuildwheel.overrides]] +select = "*-ios_arm64_*" +inherit.test-requires = "append" +test-requires = ["arm64-testing-helper"] +``` + +This configuration would: + + * Specify a `test-sources` and `test-requires` for all iOS targets; + * Add a `PATH` setting that will be used on physical iOS devices; and + * Add `arm64-testing-helper` to the test environment for all ARM64 iOS devices (whether simulator or device). + +### iOS version compatibility + +iOS builds will honor the `IPHONEOS_DEPLOYMENT_TARGET` environment variable to set the minimum supported API version for generated wheels. This will default to `13.0` if the environment variable isn't set. + +### Cross platform builds + +iOS builds are *cross platform builds*, as it not possible to run compilers and other build tools "on device". The pre-compiled iOS binaries used to support iOS builds include tooling that can convert any virtual environment into a cross platform virtual environment - that is, an environment that can run binaries on the build machine (macOS), but, if asked, will respond as if it is an iOS machine. This allows `pip`, `build`, and other build tools to perform iOS-appropriate behaviour. + +### Build frontend support + +iOS builds support both the `pip` and `build` build frontends. In principle, support for `uv` with the `build[uv]` frontend should be possible, but `uv` [doesn't currently have support for cross-platform builds](https://github.com/astral-sh/uv/issues/7957), and [doesn't have support for iOS (or Android) tags](https://github.com/astral-sh/uv/issues/8029). + +### Build environment + +The environment used to run builds does not inherit the full user environment - in particular, `PATH` is deliberately re-written. This is because UNIX C tooling doesn't do a great job differentiating between "macOS ARM64" and "iOS ARM64" binaries. If (for example) Homebrew is on the path when compilation commands are invoked, it's easy for a macOS version of a library to be linked into the iOS binary, rendering it unusable on iOS. To prevent this, iOS builds always force `PATH` to a "known minimal" path, that includes only the bare system utilities, and the iOS compiler toolchain. + +If your project requires additional tools to build (such as `cmake`, `ninja`, or `rustc`), those tools must be explicitly declared as cross-build tools using [`CIBW_XBUILD_TOOLS`](options.md#xbuild-tools). *Any* tool used by the build process must be included in the `CIBW_XBUILD_TOOLS` list, not just tools that cibuildwheel will invoke directly. For example, if your build script invokes `cmake`, and the `cmake` script invokes `magick` to perform some image transformations, both `cmake` and `magick` must be included in your cross-build tools list. + +### Tests + +If tests have been configured, the test suite will be executed on the simulator matching the architecture of the build machine - that is, if you're building on an ARM64 macOS machine, the ARM64 wheel will be tested on an ARM64 simulator. It is not possible to use cibuildwheel to test wheels on other simulators, or on physical devices. + +The iOS test environment can't support running shell scripts, so the [`CIBW_TEST_COMMAND`](options.md#test-command) value must be specified as if it were a command line being passed to `python -m ...`. In addition, the project must use [`CIBW_TEST_SOURCES`](options.md#test-sources) to specify the minimum subset of files that should be copied to the test environment. This is because the test must be run "on device", and the simulator device will not have access to the local project directory. + +The test process uses the same testbed used by CPython itself to run the CPython test suite. It is an Xcode project that has been configured to have a single Xcode "XCUnit" test - the result of which reports the success or failure of running `python -m `. diff --git a/docs/platforms/ios.md b/docs/platforms/ios.md deleted file mode 100644 index 0c93ba052..000000000 --- a/docs/platforms/ios.md +++ /dev/null @@ -1,70 +0,0 @@ ---- -title: 'iOS' ---- - -# iOS builds - -## Pre-requisites - -You must be building on a macOS machine, with Xcode installed. The Xcode installation must have an iOS SDK available, with all license agreements agreed to by the user. To check if an iOS SDK is available, open the Xcode settings panel, and check the Platforms tab. This will also ensure that license agreements have been acknowledged. - -Building iOS wheels also requires a working macOS Python installation. See the notes on [macOS builds](./macos.md) for details about configuration of the macOS environment. - -## Specifying an iOS build - -iOS is effectively 2 platforms - physical devices, and simulators. While the API for these two platforms are identical, the ABI is not compatible, even when dealing with a device and simulator with the same CPU architecture. For this reason, the architecture specification for iOS builds includes *both* the CPU architecture *and* the ABI that is being targeted. There are three possible values for architecture on iOS; the values match those used by `sys.implementation._multiarch` when running on iOS (with hyphens replaced with underscores, matching wheel filename normalization): - -* `arm64_iphoneos` (for physical iOS devices); -* `arm64_iphonesimulator` (for iOS simulators running on Apple Silicon macOS machines); and -* `x64_64_iphonesimulator` (for iOS simulators running on Intel macOS machines). - -By default, cibuildwheel will build wheels for all three of these targets. - -If you need to specify different compilation flags or other properties on a per-ABI or per-CPU basis, you can use [configuration overrides](../../options/#overrides) with a `select` clause that targets the specific ABI or architecture. For example, consider the following example: - -``` -[tool.cibuildwheel.ios] -test-sources = ["tests"] -test-requires = ["pytest"] - -[[tool.cibuildwheel.overrides]] -select = "*_iphoneos" -environment.PATH = "/path/to/special/device/details:..." - -[[tool.cibuildwheel.overrides]] -select = "*-ios_arm64_*" -inherit.test-requires = "append" -test-requires = ["arm64-testing-helper"] -``` - -This configuration would: - - * Specify a `test-sources` and `test-requires` for all iOS targets; - * Add a `PATH` setting that will be used on physical iOS devices; and - * Add `arm64-testing-helper` to the test environment for all ARM64 iOS devices (whether simulator or device). - -## iOS version compatibility - -iOS builds will honor the `IPHONEOS_DEPLOYMENT_TARGET` environment variable to set the minimum supported API version for generated wheels. This will default to `13.0` if the environment variable isn't set. - -## Cross platform builds - -iOS builds are *cross platform builds*, as it not possible to run compilers and other build tools "on device". The pre-compiled iOS binaries used to support iOS builds include tooling that can convert any virtual environment into a cross platform virtual environment - that is, an environment that can run binaries on the build machine (macOS), but, if asked, will respond as if it is an iOS machine. This allows `pip`, `build`, and other build tools to perform iOS-appropriate behaviour. - -## Build frontend support - -iOS builds support both the `pip` and `build` build frontends. In principle, support for `uv` with the `build[uv]` frontend should be possible, but `uv` [doesn't currently have support for cross-platform builds](https://github.com/astral-sh/uv/issues/7957), and [doesn't have support for iOS (or Android) tags](https://github.com/astral-sh/uv/issues/8029). - -## Build environment - -The environment used to run builds does not inherit the full user environment - in particular, `PATH` is deliberately re-written. This is because UNIX C tooling doesn't do a great job differentiating between "macOS ARM64" and "iOS ARM64" binaries. If (for example) Homebrew is on the path when compilation commands are invoked, it's easy for a macOS version of a library to be linked into the iOS binary, rendering it unusable on iOS. To prevent this, iOS builds always force `PATH` to a "known minimal" path, that includes only the bare system utilities, and the iOS compiler toolchain. - -If your project requires additional tools to build (such as `cmake`, `ninja`, or `rustc`), those tools must be explicitly declared as cross-build tools using [`CIBW_XBUILD_TOOLS`](../../options#xbuild-tools). *Any* tool used by the build process must be included in the `CIBW_XBUILD_TOOLS` list, not just tools that cibuildwheel will invoke directly. For example, if your build script invokes `cmake`, and the `cmake` script invokes `magick` to perform some image transformations, both `cmake` and `magick` must be included in your cross-build tools list. - -## Tests - -If tests have been configured, the test suite will be executed on the simulator matching the architecture of the build machine - that is, if you're building on an ARM64 macOS machine, the ARM64 wheel will be tested on an ARM64 simulator. It is not possible to use cibuildwheel to test wheels on other simulators, or on physical devices. - -The iOS test environment can't support running shell scripts, so the [`CIBW_TEST_COMMAND`](../../options#test-command) value must be specified as if it were a command line being passed to `python -m ...`. In addition, the project must use [`CIBW_TEST_SOURCES`](../../options#test-sources) to specify the minimum subset of files that should be copied to the test environment. This is because the test must be run "on device", and the simulator device will not have access to the local project directory. - -The test process uses the same testbed used by CPython itself to run the CPython test suite. It is an Xcode project that has been configured to have a single Xcode "XCUnit" test - the result of which reports the success or failure of running `python -m `. diff --git a/docs/platforms/linux.md b/docs/platforms/linux.md deleted file mode 100644 index ef86439c3..000000000 --- a/docs/platforms/linux.md +++ /dev/null @@ -1,13 +0,0 @@ -### Linux builds - -If you've got [Docker](https://www.docker.com/products/docker-desktop) installed on your development machine, you can run a Linux build. - -!!! tip - You can run the Linux build on any platform. Even Windows can run - Linux containers these days, but there are a few hoops to jump - through. Check [this document](https://docs.microsoft.com/en-us/virtualization/windowscontainers/quick-start/quick-start-windows-10-linux) - for more info. - -Because the builds are happening in manylinux Docker containers, they're perfectly reproducible. - -The only side effect to your system will be docker images being pulled. diff --git a/docs/platforms/macos.md b/docs/platforms/macos.md deleted file mode 100644 index bf07e09c0..000000000 --- a/docs/platforms/macos.md +++ /dev/null @@ -1,52 +0,0 @@ ---- -title: 'macOS' ---- - -# macOS builds - -## Pre-requisites - -Pre-requisite: you need to have native build tools installed. - -Because the builds are happening without full isolation, there might be some differences compared to CI builds (Xcode version, OS version, local files, ...) that might prevent you from finding an issue only seen in CI. - -In order to speed-up builds, cibuildwheel will cache the tools it needs to be reused for future builds. The folder used for caching is system/user dependent and is reported in the printed preamble of each run (e.g. `Cache folder: /Users/Matt/Library/Caches/cibuildwheel`). - -You can override the cache folder using the `CIBW_CACHE_PATH` environment variable. - -!!! warning - cibuildwheel uses official python.org macOS installers for CPython but those can only be installed globally. - - In order not to mess with your system, cibuildwheel won't install those if they are missing. Instead, it will error out with a message to let you install the missing CPython: - - ```console - Error: CPython 3.9 is not installed. - cibuildwheel will not perform system-wide installs when running outside of CI. - To build locally, install CPython 3.9 on this machine, or, disable this version of Python using CIBW_SKIP=cp39-macosx_* - - Download link: https://www.python.org/ftp/python/3.9.8/python-3.9.8-macosx10.9.pkg - ``` - -## macOS Version Compatibility - -macOS builds will honor the `MACOSX_DEPLOYMENT_TARGET` environment variable to control the minimum supported macOS version for generated wheels. The lowest value you can set `MACOSX_DEPLOYMENT_TARGET` is as follows: - -| Arch | Python version range | Minimum target | -|-------|----------------------|----------------| -| Intel | CPython 3.8-3.11 | 10.9 | -| Intel | CPython 3.12+ | 10.13 | -| AS | CPython or PyPy | 11 | -| Intel | PyPy 3.8 | 10.13 | -| Intel | PyPy 3.9+ | 10.15 | - -If you set the value lower, cibuildwheel will cap it to the lowest supported value for each target as needed. - -!!! note - For Rust-based extensions, `Rustc` requires `MACOSX_DEPLOYMENT_TARGET` to be at - least 10.12. However, `cibuildwheel` defaults to 10.9 for - **Intel / CPython 3.8-3.11** builds. Users must manually set - `MACOSX_DEPLOYMENT_TARGET` to 10.12 or higher when building Rust extensions. - -## Universal builds - -By default, macOS builds will build a single architecture wheel, using the build machine's architecture. If you need to support both x86_64 and Apple Silicon, you can use the `CIBW_ARCHS` environment variable to specify the architectures you want to build, or the value `universal2` to build a multi-architecture wheel. cibuildwheel will test x86_64 wheels (or the x86_64 slice of a `universal2` wheel) when running on Apple Silicon hardware, but it is *not* possible to test Apple Silicon wheels on x86_64 hardware. diff --git a/docs/platforms/pyodide.md b/docs/platforms/pyodide.md deleted file mode 100644 index a6edad681..000000000 --- a/docs/platforms/pyodide.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: 'Pyodide' ---- - -# Pyodide (WebAssembly) builds (experimental) - -## Prerequisites - -You need to have a matching host version of Python (unlike all other cibuildwheel platforms). Linux host highly recommended; macOS hosts may work (e.g. invoking `pytest` directly in [`CIBW_TEST_COMMAND`](../options.md#test-command) is [currently failing](https://github.com/pyodide/pyodide/issues/4802)) and Windows hosts will not work. - -## Specifying a pyodide build - -You must target pyodide with `--platform pyodide` (or use `--only` on the identifier). diff --git a/docs/platforms/windows.md b/docs/platforms/windows.md deleted file mode 100644 index 421fa8543..000000000 --- a/docs/platforms/windows.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: 'Windows' ---- - -# Windows builds - -## Pre-requisites - -You must have native build tools (i.e., Visual Studio) installed. - -Because the builds are happening without full isolation, there might be some differences compared to CI builds (Visual Studio version, OS version, local files, ...) that might prevent you from finding an issue only seen in CI. - -In order to speed-up builds, cibuildwheel will cache the tools it needs to be reused for future builds. The folder used for caching is system/user dependent and is reported in the printed preamble of each run (e.g. `Cache folder: C:\Users\Matt\AppData\Local\pypa\cibuildwheel\Cache`). - -You can override the cache folder using the ``CIBW_CACHE_PATH`` environment variable. diff --git a/docs/setup.md b/docs/setup.md index e82f5a3e8..c13fb972f 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -1,36 +1,29 @@ --- -title: 'Setup' +title: 'Getting started' --- -# Setup +# Getting started -## Platform support - -Each platform that cibuildwheel supports has its own prerequisites and platform-specific behaviors. cibuildwheel supports the following platforms: - -* [Linux](./platforms/linux.md) -* [Windows](./platforms/windows.md) -* [macOS](./platforms/macos.md) -* [iOS](./platforms/ios.md) -* [Experimental: Pyodide (WebAssembly)](./platforms/pyodide.md) - -## Run cibuildwheel locally (optional) {: #local} - -Before getting to CI setup, it can be convenient to test cibuildwheel -locally to quickly iterate and track down issues without even touching CI. +Before getting to [CI setup](ci-services.md), it can be convenient to test cibuildwheel locally to quickly iterate and track down issues without having to commit each change, push, and then check CI logs. Install cibuildwheel and run a build like this: ```sh -# using pipx (https://github.com/pypa/pipx) +# run using uv +uvx cibuildwheel + +# or pipx pipx run cibuildwheel -# or, +# or, install it first pip install cibuildwheel cibuildwheel ``` -You should see the builds taking place. You can experiment with options using environment variables or pyproject.toml. +!!!tip + You can pass the `--platform linux` option to cibuildwheel to build Linux wheels, even if you're not on Linux. On most machines, the easiest builds to try are the Linux builds. You don't need any software installed except a Docker daemon, such as [Docker Desktop](https://www.docker.com/get-started/). Each platform that cibuildwheel supports has its own system requirements and platform-specific behaviors. See the [platforms page](platforms.md) for details. + +You should see the builds taking place. You can experiment with [options](options.md) using environment variables or pyproject.toml. !!! tab "Environment variables" @@ -55,7 +48,7 @@ You should see the builds taking place. You can experiment with options using en !!! tab "pyproject.toml" - If you write your options into [`pyproject.toml`](options.md#configuration-file), you can work on your options locally, and they'll be automatically picked up when running in CI. + If you write your options into [`pyproject.toml`](configuration.md#configuration-file), you can work on your options locally, and they'll be automatically picked up when running in CI. > pyproject.toml @@ -70,182 +63,6 @@ You should see the builds taking place. You can experiment with options using en cibuildwheel ``` -## Configure a CI service - -### GitHub Actions [linux/mac/windows] {: #github-actions} - -To build Linux, macOS, and Windows wheels using GitHub Actions, create a `.github/workflows/build_wheels.yml` file in your repo. - -!!! tab "Action" - For GitHub Actions, `cibuildwheel` provides an action you can use. This is - concise and enables easier auto updating via GitHub's Dependabot; see - [Automatic updates](faq.md#automatic-updates). - - > .github/workflows/build_wheels.yml - - ```yaml - {% include "../examples/github-minimal.yml" %} - ``` - - Use `env:` to pass [build options](options.md) and `with:` to set - `package-dir: .`, `output-dir: wheelhouse` and `config-file: ''` - locations (those values are the defaults). - -!!! tab "pipx" - The GitHub Actions runners have pipx installed, so you can easily build in - just one line. This is internally how the action works; the main benefit of - the action form is easy updates via GitHub's Dependabot. - - > .github/workflows/build_wheels.yml - - ```yaml - {% include "../examples/github-pipx.yml" %} - ``` - -!!! tab "Generic" - This is the most generic form using setup-python and pip; it looks the most - like the other CI examples. If you want to avoid having setup that takes - advantage of GitHub Actions features or pipx being preinstalled, this might - appeal to you. - - > .github/workflows/build_wheels.yml - {% - include-markdown "../README.md" - start="" - end="" - %} - -Commit this file, and push to GitHub - either to your default branch, or to a PR branch. The build should start automatically. - -For more info on this file, check out the [docs](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions). - -[`examples/github-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml) extends this minimal example to include iOS and Pyodide builds, and a demonstration of how to automatically upload the built wheels to PyPI. - - -### Azure Pipelines [linux/mac/windows] {: #azure-pipelines} - -To build Linux, Mac, and Windows wheels on Azure Pipelines, create a `azure-pipelines.yml` file in your repo. - -> azure-pipelines.yml - -```yaml -{% include "../examples/azure-pipelines-minimal.yml" %} -``` - -Commit this file, enable building of your repo on Azure Pipelines, and push. - -Wheels will be stored for you and available through the Pipelines interface. For more info on this file, check out the [docs](https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema). - -### Travis CI [linux/windows] {: #travis-ci} - -To build Linux and Windows wheels on Travis CI, create a `.travis.yml` file in your repo. - -> .travis.yml - -```yaml -{% include "../examples/travis-ci-minimal.yml" %} -``` - -Commit this file, enable building of your repo on Travis CI, and push. - -Then setup a deployment method by following the [Travis CI deployment docs](https://docs.travis-ci.com/user/deployment/), or see [Delivering to PyPI](deliver-to-pypi.md). For more info on `.travis.yml`, check out the [docs](https://docs.travis-ci.com/). - -[`examples/travis-ci-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/travis-ci-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI. - -### AppVeyor [linux/mac/windows] {: #appveyor} - -To build Linux, Mac, and Windows wheels on AppVeyor, create an `appveyor.yml` file in your repo. - -> appveyor.yml - -```yaml -{% include "../examples/appveyor-minimal.yml" %} -``` - -Commit this file, enable building of your repo on AppVeyor, and push. - -AppVeyor will store the built wheels for you - you can access them from the project console. Alternatively, you may want to store them in the same place as the Travis CI build. See [AppVeyor deployment docs](https://www.appveyor.com/docs/deployment/) for more info, or see [Delivering to PyPI](deliver-to-pypi.md) below. - -For more info on this config file, check out the [docs](https://www.appveyor.com/docs/). - -### CircleCI [linux/mac] {: #circleci} - -To build Linux and Mac wheels on CircleCI, create a `.circleci/config.yml` file in your repo, - -> .circleci/config.yml - -```yaml -{% include "../examples/circleci-minimal.yml" %} -``` - -Commit this file, enable building of your repo on CircleCI, and push. - -!!! note - CircleCI doesn't enable free macOS containers for open source by default, but you can ask for access. See [here](https://circleci.com/docs/2.0/oss/#overview) for more information. - -CircleCI will store the built wheels for you - you can access them from the project console. Check out the CircleCI [docs](https://circleci.com/docs/2.0/configuration-reference/#section=configuration) for more info on this config file. - -### Gitlab CI [linux] {: #gitlab-ci} - -To build Linux wheels on Gitlab CI, create a `.gitlab-ci.yml` file in your repo, - -> .gitlab-ci.yml - -```yaml -{% include "../examples/gitlab-minimal.yml" %} -``` - -Commit this file, and push to Gitlab. The pipeline should start automatically. - -Gitlab will store the built wheels for you - you can access them from the Pipelines view. Check out the Gitlab [docs](https://docs.gitlab.com/ee/ci/yaml/) for more info on this config file. - -### Cirrus CI [linux/mac/windows] {: #cirrus-ci} - -To build Linux, Mac, and Windows wheels on Cirrus CI, create a `.cirrus.yml` file in your repo, - -> .cirrus.yml - -```yaml -{% include "../examples/cirrus-ci-minimal.yml" %} -``` - -Commit this file, enable building of your repo on Cirrus CI, and push. - -Cirrus CI will store the built wheels for you - you can access them from the individual task view. Check out the Cirrus CI [docs](https://cirrus-ci.org/guide/writing-tasks/) for more info on this config file. - -> ⚠️ Got an error? Check the [FAQ](faq.md). - -## Next steps - -Once you've got the wheel building successfully, you might want to set up [testing](options.md#test-command) or [automatic releases to PyPI](deliver-to-pypi.md#automatic-method). - - +- Once you've got a build working locally, you can move on to [setting up a CI service](ci-services.md). +- View the [full options reference](options.md) to see what cibuildwheel can do. +- Check out the [FAQ](faq.md) for common questions. diff --git a/mkdocs.yml b/mkdocs.yml index 1d0150736..b434ca1a1 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -20,20 +20,18 @@ extra_javascript: nav: - Home: index.md - - User guide: + - Guide: - setup.md - - options.md + - ci-services.md - deliver-to-pypi.md - - cpp_standards.md - faq.md + - cpp_standards.md + - Reference: + - platforms.md + - configuration.md + - options.md - working-examples.md - - Supported Platforms: - - platforms/linux.md - - platforms/windows.md - - platforms/macos.md - - platforms/ios.md - - platforms/pyodide.md - - About the project: + - About: - contributing.md - changelog.md diff --git a/test/test_abi_variants.py b/test/test_abi_variants.py index 23cd3de64..ec529849d 100644 --- a/test/test_abi_variants.py +++ b/test/test_abi_variants.py @@ -180,7 +180,7 @@ def test_abi_none(tmp_path, capfd): project_dir, add_env={ "CIBW_TEST_REQUIRES": "pytest", - "CIBW_TEST_COMMAND": f"{utils.invoke_pytest()} {{project}}/test", + "CIBW_TEST_COMMAND": f"{utils.invoke_pytest()} ./test", # limit the number of builds for test performance reasons "CIBW_BUILD": "cp38-* cp{}{}-* cp313t-* pp310-*".format(*utils.SINGLE_PYTHON_VERSION), }, diff --git a/test/test_before_test.py b/test/test_before_test.py index 8a33a8082..7e766abaa 100644 --- a/test/test_before_test.py +++ b/test/test_before_test.py @@ -62,8 +62,8 @@ def test(tmp_path, build_frontend_env): "CIBW_TEST_REQUIRES": "pytest", # the 'false ||' bit is to ensure this command runs in a shell on # mac/linux. - "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test", - "CIBW_TEST_COMMAND_WINDOWS": "pytest {project}/test", + "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} ./test", + "CIBW_TEST_COMMAND_WINDOWS": "pytest ./test", **build_frontend_env, }, ) diff --git a/test/test_emulation.py b/test/test_emulation.py index 70242a510..4bdc0a315 100644 --- a/test/test_emulation.py +++ b/test/test_emulation.py @@ -32,7 +32,7 @@ def test(tmp_path, request): project_dir, add_env={ "CIBW_TEST_REQUIRES": "pytest", - "CIBW_TEST_COMMAND": "pytest {project}/test", + "CIBW_TEST_COMMAND": "pytest ./test", "CIBW_ARCHS": archs, }, ) diff --git a/test/test_testing.py b/test/test_testing.py index a4bae870c..16f00aa60 100644 --- a/test/test_testing.py +++ b/test/test_testing.py @@ -80,8 +80,8 @@ def test(tmp_path): "CIBW_TEST_REQUIRES": "pytest", # the 'false ||' bit is to ensure this command runs in a shell on # mac/linux. - "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test", - "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest {project}/test", + "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} ./test", + "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest ./test", }, ) @@ -101,8 +101,8 @@ def test_extras_require(tmp_path): "CIBW_TEST_EXTRAS": "test", # the 'false ||' bit is to ensure this command runs in a shell on # mac/linux. - "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test", - "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest {project}/test", + "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} ./test", + "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest ./test", }, single_python=True, ) @@ -133,8 +133,8 @@ def test_dependency_groups(tmp_path): "CIBW_TEST_GROUPS": "dev", # the 'false ||' bit is to ensure this command runs in a shell on # mac/linux. - "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test", - "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest {project}/test", + "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} ./test", + "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest ./test", }, single_python=True, ) @@ -166,7 +166,7 @@ def test_failing_test(tmp_path): output_dir=output_dir, add_env={ "CIBW_TEST_REQUIRES": "pytest", - "CIBW_TEST_COMMAND": f"{utils.invoke_pytest()} {{project}}/test", + "CIBW_TEST_COMMAND": f"{utils.invoke_pytest()} ./test", # CPython 3.8 when running on macOS arm64 is unusual. The build # always runs in x86_64, so the arm64 tests are not run. See # #1169 for reasons why. That means the build succeeds, which From 625240d4ff4b86d45537939360e3433309d71362 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:11:26 -0400 Subject: [PATCH 1010/1105] [pre-commit.ci] pre-commit autoupdate (#2360) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.4 → v0.11.5](https://github.com/astral-sh/ruff-pre-commit/compare/v0.11.4...v0.11.5) - [github.com/python-jsonschema/check-jsonschema: 0.32.1 → 0.33.0](https://github.com/python-jsonschema/check-jsonschema/compare/0.32.1...0.33.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 75e2789a0..11e7e982a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.4 + rev: v0.11.5 hooks: - id: ruff args: ["--fix", "--show-fixes"] @@ -81,7 +81,7 @@ repos: - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.32.1 + rev: 0.33.0 hooks: - id: check-dependabot - id: check-github-actions From 1fcca39f6da83fbf6d1d9568fb08cccfab99b6cc Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 17:13:04 -0400 Subject: [PATCH 1011/1105] [Bot] Update dependencies (#2359) Update dependencies Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> --- cibuildwheel/resources/build-platforms.toml | 36 ++++++------- .../resources/constraints-pyodide312.txt | 10 ++-- .../resources/constraints-python310.txt | 2 +- .../resources/constraints-python311.txt | 2 +- .../resources/constraints-python312.txt | 2 +- .../resources/constraints-python313.txt | 2 +- .../resources/constraints-python38.txt | 2 +- .../resources/constraints-python39.txt | 2 +- cibuildwheel/resources/constraints.txt | 2 +- .../resources/pinned_docker_images.cfg | 54 +++++++++---------- docs/working-examples.md | 8 +-- 11 files changed, 61 insertions(+), 61 deletions(-) diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index 18838f15c..d8bf3833c 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -112,15 +112,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.9/python-3.12.9-macos11.pkg" }, - { identifier = "cp312-macosx_arm64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.9/python-3.12.9-macos11.pkg" }, - { identifier = "cp312-macosx_universal2", version = "3.12", url = "https://www.python.org/ftp/python/3.12.9/python-3.12.9-macos11.pkg" }, - { identifier = "cp313-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.2/python-3.13.2-macos11.pkg" }, - { identifier = "cp313-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.2/python-3.13.2-macos11.pkg" }, - { identifier = "cp313-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.2/python-3.13.2-macos11.pkg" }, - { identifier = "cp313t-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.2/python-3.13.2-macos11.pkg" }, - { identifier = "cp313t-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.2/python-3.13.2-macos11.pkg" }, - { identifier = "cp313t-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.2/python-3.13.2-macos11.pkg" }, + { identifier = "cp312-macosx_x86_64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.10/python-3.12.10-macos11.pkg" }, + { identifier = "cp312-macosx_arm64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.10/python-3.12.10-macos11.pkg" }, + { identifier = "cp312-macosx_universal2", version = "3.12", url = "https://www.python.org/ftp/python/3.12.10/python-3.12.10-macos11.pkg" }, + { identifier = "cp313-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, + { identifier = "cp313-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, + { identifier = "cp313-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, + { identifier = "cp313t-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, + { identifier = "cp313t-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, + { identifier = "cp313t-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, { 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" }, { identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.16-macos_x86_64.tar.bz2" }, @@ -141,18 +141,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.9", arch = "32" }, - { identifier = "cp312-win_amd64", version = "3.12.9", arch = "64" }, - { identifier = "cp313-win32", version = "3.13.2", arch = "32" }, - { identifier = "cp313t-win32", version = "3.13.2", arch = "32" }, - { identifier = "cp313-win_amd64", version = "3.13.2", arch = "64" }, - { identifier = "cp313t-win_amd64", version = "3.13.2", arch = "64" }, + { identifier = "cp312-win32", version = "3.12.10", arch = "32" }, + { identifier = "cp312-win_amd64", version = "3.12.10", arch = "64" }, + { identifier = "cp313-win32", version = "3.13.3", arch = "32" }, + { identifier = "cp313t-win32", version = "3.13.3", arch = "32" }, + { identifier = "cp313-win_amd64", version = "3.13.3", arch = "64" }, + { identifier = "cp313t-win_amd64", version = "3.13.3", 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.9", arch = "ARM64" }, - { identifier = "cp313-win_arm64", version = "3.13.2", arch = "ARM64" }, - { identifier = "cp313t-win_arm64", version = "3.13.2", arch = "ARM64" }, + { identifier = "cp312-win_arm64", version = "3.12.10", arch = "ARM64" }, + { identifier = "cp313-win_arm64", version = "3.13.3", arch = "ARM64" }, + { identifier = "cp313t-win_arm64", version = "3.13.3", arch = "ARM64" }, { 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" }, { identifier = "pp310-win_amd64", version = "3.10", arch = "64", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.19-win64.zip" }, diff --git a/cibuildwheel/resources/constraints-pyodide312.txt b/cibuildwheel/resources/constraints-pyodide312.txt index aed02adf7..2a0bfbce7 100644 --- a/cibuildwheel/resources/constraints-pyodide312.txt +++ b/cibuildwheel/resources/constraints-pyodide312.txt @@ -27,7 +27,7 @@ filelock==3.18.0 # via virtualenv h11==0.14.0 # via httpcore -httpcore==1.0.7 +httpcore==1.0.8 # via httpx httpx==0.28.1 # via unearth @@ -52,7 +52,7 @@ pip==25.0.1 # via -r .nox/update_constraints/tmp/constraints-pyodide.in platformdirs==4.3.7 # via virtualenv -pydantic==2.11.2 +pydantic==2.11.3 # via # pyodide-build # pyodide-lock @@ -92,7 +92,7 @@ typer==0.15.2 # auditwheel-emscripten # pyodide-build # pyodide-cli -typing-extensions==4.13.1 +typing-extensions==4.13.2 # via # anyio # pydantic @@ -101,9 +101,9 @@ typing-extensions==4.13.1 # typing-inspection typing-inspection==0.4.0 # via pydantic -unearth==0.17.3 +unearth==0.17.5 # via pyodide-build -urllib3==2.3.0 +urllib3==2.4.0 # via requests virtualenv==20.30.0 # via diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index 49a2b619f..da66890e6 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -26,7 +26,7 @@ pyproject-hooks==1.2.0 # via build tomli==2.2.1 # via build -typing-extensions==4.13.1 +typing-extensions==4.13.2 # via delocate virtualenv==20.30.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python311.txt b/cibuildwheel/resources/constraints-python311.txt index 524d961e2..ec5abaa74 100644 --- a/cibuildwheel/resources/constraints-python311.txt +++ b/cibuildwheel/resources/constraints-python311.txt @@ -22,7 +22,7 @@ platformdirs==4.3.7 # via virtualenv pyproject-hooks==1.2.0 # via build -typing-extensions==4.13.1 +typing-extensions==4.13.2 # via delocate virtualenv==20.30.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python312.txt b/cibuildwheel/resources/constraints-python312.txt index 524d961e2..ec5abaa74 100644 --- a/cibuildwheel/resources/constraints-python312.txt +++ b/cibuildwheel/resources/constraints-python312.txt @@ -22,7 +22,7 @@ platformdirs==4.3.7 # via virtualenv pyproject-hooks==1.2.0 # via build -typing-extensions==4.13.1 +typing-extensions==4.13.2 # via delocate virtualenv==20.30.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python313.txt b/cibuildwheel/resources/constraints-python313.txt index 524d961e2..ec5abaa74 100644 --- a/cibuildwheel/resources/constraints-python313.txt +++ b/cibuildwheel/resources/constraints-python313.txt @@ -22,7 +22,7 @@ platformdirs==4.3.7 # via virtualenv pyproject-hooks==1.2.0 # via build -typing-extensions==4.13.1 +typing-extensions==4.13.2 # via delocate virtualenv==20.30.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index 9ea26b911..f5d8ee8af 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -26,7 +26,7 @@ pyproject-hooks==1.2.0 # via build tomli==2.2.1 # via build -typing-extensions==4.13.1 +typing-extensions==4.13.2 # via delocate virtualenv==20.30.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index 49a2b619f..da66890e6 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -26,7 +26,7 @@ pyproject-hooks==1.2.0 # via build tomli==2.2.1 # via build -typing-extensions==4.13.1 +typing-extensions==4.13.2 # via delocate virtualenv==20.30.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index 524d961e2..ec5abaa74 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -22,7 +22,7 @@ platformdirs==4.3.7 # via virtualenv pyproject-hooks==1.2.0 # via build -typing-extensions==4.13.1 +typing-extensions==4.13.2 # via delocate virtualenv==20.30.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 03e412bea..66cfda9e7 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,45 +1,45 @@ [x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.04.05-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.04.05-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.04.05-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.04.05-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.04.12-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.04.12-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.04.12-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.04.12-1 [i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.04.05-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.04.05-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.04.12-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.04.12-1 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.04.05-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.04.05-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.05-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.04.05-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.04.12-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.04.12-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.12-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.04.12-1 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.04.05-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.04.05-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.04.05-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.04.05-1 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.04.12-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.04.12-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.04.12-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.04.12-1 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.04.05-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.04.05-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.04.05-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.04.05-1 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.04.12-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.04.12-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.04.12-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.04.12-1 [pypy_x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.04.05-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.04.05-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.04.05-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.04.12-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.04.12-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.04.12-1 [pypy_i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.04.05-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.04.12-1 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.04.05-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.04.05-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.05-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.04.12-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.04.12-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.12-1 [armv7l] -manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.04.05-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.04.05-1 +manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.04.12-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.04.12-1 diff --git a/docs/working-examples.md b/docs/working-examples.md index 1db276593..63574dd2d 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -56,8 +56,8 @@ title: Working examples | [envd][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A machine learning development environment build tool | | [Psycopg 3][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A modern implementation of a PostgreSQL adapter for Python | | [OpenColorIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A color management framework for visual effects and animation. | -| [aioquic][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python | | [ruptures][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. | +| [aioquic][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python | | [SimpleJSON][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | simplejson is a simple, fast, extensible JSON encoder/decoder for Python | | [OpenTimelineIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Open Source API and interchange format for editorial timeline information. | | [PyTables][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data | @@ -80,8 +80,8 @@ title: Working examples | [sourmash][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. | | [abess][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A fast best-subset selection library. It uses cibuildwheel to build a large project with C++ extensions. | | [python-snappy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for the snappy google library | -| [cyvcf2][] | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing | | [jq.py][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq | +| [cyvcf2][] | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing | | [matrixprofile][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. | | [Tokenizer][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support | | [iminuit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 | @@ -166,8 +166,8 @@ title: Working examples [envd]: https://github.com/tensorchord/envd [Psycopg 3]: https://github.com/psycopg/psycopg [OpenColorIO]: https://github.com/AcademySoftwareFoundation/OpenColorIO -[aioquic]: https://github.com/aiortc/aioquic [ruptures]: https://github.com/deepcharles/ruptures +[aioquic]: https://github.com/aiortc/aioquic [SimpleJSON]: https://github.com/simplejson/simplejson [OpenTimelineIO]: https://github.com/AcademySoftwareFoundation/OpenTimelineIO [PyTables]: https://github.com/PyTables/PyTables @@ -190,8 +190,8 @@ title: Working examples [sourmash]: https://github.com/sourmash-bio/sourmash [abess]: https://github.com/abess-team/abess [python-snappy]: https://github.com/intake/python-snappy -[cyvcf2]: https://github.com/brentp/cyvcf2 [jq.py]: https://github.com/mwilliamson/jq.py +[cyvcf2]: https://github.com/brentp/cyvcf2 [matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile [Tokenizer]: https://github.com/OpenNMT/Tokenizer [iminuit]: https://github.com/scikit-hep/iminuit From e9fae06abea5aa7d711cd5cce7aefd9f1e690a05 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Mon, 14 Apr 2025 23:20:08 +0200 Subject: [PATCH 1012/1105] chore: rework virtual environments creation for tests (#2356) As mentioned in https://github.com/pypa/cibuildwheel/pull/2347#discussion_r2029821701 Rework the way test venvs are created to reuse the same mechanisms as build venvs. --- cibuildwheel/platforms/macos.py | 68 +++++++------------------------ cibuildwheel/platforms/windows.py | 53 +++++------------------- cibuildwheel/venv.py | 28 +++++++++---- 3 files changed, 45 insertions(+), 104 deletions(-) diff --git a/cibuildwheel/platforms/macos.py b/cibuildwheel/platforms/macos.py index 428971263..4b4a064d8 100644 --- a/cibuildwheel/platforms/macos.py +++ b/cibuildwheel/platforms/macos.py @@ -241,25 +241,6 @@ def setup_python( # we version pip ourselves, so we don't care about pip version checking env["PIP_DISABLE_PIP_VERSION_CHECK"] = "1" - # upgrade pip to the version matching our constraints - # if necessary, reinstall it to ensure that it's available on PATH as 'pip' - if build_frontend == "build[uv]": - assert uv_path is not None - pip = [str(uv_path), "pip"] - else: - pip = ["python", "-m", "pip"] - - if not use_uv: - call( - *pip, - "install", - "--upgrade", - "pip", - *constraint_flags(dependency_constraint), - env=env, - cwd=venv_path, - ) - # Apply our environment after pip is ready env = environment.as_dictionary(prev_environment=env) @@ -434,8 +415,7 @@ def build(options: Options, tmp_path: Path) -> None: build_options.environment, build_frontend.name, ) - if not use_uv: - pip_version = get_pip_version(env) + pip_version = None if use_uv else get_pip_version(env) compatible_wheel = find_compatible_wheel(built_wheels, config.identifier) if compatible_wheel: @@ -460,7 +440,7 @@ def build(options: Options, tmp_path: Path) -> None: ) build_env = env.copy() - if not use_uv: + if pip_version is not None: build_env["VIRTUALENV_PIP"] = pip_version if constraints_path: combine_constraints( @@ -614,19 +594,6 @@ def build(options: Options, tmp_path: Path) -> None: else f"Testing wheel on {testing_arch}..." ) - # set up a virtual environment to install and test from, to make sure - # there are no dependencies that were pulled in at build time. - if not use_uv: - call( - "pip", - "install", - "virtualenv", - *constraint_flags(constraints_path), - env=env, - ) - - venv_dir = identifier_tmp_dir / f"venv-test-{testing_arch}" - arch_prefix = [] uv_arch_args = [] if testing_arch != machine_arch: @@ -642,29 +609,24 @@ def build(options: Options, tmp_path: Path) -> None: call_with_arch = functools.partial(call, *arch_prefix) shell_with_arch = functools.partial(call, *arch_prefix, "/bin/sh", "-c") + # set up a virtual environment to install and test from, to make sure + # there are no dependencies that were pulled in at build time. + venv_dir = identifier_tmp_dir / f"venv-test-{testing_arch}" + virtualenv_env = virtualenv( + config.version, + base_python, + venv_dir, + None, + use_uv=use_uv, + env=env, + pip_version=pip_version, + ) if use_uv: pip_install = functools.partial(call, *pip, "install", *uv_arch_args) - call("uv", "venv", venv_dir, f"--python={base_python}", env=env) else: pip_install = functools.partial(call_with_arch, *pip, "install") - # Use pip version from the initial env to ensure determinism - venv_args = [ - "--no-periodic-update", - f"--pip={pip_version}", - "--no-setuptools", - "--no-wheel", - ] - call_with_arch("python", "-m", "virtualenv", *venv_args, venv_dir, env=env) - - virtualenv_env = env.copy() + virtualenv_env["MACOSX_DEPLOYMENT_TARGET"] = get_test_macosx_deployment_target() - virtualenv_env["PATH"] = os.pathsep.join( - [ - str(venv_dir / "bin"), - virtualenv_env["PATH"], - ] - ) - virtualenv_env["VIRTUAL_ENV"] = str(venv_dir) # check that we are using the Python from the virtual environment call_with_arch("which", "python", env=virtualenv_env) diff --git a/cibuildwheel/platforms/windows.py b/cibuildwheel/platforms/windows.py index e429015b9..a63890644 100644 --- a/cibuildwheel/platforms/windows.py +++ b/cibuildwheel/platforms/windows.py @@ -265,21 +265,6 @@ def setup_python( env["PYTHON_ARCH"] = python_configuration.arch env["PIP_DISABLE_PIP_VERSION_CHECK"] = "1" - # upgrade pip to the version matching our constraints - # if necessary, reinstall it to ensure that it's available on PATH as 'pip.exe' - if not use_uv: - call( - "python", - "-m", - "pip", - "install", - "--upgrade", - "pip", - *constraint_flags(dependency_constraint), - env=env, - cwd=venv_path, - ) - # update env with results from CIBW_ENVIRONMENT env = environment.as_dictionary(prev_environment=env) @@ -378,8 +363,7 @@ def build(options: Options, tmp_path: Path) -> None: build_options.environment, build_frontend.name, ) - if not use_uv: - pip_version = get_pip_version(env) + pip_version = None if use_uv else get_pip_version(env) compatible_wheel = find_compatible_wheel(built_wheels, config.identifier) if compatible_wheel: @@ -407,7 +391,7 @@ def build(options: Options, tmp_path: Path) -> None: ) build_env = env.copy() - if not use_uv: + if pip_version is not None: build_env["VIRTUALENV_PIP"] = pip_version if constraints_path: @@ -486,33 +470,16 @@ def build(options: Options, tmp_path: Path) -> None: log.step("Testing wheel...") # set up a virtual environment to install and test from, to make sure # there are no dependencies that were pulled in at build time. - if not use_uv: - call( - "pip", "install", "virtualenv", *constraint_flags(constraints_path), env=env - ) - venv_dir = identifier_tmp_dir / "venv-test" - - if use_uv: - call("uv", "venv", venv_dir, f"--python={base_python}", env=env) - else: - # Use pip version from the initial env to ensure determinism - venv_args = [ - "--no-periodic-update", - f"--pip={pip_version}", - "--no-setuptools", - "--no-wheel", - ] - call("python", "-m", "virtualenv", *venv_args, venv_dir, env=env) - - virtualenv_env = env.copy() - virtualenv_env["PATH"] = os.pathsep.join( - [ - str(venv_dir / "Scripts"), - virtualenv_env["PATH"], - ] + virtualenv_env = virtualenv( + config.version, + base_python, + venv_dir, + None, + use_uv=use_uv, + env=env, + pip_version=pip_version, ) - virtualenv_env["VIRTUAL_ENV"] = str(venv_dir) # check that we are using the Python from the virtual environment call("where", "python", env=virtualenv_env) diff --git a/cibuildwheel/venv.py b/cibuildwheel/venv.py index b8e9cb789..77624b689 100644 --- a/cibuildwheel/venv.py +++ b/cibuildwheel/venv.py @@ -93,6 +93,8 @@ def virtualenv( dependency_constraint: Path | None, *, use_uv: bool, + env: dict[str, str] | None = None, + pip_version: str | None = None, ) -> dict[str, str]: """ Create a virtual environment. If `use_uv` is True, @@ -109,8 +111,9 @@ def virtualenv( call("uv", "venv", venv_path, "--python", python) else: virtualenv_app = _ensure_virtualenv(version) - pip_constraint = _parse_pip_constraint_for_virtualenv(dependency_constraint) - additional_flags = [f"--pip={pip_constraint}", "--no-setuptools", "--no-wheel"] + if pip_version is None: + pip_version = _parse_pip_constraint_for_virtualenv(dependency_constraint) + additional_flags = [f"--pip={pip_version}", "--no-setuptools", "--no-wheel"] # Using symlinks to pre-installed seed packages is really the fastest way to get a virtual # environment. The initial cost is a bit higher but reusing is much faster. @@ -118,7 +121,7 @@ def virtualenv( # Requires pip>=19.3 so disabling for "embed" because this means we don't know what's the # version of pip that will end-up installed. # c.f. https://virtualenv.pypa.io/en/latest/cli_interface.html#section-seeder - if not _IS_WIN and pip_constraint != "embed" and Version(pip_constraint) >= Version("19.3"): + if not _IS_WIN and pip_version != "embed" and Version(pip_version) >= Version("19.3"): additional_flags.append("--symlink-app-data") call( @@ -132,12 +135,21 @@ def virtualenv( python, venv_path, ) - paths = [str(venv_path), str(venv_path / "Scripts")] if _IS_WIN else [str(venv_path / "bin")] - env = os.environ.copy() - env["PATH"] = os.pathsep.join([*paths, env["PATH"]]) - env["VIRTUAL_ENV"] = str(venv_path) - return env + venv_env = os.environ.copy() if env is None else env.copy() + venv_env["PATH"] = os.pathsep.join([*paths, venv_env["PATH"]]) + venv_env["VIRTUAL_ENV"] = str(venv_path) + if not use_uv and pip_version == "embed": + call( + "pip", + "install", + "--upgrade", + "pip", + *constraint_flags(dependency_constraint), + env=venv_env, + cwd=venv_path, + ) + return venv_env def find_uv() -> Path | None: From 95e3a6575f777977aa5d3ac9274c6b85fce9c2d3 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Mon, 14 Apr 2025 23:20:26 +0200 Subject: [PATCH 1013/1105] fix(CI): Cirrus CI macos jobs (#2355) * fix(CI): Cirrus CI macos_arm64_cp38 job * fix(CI): run on macos-runner:sequoia * doc: update Cirrus CI minimal example --- .cirrus.yml | 6 +++--- examples/cirrus-ci-minimal.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 6c13ee1a7..1250dacb7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -62,7 +62,7 @@ windows_x86_task: macos_arm64_task: macos_instance: - image: ghcr.io/cirruslabs/macos-runner:sonoma + image: ghcr.io/cirruslabs/macos-runner:sequoia env: VENV_ROOT: ${HOME}/venv-cibuildwheel PATH: ${VENV_ROOT}/bin:${PATH} @@ -73,11 +73,11 @@ macos_arm64_task: macos_arm64_cp38_task: macos_instance: - image: ghcr.io/cirruslabs/macos-runner:sonoma + image: ghcr.io/cirruslabs/macos-runner:sequoia env: VENV_ROOT: ${HOME}/venv-cibuildwheel PATH: ${VENV_ROOT}/bin:${PATH} - PYTEST_ADDOPTS: --run-cp38-universal2 -k 'test_cp38_arm64_testing_universal2_installer or test_arch_auto' + PYTEST_ADDOPTS: --run-cp38-universal2 -k 'test_cp38_arm64_testing_universal2_installer or test_arch_auto or test_dummy_serial' install_pre_requirements_script: - brew install python@3.12 - python3.12 -m venv ${VENV_ROOT} diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index 59f724c2c..712e964cb 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -60,7 +60,7 @@ windows_x86_task: macos_arm64_task: name: Build macOS arm64 wheels. macos_instance: - image: ghcr.io/cirruslabs/macos-runner:sonoma + image: ghcr.io/cirruslabs/macos-runner:sequoia env: VENV_ROOT: ${HOME}/venv-cibuildwheel PATH: ${VENV_ROOT}/bin:${PATH} From 99183d68ac491ca04c562a5de91c7287b1bd1728 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 15 Apr 2025 14:49:17 -0400 Subject: [PATCH 1014/1105] ci: add Windows ARM (#2362) * ci: add Windows ARM Signed-off-by: Henry Schreiner * ci: install rust on Windows ARM Signed-off-by: Henry Schreiner * ci: different action for rust Signed-off-by: Henry Schreiner * ci: no sync required (avoid dev group) Signed-off-by: Henry Schreiner * fix: expected wheels on Windows ARM64 * fix: skip python 3.8 on Windows ARM64 --------- Signed-off-by: Henry Schreiner Co-authored-by: mayeut --- .github/workflows/test.yml | 14 +++++++------- test/test_dependency_versions.py | 3 +++ test/utils.py | 10 +++++++++- unit_test/oci_container_test.py | 1 + 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 675831734..4f4b3a772 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,7 +36,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-13, macos-15] + os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-13, macos-15] python_version: ['3.13'] include: - os: ubuntu-latest @@ -70,7 +70,7 @@ jobs: - name: Generate a sample project run: | - uv run -m test.test_projects test.test_0_basic.basic_project sample_proj + uv run --no-sync -m test.test_projects test.test_0_basic.basic_project sample_proj - name: Run a sample build (GitHub Action) uses: ./ @@ -122,7 +122,7 @@ jobs: - name: Test cibuildwheel run: | - uv run bin/run_tests.py ${{ (runner.os == 'Linux' && runner.arch == 'X64') && '--run-podman' || '' }} + uv run --no-sync bin/run_tests.py ${{ (runner.os == 'Linux' && runner.arch == 'X64') && '--run-podman' || '' }} emulated-archs: name: Get qemu emulated architectures @@ -141,7 +141,7 @@ jobs: - name: Get qemu emulated architectures id: archs run: | - OUTPUT=$(uv run python -c "from json import dumps; from test.utils import EMULATED_ARCHS; print(dumps(EMULATED_ARCHS))") + OUTPUT=$(uv run --no-sync python -c "from json import dumps; from test.utils import EMULATED_ARCHS; print(dumps(EMULATED_ARCHS))") echo "${OUTPUT}" echo "archs=${OUTPUT}" >> "$GITHUB_OUTPUT" @@ -166,7 +166,7 @@ jobs: uses: docker/setup-qemu-action@v3 - name: Run the emulation tests - run: uv run pytest --run-emulation ${{ matrix.arch }} test/test_emulation.py + run: uv run --no-sync pytest --run-emulation ${{ matrix.arch }} test/test_emulation.py test-pyodide: name: Test cibuildwheel building Pyodide wheels @@ -186,7 +186,7 @@ jobs: - name: Generate a sample project run: | - uv run -m test.test_projects test.test_0_basic.basic_project sample_proj + uv run --no-sync -m test.test_projects test.test_0_basic.basic_project sample_proj - name: Run a sample build (GitHub Action) uses: ./ @@ -198,6 +198,6 @@ jobs: - name: Run tests with 'CIBW_PLATFORM' set to 'pyodide' run: | - uv run ./bin/run_tests.py + uv run --no-sync ./bin/run_tests.py env: CIBW_PLATFORM: pyodide diff --git a/test/test_dependency_versions.py b/test/test_dependency_versions.py index b264868f3..b8d80f3bc 100644 --- a/test/test_dependency_versions.py +++ b/test/test_dependency_versions.py @@ -1,3 +1,4 @@ +import platform import re import textwrap from pathlib import Path @@ -56,6 +57,8 @@ def test_pinned_versions(tmp_path, python_version, build_frontend_env_nouv): pytest.skip("linux doesn't pin individual tool versions, it pins manylinux images instead") if python_version != "3.12" and utils.platform == "pyodide": pytest.skip(f"pyodide does not support Python {python_version}") + if python_version == "3.8" and utils.platform == "windows" and platform.machine() == "ARM64": + pytest.skip(f"Windows ARM64 does not support Python {python_version}") project_dir = tmp_path / "project" project_with_expected_version_checks.generate(project_dir) diff --git a/test/utils.py b/test/utils.py index d999e1b40..b3d2b172d 100644 --- a/test/utils.py +++ b/test/utils.py @@ -245,6 +245,10 @@ def _expected_wheels( "cp313-cp313t", ] + if machine_arch == "ARM64": + # no CPython 3.8 on Windows ARM64 + python_abi_tags.pop(0) + if machine_arch in ["x86_64", "i686", "AMD64", "aarch64", "arm64"]: python_abi_tags += [ "pp38-pypy38_pp73", @@ -290,7 +294,11 @@ def _expected_wheels( ) elif platform == "windows": - platform_tags = ["win_amd64"] if machine_arch == "AMD64" else ["win32"] + platform_tags = { + "AMD64": ["win_amd64"], + "ARM64": ["win_arm64"], + "x86": ["win32"], + }.get(machine_arch, []) elif platform == "macos": if python_abi_tag.startswith("pp"): diff --git a/unit_test/oci_container_test.py b/unit_test/oci_container_test.py index 5acc9cc48..24466023e 100644 --- a/unit_test/oci_container_test.py +++ b/unit_test/oci_container_test.py @@ -37,6 +37,7 @@ "s390x": OCIPlatform.S390X, "aarch64": OCIPlatform.ARM64, "arm64": OCIPlatform.ARM64, + "ARM64": OCIPlatform.ARM64, }[pm] PODMAN = OCIContainerEngineConfig(name="podman") From 03f1905bb9c49fa8409c860a4d89001d6a402da8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 21 Apr 2025 22:45:23 +0100 Subject: [PATCH 1015/1105] [pre-commit.ci] pre-commit autoupdate (#2370) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.5 → v0.11.6](https://github.com/astral-sh/ruff-pre-commit/compare/v0.11.5...v0.11.6) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 11e7e982a..6e0fec079 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.5 + rev: v0.11.6 hooks: - id: ruff args: ["--fix", "--show-fixes"] From 4e5b8ee8e802e93138d3a236a81191509298a9d6 Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Wed, 23 Apr 2025 09:36:36 -0400 Subject: [PATCH 1016/1105] [Bot] Update dependencies (#2368) Update dependencies Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> --- .../resources/constraints-pyodide312.txt | 2 +- .../resources/constraints-python310.txt | 2 +- .../resources/constraints-python311.txt | 2 +- .../resources/constraints-python312.txt | 2 +- .../resources/constraints-python313.txt | 2 +- .../resources/constraints-python38.txt | 2 +- .../resources/constraints-python39.txt | 2 +- cibuildwheel/resources/constraints.txt | 2 +- .../resources/pinned_docker_images.cfg | 54 +++++++++---------- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/cibuildwheel/resources/constraints-pyodide312.txt b/cibuildwheel/resources/constraints-pyodide312.txt index 2a0bfbce7..e7bd14b30 100644 --- a/cibuildwheel/resources/constraints-pyodide312.txt +++ b/cibuildwheel/resources/constraints-pyodide312.txt @@ -42,7 +42,7 @@ markdown-it-py==3.0.0 # via rich mdurl==0.1.2 # via markdown-it-py -packaging==24.2 +packaging==25.0 # via # auditwheel-emscripten # build diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index da66890e6..9eccc27be 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -14,7 +14,7 @@ importlib-metadata==8.6.1 # via build macholib==1.16.3 # via delocate -packaging==24.2 +packaging==25.0 # via # build # delocate diff --git a/cibuildwheel/resources/constraints-python311.txt b/cibuildwheel/resources/constraints-python311.txt index ec5abaa74..7abb00bfa 100644 --- a/cibuildwheel/resources/constraints-python311.txt +++ b/cibuildwheel/resources/constraints-python311.txt @@ -12,7 +12,7 @@ filelock==3.18.0 # via virtualenv macholib==1.16.3 # via delocate -packaging==24.2 +packaging==25.0 # via # build # delocate diff --git a/cibuildwheel/resources/constraints-python312.txt b/cibuildwheel/resources/constraints-python312.txt index ec5abaa74..7abb00bfa 100644 --- a/cibuildwheel/resources/constraints-python312.txt +++ b/cibuildwheel/resources/constraints-python312.txt @@ -12,7 +12,7 @@ filelock==3.18.0 # via virtualenv macholib==1.16.3 # via delocate -packaging==24.2 +packaging==25.0 # via # build # delocate diff --git a/cibuildwheel/resources/constraints-python313.txt b/cibuildwheel/resources/constraints-python313.txt index ec5abaa74..7abb00bfa 100644 --- a/cibuildwheel/resources/constraints-python313.txt +++ b/cibuildwheel/resources/constraints-python313.txt @@ -12,7 +12,7 @@ filelock==3.18.0 # via virtualenv macholib==1.16.3 # via delocate -packaging==24.2 +packaging==25.0 # via # build # delocate diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index f5d8ee8af..490e373a9 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -14,7 +14,7 @@ importlib-metadata==8.5.0 # via build macholib==1.16.3 # via delocate -packaging==24.2 +packaging==25.0 # via # build # delocate diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index da66890e6..9eccc27be 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -14,7 +14,7 @@ importlib-metadata==8.6.1 # via build macholib==1.16.3 # via delocate -packaging==24.2 +packaging==25.0 # via # build # delocate diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index ec5abaa74..7abb00bfa 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -12,7 +12,7 @@ filelock==3.18.0 # via virtualenv macholib==1.16.3 # via delocate -packaging==24.2 +packaging==25.0 # via # build # delocate diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 66cfda9e7..528a4eebd 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,45 +1,45 @@ [x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.04.12-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.04.12-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.04.12-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.04.12-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.04.19-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.04.19-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.04.19-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.04.19-1 [i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.04.12-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.04.12-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.04.19-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.04.19-1 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.04.12-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.04.12-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.12-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.04.12-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.04.19-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.04.19-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.19-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.04.19-1 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.04.12-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.04.12-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.04.12-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.04.12-1 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.04.19-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.04.19-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.04.19-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.04.19-1 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.04.12-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.04.12-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.04.12-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.04.12-1 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.04.19-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.04.19-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.04.19-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.04.19-1 [pypy_x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.04.12-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.04.12-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.04.12-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.04.19-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.04.19-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.04.19-1 [pypy_i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.04.12-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.04.19-1 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.04.12-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.04.12-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.12-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.04.19-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.04.19-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.19-1 [armv7l] -manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.04.12-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.04.12-1 +manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.04.19-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.04.19-1 From 4241f37b2c5be7f7ed96214b83f8cfbe1496cc28 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sat, 26 Apr 2025 11:35:02 +0100 Subject: [PATCH 1017/1105] [2.x] Update dependencies (#2371) --- cibuildwheel/resources/build-platforms.toml | 36 ++++++++-------- .../resources/cibuildwheel.schema.json | 4 +- .../resources/constraints-pyodide312.txt | 23 +++++----- .../resources/constraints-python310.txt | 6 +-- .../resources/constraints-python311.txt | 6 +-- .../resources/constraints-python312.txt | 6 +-- .../resources/constraints-python313.txt | 6 +-- .../resources/constraints-python38.txt | 6 +-- .../resources/constraints-python39.txt | 6 +-- cibuildwheel/resources/constraints.txt | 6 +-- .../resources/pinned_docker_images.cfg | 42 +++++++++---------- cibuildwheel/resources/virtualenv.toml | 2 +- 12 files changed, 76 insertions(+), 73 deletions(-) diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index ddf379426..3f27c05fc 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -141,15 +141,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.9/python-3.12.9-macos11.pkg" }, - { identifier = "cp312-macosx_arm64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.9/python-3.12.9-macos11.pkg" }, - { identifier = "cp312-macosx_universal2", version = "3.12", url = "https://www.python.org/ftp/python/3.12.9/python-3.12.9-macos11.pkg" }, - { identifier = "cp313-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.2/python-3.13.2-macos11.pkg" }, - { identifier = "cp313-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.2/python-3.13.2-macos11.pkg" }, - { identifier = "cp313-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.2/python-3.13.2-macos11.pkg" }, - { identifier = "cp313t-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.2/python-3.13.2-macos11.pkg" }, - { identifier = "cp313t-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.2/python-3.13.2-macos11.pkg" }, - { identifier = "cp313t-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.2/python-3.13.2-macos11.pkg" }, + { identifier = "cp312-macosx_x86_64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.10/python-3.12.10-macos11.pkg" }, + { identifier = "cp312-macosx_arm64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.10/python-3.12.10-macos11.pkg" }, + { identifier = "cp312-macosx_universal2", version = "3.12", url = "https://www.python.org/ftp/python/3.12.10/python-3.12.10-macos11.pkg" }, + { identifier = "cp313-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, + { identifier = "cp313-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, + { identifier = "cp313-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, + { identifier = "cp313t-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, + { identifier = "cp313t-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, + { identifier = "cp313t-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-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" }, @@ -175,18 +175,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.9", arch = "32" }, - { identifier = "cp312-win_amd64", version = "3.12.9", arch = "64" }, - { identifier = "cp313-win32", version = "3.13.2", arch = "32" }, - { identifier = "cp313t-win32", version = "3.13.2", arch = "32" }, - { identifier = "cp313-win_amd64", version = "3.13.2", arch = "64" }, - { identifier = "cp313t-win_amd64", version = "3.13.2", arch = "64" }, + { identifier = "cp312-win32", version = "3.12.10", arch = "32" }, + { identifier = "cp312-win_amd64", version = "3.12.10", arch = "64" }, + { identifier = "cp313-win32", version = "3.13.3", arch = "32" }, + { identifier = "cp313t-win32", version = "3.13.3", arch = "32" }, + { identifier = "cp313-win_amd64", version = "3.13.3", arch = "64" }, + { identifier = "cp313t-win_amd64", version = "3.13.3", 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.9", arch = "ARM64" }, - { identifier = "cp313-win_arm64", version = "3.13.2", arch = "ARM64" }, - { identifier = "cp313t-win_arm64", version = "3.13.2", arch = "ARM64" }, + { identifier = "cp312-win_arm64", version = "3.12.10", arch = "ARM64" }, + { identifier = "cp313-win_arm64", version = "3.13.3", arch = "ARM64" }, + { identifier = "cp313t-win_arm64", version = "3.13.3", 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" }, diff --git a/cibuildwheel/resources/cibuildwheel.schema.json b/cibuildwheel/resources/cibuildwheel.schema.json index 68c195ab2..e9ef3985b 100644 --- a/cibuildwheel/resources/cibuildwheel.schema.json +++ b/cibuildwheel/resources/cibuildwheel.schema.json @@ -13,10 +13,9 @@ }, "enable": { "enum": [ - "cpython-eol", "cpython-freethreading", "cpython-prerelease", - "pypy-eol" + "pypy" ] }, "description": "A Python version or flavor to enable." @@ -289,6 +288,7 @@ "type": "boolean", "default": false, "description": "The project supports free-threaded builds of Python (PEP703)", + "deprecated": "Use the `enable` option instead.", "title": "CIBW_FREE_THREADED_SUPPORT" }, "manylinux-aarch64-image": { diff --git a/cibuildwheel/resources/constraints-pyodide312.txt b/cibuildwheel/resources/constraints-pyodide312.txt index 7827ad07e..e7bd14b30 100644 --- a/cibuildwheel/resources/constraints-pyodide312.txt +++ b/cibuildwheel/resources/constraints-pyodide312.txt @@ -19,7 +19,7 @@ charset-normalizer==3.4.1 # via requests click==8.1.8 # via typer -cmake==3.31.6 +cmake==4.0.0 # via pyodide-build distlib==0.3.9 # via virtualenv @@ -27,7 +27,7 @@ filelock==3.18.0 # via virtualenv h11==0.14.0 # via httpcore -httpcore==1.0.7 +httpcore==1.0.8 # via httpx httpx==0.28.1 # via unearth @@ -42,7 +42,7 @@ markdown-it-py==3.0.0 # via rich mdurl==0.1.2 # via markdown-it-py -packaging==24.2 +packaging==25.0 # via # auditwheel-emscripten # build @@ -52,11 +52,11 @@ pip==25.0.1 # via -r .nox/update_constraints/tmp/constraints-pyodide.in platformdirs==4.3.7 # via virtualenv -pydantic==2.10.6 +pydantic==2.11.3 # via # pyodide-build # pyodide-lock -pydantic-core==2.27.2 +pydantic-core==2.33.1 # via pydantic pygments==2.19.1 # via rich @@ -74,7 +74,7 @@ requests==2.32.3 # via pyodide-build resolvelib==1.1.0 # via pyodide-build -rich==13.9.4 +rich==14.0.0 # via # pyodide-build # pyodide-cli @@ -92,17 +92,20 @@ typer==0.15.2 # auditwheel-emscripten # pyodide-build # pyodide-cli -typing-extensions==4.12.2 +typing-extensions==4.13.2 # via # anyio # pydantic # pydantic-core # typer -unearth==0.17.3 + # typing-inspection +typing-inspection==0.4.0 + # via pydantic +unearth==0.17.5 # via pyodide-build -urllib3==2.3.0 +urllib3==2.4.0 # via requests -virtualenv==20.29.3 +virtualenv==20.30.0 # via # build # pyodide-build diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index c7cd2fb8e..9eccc27be 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -14,7 +14,7 @@ importlib-metadata==8.6.1 # via build macholib==1.16.3 # via delocate -packaging==24.2 +packaging==25.0 # via # build # delocate @@ -26,9 +26,9 @@ pyproject-hooks==1.2.0 # via build tomli==2.2.1 # via build -typing-extensions==4.12.2 +typing-extensions==4.13.2 # via delocate -virtualenv==20.29.3 +virtualenv==20.30.0 # via -r cibuildwheel/resources/constraints.in zipp==3.21.0 # via importlib-metadata diff --git a/cibuildwheel/resources/constraints-python311.txt b/cibuildwheel/resources/constraints-python311.txt index 7b07dba10..7abb00bfa 100644 --- a/cibuildwheel/resources/constraints-python311.txt +++ b/cibuildwheel/resources/constraints-python311.txt @@ -12,7 +12,7 @@ filelock==3.18.0 # via virtualenv macholib==1.16.3 # via delocate -packaging==24.2 +packaging==25.0 # via # build # delocate @@ -22,7 +22,7 @@ platformdirs==4.3.7 # via virtualenv pyproject-hooks==1.2.0 # via build -typing-extensions==4.12.2 +typing-extensions==4.13.2 # via delocate -virtualenv==20.29.3 +virtualenv==20.30.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python312.txt b/cibuildwheel/resources/constraints-python312.txt index 7b07dba10..7abb00bfa 100644 --- a/cibuildwheel/resources/constraints-python312.txt +++ b/cibuildwheel/resources/constraints-python312.txt @@ -12,7 +12,7 @@ filelock==3.18.0 # via virtualenv macholib==1.16.3 # via delocate -packaging==24.2 +packaging==25.0 # via # build # delocate @@ -22,7 +22,7 @@ platformdirs==4.3.7 # via virtualenv pyproject-hooks==1.2.0 # via build -typing-extensions==4.12.2 +typing-extensions==4.13.2 # via delocate -virtualenv==20.29.3 +virtualenv==20.30.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python313.txt b/cibuildwheel/resources/constraints-python313.txt index 7b07dba10..7abb00bfa 100644 --- a/cibuildwheel/resources/constraints-python313.txt +++ b/cibuildwheel/resources/constraints-python313.txt @@ -12,7 +12,7 @@ filelock==3.18.0 # via virtualenv macholib==1.16.3 # via delocate -packaging==24.2 +packaging==25.0 # via # build # delocate @@ -22,7 +22,7 @@ platformdirs==4.3.7 # via virtualenv pyproject-hooks==1.2.0 # via build -typing-extensions==4.12.2 +typing-extensions==4.13.2 # via delocate -virtualenv==20.29.3 +virtualenv==20.30.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index 72784c87f..490e373a9 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -14,7 +14,7 @@ importlib-metadata==8.5.0 # via build macholib==1.16.3 # via delocate -packaging==24.2 +packaging==25.0 # via # build # delocate @@ -26,9 +26,9 @@ pyproject-hooks==1.2.0 # via build tomli==2.2.1 # via build -typing-extensions==4.12.2 +typing-extensions==4.13.2 # via delocate -virtualenv==20.29.3 +virtualenv==20.30.0 # via -r cibuildwheel/resources/constraints.in zipp==3.20.2 # via importlib-metadata diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index c7cd2fb8e..9eccc27be 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -14,7 +14,7 @@ importlib-metadata==8.6.1 # via build macholib==1.16.3 # via delocate -packaging==24.2 +packaging==25.0 # via # build # delocate @@ -26,9 +26,9 @@ pyproject-hooks==1.2.0 # via build tomli==2.2.1 # via build -typing-extensions==4.12.2 +typing-extensions==4.13.2 # via delocate -virtualenv==20.29.3 +virtualenv==20.30.0 # via -r cibuildwheel/resources/constraints.in zipp==3.21.0 # via importlib-metadata diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index 7b07dba10..7abb00bfa 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -12,7 +12,7 @@ filelock==3.18.0 # via virtualenv macholib==1.16.3 # via delocate -packaging==24.2 +packaging==25.0 # via # build # delocate @@ -22,7 +22,7 @@ platformdirs==4.3.7 # via virtualenv pyproject-hooks==1.2.0 # via build -typing-extensions==4.12.2 +typing-extensions==4.13.2 # via delocate -virtualenv==20.29.3 +virtualenv==20.30.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index b7318293b..ad5f418c0 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,58 +1,58 @@ [x86_64] manylinux1 = quay.io/pypa/manylinux1_x86_64:2024-04-29-76807b8 manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.03.23-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.04.19-1 manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.03.23-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.04.19-1 musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2024.10.26-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.03.23-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.04.19-1 [i686] manylinux1 = quay.io/pypa/manylinux1_i686:2024-04-29-76807b8 manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-08-05-4535177 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.03.23-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.04.19-1 manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-12-26-0d38463 musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2024.10.26-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.03.23-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.04.19-1 [pypy_x86_64] manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.03.23-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.04.19-1 manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.03.23-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.04.19-1 [pypy_i686] manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-08-05-4535177 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.03.23-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.04.19-1 manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-12-26-0d38463 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.03.23-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.04.19-1 manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.03.23-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.04.19-1 musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2024.10.26-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.03.23-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.04.19-1 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.03.23-1 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.04.19-1 manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.03.23-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.04.19-1 musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2024.10.26-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.03.23-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.04.19-1 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.03.23-1 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.04.19-1 manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.03.23-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.04.19-1 musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2024.10.26-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.03.23-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.04.19-1 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.03.23-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.04.19-1 manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.03.23-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.04.19-1 [armv7l] -manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.03.23-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.03.23-1 +manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.04.19-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.04.19-1 diff --git a/cibuildwheel/resources/virtualenv.toml b/cibuildwheel/resources/virtualenv.toml index b791121a1..09e96e302 100644 --- a/cibuildwheel/resources/virtualenv.toml +++ b/cibuildwheel/resources/virtualenv.toml @@ -1,2 +1,2 @@ py36 = { version = "20.21.1", url = "https://github.com/pypa/get-virtualenv/blob/20.21.1/public/virtualenv.pyz?raw=true" } -default = { version = "20.29.3", url = "https://github.com/pypa/get-virtualenv/blob/20.29.3/public/virtualenv.pyz?raw=true" } +default = { version = "20.30.0", url = "https://github.com/pypa/get-virtualenv/blob/20.30.0/public/virtualenv.pyz?raw=true" } From faf86a6ed7efa889faf6996aa23820831055001a Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sat, 26 Apr 2025 11:39:25 +0100 Subject: [PATCH 1018/1105] Bump version: v2.23.3 --- README.md | 16 +++++++--------- cibuildwheel/__init__.py | 2 +- docs/changelog.md | 6 ++++++ docs/faq.md | 6 +++--- docs/setup.md | 4 ++-- examples/appveyor-minimal.yml | 2 +- examples/azure-pipelines-minimal.yml | 6 +++--- examples/circleci-minimal.yml | 6 +++--- examples/cirrus-ci-intel-mac.yml | 2 +- examples/cirrus-ci-minimal.yml | 2 +- examples/github-deploy.yml | 2 +- examples/github-minimal.yml | 2 +- examples/github-with-qemu.yml | 2 +- examples/gitlab-minimal.yml | 6 +++--- examples/gitlab-with-qemu.yml | 2 +- examples/travis-ci-deploy.yml | 2 +- examples/travis-ci-minimal.yml | 2 +- examples/travis-ci-test-and-deploy.yml | 4 ++-- pyproject.toml | 2 +- 19 files changed, 40 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 1d8b087df..9a3c0ab24 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ jobs: - uses: actions/setup-python@v5 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.23.2 + run: python -m pip install cibuildwheel==2.23.3 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -215,6 +215,12 @@ Changelog +### v2.23.3 + +_26 April 2025_ + +- 🛠 Dependency updates, including Python 3.13.3 (#2371) + ### v2.23.2 _24 March 2025_ @@ -256,14 +262,6 @@ _23 November 2024_ - 🛠 Now cibuildwheel uses dependency-groups for development dependencies (#2064, #2085) - 📚 Docs updates and tidy ups (#2061, #2067, #2072) - -### v2.21.3 - -_9 October 2024_ - -- 🛠 Update CPython 3.13 to 3.13.0 final release (#2032) -- 📚 Docs updates and tidy ups (#2035) - --- diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index de14b4cba..222a417b9 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1,3 +1,3 @@ from __future__ import annotations -__version__ = "2.23.2" +__version__ = "2.23.3" diff --git a/docs/changelog.md b/docs/changelog.md index b9234b943..a633ea807 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -4,6 +4,12 @@ title: Changelog # Changelog +### v2.23.3 + +_26 April 2025_ + +- 🛠 Dependency updates, including Python 3.13.3 (#2371) + ### v2.23.2 _24 March 2025_ diff --git a/docs/faq.md b/docs/faq.md index 86835d6ef..82a6ccc88 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -142,7 +142,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: pypa/cibuildwheel@v2.23.2 +uses: pypa/cibuildwheel@v2.23.3 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. @@ -164,7 +164,7 @@ The second option, and the only one that supports other CI systems, is using a ` ```bash # requirements-cibw.txt -cibuildwheel==2.23.2 +cibuildwheel==2.23.3 ``` Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this: @@ -328,7 +328,7 @@ Solutions to this vary, but the simplest is to use pipx: # most runners have pipx preinstalled, but in case you don't python3 -m pip install pipx -pipx run cibuildwheel==2.23.2 --output-dir wheelhouse +pipx run cibuildwheel==2.23.3 --output-dir wheelhouse pipx run twine upload wheelhouse/*.whl ``` diff --git a/docs/setup.md b/docs/setup.md index 29e8a380e..4c743f981 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -161,7 +161,7 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/ - uses: actions/checkout@v4 - name: Build wheels - run: pipx run cibuildwheel==2.23.2 + run: pipx run cibuildwheel==2.23.3 - uses: actions/upload-artifact@v4 with: @@ -198,7 +198,7 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/ - uses: actions/setup-python@v5 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.23.2 + run: python -m pip install cibuildwheel==2.23.3 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse diff --git a/examples/appveyor-minimal.yml b/examples/appveyor-minimal.yml index b9c9e11c0..446c2c912 100644 --- a/examples/appveyor-minimal.yml +++ b/examples/appveyor-minimal.yml @@ -9,7 +9,7 @@ environment: stack: python 3.12 -install: python -m pip install cibuildwheel==2.23.2 +install: python -m pip install cibuildwheel==2.23.3 build_script: python -m cibuildwheel --output-dir wheelhouse diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index 29c3bc603..db66bfddd 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -6,7 +6,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - pip3 install cibuildwheel==2.23.2 + pip3 install cibuildwheel==2.23.3 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -20,7 +20,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - python3 -m pip install cibuildwheel==2.23.2 + python3 -m pip install cibuildwheel==2.23.3 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -34,7 +34,7 @@ jobs: - bash: | set -o errexit python -m pip install --upgrade pip - pip install cibuildwheel==2.23.2 + pip install cibuildwheel==2.23.3 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index 1265b26fb..426cd648b 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -11,7 +11,7 @@ jobs: - run: name: Build the Linux wheels. command: | - python3 -m pip install --user cibuildwheel==2.23.2 + python3 -m pip install --user cibuildwheel==2.23.3 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -28,7 +28,7 @@ jobs: - run: name: Build the Linux aarch64 wheels. command: | - python3 -m pip install --user cibuildwheel==2.23.2 + python3 -m pip install --user cibuildwheel==2.23.3 python3 -m cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -44,7 +44,7 @@ jobs: name: Build the OS X wheels. command: | sudo softwareupdate --install-rosetta --agree-to-license # for python<=3.8 or x86_64/universal2 tests - pip3 install cibuildwheel==2.23.2 + pip3 install cibuildwheel==2.23.3 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ diff --git a/examples/cirrus-ci-intel-mac.yml b/examples/cirrus-ci-intel-mac.yml index 9fe287a42..324f075fb 100644 --- a/examples/cirrus-ci-intel-mac.yml +++ b/examples/cirrus-ci-intel-mac.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==2.23.2 + - python -m pip install cibuildwheel==2.23.3 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index 59f724c2c..599f3db1e 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==2.23.2 + - python -m pip install cibuildwheel==2.23.3 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index 5d105a58a..bb4747d5a 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v2.23.2 + uses: pypa/cibuildwheel@v2.23.3 - uses: actions/upload-artifact@v4 with: diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index 7ad9e610d..839100bf2 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v2.23.2 + uses: pypa/cibuildwheel@v2.23.3 # env: # CIBW_SOME_OPTION: value # ... diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index fd0126a74..3c6ee1ab8 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -21,7 +21,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.23.2 + uses: pypa/cibuildwheel@v2.23.3 env: # configure cibuildwheel on Linux to build native archs ('auto'), # and to split the remaining architectures between the x86_64 and diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index b4268771b..7441a0e63 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -12,7 +12,7 @@ linux: DOCKER_TLS_CERTDIR: "" script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==2.23.2 + - python -m pip install cibuildwheel==2.23.3 - cibuildwheel --output-dir wheelhouse artifacts: paths: @@ -23,7 +23,7 @@ windows: before_script: - choco install python -y --version 3.12.4 - choco install git.install -y - - py -m pip install cibuildwheel==2.23.2 + - py -m pip install cibuildwheel==2.23.3 script: - py -m cibuildwheel --output-dir wheelhouse --platform windows artifacts: @@ -35,7 +35,7 @@ windows: macos: image: macos-14-xcode-15 before_script: - - python3 -m pip install cibuildwheel==2.23.2 + - python3 -m pip install cibuildwheel==2.23.3 script: - python3 -m cibuildwheel --output-dir wheelhouse artifacts: diff --git a/examples/gitlab-with-qemu.yml b/examples/gitlab-with-qemu.yml index 36cc5e4cc..2a6bc55ae 100644 --- a/examples/gitlab-with-qemu.yml +++ b/examples/gitlab-with-qemu.yml @@ -14,7 +14,7 @@ linux: - curl -sSL https://get.docker.com/ | sh # Warning: This is extremely slow, be careful with how many wheels you build - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - python -m pip install cibuildwheel==2.23.2 + - python -m pip install cibuildwheel==2.23.3 # Assuming your CI runner's default architecture is x86_64... - cibuildwheel --output-dir wheelhouse --platform linux --archs aarch64 artifacts: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index 82959ee67..903b54b92 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -20,7 +20,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==2.23.2 + - python3 -m pip install cibuildwheel==2.23.3 script: # build the wheels, put them into './dist' diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index 45aa1c4ee..63c812820 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -26,7 +26,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==2.23.2 + - python3 -m pip install cibuildwheel==2.23.3 script: # build the wheels, put them into './wheelhouse' diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index 19a6e1fa8..ae992946c 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -52,7 +52,7 @@ jobs: - stage: deploy name: Build and deploy Linux wheels services: docker - install: python3 -m pip install cibuildwheel==2.23.2 twine + install: python3 -m pip install cibuildwheel==2.23.3 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl # Deploy on windows @@ -60,7 +60,7 @@ jobs: name: Build and deploy Windows wheels os: windows language: shell - install: python3 -m pip install cibuildwheel==2.23.2 twine + install: python3 -m pip install cibuildwheel==2.23.3 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl diff --git a/pyproject.toml b/pyproject.toml index e85583614..b8a180b29 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "cibuildwheel" -version = "2.23.2" +version = "2.23.3" description = "Build Python wheels on CI with minimal configuration." readme = "README.md" license = "BSD-2-Clause" From 4449d7b5fafdc2111ec2d4b0cf864db1873e6571 Mon Sep 17 00:00:00 2001 From: Shantanu <12621235+hauntsaninja@users.noreply.github.com> Date: Mon, 28 Apr 2025 09:02:43 -0700 Subject: [PATCH 1019/1105] chore: type check install_certifi.py (#2365) --- .pre-commit-config.yaml | 1 - cibuildwheel/resources/install_certifi.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6e0fec079..fb55aa5bf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,6 @@ repos: hooks: - id: mypy name: mypy 3.11 on cibuildwheel/ - exclude: ^cibuildwheel/resources/.*py$ args: ["--python-version=3.11"] additional_dependencies: &mypy-dependencies - bracex diff --git a/cibuildwheel/resources/install_certifi.py b/cibuildwheel/resources/install_certifi.py index 0d261d51a..860521750 100644 --- a/cibuildwheel/resources/install_certifi.py +++ b/cibuildwheel/resources/install_certifi.py @@ -26,7 +26,7 @@ ) -def main(): +def main() -> None: openssl_dir, openssl_cafile = os.path.split(ssl.get_default_verify_paths().openssl_cafile) print(" -- pip install --upgrade certifi") subprocess.check_call( From 0463d260668617976c029ee2c3cf26b1cae5e71b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Apr 2025 12:02:52 -0400 Subject: [PATCH 1020/1105] chore(deps): bump astral-sh/setup-uv from 5 to 6 in the actions group (#2375) Bumps the actions group with 1 update: [astral-sh/setup-uv](https://github.com/astral-sh/setup-uv). Updates `astral-sh/setup-uv` from 5 to 6 - [Release notes](https://github.com/astral-sh/setup-uv/releases) - [Commits](https://github.com/astral-sh/setup-uv/compare/v5...v6) --- updated-dependencies: - dependency-name: astral-sh/setup-uv dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4f4b3a772..b6bb7c866 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,7 +50,7 @@ jobs: python-version: ${{ matrix.python_version }} allow-prereleases: true - - uses: astral-sh/setup-uv@v5 + - uses: astral-sh/setup-uv@v6 # free some space to prevent reaching GHA disk space limits - name: Clean docker images @@ -135,7 +135,7 @@ jobs: - uses: actions/setup-python@v5 with: python-version: "3.x" - - uses: astral-sh/setup-uv@v5 + - uses: astral-sh/setup-uv@v6 - name: Install dependencies run: uv sync --no-dev --group test - name: Get qemu emulated architectures @@ -158,7 +158,7 @@ jobs: - uses: actions/setup-python@v5 with: python-version: "3.x" - - uses: astral-sh/setup-uv@v5 + - uses: astral-sh/setup-uv@v6 - name: Install dependencies run: uv sync --no-dev --group test @@ -179,7 +179,7 @@ jobs: name: Install Python 3.12 with: python-version: '3.12' - - uses: astral-sh/setup-uv@v5 + - uses: astral-sh/setup-uv@v6 - name: Install dependencies run: uv sync --no-dev --group test From 5f8d06ff55679f81d007fe6aed2e7e0d9e9e3181 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Mon, 28 Apr 2025 18:05:03 +0200 Subject: [PATCH 1021/1105] feat: initial support for riscv64 (#2366) * feat: initial support for riscv64 * use enable for riscv64 * Apply review suggestion Co-authored-by: Joe Rickerby * update documentation --------- Co-authored-by: Joe Rickerby --- bin/generate_schema.py | 7 +++ bin/update_docker.py | 3 + cibuildwheel/architecture.py | 2 + cibuildwheel/logger.py | 2 + cibuildwheel/oci_container.py | 1 + cibuildwheel/options.py | 2 + cibuildwheel/platforms/linux.py | 1 + cibuildwheel/resources/build-platforms.toml | 14 +++++ .../resources/cibuildwheel.schema.json | 60 ++++++++++++++++--- cibuildwheel/resources/defaults.toml | 2 + .../resources/pinned_docker_images.cfg | 2 + cibuildwheel/selector.py | 5 ++ docs/options.md | 34 +++++++---- test/test_emulation.py | 13 +++- test/utils.py | 1 + unit_test/build_selector_test.py | 9 +++ unit_test/main_tests/main_platform_test.py | 1 + unit_test/oci_container_test.py | 6 +- 18 files changed, 139 insertions(+), 26 deletions(-) diff --git a/bin/generate_schema.py b/bin/generate_schema.py index 8ca6a1a76..728a5a56c 100755 --- a/bin/generate_schema.py +++ b/bin/generate_schema.py @@ -31,6 +31,7 @@ - cpython-freethreading - cpython-prerelease - pypy + - cpython-experimental-riscv64 description: A Python version or flavor to enable. additionalProperties: false description: cibuildwheel's settings. @@ -157,6 +158,9 @@ manylinux-pypy_x86_64-image: type: string description: Specify alternative manylinux / musllinux container images + manylinux-riscv64-image: + type: string + description: Specify alternative manylinux / musllinux container images manylinux-s390x-image: type: string description: Specify alternative manylinux / musllinux container images @@ -175,6 +179,9 @@ musllinux-ppc64le-image: type: string description: Specify alternative manylinux / musllinux container images + musllinux-riscv64-image: + type: string + description: Specify alternative manylinux / musllinux container images musllinux-s390x-image: type: string description: Specify alternative manylinux / musllinux container images diff --git a/bin/update_docker.py b/bin/update_docker.py index 3f23d75da..efb90154e 100755 --- a/bin/update_docker.py +++ b/bin/update_docker.py @@ -116,5 +116,8 @@ def __init__(self, manylinux_version: str, platforms: list[str], tag: str | None suffix = f"_{platform.removeprefix('pypy_')}" config[platform][image.manylinux_version] = f"{image.image_name}{suffix}:{tag_name}" +if not config.has_section("riscv64"): + config["riscv64"] = {} + with open(RESOURCES / "pinned_docker_images.cfg", "w") as f: config.write(f) diff --git a/cibuildwheel/architecture.py b/cibuildwheel/architecture.py index de17c75dd..0ac2f1a1a 100644 --- a/cibuildwheel/architecture.py +++ b/cibuildwheel/architecture.py @@ -51,6 +51,7 @@ class Architecture(StrEnum): ppc64le = auto() s390x = auto() armv7l = auto() + riscv64 = auto() # mac archs universal2 = auto() @@ -167,6 +168,7 @@ def all_archs(platform: PlatformName) -> "set[Architecture]": Architecture.ppc64le, Architecture.s390x, Architecture.armv7l, + Architecture.riscv64, }, "macos": {Architecture.x86_64, Architecture.arm64, Architecture.universal2}, "windows": {Architecture.x86, Architecture.AMD64, Architecture.ARM64}, diff --git a/cibuildwheel/logger.py b/cibuildwheel/logger.py index 391786a04..321352e8c 100644 --- a/cibuildwheel/logger.py +++ b/cibuildwheel/logger.py @@ -22,12 +22,14 @@ "manylinux_ppc64le": "manylinux ppc64le", "manylinux_s390x": "manylinux s390x", "manylinux_armv7l": "manylinux armv7l", + "manylinux_riscv64": "manylinux riscv64", "musllinux_x86_64": "musllinux x86_64", "musllinux_i686": "musllinux i686", "musllinux_aarch64": "musllinux aarch64", "musllinux_ppc64le": "musllinux ppc64le", "musllinux_s390x": "musllinux s390x", "musllinux_armv7l": "musllinux armv7l", + "musllinux_riscv64": "musllinux riscv64", "win32": "Windows 32bit", "win_amd64": "Windows 64bit", "win_arm64": "Windows on ARM 64bit", diff --git a/cibuildwheel/oci_container.py b/cibuildwheel/oci_container.py index 3a4a49958..fa3d77048 100644 --- a/cibuildwheel/oci_container.py +++ b/cibuildwheel/oci_container.py @@ -33,6 +33,7 @@ class OCIPlatform(Enum): ARMV7 = "linux/arm/v7" ARM64 = "linux/arm64" PPC64LE = "linux/ppc64le" + RISCV64 = "linux/riscv64" S390X = "linux/s390x" diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index b0177e0c9..283f48f7c 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -35,6 +35,7 @@ "ppc64le", "s390x", "armv7l", + "riscv64", "pypy_aarch64", "pypy_i686", ) @@ -46,6 +47,7 @@ "ppc64le", "s390x", "armv7l", + "riscv64", ) diff --git a/cibuildwheel/platforms/linux.py b/cibuildwheel/platforms/linux.py index 4932298aa..e39a24e08 100644 --- a/cibuildwheel/platforms/linux.py +++ b/cibuildwheel/platforms/linux.py @@ -28,6 +28,7 @@ Architecture.ppc64le: OCIPlatform.PPC64LE, Architecture.s390x: OCIPlatform.S390X, Architecture.armv7l: OCIPlatform.ARMV7, + Architecture.riscv64: OCIPlatform.RISCV64, } diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index d8bf3833c..d2ad15e09 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -46,6 +46,13 @@ python_configurations = [ { identifier = "cp312-manylinux_armv7l", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-manylinux_armv7l", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-manylinux_armv7l", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp38-manylinux_riscv64", version = "3.8", path_str = "/opt/python/cp38-cp38" }, + { identifier = "cp39-manylinux_riscv64", version = "3.9", path_str = "/opt/python/cp39-cp39" }, + { identifier = "cp310-manylinux_riscv64", version = "3.10", path_str = "/opt/python/cp310-cp310" }, + { identifier = "cp311-manylinux_riscv64", version = "3.11", path_str = "/opt/python/cp311-cp311" }, + { identifier = "cp312-manylinux_riscv64", version = "3.12", path_str = "/opt/python/cp312-cp312" }, + { identifier = "cp313-manylinux_riscv64", version = "3.13", path_str = "/opt/python/cp313-cp313" }, + { identifier = "cp313t-manylinux_riscv64", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, { identifier = "pp38-manylinux_aarch64", version = "3.8", path_str = "/opt/python/pp38-pypy38_pp73" }, { identifier = "pp39-manylinux_aarch64", version = "3.9", path_str = "/opt/python/pp39-pypy39_pp73" }, { identifier = "pp310-manylinux_aarch64", version = "3.10", path_str = "/opt/python/pp310-pypy310_pp73" }, @@ -96,6 +103,13 @@ python_configurations = [ { identifier = "cp312-musllinux_armv7l", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-musllinux_armv7l", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-musllinux_armv7l", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp38-musllinux_riscv64", version = "3.8", path_str = "/opt/python/cp38-cp38" }, + { identifier = "cp39-musllinux_ricv64", version = "3.9", path_str = "/opt/python/cp39-cp39" }, + { identifier = "cp310-musllinux_riscv64", version = "3.10", path_str = "/opt/python/cp310-cp310" }, + { identifier = "cp311-musllinux_riscv64", version = "3.11", path_str = "/opt/python/cp311-cp311" }, + { identifier = "cp312-musllinux_riscv64", version = "3.12", path_str = "/opt/python/cp312-cp312" }, + { identifier = "cp313-musllinux_riscv64", version = "3.13", path_str = "/opt/python/cp313-cp313" }, + { identifier = "cp313t-musllinux_riscv64", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, ] [macos] diff --git a/cibuildwheel/resources/cibuildwheel.schema.json b/cibuildwheel/resources/cibuildwheel.schema.json index 10e07cc15..46ad0020f 100644 --- a/cibuildwheel/resources/cibuildwheel.schema.json +++ b/cibuildwheel/resources/cibuildwheel.schema.json @@ -15,7 +15,8 @@ "enum": [ "cpython-freethreading", "cpython-prerelease", - "pypy" + "pypy", + "cpython-experimental-riscv64" ] }, "description": "A Python version or flavor to enable." @@ -357,6 +358,11 @@ "description": "Specify alternative manylinux / musllinux container images", "title": "CIBW_MANYLINUX_PYPY_X86_64_IMAGE" }, + "manylinux-riscv64-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MANYLINUX_RISCV64_IMAGE" + }, "manylinux-s390x-image": { "type": "string", "description": "Specify alternative manylinux / musllinux container images", @@ -387,6 +393,11 @@ "description": "Specify alternative manylinux / musllinux container images", "title": "CIBW_MUSLLINUX_PPC64LE_IMAGE" }, + "musllinux-riscv64-image": { + "type": "string", + "description": "Specify alternative manylinux / musllinux container images", + "title": "CIBW_MUSLLINUX_RISCV64_IMAGE" + }, "musllinux-s390x-image": { "type": "string", "description": "Specify alternative manylinux / musllinux container images", @@ -566,6 +577,9 @@ "before-build": { "$ref": "#/$defs/inherit" }, + "xbuild-tools": { + "$ref": "#/$defs/inherit" + }, "before-test": { "$ref": "#/$defs/inherit" }, @@ -581,9 +595,6 @@ "environment-pass": { "$ref": "#/$defs/inherit" }, - "xbuild-tools": { - "$ref": "#/$defs/inherit" - }, "repair-wheel-command": { "$ref": "#/$defs/inherit" }, @@ -652,6 +663,9 @@ "manylinux-pypy_x86_64-image": { "$ref": "#/properties/manylinux-pypy_x86_64-image" }, + "manylinux-riscv64-image": { + "$ref": "#/properties/manylinux-riscv64-image" + }, "manylinux-s390x-image": { "$ref": "#/properties/manylinux-s390x-image" }, @@ -670,12 +684,18 @@ "musllinux-ppc64le-image": { "$ref": "#/properties/musllinux-ppc64le-image" }, + "musllinux-riscv64-image": { + "$ref": "#/properties/musllinux-riscv64-image" + }, "musllinux-s390x-image": { "$ref": "#/properties/musllinux-s390x-image" }, "musllinux-x86_64-image": { "$ref": "#/properties/musllinux-x86_64-image" }, + "xbuild-tools": { + "$ref": "#/properties/xbuild-tools" + }, "repair-wheel-command": { "$ref": "#/properties/repair-wheel-command" }, @@ -752,6 +772,9 @@ "manylinux-pypy_x86_64-image": { "$ref": "#/properties/manylinux-pypy_x86_64-image" }, + "manylinux-riscv64-image": { + "$ref": "#/properties/manylinux-riscv64-image" + }, "manylinux-s390x-image": { "$ref": "#/properties/manylinux-s390x-image" }, @@ -770,12 +793,18 @@ "musllinux-ppc64le-image": { "$ref": "#/properties/musllinux-ppc64le-image" }, + "musllinux-riscv64-image": { + "$ref": "#/properties/musllinux-riscv64-image" + }, "musllinux-s390x-image": { "$ref": "#/properties/musllinux-s390x-image" }, "musllinux-x86_64-image": { "$ref": "#/properties/musllinux-x86_64-image" }, + "xbuild-tools": { + "$ref": "#/properties/xbuild-tools" + }, "repair-wheel-command": { "description": "Execute a shell command to repair each built wheel.", "oneOf": [ @@ -840,6 +869,9 @@ "environment": { "$ref": "#/properties/environment" }, + "xbuild-tools": { + "$ref": "#/properties/xbuild-tools" + }, "repair-wheel-command": { "$ref": "#/properties/repair-wheel-command" }, @@ -891,6 +923,9 @@ "environment": { "$ref": "#/properties/environment" }, + "xbuild-tools": { + "$ref": "#/properties/xbuild-tools" + }, "repair-wheel-command": { "description": "Execute a shell command to repair each built wheel.", "oneOf": [ @@ -955,6 +990,9 @@ "environment": { "$ref": "#/properties/environment" }, + "xbuild-tools": { + "$ref": "#/properties/xbuild-tools" + }, "repair-wheel-command": { "$ref": "#/properties/repair-wheel-command" }, @@ -1006,22 +1044,28 @@ "environment": { "$ref": "#/properties/environment" }, - "repair-wheel-command": { - "$ref": "#/properties/repair-wheel-command" - }, "xbuild-tools": { "$ref": "#/properties/xbuild-tools" }, + "repair-wheel-command": { + "$ref": "#/properties/repair-wheel-command" + }, "test-command": { "$ref": "#/properties/test-command" }, "test-extras": { "$ref": "#/properties/test-extras" }, + "test-sources": { + "$ref": "#/properties/test-sources" + }, + "test-groups": { + "$ref": "#/properties/test-groups" + }, "test-requires": { "$ref": "#/properties/test-requires" } - } + } } } } diff --git a/cibuildwheel/resources/defaults.toml b/cibuildwheel/resources/defaults.toml index 8ca424556..4d03394fd 100644 --- a/cibuildwheel/resources/defaults.toml +++ b/cibuildwheel/resources/defaults.toml @@ -33,6 +33,7 @@ manylinux-aarch64-image = "manylinux_2_28" manylinux-ppc64le-image = "manylinux_2_28" manylinux-s390x-image = "manylinux_2_28" manylinux-armv7l-image = "manylinux_2_31" +manylinux-riscv64-image = "ghcr.io/pypa/cibuildwheel/no_default_image:please_use_override" manylinux-pypy_x86_64-image = "manylinux_2_28" manylinux-pypy_i686-image = "manylinux2014" manylinux-pypy_aarch64-image = "manylinux_2_28" @@ -43,6 +44,7 @@ musllinux-aarch64-image = "musllinux_1_2" musllinux-ppc64le-image = "musllinux_1_2" musllinux-s390x-image = "musllinux_1_2" musllinux-armv7l-image = "musllinux_1_2" +musllinux-riscv64-image = "ghcr.io/pypa/cibuildwheel/no_default_image:please_use_override" [tool.cibuildwheel.linux] diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 528a4eebd..7a9962a39 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -43,3 +43,5 @@ manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.19-1 manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.04.19-1 musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.04.19-1 +[riscv64] + diff --git a/cibuildwheel/selector.py b/cibuildwheel/selector.py index 0e9736f53..98c7a6601 100644 --- a/cibuildwheel/selector.py +++ b/cibuildwheel/selector.py @@ -32,6 +32,7 @@ class EnableGroup(StrEnum): CPythonFreeThreading = "cpython-freethreading" CPythonPrerelease = "cpython-prerelease" PyPy = "pypy" + CPythonExperimentalRiscV64 = "cpython-experimental-riscv64" @classmethod def all_groups(cls) -> frozenset["EnableGroup"]: @@ -70,6 +71,10 @@ def __call__(self, build_id: str) -> bool: return False if EnableGroup.PyPy not in self.enable and fnmatch(build_id, "pp*"): return False + if EnableGroup.CPythonExperimentalRiscV64 not in self.enable and fnmatch( + build_id, "*_riscv64" + ): + return False should_build = selector_matches(self.build_config, build_id) should_skip = selector_matches(self.skip_config, build_id) diff --git a/docs/options.md b/docs/options.md index de4317b4d..9d906b0c9 100644 --- a/docs/options.md +++ b/docs/options.md @@ -50,23 +50,24 @@ When setting the options, you can use shell-style globbing syntax, as per [fnmat
-| | macOS | Windows | Linux Intel | Linux Other | iOS | -|---------------|------------------------------------------------------------------------|-----------------------------------------------------|-----------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------| -| Python 3.8 | cp38-macosx_x86_64
cp38-macosx_universal2
cp38-macosx_arm64 | cp38-win_amd64
cp38-win32 | cp38-manylinux_x86_64
cp38-manylinux_i686
cp38-musllinux_x86_64
cp38-musllinux_i686 | cp38-manylinux_aarch64
cp38-manylinux_ppc64le
cp38-manylinux_s390x
cp38-manylinux_armv7l
cp38-musllinux_aarch64
cp38-musllinux_ppc64le
cp38-musllinux_s390x
cp38-musllinux_armv7l | | -| Python 3.9 | cp39-macosx_x86_64
cp39-macosx_universal2
cp39-macosx_arm64 | cp39-win_amd64
cp39-win32
cp39-win_arm64 | cp39-manylinux_x86_64
cp39-manylinux_i686
cp39-musllinux_x86_64
cp39-musllinux_i686 | cp39-manylinux_aarch64
cp39-manylinux_ppc64le
cp39-manylinux_s390x
cp39-manylinux_armv7l
cp39-musllinux_aarch64
cp39-musllinux_ppc64le
cp39-musllinux_s390x
cp39-musllinux_armv7l | | -| Python 3.10 | cp310-macosx_x86_64
cp310-macosx_universal2
cp310-macosx_arm64 | cp310-win_amd64
cp310-win32
cp310-win_arm64 | cp310-manylinux_x86_64
cp310-manylinux_i686
cp310-musllinux_x86_64
cp310-musllinux_i686 | cp310-manylinux_aarch64
cp310-manylinux_ppc64le
cp310-manylinux_s390x
cp310-manylinux_armv7l
cp310-musllinux_aarch64
cp310-musllinux_ppc64le
cp310-musllinux_s390x
cp310-musllinux_armv7l | | -| Python 3.11 | cp311-macosx_x86_64
cp311-macosx_universal2
cp311-macosx_arm64 | cp311-win_amd64
cp311-win32
cp311-win_arm64 | cp311-manylinux_x86_64
cp311-manylinux_i686
cp311-musllinux_x86_64
cp311-musllinux_i686 | cp311-manylinux_aarch64
cp311-manylinux_ppc64le
cp311-manylinux_s390x
cp311-manylinux_armv7l
cp311-musllinux_aarch64
cp311-musllinux_ppc64le
cp311-musllinux_s390x
cp311-musllinux_armv7l | | -| Python 3.12 | cp312-macosx_x86_64
cp312-macosx_universal2
cp312-macosx_arm64 | cp312-win_amd64
cp312-win32
cp312-win_arm64 | cp312-manylinux_x86_64
cp312-manylinux_i686
cp312-musllinux_x86_64
cp312-musllinux_i686 | cp312-manylinux_aarch64
cp312-manylinux_ppc64le
cp312-manylinux_s390x
cp312-musllinux_armv7l
cp312-musllinux_ppc64le
cp312-musllinux_s390x
cp312-musllinux_armv7l | | -| Python 3.13 | cp313-macosx_x86_64
cp313-macosx_universal2
cp313-macosx_arm64 | cp313-win_amd64
cp313-win32
cp313-win_arm64 | cp313-manylinux_x86_64
cp313-manylinux_i686
cp313-musllinux_x86_64
cp313-musllinux_i686 | cp313-manylinux_aarch64
cp313-manylinux_ppc64le
cp313-manylinux_s390x
cp313-manylinux_armv7l
cp313-musllinux_aarch64
cp313-musllinux_ppc64le
cp313-musllinux_s390x
cp313-musllinux_armv7l | cp313-ios_arm64_iphoneos
cp313-ios_arm64_iphonesimulator
cp313-ios_x86_64_iphonesimulator | -| PyPy3.8 v7.3 | pp38-macosx_x86_64
pp38-macosx_arm64 | pp38-win_amd64 | pp38-manylinux_x86_64
pp38-manylinux_i686 | pp38-manylinux_aarch64 | | -| PyPy3.9 v7.3 | pp39-macosx_x86_64
pp39-macosx_arm64 | pp39-win_amd64 | pp39-manylinux_x86_64
pp39-manylinux_i686 | pp39-manylinux_aarch64 | | -| PyPy3.10 v7.3 | pp310-macosx_x86_64
pp310-macosx_arm64 | pp310-win_amd64 | pp310-manylinux_x86_64
pp310-manylinux_i686 | pp310-manylinux_aarch64 | | -| PyPy3.11 v7.3 | pp311-macosx_x86_64
pp311-macosx_arm64 | pp311-win_amd64 | pp311-manylinux_x86_64
pp311-manylinux_i686 | pp311-manylinux_aarch64 | | +| | macOS | Windows | Linux Intel | Linux Other | iOS | +|---------------|------------------------------------------------------------------------|-----------------------------------------------------|-----------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------| +| Python 3.8 | cp38-macosx_x86_64
cp38-macosx_universal2
cp38-macosx_arm64 | cp38-win_amd64
cp38-win32 | cp38-manylinux_x86_64
cp38-manylinux_i686
cp38-musllinux_x86_64
cp38-musllinux_i686 | cp38-manylinux_aarch64
cp38-manylinux_ppc64le
cp38-manylinux_s390x
cp38-manylinux_armv7l
cp38-manylinux_riscv64
cp38-musllinux_aarch64
cp38-musllinux_ppc64le
cp38-musllinux_s390x
cp38-musllinux_armv7l
cp38-musllinux_riscv64 | | +| Python 3.9 | cp39-macosx_x86_64
cp39-macosx_universal2
cp39-macosx_arm64 | cp39-win_amd64
cp39-win32
cp39-win_arm64 | cp39-manylinux_x86_64
cp39-manylinux_i686
cp39-musllinux_x86_64
cp39-musllinux_i686 | cp39-manylinux_aarch64
cp39-manylinux_ppc64le
cp39-manylinux_s390x
cp39-manylinux_armv7l
cp39-manylinux_riscv64
cp39-musllinux_aarch64
cp39-musllinux_ppc64le
cp39-musllinux_s390x
cp39-musllinux_armv7l
cp39-musllinux_riscv64 | | +| Python 3.10 | cp310-macosx_x86_64
cp310-macosx_universal2
cp310-macosx_arm64 | cp310-win_amd64
cp310-win32
cp310-win_arm64 | cp310-manylinux_x86_64
cp310-manylinux_i686
cp310-musllinux_x86_64
cp310-musllinux_i686 | cp310-manylinux_aarch64
cp310-manylinux_ppc64le
cp310-manylinux_s390x
cp310-manylinux_armv7l
cp310-manylinux_riscv64
cp310-musllinux_aarch64
cp310-musllinux_ppc64le
cp310-musllinux_s390x
cp310-musllinux_armv7l
cp310-musllinux_riscv64 | | +| Python 3.11 | cp311-macosx_x86_64
cp311-macosx_universal2
cp311-macosx_arm64 | cp311-win_amd64
cp311-win32
cp311-win_arm64 | cp311-manylinux_x86_64
cp311-manylinux_i686
cp311-musllinux_x86_64
cp311-musllinux_i686 | cp311-manylinux_aarch64
cp311-manylinux_ppc64le
cp311-manylinux_s390x
cp311-manylinux_armv7l
cp311-manylinux_riscv64
cp311-musllinux_aarch64
cp311-musllinux_ppc64le
cp311-musllinux_s390x
cp311-musllinux_armv7l
cp311-musllinux_riscv64 | | +| Python 3.12 | cp312-macosx_x86_64
cp312-macosx_universal2
cp312-macosx_arm64 | cp312-win_amd64
cp312-win32
cp312-win_arm64 | cp312-manylinux_x86_64
cp312-manylinux_i686
cp312-musllinux_x86_64
cp312-musllinux_i686 | cp312-manylinux_aarch64
cp312-manylinux_ppc64le
cp312-manylinux_s390x
cp312-manylinux_armv7l
cp312-manylinux_riscv64
cp312-musllinux_aarch64
cp312-musllinux_ppc64le
cp312-musllinux_s390x
cp312-musllinux_armv7l
cp312-musllinux_riscv64 | | +| Python 3.13 | cp313-macosx_x86_64
cp313-macosx_universal2
cp313-macosx_arm64 | cp313-win_amd64
cp313-win32
cp313-win_arm64 | cp313-manylinux_x86_64
cp313-manylinux_i686
cp313-musllinux_x86_64
cp313-musllinux_i686 | cp313-manylinux_aarch64
cp313-manylinux_ppc64le
cp313-manylinux_s390x
cp313-manylinux_armv7l
cp313-manylinux_riscv64
cp313-musllinux_aarch64
cp313-musllinux_ppc64le
cp313-musllinux_s390x
cp313-musllinux_armv7l
cp313-musllinux_riscv64 | cp313-ios_arm64_iphoneos
cp313-ios_arm64_iphonesimulator
cp313-ios_x86_64_iphonesimulator | +| PyPy3.8 v7.3 | pp38-macosx_x86_64
pp38-macosx_arm64 | pp38-win_amd64 | pp38-manylinux_x86_64
pp38-manylinux_i686 | pp38-manylinux_aarch64 | | +| PyPy3.9 v7.3 | pp39-macosx_x86_64
pp39-macosx_arm64 | pp39-win_amd64 | pp39-manylinux_x86_64
pp39-manylinux_i686 | pp39-manylinux_aarch64 | | +| PyPy3.10 v7.3 | pp310-macosx_x86_64
pp310-macosx_arm64 | pp310-win_amd64 | pp310-manylinux_x86_64
pp310-manylinux_i686 | pp310-manylinux_aarch64 | | +| PyPy3.11 v7.3 | pp311-macosx_x86_64
pp311-macosx_arm64 | pp311-win_amd64 | pp311-manylinux_x86_64
pp311-manylinux_i686 | pp311-manylinux_aarch64 | | The list of supported and currently selected build identifiers can also be retrieved by passing the `--print-build-identifiers` flag to cibuildwheel. The format is `python_tag-platform_tag`, with tags similar to those in [PEP 425](https://www.python.org/dev/peps/pep-0425/#details). Windows arm64 platform support is experimental. +Linux riscv64 platform support is experimental and requires an explicit opt-in through [CIBW_ENABLE](#enable). For an experimental WebAssembly build with `--platform pyodide`, `cp312-pyodide_wasm32` is the only platform identifier. @@ -178,7 +179,7 @@ On Windows, this option can be used to [compile for `ARM64` from an Intel machin Options: -- Linux: `x86_64` `i686` `aarch64` `ppc64le` `s390x` `armv7l` +- Linux: `x86_64` `i686` `aarch64` `ppc64le` `s390x` `armv7l` `riscv64` - macOS: `x86_64` `arm64` `universal2` - Windows: `AMD64` `x86` `ARM64` - Pyodide: `wasm32` @@ -191,6 +192,8 @@ Options: to use [CIBW_BUILD](#build-skip) with this option to target specific architectures via build selectors. +Linux riscv64 platform support is experimental and requires an explicit opt-in through [CIBW_ENABLE](#enable). + Default: `auto` | Runner | `native` | `auto` | `auto64` | `auto32` | @@ -317,6 +320,9 @@ values are: The build identifiers for those variants have a `t` suffix in their `python_tag` (e.g. `cp313t-manylinux_x86_64`). - `pypy`: Enable PyPy. +- `cpython-experimental-riscv64`: Enable experimental riscv64 builds. Those builds + are disabled by default as they can't be uploaded to PyPI and a PEP will most likely + be required before this can happen. !!! caution @@ -972,6 +978,7 @@ The available options are: | CIBW_MANYLINUX_PPC64LE_IMAGE | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_ppc64le) | | CIBW_MANYLINUX_S390X_IMAGE | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_s390x) | | CIBW_MANYLINUX_ARMV7L_IMAGE | [`manylinux_2_31`](https://quay.io/pypa/manylinux_2_31_armv7l) | +| CIBW_MANYLINUX_RISCV64_IMAGE | No default | | CIBW_MANYLINUX_PYPY_AARCH64_IMAGE | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_aarch64) | | CIBW_MANYLINUX_PYPY_I686_IMAGE | [`manylinux2014`](https://quay.io/pypa/manylinux2014_i686) | | CIBW_MUSLLINUX_X86_64_IMAGE | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_x86_64) | @@ -980,6 +987,7 @@ The available options are: | CIBW_MUSLLINUX_PPC64LE_IMAGE | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_ppc64le) | | CIBW_MUSLLINUX_S390X_IMAGE | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_s390x) | | CIBW_MUSLLINUX_ARMV7L_IMAGE | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_armv7l) | +| CIBW_MUSLLINUX_RISCV64_IMAGE | No default | Set the Docker image to be used for building [manylinux / musllinux](https://github.com/pypa/manylinux) wheels. diff --git a/test/test_emulation.py b/test/test_emulation.py index 4bdc0a315..0d218b000 100644 --- a/test/test_emulation.py +++ b/test/test_emulation.py @@ -34,14 +34,21 @@ def test(tmp_path, request): "CIBW_TEST_REQUIRES": "pytest", "CIBW_TEST_COMMAND": "pytest ./test", "CIBW_ARCHS": archs, + # TODO remove me once proper support is added + "CIBW_MANYLINUX_RISCV64_IMAGE": "ghcr.io/mayeut/manylinux_2_31:2025.03.02-1", + "CIBW_SKIP": "*-musllinux_riscv64", }, ) # also check that we got the right wheels - expected_wheels = itertools.chain.from_iterable( - utils.expected_wheels("spam", "0.1.0", machine_arch=arch, single_arch=True) - for arch in archs.split(" ") + expected_wheels = list( + itertools.chain.from_iterable( + utils.expected_wheels("spam", "0.1.0", machine_arch=arch, single_arch=True) + for arch in archs.split(" ") + ) ) + # TODO remove me once proper support is added + expected_wheels = [wheel for wheel in expected_wheels if "musllinux_1_2_riscv64" not in wheel] assert set(actual_wheels) == set(expected_wheels) diff --git a/test/utils.py b/test/utils.py index b3d2b172d..e05d3a2dd 100644 --- a/test/utils.py +++ b/test/utils.py @@ -227,6 +227,7 @@ def _expected_wheels( "armv7l": ["manylinux_2_17", "manylinux2014", "manylinux_2_31"], "i686": ["manylinux_2_5", "manylinux1", "manylinux_2_17", "manylinux2014"], "x86_64": ["manylinux_2_5", "manylinux1", "manylinux_2_28"], + "riscv64": ["manylinux_2_31"], }.get(machine_arch, ["manylinux_2_17", "manylinux2014", "manylinux_2_28"]) if musllinux_versions is None: diff --git a/unit_test/build_selector_test.py b/unit_test/build_selector_test.py index 992677ed9..ea72bf7c2 100644 --- a/unit_test/build_selector_test.py +++ b/unit_test/build_selector_test.py @@ -158,6 +158,15 @@ def test_build_free_threaded_python(): assert build_selector("cp313t-manylinux_x86_64") +def test_build_riscv64_enable(): + build_selector = BuildSelector(build_config="*", skip_config="") + assert not build_selector("cp313-manylinux_riscv64") + build_selector = BuildSelector( + build_config="*", skip_config="", enable=frozenset([EnableGroup.CPythonExperimentalRiscV64]) + ) + assert build_selector("cp313-manylinux_riscv64") + + def test_testing_selector(): # local import to avoid pytest trying to collect this as a test class! from cibuildwheel.selector import TestSelector diff --git a/unit_test/main_tests/main_platform_test.py b/unit_test/main_tests/main_platform_test.py index 7ccfab6b8..084207368 100644 --- a/unit_test/main_tests/main_platform_test.py +++ b/unit_test/main_tests/main_platform_test.py @@ -179,6 +179,7 @@ def test_archs_platform_all(platform, intercepted_build_args, monkeypatch): Architecture.ppc64le, Architecture.s390x, Architecture.armv7l, + Architecture.riscv64, } elif platform == "windows": assert options.globals.architectures == { diff --git a/unit_test/oci_container_test.py b/unit_test/oci_container_test.py index 24466023e..c6ea3b645 100644 --- a/unit_test/oci_container_test.py +++ b/unit_test/oci_container_test.py @@ -552,7 +552,7 @@ def test_local_image( # both GHA & local macOS arm64 podman desktop are failing pytest.xfail("podman fails with armv7l images") - remote_image = "debian:12-slim" + remote_image = "debian:trixie-slim" platform_name = platform.value.replace("/", "_") local_image = f"cibw_{container_engine.name}_{platform_name}_local:latest" dockerfile = tmp_path / "Dockerfile" @@ -582,7 +582,7 @@ def test_multiarch_image(container_engine, platform): # both GHA & local macOS arm64 podman desktop are failing pytest.xfail("podman fails with armv7l images") with OCIContainer( - engine=container_engine, image="debian:12-slim", oci_platform=platform + engine=container_engine, image="debian:trixie-slim", oci_platform=platform ) as container: output = container.call(["uname", "-m"], capture_output=True) output_map_kernel = { @@ -591,6 +591,7 @@ def test_multiarch_image(container_engine, platform): OCIPlatform.ARMV7: ("armv7l", "armv8l"), OCIPlatform.ARM64: ("aarch64",), OCIPlatform.PPC64LE: ("ppc64le",), + OCIPlatform.RISCV64: ("riscv64",), OCIPlatform.S390X: ("s390x",), } assert output.strip() in output_map_kernel[platform] @@ -601,6 +602,7 @@ def test_multiarch_image(container_engine, platform): OCIPlatform.ARMV7: "armhf", OCIPlatform.ARM64: "arm64", OCIPlatform.PPC64LE: "ppc64el", + OCIPlatform.RISCV64: "riscv64", OCIPlatform.S390X: "s390x", } assert output_map_dpkg[platform] == output.strip() From 020a91baa84b3703bfaf7cf8f8eb084521e7686c Mon Sep 17 00:00:00 2001 From: Tim Felgentreff Date: Tue, 29 Apr 2025 00:25:17 +0200 Subject: [PATCH 1022/1105] feat: support GraalPy (#1538) * Properly close files used for testing * Add support for GraalPy * Help GraalPy discover build tools on Windows * Expect manylinux-interpreters ensure graalpy* warning in pip * Workaround GraalPy bugs on Windows * Workaround oracle/graalpython#491 also when uv is not available * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update azure-pipelines.yml * Update azure-pipelines.yml * refacotor: use pathlib.write_text Signed-off-by: Henry Schreiner * Include GraalPy in docker_warmup and remove workaround for installing it late --------- Signed-off-by: Henry Schreiner Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner --- .github/workflows/test.yml | 2 +- README.md | 5 +- azure-pipelines.yml | 3 +- bin/update_pythons.py | 81 ++++++++++++++++++++- cibuildwheel/logger.py | 2 + cibuildwheel/platforms/macos.py | 22 +++++- cibuildwheel/platforms/windows.py | 77 ++++++++++++++++++++ cibuildwheel/resources/build-platforms.toml | 5 ++ cibuildwheel/selector.py | 3 + docs/options.md | 1 + test/conftest.py | 3 +- test/test_abi_variants.py | 10 ++- test/test_before_all.py | 4 +- test/test_before_build.py | 4 +- test/test_before_test.py | 10 ++- test/test_dependency_versions.py | 20 +++++ test/test_pep518.py | 15 ++++ test/test_testing.py | 20 +++-- test/utils.py | 8 +- unit_test/linux_build_steps_test.py | 2 +- unit_test/main_tests/main_options_test.py | 12 +-- unit_test/option_prepare_test.py | 16 ++-- 22 files changed, 287 insertions(+), 38 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b6bb7c866..3ae094dcd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -80,7 +80,7 @@ jobs: env: CIBW_ARCHS_MACOS: x86_64 universal2 arm64 CIBW_BUILD_FRONTEND: 'build[uv]' - CIBW_ENABLE: "cpython-prerelease cpython-freethreading pypy" + CIBW_ENABLE: "cpython-prerelease cpython-freethreading pypy graalpy" - name: Run a sample build (GitHub Action, only) uses: ./ diff --git a/README.md b/README.md index 12b328001..2d9af6b11 100644 --- a/README.md +++ b/README.md @@ -36,14 +36,15 @@ While cibuildwheel itself requires a recent Python version to run (we support th | PyPy 3.9 v7.3 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | N/A | N/A | N/A | | PyPy 3.10 v7.3 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | N/A | N/A | N/A | | PyPy 3.11 v7.3 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | N/A | N/A | N/A | +| GraalPy 24.2 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | N/A | ✅¹ | N/A | N/A | N/A | N/A | N/A | -¹ PyPy is only supported for manylinux wheels.
+¹ PyPy & GraalPy are only supported for manylinux wheels.
² Windows arm64 support is experimental.
³ Free-threaded mode requires opt-in using [`CIBW_ENABLE`](https://cibuildwheel.pypa.io/en/stable/options/#enable).
⁴ Experimental, not yet supported on PyPI, but can be used directly in web deployment. Use `--platform pyodide` to build.
⁵ manylinux armv7l support is experimental. As there are no RHEL based image for this architecture, it's using an Ubuntu based image instead.
-- Builds manylinux, musllinux, macOS 10.9+ (10.13+ for Python 3.12+), and Windows wheels for CPython and PyPy +- Builds manylinux, musllinux, macOS 10.9+ (10.13+ for Python 3.12+), and Windows wheels for CPython, PyPy, and GraalPy - Works on GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, GitLab CI, and Cirrus CI - Bundles shared library dependencies on Linux and macOS through [auditwheel](https://github.com/pypa/auditwheel) and [delocate](https://github.com/matthew-brett/delocate) - Runs your library's tests against the wheel-installed version of your library diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eaf93958e..1cc707fd9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,7 +6,7 @@ pr: jobs: - job: linux_311 - timeoutInMinutes: 120 + timeoutInMinutes: 180 pool: {vmImage: 'Ubuntu-22.04'} steps: - task: UsePythonVersion@0 @@ -20,6 +20,7 @@ jobs: - job: macos_311 pool: {vmImage: 'macOS-13'} + timeoutInMinutes: 120 steps: - task: UsePythonVersion@0 inputs: diff --git a/bin/update_pythons.py b/bin/update_pythons.py index 7b8ea1474..75de60a64 100755 --- a/bin/update_pythons.py +++ b/bin/update_pythons.py @@ -5,6 +5,7 @@ import difflib import logging import operator +import re import tomllib from collections.abc import Mapping, MutableMapping from pathlib import Path @@ -44,13 +45,19 @@ class ConfigWinPP(TypedDict): url: str +class ConfigWinGP(TypedDict): + identifier: str + version: str + url: str + + class ConfigApple(TypedDict): identifier: str version: str url: str -AnyConfig = ConfigWinCP | ConfigWinPP | ConfigApple +AnyConfig = ConfigWinCP | ConfigWinPP | ConfigWinGP | ConfigApple # The following set of "Versions" classes allow the initial call to the APIs to @@ -106,6 +113,72 @@ def update_version_windows(self, spec: Specifier) -> ConfigWinCP | None: ) +class GraalPyVersions: + def __init__(self) -> None: + response = requests.get("https://api.github.com/repos/oracle/graalpython/releases") + response.raise_for_status() + + releases = response.json() + gp_version_re = re.compile(r"-(\d+\.\d+\.\d+)$") + cp_version_re = re.compile(r"Python (\d+\.\d+(?:\.\d+)?)") + for release in releases: + m = gp_version_re.search(release["tag_name"]) + if m: + release["graalpy_version"] = Version(m.group(1)) + m = cp_version_re.search(release["body"]) + if m: + release["python_version"] = Version(m.group(1)) + + self.releases = [r for r in releases if "graalpy_version" in r and "python_version" in r] + + def update_version(self, identifier: str, spec: Specifier) -> AnyConfig: + if "x86_64" in identifier or "amd64" in identifier: + arch = "x86_64" + elif "arm64" in identifier or "aarch64" in identifier: + arch = "aarch64" + else: + msg = f"{identifier} not supported yet on GraalPy" + raise RuntimeError(msg) + + releases = [r for r in self.releases if spec.contains(r["python_version"])] + releases = sorted(releases, key=lambda r: r["graalpy_version"]) + + if not releases: + msg = f"GraalPy {arch} not found for {spec}!" + raise RuntimeError(msg) + + release = releases[-1] + version = release["python_version"] + gpversion = release["graalpy_version"] + + if "macosx" in identifier: + arch = "x86_64" if "x86_64" in identifier else "arm64" + config = ConfigApple + platform = "macos" + elif "win" in identifier: + arch = "aarch64" if "arm64" in identifier else "x86_64" + config = ConfigWinGP + platform = "windows" + else: + msg = "GraalPy provides downloads for macOS and Windows and is included for manylinux" + raise RuntimeError(msg) + + arch = "amd64" if arch == "x86_64" else "aarch64" + ext = "zip" if "win" in identifier else "tar.gz" + (url,) = ( + rf["browser_download_url"] + for rf in release["assets"] + if rf["name"].endswith(f"{platform}-{arch}.{ext}") + and rf["name"].startswith(f"graalpy-{gpversion.major}") + ) + + return config( + identifier=identifier, + version=f"{version.major}.{version.minor}", + url=url, + ) + + class PyPyVersions: def __init__(self, arch_str: ArchStr): response = requests.get("https://downloads.python.org/pypy/versions.json") @@ -294,6 +367,8 @@ def __init__(self) -> None: self.ios_cpython = CPythonIOSVersions() + self.graalpy = GraalPyVersions() + def update_config(self, config: MutableMapping[str, str]) -> None: identifier = config["identifier"] version = Version(config["version"]) @@ -311,6 +386,8 @@ def update_config(self, config: MutableMapping[str, str]) -> None: config_update = self.macos_pypy.update_version_macos(spec) elif "macosx_arm64" in identifier: config_update = self.macos_pypy_arm64.update_version_macos(spec) + elif identifier.startswith("gp"): + config_update = self.graalpy.update_version(identifier, spec) elif "t-win32" in identifier and identifier.startswith("cp"): config_update = self.windows_t_32.update_version_windows(spec) elif "win32" in identifier and identifier.startswith("cp"): @@ -322,6 +399,8 @@ def update_config(self, config: MutableMapping[str, str]) -> None: config_update = self.windows_64.update_version_windows(spec) elif identifier.startswith("pp"): config_update = self.windows_pypy_64.update_version_windows(spec) + elif identifier.startswith("gp"): + config_update = self.graalpy.update_version(identifier, spec) elif "t-win_arm64" in identifier and identifier.startswith("cp"): config_update = self.windows_t_arm64.update_version_windows(spec) elif "win_arm64" in identifier and identifier.startswith("cp"): diff --git a/cibuildwheel/logger.py b/cibuildwheel/logger.py index 321352e8c..80c2fb02e 100644 --- a/cibuildwheel/logger.py +++ b/cibuildwheel/logger.py @@ -243,6 +243,8 @@ def build_description_from_identifier(identifier: str) -> str: build_description += "CPython" elif python_interpreter == "pp": build_description += "PyPy" + elif python_interpreter == "gp": + build_description += "GraalPy" else: msg = f"unknown python {python_interpreter!r}" raise Exception(msg) diff --git a/cibuildwheel/platforms/macos.py b/cibuildwheel/platforms/macos.py index 4b4a064d8..420e16139 100644 --- a/cibuildwheel/platforms/macos.py +++ b/cibuildwheel/platforms/macos.py @@ -103,7 +103,7 @@ def get_python_configurations( # skip builds as required by BUILD/SKIP python_configurations = [c for c in python_configurations if build_selector(c.identifier)] - # filter-out some cross-compilation configs with PyPy: + # filter-out some cross-compilation configs with PyPy and GraalPy: # can't build arm64 on x86_64 # rosetta allows to build x86_64 on arm64 if platform.machine() == "x86_64": @@ -111,7 +111,7 @@ def get_python_configurations( python_configurations = [ c for c in python_configurations - if not (c.identifier.startswith("pp") and c.identifier.endswith("arm64")) + if not (c.identifier.startswith(("pp", "gp")) and c.identifier.endswith("arm64")) ] removed_elements = python_configurations_before - set(python_configurations) if removed_elements: @@ -191,6 +191,22 @@ def install_pypy(tmp: Path, url: str) -> Path: return installation_path / "bin" / "pypy3" +def install_graalpy(tmp: Path, url: str) -> Path: + graalpy_archive = url.rsplit("/", 1)[-1] + extension = ".tar.gz" + assert graalpy_archive.endswith(extension) + installation_path = CIBW_CACHE_PATH / graalpy_archive[: -len(extension)] + with FileLock(str(installation_path) + ".lock"): + if not installation_path.exists(): + downloaded_archive = tmp / graalpy_archive + download(url, downloaded_archive) + installation_path.mkdir(parents=True) + # GraalPy top-folder name is inconsistent with archive name + call("tar", "-C", installation_path, "--strip-components=1", "-xzf", downloaded_archive) + downloaded_archive.unlink() + return installation_path / "bin" / "graalpy" + + def setup_python( tmp: Path, python_configuration: PythonConfiguration, @@ -212,6 +228,8 @@ def setup_python( elif implementation_id.startswith("pp"): base_python = install_pypy(tmp, python_configuration.url) + elif implementation_id.startswith("gp"): + base_python = install_graalpy(tmp, python_configuration.url) else: msg = "Unknown Python implementation" raise ValueError(msg) diff --git a/cibuildwheel/platforms/windows.py b/cibuildwheel/platforms/windows.py index a63890644..91e72404b 100644 --- a/cibuildwheel/platforms/windows.py +++ b/cibuildwheel/platforms/windows.py @@ -123,6 +123,20 @@ def install_pypy(tmp: Path, arch: str, url: str) -> Path: return installation_path / "python.exe" +def install_graalpy(tmp: Path, url: str) -> Path: + zip_filename = url.rsplit("/", 1)[-1] + extension = ".zip" + assert zip_filename.endswith(extension) + installation_path = CIBW_CACHE_PATH / zip_filename[: -len(extension)] + with FileLock(str(installation_path) + ".lock"): + if not installation_path.exists(): + graalpy_zip = tmp / zip_filename + download(url, graalpy_zip) + # Extract to the parent directory because the zip file still contains a directory + extract_zip(graalpy_zip, installation_path.parent) + return installation_path / "bin" / "graalpy.exe" + + def setup_setuptools_cross_compile( tmp: Path, python_configuration: PythonConfiguration, @@ -239,6 +253,8 @@ def setup_python( elif implementation_id.startswith("pp"): assert python_configuration.url is not None base_python = install_pypy(tmp, python_configuration.arch, python_configuration.url) + elif implementation_id.startswith("gp"): + base_python = install_graalpy(tmp, python_configuration.url or "") else: msg = "Unknown Python implementation" raise ValueError(msg) @@ -314,6 +330,49 @@ def setup_python( setup_setuptools_cross_compile(tmp, python_configuration, python_libs_base, env) setup_rust_cross_compile(tmp, python_configuration, python_libs_base, env) + if implementation_id.startswith("gp"): + # GraalPy fails to discover compilers, setup the relevant environment + # variables. Adapted from + # https://github.com/microsoft/vswhere/wiki/Start-Developer-Command-Prompt + # Remove when https://github.com/oracle/graalpython/issues/492 is fixed. + vcpath = subprocess.check_output( + [ + Path(os.environ["PROGRAMFILES(X86)"]) + / "Microsoft Visual Studio" + / "Installer" + / "vswhere.exe", + "-products", + "*", + "-latest", + "-property", + "installationPath", + ], + text=True, + ).strip() + log.notice(f"Discovering Visual Studio for GraalPy at {vcpath}") + env.update( + dict( + [ + envvar.strip().split("=", 1) + for envvar in subprocess.check_output( + [ + f"{vcpath}\\Common7\\Tools\\vsdevcmd.bat", + "-no_logo", + "-arch=amd64", + "-host_arch=amd64", + "&&", + "set", + ], + shell=True, + text=True, + env=env, + ) + .strip() + .split("\n") + ] + ) + ) + return base_python, env @@ -342,6 +401,7 @@ def build(options: Options, tmp_path: Path) -> None: for config in python_configurations: build_options = options.build_options(config.identifier) build_frontend = build_options.build_frontend or BuildFrontendConfig("build") + use_uv = build_frontend.name == "build[uv]" and can_use_uv(config) log.build_start(config.identifier) @@ -390,6 +450,22 @@ def build(options: Options, tmp_path: Path) -> None: build_frontend, build_options.build_verbosity, build_options.config_settings ) + if ( + config.identifier.startswith("gp") + and build_frontend.name == "build" + and "--no-isolation" not in extra_flags + and "-n" not in extra_flags + ): + # GraalPy fails to discover its standard library when a venv is created + # from a virtualenv seeded executable. See + # https://github.com/oracle/graalpython/issues/491 and remove this once + # fixed upstream. + log.notice( + "Disabling build isolation to workaround GraalPy bug. If the build fails, consider using pip or build[uv] as build frontend." + ) + shell("graalpy -m pip install setuptools wheel", env=env) + extra_flags = [*extra_flags, "-n"] + build_env = env.copy() if pip_version is not None: build_env["VIRTUALENV_PIP"] = pip_version @@ -414,6 +490,7 @@ def build(options: Options, tmp_path: Path) -> None: elif build_frontend.name == "build" or build_frontend.name == "build[uv]": if use_uv and "--no-isolation" not in extra_flags and "-n" not in extra_flags: extra_flags.append("--installer=uv") + call( "python", "-m", diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index d2ad15e09..d77ac1e2d 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -18,6 +18,7 @@ python_configurations = [ { identifier = "pp39-manylinux_x86_64", version = "3.9", path_str = "/opt/python/pp39-pypy39_pp73" }, { identifier = "pp310-manylinux_x86_64", version = "3.10", path_str = "/opt/python/pp310-pypy310_pp73" }, { identifier = "pp311-manylinux_x86_64", version = "3.11", path_str = "/opt/python/pp311-pypy311_pp73" }, + { identifier = "gp242-manylinux_x86_64", version = "3.11", path_str = "/opt/python/graalpy311-graalpy242_311_native" }, { identifier = "cp38-manylinux_aarch64", version = "3.8", path_str = "/opt/python/cp38-cp38" }, { identifier = "cp39-manylinux_aarch64", version = "3.9", path_str = "/opt/python/cp39-cp39" }, { identifier = "cp310-manylinux_aarch64", version = "3.10", path_str = "/opt/python/cp310-cp310" }, @@ -57,6 +58,7 @@ python_configurations = [ { identifier = "pp39-manylinux_aarch64", version = "3.9", path_str = "/opt/python/pp39-pypy39_pp73" }, { identifier = "pp310-manylinux_aarch64", version = "3.10", path_str = "/opt/python/pp310-pypy310_pp73" }, { identifier = "pp311-manylinux_aarch64", version = "3.11", path_str = "/opt/python/pp311-pypy311_pp73" }, + { identifier = "gp242-manylinux_aarch64", version = "3.11", path_str = "/opt/python/graalpy311-graalpy242_311_native" }, { identifier = "pp38-manylinux_i686", version = "3.8", path_str = "/opt/python/pp38-pypy38_pp73" }, { identifier = "pp39-manylinux_i686", version = "3.9", path_str = "/opt/python/pp39-pypy39_pp73" }, { identifier = "pp310-manylinux_i686", version = "3.10", path_str = "/opt/python/pp310-pypy310_pp73" }, @@ -143,6 +145,8 @@ python_configurations = [ { identifier = "pp310-macosx_arm64", version = "3.10", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.19-macos_arm64.tar.bz2" }, { identifier = "pp311-macosx_x86_64", version = "3.11", url = "https://downloads.python.org/pypy/pypy3.11-v7.3.19-macos_x86_64.tar.bz2" }, { identifier = "pp311-macosx_arm64", version = "3.11", url = "https://downloads.python.org/pypy/pypy3.11-v7.3.19-macos_arm64.tar.bz2" }, + { identifier = "gp242-macosx_x86_64", version = "3.11", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.0/graalpy-24.2.0-macos-amd64.tar.gz" }, + { identifier = "gp242-macosx_arm64", version = "3.11", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.0/graalpy-24.2.0-macos-aarch64.tar.gz" }, ] [windows] @@ -171,6 +175,7 @@ python_configurations = [ { identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.16-win64.zip" }, { identifier = "pp310-win_amd64", version = "3.10", arch = "64", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.19-win64.zip" }, { identifier = "pp311-win_amd64", version = "3.11", arch = "64", url = "https://downloads.python.org/pypy/pypy3.11-v7.3.19-win64.zip" }, + { identifier = "gp242-win_amd64", version = "3.11", arch = "64", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.0/graalpy-24.2.0-windows-amd64.zip" }, ] [pyodide] diff --git a/cibuildwheel/selector.py b/cibuildwheel/selector.py index 98c7a6601..48578712d 100644 --- a/cibuildwheel/selector.py +++ b/cibuildwheel/selector.py @@ -33,6 +33,7 @@ class EnableGroup(StrEnum): CPythonPrerelease = "cpython-prerelease" PyPy = "pypy" CPythonExperimentalRiscV64 = "cpython-experimental-riscv64" + GraalPy = "graalpy" @classmethod def all_groups(cls) -> frozenset["EnableGroup"]: @@ -75,6 +76,8 @@ def __call__(self, build_id: str) -> bool: build_id, "*_riscv64" ): return False + if EnableGroup.GraalPy not in self.enable and fnmatch(build_id, "gp*"): + return False should_build = selector_matches(self.build_config, build_id) should_skip = selector_matches(self.skip_config, build_id) diff --git a/docs/options.md b/docs/options.md index 9d906b0c9..5006d8e28 100644 --- a/docs/options.md +++ b/docs/options.md @@ -323,6 +323,7 @@ values are: - `cpython-experimental-riscv64`: Enable experimental riscv64 builds. Those builds are disabled by default as they can't be uploaded to PyPI and a PEP will most likely be required before this can happen. +- `graalpy`: Enable GraalPy. !!! caution diff --git a/test/conftest.py b/test/conftest.py index 8c0c9504c..f2b575df0 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -56,9 +56,8 @@ def docker_warmup(request: pytest.FixtureRequest) -> None: images = [build_options.manylinux_images[arch] for arch in archs] + [ build_options.musllinux_images[arch] for arch in archs ] - # exclude GraalPy as it's not a target for cibuildwheel command = ( - "manylinux-interpreters ensure $(manylinux-interpreters list 2>/dev/null | grep -v graalpy) &&" + "manylinux-interpreters ensure-all &&" "cpython3.13 -m pip download -d /tmp setuptools wheel pytest" ) for image in images: diff --git a/test/test_abi_variants.py b/test/test_abi_variants.py index ec529849d..5c7c27f54 100644 --- a/test/test_abi_variants.py +++ b/test/test_abi_variants.py @@ -41,9 +41,9 @@ def test_abi3(tmp_path): actual_wheels = utils.cibuildwheel_run( project_dir, add_env={ - # free_threaded and PyPy do not have a Py_LIMITED_API equivalent, just build one of those + # free_threaded, GraalPy, and PyPy do not have a Py_LIMITED_API equivalent, just build one of those # also limit the number of builds for test performance reasons - "CIBW_BUILD": f"cp39-* cp310-* pp310-* {single_python_tag}-* cp313t-*" + "CIBW_BUILD": f"cp39-* cp310-* pp310-* gp242-* {single_python_tag}-* cp313t-*" }, ) @@ -59,7 +59,11 @@ def test_abi3(tmp_path): expected_wheels = [ w.replace("cp310-cp310", "cp310-abi3") for w in expected_wheels - if "-cp39" in w or "-cp310" in w or "-pp310" in w or "-cp313t" in w + if "-cp39" in w + or "-cp310" in w + or "-pp310" in w + or "-graalpy242" in w + or "-cp313t" in w ] assert set(actual_wheels) == set(expected_wheels) diff --git a/test/test_before_all.py b/test/test_before_all.py index a46031ee7..c7ec86240 100644 --- a/test/test_before_all.py +++ b/test/test_before_all.py @@ -38,8 +38,8 @@ def test(tmp_path): # build the wheels before_all_command = ( - """python -c "import os, sys;open('{project}/text_info.txt', 'w').write('sample text '+os.environ.get('TEST_VAL', ''))" && """ - '''python -c "import sys; open('{project}/python_prefix.txt', 'w').write(sys.prefix)"''' + """python -c "import os, pathlib, sys; pathlib.Path('{project}/text_info.txt').write_text('sample text '+os.environ.get('TEST_VAL', ''))" && """ + '''python -c "import pathlib, sys; pathlib.Path('{project}/python_prefix.txt').write_text(sys.prefix)"''' ) actual_wheels = utils.cibuildwheel_run( project_dir, diff --git a/test/test_before_build.py b/test/test_before_build.py index 19a770133..9494de7bd 100644 --- a/test/test_before_build.py +++ b/test/test_before_build.py @@ -41,8 +41,8 @@ def test(tmp_path): project_with_before_build_asserts.generate(project_dir) before_build = ( - """python -c "import sys; open('{project}/pythonversion_bb.txt', 'w').write(sys.version)" && """ - f'''python -c "import sys; open('{{project}}/pythonprefix_bb.txt', 'w').write({SYS_PREFIX})"''' + """python -c "import pathlib, sys; pathlib.Path('{project}/pythonversion_bb.txt').write_text(sys.version)" && """ + f'''python -c "import pathlib, sys; pathlib.Path('{{project}}/pythonprefix_bb.txt').write_text({SYS_PREFIX})"''' ) frontend = "build" if utils.platform != "pyodide": diff --git a/test/test_before_test.py b/test/test_before_test.py index 7e766abaa..a3700f843 100644 --- a/test/test_before_test.py +++ b/test/test_before_test.py @@ -7,7 +7,7 @@ from pathlib import Path from unittest import TestCase -PROJECT_DIR = Path(__file__).joinpath("..", "..").resolve() +PROJECT_DIR = Path(__file__).parent.parent.resolve() class TestBeforeTest(TestCase): @@ -39,8 +39,8 @@ def test(tmp_path, build_frontend_env): test_projects.new_c_project().generate(test_project_dir) before_test_steps = [ - '''python -c "import os, sys; open('{project}/pythonversion_bt.txt', 'w').write(sys.version)"''', - '''python -c "import os, sys; open('{project}/pythonprefix_bt.txt', 'w').write(sys.prefix)"''', + '''python -c "import pathlib, sys; pathlib.Path('{project}/pythonversion_bt.txt').write_text(sys.version)"''', + '''python -c "import pathlib, sys; pathlib.Path('{project}/pythonprefix_bt.txt').write_text(sys.prefix)"''', ] if utils.platform == "pyodide": @@ -63,7 +63,9 @@ def test(tmp_path, build_frontend_env): # the 'false ||' bit is to ensure this command runs in a shell on # mac/linux. "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} ./test", - "CIBW_TEST_COMMAND_WINDOWS": "pytest ./test", + # pytest fails on GraalPy 24.2.0 on Windows so we skip it there + # until https://github.com/oracle/graalpython/issues/490 is fixed + "CIBW_TEST_COMMAND_WINDOWS": "where graalpy || pytest ./test", **build_frontend_env, }, ) diff --git a/test/test_dependency_versions.py b/test/test_dependency_versions.py index b8d80f3bc..d4b9416f3 100644 --- a/test/test_dependency_versions.py +++ b/test/test_dependency_versions.py @@ -128,6 +128,17 @@ def test_dependency_constraints(method, tmp_path, build_frontend_env_nouv): build_environment = {} + if ( + utils.platform == "windows" + and method == "file" + and build_frontend_env_nouv["CIBW_BUILD_FRONTEND"] == "build" + ): + # GraalPy fails to discover its standard library when a venv is created + # from a virtualenv seeded executable. See + # https://github.com/oracle/graalpython/issues/491 and remove this once + # fixed upstream. + build_frontend_env_nouv["CIBW_SKIP"] = "gp*" + for package_name, version in tool_versions.items(): env_name = f"EXPECTED_{package_name.upper()}_VERSION" build_environment[env_name] = version @@ -147,4 +158,13 @@ def test_dependency_constraints(method, tmp_path, build_frontend_env_nouv): # also check that we got the right wheels expected_wheels = utils.expected_wheels("spam", "0.1.0") + if ( + utils.platform == "windows" + and method == "file" + and build_frontend_env_nouv["CIBW_BUILD_FRONTEND"] == "build" + ): + # See reference to https://github.com/oracle/graalpython/issues/491 + # above + expected_wheels = [w for w in expected_wheels if "graalpy" not in w] + assert set(actual_wheels) == set(expected_wheels) diff --git a/test/test_pep518.py b/test/test_pep518.py index 2147520f9..c861f0da3 100644 --- a/test/test_pep518.py +++ b/test/test_pep518.py @@ -33,11 +33,26 @@ def test_pep518(tmp_path, build_frontend_env): project_dir = tmp_path / "project" basic_project.generate(project_dir) + # GraalPy fails to discover its standard library when a venv is created + # from a virtualenv seeded executable. See + # https://github.com/oracle/graalpython/issues/491 and remove this once + # fixed upstream. + if build_frontend_env["CIBW_BUILD_FRONTEND"] == "build" and utils.platform == "windows": + build_frontend_env["CIBW_SKIP"] = "gp*" + # build the wheels actual_wheels = utils.cibuildwheel_run(project_dir, add_env=build_frontend_env) # check that the expected wheels are produced expected_wheels = utils.expected_wheels("spam", "0.1.0") + + # GraalPy fails to discover its standard library when a venv is created + # from a virtualenv seeded executable. See + # https://github.com/oracle/graalpython/issues/491 and remove this once + # fixed upstream. + if build_frontend_env["CIBW_BUILD_FRONTEND"] == "build" and utils.platform == "windows": + expected_wheels = [w for w in expected_wheels if "graalpy" not in w] + assert set(actual_wheels) == set(expected_wheels) # These checks ensure an extra file is not created when using custom diff --git a/test/test_testing.py b/test/test_testing.py index 16f00aa60..9b7364f99 100644 --- a/test/test_testing.py +++ b/test/test_testing.py @@ -81,7 +81,9 @@ def test(tmp_path): # the 'false ||' bit is to ensure this command runs in a shell on # mac/linux. "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} ./test", - "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest ./test", + # pytest fails on GraalPy 24.2.0 on Windows so we skip it there + # until https://github.com/oracle/graalpython/issues/490 is fixed + "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest ./test", }, ) @@ -102,7 +104,9 @@ def test_extras_require(tmp_path): # the 'false ||' bit is to ensure this command runs in a shell on # mac/linux. "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} ./test", - "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest ./test", + # pytest fails on GraalPy 24.2.0 on Windows so we skip it there + # until https://github.com/oracle/graalpython/issues/490 is fixed + "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest ./test", }, single_python=True, ) @@ -134,7 +138,9 @@ def test_dependency_groups(tmp_path): # the 'false ||' bit is to ensure this command runs in a shell on # mac/linux. "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} ./test", - "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || pytest ./test", + # pytest fails on GraalPy 24.2.0 on Windows so we skip it there + # until https://github.com/oracle/graalpython/issues/490 is fixed + "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest ./test", }, single_python=True, ) @@ -189,7 +195,9 @@ def test_bare_pytest_invocation(tmp_path: Path, test_runner: str) -> None: add_env={ "CIBW_TEST_REQUIRES": "pytest" if test_runner == "pytest" else "", "CIBW_TEST_COMMAND": ( - "python -m pytest" + # pytest fails on GraalPy 24.2.0 on Windows so we skip it there + # until https://github.com/oracle/graalpython/issues/490 fixed + "graalpy.exe -c 1 || python -m pytest" if test_runner == "pytest" else "python -m unittest discover test spam_test.py" ), @@ -211,7 +219,9 @@ def test_test_sources(tmp_path): add_env={ "CIBW_TEST_REQUIRES": "pytest", "CIBW_TEST_COMMAND": "pytest", - "CIBW_TEST_COMMAND_WINDOWS": "pytest", + # pytest fails on GraalPy 24.2.0 on Windows so we skip it there + # until https://github.com/oracle/graalpython/issues/490 is fixed + "CIBW_TEST_COMMAND_WINDOWS": "where graalpy || pytest", "CIBW_TEST_SOURCES": "test", }, ) diff --git a/test/utils.py b/test/utils.py index e05d3a2dd..957ee7295 100644 --- a/test/utils.py +++ b/test/utils.py @@ -55,7 +55,7 @@ def cibuildwheel_get_build_identifiers( cmd = [sys.executable, "-m", "cibuildwheel", "--print-build-identifiers", str(project_path)] if env is None: env = os.environ.copy() - env["CIBW_ENABLE"] = "cpython-freethreading pypy" + env["CIBW_ENABLE"] = "cpython-freethreading pypy graalpy" if prerelease_pythons: env["CIBW_ENABLE"] += " cpython-prerelease" @@ -257,6 +257,10 @@ def _expected_wheels( "pp310-pypy310_pp73", "pp311-pypy311_pp73", ] + if machine_arch in ["x86_64", "AMD64", "aarch64", "arm64"]: + python_abi_tags += [ + "graalpy311-graalpy242_311_native", + ] if single_python: python_tag = "cp{}{}-".format(*SINGLE_PYTHON_VERSION) @@ -286,7 +290,7 @@ def _expected_wheels( for manylinux_version in manylinux_versions ) ] - if len(musllinux_versions) > 0 and not python_abi_tag.startswith("pp"): + if len(musllinux_versions) > 0 and not python_abi_tag.startswith(("pp", "graalpy")): platform_tags.append( ".".join( f"{musllinux_version}_{machine_arch}" diff --git a/unit_test/linux_build_steps_test.py b/unit_test/linux_build_steps_test.py index cd295a5e9..aa4363c13 100644 --- a/unit_test/linux_build_steps_test.py +++ b/unit_test/linux_build_steps_test.py @@ -24,7 +24,7 @@ def test_linux_container_split(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) manylinux-x86_64-image = "normal_container_image" manylinux-i686-image = "normal_container_image" build = "*-manylinux_x86_64" - skip = "pp*" + skip = "[gp]p*" archs = "x86_64 i686" [[tool.cibuildwheel.overrides]] diff --git a/unit_test/main_tests/main_options_test.py b/unit_test/main_tests/main_options_test.py index 48723213b..66ee4c952 100644 --- a/unit_test/main_tests/main_options_test.py +++ b/unit_test/main_tests/main_options_test.py @@ -423,9 +423,9 @@ def test_debug_traceback(monkeypatch, method, capfd): @pytest.mark.parametrize("method", ["unset", "command_line", "env_var"]) def test_enable(method, intercepted_build_args, monkeypatch): if method == "command_line": - monkeypatch.setattr(sys, "argv", [*sys.argv, "--enable", "pypy"]) + monkeypatch.setattr(sys, "argv", [*sys.argv, "--enable", "pypy", "--enable", "graalpy"]) elif method == "env_var": - monkeypatch.setenv("CIBW_ENABLE", "pypy") + monkeypatch.setenv("CIBW_ENABLE", "pypy graalpy") main() @@ -434,18 +434,20 @@ def test_enable(method, intercepted_build_args, monkeypatch): if method == "unset": assert enable_groups == frozenset() else: - assert enable_groups == frozenset([EnableGroup.PyPy]) + assert enable_groups == frozenset([EnableGroup.PyPy, EnableGroup.GraalPy]) def test_enable_arg_inherits(intercepted_build_args, monkeypatch): - monkeypatch.setenv("CIBW_ENABLE", "pypy") + monkeypatch.setenv("CIBW_ENABLE", "pypy graalpy") monkeypatch.setattr(sys, "argv", [*sys.argv, "--enable", "cpython-prerelease"]) main() enable_groups = intercepted_build_args.args[0].globals.build_selector.enable - assert enable_groups == frozenset((EnableGroup.PyPy, EnableGroup.CPythonPrerelease)) + assert enable_groups == frozenset( + (EnableGroup.PyPy, EnableGroup.GraalPy, EnableGroup.CPythonPrerelease) + ) def test_enable_arg_error_message(monkeypatch, capsys): diff --git a/unit_test/option_prepare_test.py b/unit_test/option_prepare_test.py index 4a24190c1..d5dc7d191 100644 --- a/unit_test/option_prepare_test.py +++ b/unit_test/option_prepare_test.py @@ -14,7 +14,7 @@ from cibuildwheel.util import file DEFAULT_IDS = {"cp38", "cp39", "cp310", "cp311", "cp312", "cp313"} -ALL_IDS = DEFAULT_IDS | {"cp313t", "pp38", "pp39", "pp310", "pp311"} +ALL_IDS = DEFAULT_IDS | {"cp313t", "pp38", "pp39", "pp310", "pp311", "gp242"} @pytest.fixture @@ -103,7 +103,7 @@ def test_build_with_override_launches(monkeypatch, tmp_path): [tool.cibuildwheel] manylinux-x86_64-image = "manylinux_2_28" musllinux-x86_64-image = "musllinux_1_2" -enable = ["pypy", "cpython-freethreading"] +enable = ["pypy", "graalpy", "cpython-freethreading"] # Before Python 3.10, use manylinux2014 [[tool.cibuildwheel.overrides]] @@ -155,6 +155,7 @@ def test_build_with_override_launches(monkeypatch, tmp_path): "pp39", "pp310", "pp311", + "gp242", } } assert kwargs["options"].build_options("cp39-manylinux_x86_64").before_all == "" @@ -176,6 +177,7 @@ def test_build_with_override_launches(monkeypatch, tmp_path): "pp39", "pp310", "pp311", + "gp242", ] } @@ -185,14 +187,16 @@ def test_build_with_override_launches(monkeypatch, tmp_path): assert kwargs["container"]["oci_platform"] == OCIPlatform.i386 identifiers = {x.identifier for x in kwargs["platform_configs"]} - assert identifiers == {f"{x}-manylinux_i686" for x in ALL_IDS} + assert identifiers == {f"{x}-manylinux_i686" for x in ALL_IDS if "gp" not in x} kwargs = build_in_container.call_args_list[4][1] assert "quay.io/pypa/musllinux_1_2_x86_64" in kwargs["container"]["image"] assert kwargs["container"]["cwd"] == PurePosixPath("/project") assert kwargs["container"]["oci_platform"] == OCIPlatform.AMD64 identifiers = {x.identifier for x in kwargs["platform_configs"]} - assert identifiers == {f"{x}-musllinux_x86_64" for x in ALL_IDS if "pp" not in x} + assert identifiers == { + f"{x}-musllinux_x86_64" for x in ALL_IDS if "pp" not in x and "gp" not in x + } kwargs = build_in_container.call_args_list[5][1] assert "quay.io/pypa/musllinux_1_2_i686" in kwargs["container"]["image"] @@ -200,4 +204,6 @@ def test_build_with_override_launches(monkeypatch, tmp_path): assert kwargs["container"]["oci_platform"] == OCIPlatform.i386 identifiers = {x.identifier for x in kwargs["platform_configs"]} - assert identifiers == {f"{x}-musllinux_i686" for x in ALL_IDS if "pp" not in x} + assert identifiers == { + f"{x}-musllinux_i686" for x in ALL_IDS if "pp" not in x and "gp" not in x + } From e91560e8a14470ff35488e414aa7aa1de5aec2d8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 28 Apr 2025 18:25:42 -0400 Subject: [PATCH 1023/1105] [pre-commit.ci] pre-commit autoupdate (#2376) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.6 → v0.11.7](https://github.com/astral-sh/ruff-pre-commit/compare/v0.11.6...v0.11.7) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fb55aa5bf..55d0b9df9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.6 + rev: v0.11.7 hooks: - id: ruff args: ["--fix", "--show-fixes"] From 048ff03577c40eec979f98f0db8452c3d5749bed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 16:21:01 +0100 Subject: [PATCH 1024/1105] chore(deps): bump the actions group with 2 updates (#2379) Bumps the actions group with 2 updates: [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance) and [wntrblm/nox](https://github.com/wntrblm/nox). Updates `actions/attest-build-provenance` from 2.2.3 to 2.3.0 - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](https://github.com/actions/attest-build-provenance/compare/c074443f1aee8d4aeeae555aebba3282517141b2...db473fddc028af60658334401dc6fa3ffd8669fd) Updates `wntrblm/nox` from 2025.02.09 to 2025.05.01 - [Release notes](https://github.com/wntrblm/nox/releases) - [Changelog](https://github.com/wntrblm/nox/blob/main/CHANGELOG.md) - [Commits](https://github.com/wntrblm/nox/compare/2025.02.09...2025.05.01) --- updated-dependencies: - dependency-name: actions/attest-build-provenance dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: wntrblm/nox dependency-version: 2025.05.01 dependency-type: direct:production dependency-group: actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- .github/workflows/update-dependencies.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d9d48888b..34e3aacea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,7 +33,7 @@ jobs: path: dist - name: Generate artifact attestation for sdist and wheel - uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3 + uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0 with: subject-path: "dist/cibuildwheel-*" diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index a31aaf887..c22469df6 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v4 - - uses: wntrblm/nox@2025.02.09 + - uses: wntrblm/nox@2025.05.01 - name: "Run update: dependencies" run: nox --force-color -s update_constraints From 143ec07556449851fc06e0faa680af9cd9be365e Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 16:23:25 -0400 Subject: [PATCH 1025/1105] [Bot] Update dependencies (#2374) Update dependencies Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> --- cibuildwheel/resources/build-platforms.toml | 6 +-- .../resources/constraints-pyodide312.txt | 16 +++--- .../resources/constraints-python310.txt | 4 +- .../resources/constraints-python311.txt | 2 +- .../resources/constraints-python312.txt | 2 +- .../resources/constraints-python313.txt | 2 +- .../resources/constraints-python39.txt | 4 +- cibuildwheel/resources/constraints.txt | 2 +- cibuildwheel/resources/nodejs.toml | 4 +- .../resources/pinned_docker_images.cfg | 54 +++++++++---------- docs/working-examples.md | 16 +++--- 11 files changed, 56 insertions(+), 56 deletions(-) diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index d77ac1e2d..15f534022 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -145,8 +145,8 @@ python_configurations = [ { identifier = "pp310-macosx_arm64", version = "3.10", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.19-macos_arm64.tar.bz2" }, { identifier = "pp311-macosx_x86_64", version = "3.11", url = "https://downloads.python.org/pypy/pypy3.11-v7.3.19-macos_x86_64.tar.bz2" }, { identifier = "pp311-macosx_arm64", version = "3.11", url = "https://downloads.python.org/pypy/pypy3.11-v7.3.19-macos_arm64.tar.bz2" }, - { identifier = "gp242-macosx_x86_64", version = "3.11", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.0/graalpy-24.2.0-macos-amd64.tar.gz" }, - { identifier = "gp242-macosx_arm64", version = "3.11", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.0/graalpy-24.2.0-macos-aarch64.tar.gz" }, + { identifier = "gp242-macosx_x86_64", version = "3.11", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.1/graalpy-24.2.1-macos-amd64.tar.gz" }, + { identifier = "gp242-macosx_arm64", version = "3.11", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.1/graalpy-24.2.1-macos-aarch64.tar.gz" }, ] [windows] @@ -175,7 +175,7 @@ python_configurations = [ { identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.16-win64.zip" }, { identifier = "pp310-win_amd64", version = "3.10", arch = "64", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.19-win64.zip" }, { identifier = "pp311-win_amd64", version = "3.11", arch = "64", url = "https://downloads.python.org/pypy/pypy3.11-v7.3.19-win64.zip" }, - { identifier = "gp242-win_amd64", version = "3.11", arch = "64", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.0/graalpy-24.2.0-windows-amd64.zip" }, + { identifier = "gp242-win_amd64", version = "3.11", arch = "64", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.1/graalpy-24.2.1-windows-amd64.zip" }, ] [pyodide] diff --git a/cibuildwheel/resources/constraints-pyodide312.txt b/cibuildwheel/resources/constraints-pyodide312.txt index e7bd14b30..2580c967b 100644 --- a/cibuildwheel/resources/constraints-pyodide312.txt +++ b/cibuildwheel/resources/constraints-pyodide312.txt @@ -10,12 +10,12 @@ build==1.2.2.post1 # via # -r .nox/update_constraints/tmp/constraints-pyodide.in # pyodide-build -certifi==2025.1.31 +certifi==2025.4.26 # via # httpcore # httpx # requests -charset-normalizer==3.4.1 +charset-normalizer==3.4.2 # via requests click==8.1.8 # via typer @@ -25,9 +25,9 @@ distlib==0.3.9 # via virtualenv filelock==3.18.0 # via virtualenv -h11==0.14.0 +h11==0.16.0 # via httpcore -httpcore==1.0.8 +httpcore==1.0.9 # via httpx httpx==0.28.1 # via unearth @@ -48,15 +48,15 @@ packaging==25.0 # build # pyodide-build # unearth -pip==25.0.1 +pip==25.1.1 # via -r .nox/update_constraints/tmp/constraints-pyodide.in platformdirs==4.3.7 # via virtualenv -pydantic==2.11.3 +pydantic==2.11.4 # via # pyodide-build # pyodide-lock -pydantic-core==2.33.1 +pydantic-core==2.33.2 # via pydantic pygments==2.19.1 # via rich @@ -87,7 +87,7 @@ shellingham==1.5.4 # via typer sniffio==1.3.1 # via anyio -typer==0.15.2 +typer==0.15.3 # via # auditwheel-emscripten # pyodide-build diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index 9eccc27be..3f3ca6dca 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -10,7 +10,7 @@ distlib==0.3.9 # via virtualenv filelock==3.18.0 # via virtualenv -importlib-metadata==8.6.1 +importlib-metadata==8.7.0 # via build macholib==1.16.3 # via delocate @@ -18,7 +18,7 @@ packaging==25.0 # via # build # delocate -pip==25.0.1 +pip==25.1.1 # via -r cibuildwheel/resources/constraints.in platformdirs==4.3.7 # via virtualenv diff --git a/cibuildwheel/resources/constraints-python311.txt b/cibuildwheel/resources/constraints-python311.txt index 7abb00bfa..b3f0cf64c 100644 --- a/cibuildwheel/resources/constraints-python311.txt +++ b/cibuildwheel/resources/constraints-python311.txt @@ -16,7 +16,7 @@ packaging==25.0 # via # build # delocate -pip==25.0.1 +pip==25.1.1 # via -r cibuildwheel/resources/constraints.in platformdirs==4.3.7 # via virtualenv diff --git a/cibuildwheel/resources/constraints-python312.txt b/cibuildwheel/resources/constraints-python312.txt index 7abb00bfa..b3f0cf64c 100644 --- a/cibuildwheel/resources/constraints-python312.txt +++ b/cibuildwheel/resources/constraints-python312.txt @@ -16,7 +16,7 @@ packaging==25.0 # via # build # delocate -pip==25.0.1 +pip==25.1.1 # via -r cibuildwheel/resources/constraints.in platformdirs==4.3.7 # via virtualenv diff --git a/cibuildwheel/resources/constraints-python313.txt b/cibuildwheel/resources/constraints-python313.txt index 7abb00bfa..b3f0cf64c 100644 --- a/cibuildwheel/resources/constraints-python313.txt +++ b/cibuildwheel/resources/constraints-python313.txt @@ -16,7 +16,7 @@ packaging==25.0 # via # build # delocate -pip==25.0.1 +pip==25.1.1 # via -r cibuildwheel/resources/constraints.in platformdirs==4.3.7 # via virtualenv diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index 9eccc27be..3f3ca6dca 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -10,7 +10,7 @@ distlib==0.3.9 # via virtualenv filelock==3.18.0 # via virtualenv -importlib-metadata==8.6.1 +importlib-metadata==8.7.0 # via build macholib==1.16.3 # via delocate @@ -18,7 +18,7 @@ packaging==25.0 # via # build # delocate -pip==25.0.1 +pip==25.1.1 # via -r cibuildwheel/resources/constraints.in platformdirs==4.3.7 # via virtualenv diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index 7abb00bfa..b3f0cf64c 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -16,7 +16,7 @@ packaging==25.0 # via # build # delocate -pip==25.0.1 +pip==25.1.1 # via -r cibuildwheel/resources/constraints.in platformdirs==4.3.7 # via virtualenv diff --git a/cibuildwheel/resources/nodejs.toml b/cibuildwheel/resources/nodejs.toml index ad93f2d7b..9674bc39f 100644 --- a/cibuildwheel/resources/nodejs.toml +++ b/cibuildwheel/resources/nodejs.toml @@ -1,3 +1,3 @@ url = "https://nodejs.org/dist/" -v22 = "v22.14.0" -v20 = "v20.19.0" +v22 = "v22.15.0" +v20 = "v20.19.1" diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 7a9962a39..3d1b3283c 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,47 +1,47 @@ [x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.04.19-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.04.19-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.04.19-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.04.19-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.03-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.03-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.04.26-0 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.05.03-1 [i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.04.19-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.04.19-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.03-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.05.03-1 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.04.19-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.04.19-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.19-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.04.19-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.03-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.03-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.26-0 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.05.03-1 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.04.19-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.04.19-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.04.19-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.04.19-1 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.05.03-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.05.03-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.04.26-0 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.05.03-1 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.04.19-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.04.19-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.04.19-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.04.19-1 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.05.03-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.05.03-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.04.26-0 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.05.03-1 [pypy_x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.04.19-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.04.19-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.04.19-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.03-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.03-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.04.26-0 [pypy_i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.04.19-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.03-1 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.04.19-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.04.19-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.19-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.03-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.03-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.26-0 [armv7l] -manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.04.19-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.04.19-1 +manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.05.03-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.05.03-1 [riscv64] diff --git a/docs/working-examples.md b/docs/working-examples.md index 63574dd2d..366d6f257 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -51,8 +51,8 @@ title: Working examples | [PyYAML][] | ![github icon][] | ![apple icon][] | Canonical source repository for PyYAML | | [pikepdf][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by QPDF | | [numexpr][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, Pandas, PyTables and more | -| [h5py][] | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. | | [Wrapt][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python module for decorators, wrappers and monkey patching. | +| [h5py][] | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. | | [envd][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A machine learning development environment build tool | | [Psycopg 3][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A modern implementation of a PostgreSQL adapter for Python | | [OpenColorIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A color management framework for visual effects and animation. | @@ -98,13 +98,13 @@ title: Working examples | [boost-histogram][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. | | [Python-WebRTC][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | a Python extension that provides bindings to WebRTC M92 | | [Imagecodecs (fork)][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. | -| [fathon][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms | | [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 | +| [fathon][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms | | [Arbor][] | ![github icon][] | ![apple icon][] ![linux icon][] | Arbor is a multi-compartment neuron simulation library; compatible with next-generation accelerators; best-practices applied to research software; focused on community-driven development. Includes a [small script](https://github.com/arbor-sim/arbor/blob/master/scripts/patchwheel.py) patching `rpath` in bundled libraries. | -| [polaroid][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. | | [clang-format][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. | -| [etebase-py][] | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. | +| [polaroid][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. | | [cf-units][] | ![github icon][] | ![apple icon][] ![linux icon][] | Units of measure as required by the Climate and Forecast (CF) Metadata Conventions | +| [etebase-py][] | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. | | [ninja][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | | [numpythia][] | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy | | [pyjet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy | @@ -161,8 +161,8 @@ title: Working examples [PyYAML]: https://github.com/yaml/pyyaml [pikepdf]: https://github.com/pikepdf/pikepdf [numexpr]: https://github.com/pydata/numexpr -[h5py]: https://github.com/h5py/h5py [Wrapt]: https://github.com/GrahamDumpleton/wrapt +[h5py]: https://github.com/h5py/h5py [envd]: https://github.com/tensorchord/envd [Psycopg 3]: https://github.com/psycopg/psycopg [OpenColorIO]: https://github.com/AcademySoftwareFoundation/OpenColorIO @@ -208,13 +208,13 @@ title: Working examples [boost-histogram]: https://github.com/scikit-hep/boost-histogram [Python-WebRTC]: https://github.com/MarshalX/python-webrtc [Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build -[fathon]: https://github.com/stfbnc/fathon [pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example +[fathon]: https://github.com/stfbnc/fathon [Arbor]: https://github.com/arbor-sim/arbor -[polaroid]: https://github.com/daggy1234/polaroid [clang-format]: https://github.com/ssciwr/clang-format-wheel -[etebase-py]: https://github.com/etesync/etebase-py +[polaroid]: https://github.com/daggy1234/polaroid [cf-units]: https://github.com/SciTools/cf-units +[etebase-py]: https://github.com/etesync/etebase-py [ninja]: https://github.com/scikit-build/ninja-python-distributions [numpythia]: https://github.com/scikit-hep/numpythia [pyjet]: https://github.com/scikit-hep/pyjet From edbd234b820f271eca6dadad30c6a2d67b5cb685 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 16:23:35 -0400 Subject: [PATCH 1026/1105] [pre-commit.ci] pre-commit autoupdate (#2381) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.7 → v0.11.8](https://github.com/astral-sh/ruff-pre-commit/compare/v0.11.7...v0.11.8) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 55d0b9df9..41be3c2a2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.7 + rev: v0.11.8 hooks: - id: ruff args: ["--fix", "--show-fixes"] From 04c9427a2015a0f076d0cef047ffd2c2c3af5c1f Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Thu, 8 May 2025 12:27:05 +0100 Subject: [PATCH 1027/1105] Test enable groups as specified by PR labels (#2357) * Allow CIBW_ENABLE to control the wheels built in testing * Set CIBW_ENABLE using PR labels * Add docs * Build everything on the main branch * Add CIBW_ENABLE=all option This was mostly for use in the `main` building case, because otherwise it's maybe a bit too easy to forget to update this file when adding an enable group * Remove dead code * Make unit tests robust to the value of CIBW_ENABLE * Fix tests that explicitly choose pypy * Fix test expectation * Don't expect impossible wheels in expected_wheels * Simplify logic in expected_wheels * CircleCI- run with CIBW_ENABLE=all only on the main branch * Azure pipelines - run with CIBW_ENABLE=all on main branch * Update gitlab to run CIBW_ENABLE=all on main * Set CIBW_ENABLE=all on travis - it only runs on main anyway * Fix job name error on CircleCI * Fix tests for graalpy * Update the test configuration to use the label * Remove duplication of default value. Make it affect sample build too * Move the action to after deps are installed * GraalPy workaround for this assumption * Make unit test resilient to changing CIBW_ENABLE --- .circleci/config.yml | 63 ++++++++++++----------- .github/workflows/test.yml | 26 +++++++++- .gitlab-ci.yml | 12 +++++ .travis.yml | 14 +++-- azure-pipelines.yml | 18 +++++++ cibuildwheel/options.py | 6 ++- cibuildwheel/selector.py | 17 ++++++ docs/contributing.md | 2 + docs/options.md | 2 +- test/conftest.py | 6 +++ test/test_0_basic.py | 25 +++++---- test/test_abi_variants.py | 35 ++++++------- test/utils.py | 47 ++++++++++------- unit_test/main_tests/main_options_test.py | 12 +++++ unit_test/option_prepare_test.py | 1 + 15 files changed, 204 insertions(+), 82 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5c8bef6f6..13bcbe069 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,30 @@ -version: 2 +version: 2.1 + +commands: + cibw_prepare_environment: + description: "Prepare the environment for testing." + steps: + - run: + name: Prepare the environment. + command: bash .circleci/prepare.sh + cibw_run_tests: + description: "Runs tests, with CIBW_ENABLE=all on the main branch" + steps: + - run: + name: Test + command: | + if [ "${CIRCLE_BRANCH}" == "main" ]; then + echo "INFO: Exporting CIBW_ENABLE=all for main branch test run." + export CIBW_ENABLE=all + else + echo "INFO: CIBW_ENABLE not set for this branch test run." + fi + + venv/bin/python ./bin/run_tests.py + no_output_timeout: 30m jobs: - osx-python3.12: + osx-python312: macos: xcode: 15.4.0 resource_class: macos.m1.medium.gen1 @@ -9,16 +32,10 @@ jobs: PYTHON: python3 steps: - checkout + - cibw_prepare_environment + - cibw_run_tests - - run: - name: Prepare the environment. - command: bash .circleci/prepare.sh - - run: - name: Test. - command: venv/bin/python ./bin/run_tests.py - no_output_timeout: 30m - - linux-python3.12: + linux-python312: docker: - image: cimg/python:3.12 environment: @@ -29,14 +46,8 @@ jobs: steps: - checkout - setup_remote_docker - - - run: - name: Prepare the environment. - command: bash .circleci/prepare.sh - - run: - name: Test. - command: venv/bin/python ./bin/run_tests.py - no_output_timeout: 30m + - cibw_prepare_environment + - cibw_run_tests linux-aarch64: machine: @@ -49,19 +60,13 @@ jobs: PYTEST_ADDOPTS: -k "unit_test or main_tests or test_0_basic or test_docker_images" steps: - checkout - - - run: - name: Prepare the environment. - command: bash .circleci/prepare.sh - - run: - name: Test. - command: venv/bin/python ./bin/run_tests.py - no_output_timeout: 30m + - cibw_prepare_environment + - cibw_run_tests workflows: version: 2 all-tests: jobs: - - osx-python3.12 - - linux-python3.12 + - osx-python312 + - linux-python312 - linux-aarch64 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3ae094dcd..d860ef40b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,6 +6,11 @@ on: - main - 2.x pull_request: + types: + - opened + - synchronize + - reopened + - labeled paths-ignore: - 'docs/**' - .pre-commit-config.yaml @@ -68,6 +73,26 @@ jobs: run: | uv sync --no-dev --group test + - uses: joerick/pr-labels-action@v1.0.9 + - name: Set CIBW_ENABLE + shell: bash + run: | + if [[ "${{ github.ref_name }}" == "main" ]]; then + 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)') + + # if this is a PR, check for labels + if [[ -n "$GITHUB_PR_LABEL_CI_PYPY" ]]; then + CIBW_ENABLE+=" pypy" + fi + if [[ -n "$GITHUB_PR_LABEL_CI_GRAALPY" ]]; then + CIBW_ENABLE+=" graalpy" + fi + fi + echo "CIBW_ENABLE=${CIBW_ENABLE}" >> $GITHUB_ENV + - name: Generate a sample project run: | uv run --no-sync -m test.test_projects test.test_0_basic.basic_project sample_proj @@ -80,7 +105,6 @@ jobs: env: CIBW_ARCHS_MACOS: x86_64 universal2 arm64 CIBW_BUILD_FRONTEND: 'build[uv]' - CIBW_ENABLE: "cpython-prerelease cpython-freethreading pypy graalpy" - name: Run a sample build (GitHub Action, only) uses: ./ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ecf0361fb..5ee98dd54 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,10 @@ linux: # skip all but the basic tests # (comment the below line in a PR to debug a Gitlab-specific issue) PYTEST_ADDOPTS: -k "unit_test or test_0_basic" --suppress-no-test-exit-code + rules: + - if: '$CI_COMMIT_BRANCH == "main"' + variables: + CIBW_ENABLE: "all" script: - curl -sSL https://get.docker.com/ | sh - docker run --rm --privileged docker.io/tonistiigi/binfmt:latest --install all @@ -26,6 +30,10 @@ windows: PYTEST_ADDOPTS: -k "unit_test or test_0_basic" --suppress-no-test-exit-code before_script: - choco install python -y --version 3.12.4 + rules: + - if: '$CI_COMMIT_BRANCH == "main"' + variables: + CIBW_ENABLE: "all" script: - py -m pip install dependency-groups - py -m pip install -e. pytest-custom-exit-code $(py -m dependency_groups test) @@ -37,6 +45,10 @@ macos: image: macos-14-xcode-15 variables: PYTEST_ADDOPTS: -k "unit_test or test_0_basic" --suppress-no-test-exit-code + rules: + - if: '$CI_COMMIT_BRANCH == "main"' + variables: + CIBW_ENABLE: "all" script: - python3 -m pip install dependency-groups - python3 -m dependency_groups test | xargs python3 -m pip install -e. pytest-custom-exit-code diff --git a/.travis.yml b/.travis.yml index ec2365a09..e4d1d72a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,13 +14,17 @@ jobs: - name: Linux | x86_64 + i686 | Python 3.12 python: 3.12 services: docker - env: PYTHON=python + env: + - PYTHON=python + - CIBW_ENABLE=all - name: Linux | arm64 | Python 3.12 python: 3.12 services: docker arch: arm64 - env: PYTHON=python + env: + - PYTHON=python + - CIBW_ENABLE=all - name: Linux | ppc64le | Python 3.12 python: 3.12 @@ -32,6 +36,7 @@ jobs: # skip test_manylinuxXXXX_only, it uses too much disk space # c.f. https://travis-ci.community/t/running-out-of-disk-space-quota-when-using-docker-on-ppc64le/11634 - PYTEST_ADDOPTS='-k "not test_manylinuxXXXX_only"' + - CIBW_ENABLE=all - name: Windows | x86_64 | Python 3.12 os: windows @@ -40,13 +45,16 @@ jobs: - choco upgrade python3 -y --version 3.12.8 --limit-output --params "/InstallDir:C:\\Python312" env: - PYTHON=C:\\Python312\\python + - CIBW_ENABLE=all - name: Linux | s390x | Python 3.12 python: 3.12 services: docker arch: s390x allow_failure: True - env: PYTHON=python + env: + - PYTHON=python + - CIBW_ENABLE=all install: - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then docker run --rm --privileged docker.io/tonistiigi/binfmt:latest --install all; fi diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1cc707fd9..ddc9f18fa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,6 +16,12 @@ jobs: docker run --rm --privileged docker.io/tonistiigi/binfmt:latest --install all python -m pip install dependency-groups python -m dependency_groups test | xargs python -m pip install -e. + if [ "$(Build.SourceBranch)" = "refs/heads/main" ]; then + echo "INFO: Exporting CIBW_ENABLE=all for main branch test run." + export CIBW_ENABLE=all + else + echo "INFO: CIBW_ENABLE not set for this branch ($(Build.SourceBranch))." + fi python ./bin/run_tests.py - job: macos_311 @@ -28,6 +34,12 @@ jobs: - bash: | python -m pip install dependency-groups python -m dependency_groups test | xargs python -m pip install -e. + if [ "$(Build.SourceBranch)" = "refs/heads/main" ]; then + echo "INFO: Exporting CIBW_ENABLE=all for main branch test run." + export CIBW_ENABLE=all + else + echo "INFO: CIBW_ENABLE not set for this branch ($(Build.SourceBranch))." + fi python ./bin/run_tests.py - job: windows_311 @@ -40,4 +52,10 @@ jobs: - bash: | python -m pip install dependency-groups python -m dependency_groups test | xargs python -m pip install -e. + if [ "$(Build.SourceBranch)" = "refs/heads/main" ]; then + echo "INFO: Exporting CIBW_ENABLE=all for main branch test run." + export CIBW_ENABLE=all + else + echo "INFO: CIBW_ENABLE not set for this branch ($(Build.SourceBranch))." + fi python ./bin/run_tests.py diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index 283f48f7c..fa1d1c046 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -634,8 +634,10 @@ def globals(self) -> GlobalOptions: "enable", env_plat=False, option_format=ListFormat(sep=" "), env_rule=InheritRule.APPEND ) try: - enable = {EnableGroup(group) for group in enable_groups.split()} - enable.update(EnableGroup(command_line_group) for command_line_group in args.enable) + enable = { + *EnableGroup.parse_option_value(enable_groups), + *EnableGroup.parse_option_value(" ".join(args.enable)), + } except ValueError as e: msg = f"Failed to parse enable group. {e}. Valid group names are: {', '.join(g.value for g in EnableGroup)}" raise errors.ConfigurationError(msg) from e diff --git a/cibuildwheel/selector.py b/cibuildwheel/selector.py index 48578712d..2d78aea0e 100644 --- a/cibuildwheel/selector.py +++ b/cibuildwheel/selector.py @@ -39,6 +39,23 @@ class EnableGroup(StrEnum): def all_groups(cls) -> frozenset["EnableGroup"]: return frozenset(cls) + @classmethod + def parse_option_value(cls, value: str) -> frozenset["EnableGroup"]: + """ + Parses a string of space-separated values into a set of EnableGroup + members. The string may contain group names or "all". + """ + result = set() + for group in value.strip().split(): + if group == "all": + return cls.all_groups() + try: + result.add(cls(group)) + except ValueError: + msg = f"Unknown enable group: {group}" + raise ValueError(msg) from None + return frozenset(result) + @dataclass(frozen=True, kw_only=True) class BuildSelector: diff --git a/docs/contributing.md b/docs/contributing.md index 4eea79599..86cd49bdf 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -82,6 +82,8 @@ A few notes- - 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. + #### Running pytest directly More advanced users might prefer to invoke pytest directly. Set up a [dev environment](#setting-up-a-dev-environment), then, diff --git a/docs/options.md b/docs/options.md index 5006d8e28..c36c423ab 100644 --- a/docs/options.md +++ b/docs/options.md @@ -324,7 +324,7 @@ values are: are disabled by default as they can't be uploaded to PyPI and a PEP will most likely be required before this can happen. - `graalpy`: Enable GraalPy. - +- `all`: Enable all of the above. !!! caution `cpython-prerelease` is provided for testing purposes only. It is not diff --git a/test/conftest.py b/test/conftest.py index f2b575df0..8c3e15221 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,4 +1,5 @@ import json +import os import subprocess from collections.abc import Generator @@ -12,6 +13,9 @@ from .utils import EMULATED_ARCHS, platform +# default to just cpython +DEFAULT_CIBW_ENABLE = "cpython-freethreading cpython-prerelease cpython-experimental-riscv64" + def pytest_addoption(parser: pytest.Parser) -> None: parser.addoption( @@ -29,6 +33,8 @@ def pytest_addoption(parser: pytest.Parser) -> None: help="macOS cp38 uses the universal2 installer", ) + os.environ.setdefault("CIBW_ENABLE", DEFAULT_CIBW_ENABLE) + def docker_warmup(request: pytest.FixtureRequest) -> None: machine = request.config.getoption("--run-emulation", default=None) diff --git a/test/test_0_basic.py b/test/test_0_basic.py index 6a7732031..d0503c105 100644 --- a/test/test_0_basic.py +++ b/test/test_0_basic.py @@ -1,8 +1,10 @@ +import os import textwrap import pytest from cibuildwheel.logger import Logger +from cibuildwheel.selector import EnableGroup from . import test_projects, utils @@ -38,11 +40,13 @@ def test(tmp_path, build_frontend_env, capfd): expected_wheels = utils.expected_wheels("spam", "0.1.0") assert set(actual_wheels) == set(expected_wheels) - # Verify pip warning not shown - captured = capfd.readouterr() - for stream in (captured.err, captured.out): - assert "WARNING: Running pip as the 'root' user can result" not in stream - assert "A new release of pip available" not in stream + enable_groups = EnableGroup.parse_option_value(os.environ.get("CIBW_ENABLE", "")) + if EnableGroup.GraalPy not in enable_groups: + # Verify pip warning not shown + captured = capfd.readouterr() + for stream in (captured.err, captured.out): + assert "WARNING: Running pip as the 'root' user can result" not in stream + assert "A new release of pip available" not in stream @pytest.mark.skip(reason="to keep test output clean") @@ -61,16 +65,19 @@ def test_sample_build(tmp_path, capfd): logger.step_end() -def test_build_identifiers(tmp_path): +@pytest.mark.parametrize( + "enable_setting", ["", "cpython-prerelease", "pypy", "cpython-freethreading"] +) +def test_build_identifiers(tmp_path, enable_setting, monkeypatch): project_dir = tmp_path / "project" basic_project.generate(project_dir) + monkeypatch.setenv("CIBW_ENABLE", enable_setting) + # check that the number of expected wheels matches the number of build # identifiers expected_wheels = utils.expected_wheels("spam", "0.1.0") - build_identifiers = utils.cibuildwheel_get_build_identifiers( - project_dir, prerelease_pythons=True - ) + build_identifiers = utils.cibuildwheel_get_build_identifiers(project_dir) assert len(expected_wheels) == len(build_identifiers), ( f"{expected_wheels} vs {build_identifiers}" ) diff --git a/test/test_abi_variants.py b/test/test_abi_variants.py index 5c7c27f54..62f03850f 100644 --- a/test/test_abi_variants.py +++ b/test/test_abi_variants.py @@ -35,36 +35,34 @@ def test_abi3(tmp_path): project_dir = tmp_path / "project" limited_api_project.generate(project_dir) - single_python_tag = "cp{}{}".format(*utils.SINGLE_PYTHON_VERSION) - # build the wheels actual_wheels = utils.cibuildwheel_run( project_dir, add_env={ # free_threaded, GraalPy, and PyPy do not have a Py_LIMITED_API equivalent, just build one of those # also limit the number of builds for test performance reasons - "CIBW_BUILD": f"cp39-* cp310-* pp310-* gp242-* {single_python_tag}-* cp313t-*" + "CIBW_BUILD": "cp39-* cp310-* pp310-* gp242-* cp312-* cp313t-*", + "CIBW_ENABLE": "all", }, ) # check that the expected wheels are produced - expected_wheels = utils.expected_wheels("spam", "0.1.0") if utils.platform == "pyodide": - # there's only 1 possible configuration for pyodide, the single_python_tag one - expected_wheels = [ - w.replace(f"{single_python_tag}-{single_python_tag}", "cp310-abi3") - for w in expected_wheels - ] + # there's only 1 possible configuration for pyodide, cp312 + expected_wheels = utils.expected_wheels("spam", "0.1.0", python_abi_tags=["cp310-abi3"]) else: - expected_wheels = [ - w.replace("cp310-cp310", "cp310-abi3") - for w in expected_wheels - if "-cp39" in w - or "-cp310" in w - or "-pp310" in w - or "-graalpy242" in w - or "-cp313t" in w - ] + expected_wheels = utils.expected_wheels( + "spam", + "0.1.0", + python_abi_tags=[ + "cp39-cp39", + "cp310-abi3", # <-- ABI3, works with 3.10 and 3.12 + "cp313-cp313t", + "pp310-pypy310_pp73", + "graalpy311-graalpy242_311_native", + ], + ) + assert set(actual_wheels) == set(expected_wheels) @@ -187,6 +185,7 @@ def test_abi_none(tmp_path, capfd): "CIBW_TEST_COMMAND": f"{utils.invoke_pytest()} ./test", # limit the number of builds for test performance reasons "CIBW_BUILD": "cp38-* cp{}{}-* cp313t-* pp310-*".format(*utils.SINGLE_PYTHON_VERSION), + "CIBW_ENABLE": "all", }, ) diff --git a/test/utils.py b/test/utils.py index 957ee7295..452d002fb 100644 --- a/test/utils.py +++ b/test/utils.py @@ -23,6 +23,9 @@ EMULATED_ARCHS: Final[list[str]] = sorted( arch.value for arch in (Architecture.all_archs("linux") - Architecture.auto_archs("linux")) ) +PYPY_ARCHS = ["x86_64", "i686", "AMD64", "aarch64", "arm64"] +GRAALPY_ARCHS = ["x86_64", "AMD64", "aarch64", "arm64"] + SINGLE_PYTHON_VERSION: Final[tuple[int, int]] = (3, 12) _AARCH64_CAN_RUN_ARMV7: Final[bool] = Architecture.aarch64.value not in EMULATED_ARCHS and { @@ -46,7 +49,8 @@ def cibuildwheel_get_build_identifiers( - project_path: Path, env: dict[str, str] | None = None, *, prerelease_pythons: bool = False + project_path: Path, + env: dict[str, str] | None = None, ) -> list[str]: """ Returns the list of build identifiers that cibuildwheel will try to build @@ -55,9 +59,6 @@ def cibuildwheel_get_build_identifiers( cmd = [sys.executable, "-m", "cibuildwheel", "--print-build-identifiers", str(project_path)] if env is None: env = os.environ.copy() - env["CIBW_ENABLE"] = "cpython-freethreading pypy graalpy" - if prerelease_pythons: - env["CIBW_ENABLE"] += " cpython-prerelease" cmd_output = subprocess.run( cmd, @@ -121,8 +122,6 @@ def cibuildwheel_run( _update_pip_cache_dir(env) - env["CIBW_ENABLE"] = " ".join(EnableGroup.all_groups()) - if single_python: env["CIBW_BUILD"] = "cp{}{}-*".format(*SINGLE_PYTHON_VERSION) @@ -222,6 +221,8 @@ def _expected_wheels( # {python tag} and {abi tag} are closely related to the python interpreter used to build the wheel # so we'll merge them below as python_abi_tag + enable_groups = EnableGroup.parse_option_value(os.environ.get("CIBW_ENABLE", "")) + if manylinux_versions is None: manylinux_versions = { "armv7l": ["manylinux_2_17", "manylinux2014", "manylinux_2_31"], @@ -243,25 +244,36 @@ def _expected_wheels( "cp311-cp311", "cp312-cp312", "cp313-cp313", - "cp313-cp313t", ] - if machine_arch == "ARM64": - # no CPython 3.8 on Windows ARM64 - python_abi_tags.pop(0) + if EnableGroup.CPythonFreeThreading in enable_groups: + python_abi_tags += [ + "cp313-cp313t", + ] - if machine_arch in ["x86_64", "i686", "AMD64", "aarch64", "arm64"]: + if EnableGroup.PyPy in enable_groups: python_abi_tags += [ "pp38-pypy38_pp73", "pp39-pypy39_pp73", "pp310-pypy310_pp73", "pp311-pypy311_pp73", ] - if machine_arch in ["x86_64", "AMD64", "aarch64", "arm64"]: + + if EnableGroup.GraalPy in enable_groups: python_abi_tags += [ "graalpy311-graalpy242_311_native", ] + if machine_arch == "ARM64" and platform == "windows": + # no CPython 3.8 on Windows ARM64 + python_abi_tags = [t for t in python_abi_tags if not t.startswith("cp38")] + + if machine_arch not in PYPY_ARCHS: + python_abi_tags = [tag for tag in python_abi_tags if not tag.startswith("pp")] + + if machine_arch not in GRAALPY_ARCHS: + python_abi_tags = [tag for tag in python_abi_tags if not tag.startswith("graalpy")] + if single_python: python_tag = "cp{}{}-".format(*SINGLE_PYTHON_VERSION) python_abi_tags = [ @@ -272,13 +284,6 @@ def _expected_wheels( ) ] - if platform == "pyodide": - assert len(python_abi_tags) == 1 - python_abi_tag = python_abi_tags[0] - platform_tag = "pyodide_2024_0_wasm32" - yield f"{package_name}-{package_version}-{python_abi_tag}-{platform_tag}.whl" - return - for python_abi_tag in python_abi_tags: platform_tags = [] @@ -327,6 +332,10 @@ def _expected_wheels( if include_universal2: platform_tags.append(f"macosx_{min_macosx.replace('.', '_')}_universal2") + + elif platform == "pyodide": + platform_tags = ["pyodide_2024_0_wasm32"] + else: msg = f"Unsupported platform {platform!r}" raise Exception(msg) diff --git a/unit_test/main_tests/main_options_test.py b/unit_test/main_tests/main_options_test.py index 66ee4c952..731d10adc 100644 --- a/unit_test/main_tests/main_options_test.py +++ b/unit_test/main_tests/main_options_test.py @@ -329,6 +329,7 @@ def test_config_settings(platform_specific, platform, intercepted_build_args, mo @pytest.mark.usefixtures("platform", "intercepted_build_args", "allow_empty") def test_build_selector_deprecated_error(monkeypatch, selector, pattern, capsys): monkeypatch.setenv(selector, pattern) + monkeypatch.delenv("CIBW_ENABLE", raising=False) if selector == "CIBW_BUILD": with pytest.raises(SystemExit) as ex: @@ -422,6 +423,8 @@ def test_debug_traceback(monkeypatch, method, capfd): @pytest.mark.parametrize("method", ["unset", "command_line", "env_var"]) def test_enable(method, intercepted_build_args, monkeypatch): + monkeypatch.delenv("CIBW_ENABLE", raising=False) + if method == "command_line": monkeypatch.setattr(sys, "argv", [*sys.argv, "--enable", "pypy", "--enable", "graalpy"]) elif method == "env_var": @@ -437,6 +440,15 @@ def test_enable(method, intercepted_build_args, monkeypatch): assert enable_groups == frozenset([EnableGroup.PyPy, EnableGroup.GraalPy]) +def test_enable_all(intercepted_build_args, monkeypatch): + monkeypatch.setattr(sys, "argv", [*sys.argv, "--enable", "all"]) + + main() + + enable_groups = intercepted_build_args.args[0].globals.build_selector.enable + assert enable_groups == EnableGroup.all_groups() + + def test_enable_arg_inherits(intercepted_build_args, monkeypatch): monkeypatch.setenv("CIBW_ENABLE", "pypy graalpy") monkeypatch.setattr(sys, "argv", [*sys.argv, "--enable", "cpython-prerelease"]) diff --git a/unit_test/option_prepare_test.py b/unit_test/option_prepare_test.py index d5dc7d191..3356c523a 100644 --- a/unit_test/option_prepare_test.py +++ b/unit_test/option_prepare_test.py @@ -51,6 +51,7 @@ def ignore_context_call(*args, **kwargs): @pytest.mark.usefixtures("mock_build_container", "fake_package_dir") def test_build_default_launches(monkeypatch): monkeypatch.setattr(sys, "argv", [*sys.argv, "--platform=linux"]) + monkeypatch.delenv("CIBW_ENABLE", raising=False) main() From 5b65230f6438c3e15f0c672d2be51b3b5eac3781 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 8 May 2025 12:12:14 -0400 Subject: [PATCH 1028/1105] fix: virtualenv 20.31 no-wheel (#2382) * fix: virtualenv 20.31 no-wheel Signed-off-by: Henry Schreiner * fix: show failed output on failure Signed-off-by: Henry Schreiner * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update linux.py * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update linux.py * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: Henry Schreiner Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- cibuildwheel/platforms/linux.py | 4 +++- cibuildwheel/venv.py | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cibuildwheel/platforms/linux.py b/cibuildwheel/platforms/linux.py index e39a24e08..28650525e 100644 --- a/cibuildwheel/platforms/linux.py +++ b/cibuildwheel/platforms/linux.py @@ -353,7 +353,9 @@ def build_in_container( container.call(["uv", "venv", venv_dir, "--python", python_bin / "python"], env=env) else: # Use embedded dependencies from virtualenv to ensure determinism - venv_args = ["--no-periodic-update", "--pip=embed", "--no-setuptools", "--no-wheel"] + venv_args = ["--no-periodic-update", "--pip=embed", "--no-setuptools"] + if "38" in config.identifier: + venv_args.append("--no-wheel") container.call(["python", "-m", "virtualenv", *venv_args, venv_dir], env=env) virtualenv_env = env.copy() diff --git a/cibuildwheel/venv.py b/cibuildwheel/venv.py index 77624b689..567ba4001 100644 --- a/cibuildwheel/venv.py +++ b/cibuildwheel/venv.py @@ -20,7 +20,7 @@ @functools.cache -def _ensure_virtualenv(version: str) -> Path: +def _ensure_virtualenv(version: str) -> tuple[Path, Version]: version_parts = version.split(".") key = f"py{version_parts[0]}{version_parts[1]}" with resources.VIRTUALENV.open("rb") as f: @@ -32,7 +32,7 @@ def _ensure_virtualenv(version: str) -> Path: with FileLock(str(path) + ".lock"): if not path.exists(): download(url, path) - return path + return (path, Version(version)) def constraint_flags( @@ -110,10 +110,12 @@ def virtualenv( if use_uv: call("uv", "venv", venv_path, "--python", python) else: - virtualenv_app = _ensure_virtualenv(version) + virtualenv_app, virtualenv_version = _ensure_virtualenv(version) if pip_version is None: pip_version = _parse_pip_constraint_for_virtualenv(dependency_constraint) - additional_flags = [f"--pip={pip_version}", "--no-setuptools", "--no-wheel"] + additional_flags = [f"--pip={pip_version}", "--no-setuptools"] + if virtualenv_version < Version("20.31") or Version(version) < Version("3.9"): + additional_flags.append("--no-wheel") # Using symlinks to pre-installed seed packages is really the fastest way to get a virtual # environment. The initial cost is a bit higher but reusing is much faster. From 54a4dccd623a91f5dbb47327370f85132c1e9535 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sun, 11 May 2025 10:16:54 +0100 Subject: [PATCH 1029/1105] Remove official Appveyor support (#2386) --- CI.md | 10 ++++---- README.md | 7 ++---- appveyor.yml | 38 ----------------------------- bin/projects.py | 1 - bin/run_example_ci_configs.py | 5 ---- cibuildwheel/ci.py | 6 ++++- docs/ci-services.md | 22 +++++------------ docs/data/projects.schema.json | 1 - docs/data/projects.yml | 12 ++++----- docs/data/readme_icons/appveyor.svg | 1 - docs/working-examples.md | 5 ++-- examples/appveyor-minimal.yml | 18 -------------- pyproject.toml | 1 - test/test_cpp_standards.py | 6 ----- 14 files changed, 26 insertions(+), 107 deletions(-) delete mode 100644 appveyor.yml delete mode 100644 docs/data/readme_icons/appveyor.svg delete mode 100644 examples/appveyor-minimal.yml diff --git a/CI.md b/CI.md index d1282bc36..6b45fffc3 100644 --- a/CI.md +++ b/CI.md @@ -1,10 +1,10 @@ This is a summary of the host Python versions and platforms covered by the different CI platforms: -| | 3.11 | 3.12 | 3.13 | -|---------|----------------------------------|---------------------------------------------------------|----------------| -| Linux | Azure Pipelines / GitHub Actions | AppVeyor¹ / CircleCI¹ / Cirrus CI / GitLab¹ / Travis CI | GitHub Actions | -| macOS | Azure Pipelines | AppVeyor¹ / CircleCI¹ / Cirrus CI / GitLab¹ | GitHub Actions | -| Windows | Azure Pipelines | AppVeyor¹ / Cirrus CI / GitLab¹ / Travis CI | GitHub Actions | +| | 3.11 | 3.12 | 3.13 | +|---------|----------------------------------|---------------------------------------------|----------------| +| Linux | Azure Pipelines / GitHub Actions | CircleCI¹ / Cirrus CI / GitLab¹ / Travis CI | GitHub Actions | +| macOS | Azure Pipelines | CircleCI¹ / Cirrus CI / GitLab¹ | GitHub Actions | +| Windows | Azure Pipelines | Cirrus CI / GitLab¹ / Travis CI | GitHub Actions | > ¹ Runs a reduced set of tests to reduce CI load diff --git a/README.md b/README.md index 2d9af6b11..d9f258e38 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ cibuildwheel [![Documentation Status](https://readthedocs.org/projects/cibuildwheel/badge/?version=stable)](https://cibuildwheel.pypa.io/en/stable/?badge=stable) [![Actions Status](https://github.com/pypa/cibuildwheel/workflows/Test/badge.svg)](https://github.com/pypa/cibuildwheel/actions) [![Travis Status](https://img.shields.io/travis/com/pypa/cibuildwheel/main?logo=travis)](https://travis-ci.com/github/pypa/cibuildwheel) -[![Appveyor status](https://ci.appveyor.com/api/projects/status/gt3vwl88yt0y3hur/branch/main?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/main) [![CircleCI Status](https://img.shields.io/circleci/build/gh/pypa/cibuildwheel/main?logo=circleci)](https://circleci.com/gh/pypa/cibuildwheel) [![Azure Status](https://dev.azure.com/joerick0429/cibuildwheel/_apis/build/status/pypa.cibuildwheel?branchName=main)](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=4&branchName=main) @@ -16,7 +15,7 @@ cibuildwheel Python wheels are great. Building them across **Mac, Linux, Windows**, on **multiple versions of Python**, is not. -`cibuildwheel` is here to help. `cibuildwheel` runs on your CI server - currently it supports GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, and GitLab CI - and it builds and tests your wheels across all of your platforms. +`cibuildwheel` is here to help. `cibuildwheel` runs on your CI server - currently it supports GitHub Actions, Azure Pipelines, Travis CI, CircleCI, and GitLab CI - and it builds and tests your wheels across all of your platforms. What does it do? @@ -45,7 +44,7 @@ While cibuildwheel itself requires a recent Python version to run (we support th ⁵ manylinux armv7l support is experimental. As there are no RHEL based image for this architecture, it's using an Ubuntu based image instead.
- Builds manylinux, musllinux, macOS 10.9+ (10.13+ for Python 3.12+), and Windows wheels for CPython, PyPy, and GraalPy -- Works on GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, GitLab CI, and Cirrus CI +- Works on GitHub Actions, Azure Pipelines, Travis CI, CircleCI, GitLab CI, and Cirrus CI - Bundles shared library dependencies on Linux and macOS through [auditwheel](https://github.com/pypa/auditwheel) and [delocate](https://github.com/matthew-brett/delocate) - Runs your library's tests against the wheel-installed version of your library @@ -61,7 +60,6 @@ Usage | GitHub Actions | ✅ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅³ | | Azure Pipelines | ✅ | ✅ | ✅ | | ✅ | ✅² | ✅³ | | Travis CI | ✅ | | ✅ | ✅ | | | | -| AppVeyor | ✅ | ✅ | ✅ | | ✅ | ✅² | ✅³ | | CircleCI | ✅ | ✅ | | ✅ | ✅ | | ✅³ | | Gitlab CI | ✅ | ✅ | ✅ | ✅¹ | ✅ | | ✅³ | | Cirrus CI | ✅ | ✅ | ✅ | ✅ | ✅ | | ✅³ | @@ -188,7 +186,6 @@ Here are some repos that use cibuildwheel. [Prophet]: https://github.com/facebook/prophet [Kivy]: https://github.com/kivy/kivy -[appveyor icon]: docs/data/readme_icons/appveyor.svg [github icon]: docs/data/readme_icons/github.svg [azurepipelines icon]: docs/data/readme_icons/azurepipelines.svg [circleci icon]: docs/data/readme_icons/circleci.svg diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index ca5d4a6c4..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,38 +0,0 @@ -environment: - matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2204 - APPVEYOR_JOB_NAME: "python312-x64-ubuntu" - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - APPVEYOR_JOB_NAME: "python312-x64-vs2022" - - APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma - APPVEYOR_JOB_NAME: "python312-x64-macos" - -stack: python 3.12 - -build: off - -init: -- ps: | - $BRANCH = if ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH) { $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH } else { $env:APPVEYOR_REPO_BRANCH } - if (-not ($BRANCH -eq 'main' -or $BRANCH.ToLower().StartsWith('appveyor-'))) { - $env:PYTEST_ADDOPTS = '-k "unit_test or test_0_basic" --suppress-no-test-exit-code' - } - if ($IsLinux) { - docker run --rm --privileged docker.io/tonistiigi/binfmt:latest --install all - } - -install: - - python -m pip install -U pip - - python -m pip install -e ".[dev]" pytest-custom-exit-code - -# the '-u' flag is required so the output is in the correct order. -# See https://github.com/pypa/cibuildwheel/pull/24 for more info. -test_script: python -u ./bin/run_tests.py - -branches: - only: - - main - -skip_commits: - files: - - docs/* diff --git a/bin/projects.py b/bin/projects.py index 7414be963..029ef6679 100755 --- a/bin/projects.py +++ b/bin/projects.py @@ -33,7 +33,6 @@ from github import Github, GithubException ICONS = ( - "appveyor", "github", "azurepipelines", "circleci", diff --git a/bin/run_example_ci_configs.py b/bin/run_example_ci_configs.py index c7a5b8718..a6bd1bd06 100755 --- a/bin/run_example_ci_configs.py +++ b/bin/run_example_ci_configs.py @@ -41,11 +41,6 @@ class CIService(typing.NamedTuple): services = [ - CIService( - name="appveyor", - dst_config_path="appveyor.yml", - badge_md="[![Build status](https://ci.appveyor.com/api/projects/status/gt3vwl88yt0y3hur/branch/{branch}?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/{branch})", - ), CIService( name="azure-pipelines", dst_config_path="azure-pipelines.yml", diff --git a/cibuildwheel/ci.py b/cibuildwheel/ci.py index a7ba04ee1..03205b7a4 100644 --- a/cibuildwheel/ci.py +++ b/cibuildwheel/ci.py @@ -6,13 +6,17 @@ class CIProvider(Enum): + # official support travis_ci = "travis" - appveyor = "appveyor" circle_ci = "circle_ci" azure_pipelines = "azure_pipelines" github_actions = "github_actions" gitlab = "gitlab" cirrus_ci = "cirrus_ci" + + # unofficial support + appveyor = "appveyor" + other = "other" diff --git a/docs/ci-services.md b/docs/ci-services.md index ba0c53ec8..6564052f8 100644 --- a/docs/ci-services.md +++ b/docs/ci-services.md @@ -86,22 +86,6 @@ Then setup a deployment method by following the [Travis CI deployment docs](http [`examples/travis-ci-deploy.yml`](https://github.com/pypa/cibuildwheel/blob/main/examples/travis-ci-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI. -### AppVeyor [linux/mac/windows] {: #appveyor} - -To build Linux, Mac, and Windows wheels on AppVeyor, create an `appveyor.yml` file in your repo. - -> appveyor.yml - -```yaml -{% include "../examples/appveyor-minimal.yml" %} -``` - -Commit this file, enable building of your repo on AppVeyor, and push. - -AppVeyor will store the built wheels for you - you can access them from the project console. Alternatively, you may want to store them in the same place as the Travis CI build. See [AppVeyor deployment docs](https://www.appveyor.com/docs/deployment/) for more info, or see [Delivering to PyPI](deliver-to-pypi.md) below. - -For more info on this config file, check out the [docs](https://www.appveyor.com/docs/). - ### CircleCI [linux/mac] {: #circleci} To build Linux and Mac wheels on CircleCI, create a `.circleci/config.yml` file in your repo, @@ -149,6 +133,12 @@ Cirrus CI will store the built wheels for you - you can access them from the ind > ⚠️ Got an error? Check the [FAQ](faq.md). +### Other CI services + +#### AppVeyor {: #appveyor} + +Appveyor official support was dropped in cibuildwheel v3.0, due to a lack of CI credits. However, it can probably still be used as-is. Check the Appveyor example from the cibuildwheel v2.0 branch: [appveyor-minimal.yml](https://github.com/pypa/cibuildwheel/blob/v2.23.3/examples/appveyor-minimal.yml). + ## Next steps Once you've got the wheel building successfully, you might want to set up [testing](options.md#test-command) or [automatic releases to PyPI](deliver-to-pypi.md#automatic-method). diff --git a/docs/data/projects.schema.json b/docs/data/projects.schema.json index ba12ccb9e..452b52c52 100644 --- a/docs/data/projects.schema.json +++ b/docs/data/projects.schema.json @@ -18,7 +18,6 @@ "enum": [ "github", "travisci", - "appveyor", "circleci", "gitlab", "cirrusci", diff --git a/docs/data/projects.yml b/docs/data/projects.yml index 8c9315bd9..e6ce488d9 100644 --- a/docs/data/projects.yml +++ b/docs/data/projects.yml @@ -4,7 +4,7 @@ # stars: GitHub repo (optional, if different from package, such as for Twisted) # pypi: The pypi name, if different from the GitHub package name # os: Operating system list, [windows, apple, linux] (optional) -# ci: [appveyor, github, azurepipelines, circleci, gitlab, travisci, cirrusci] (optional) +# ci: [github, azurepipelines, circleci, gitlab, travisci, cirrusci] (optional) # notes: (text, optional) - name: abess @@ -19,11 +19,11 @@ ci: [github] os: [windows, apple, linux] -- name: pyinstrument_cext - gh: joerick/pyinstrument_cext - ci: [travisci, appveyor] +- name: pyinstrument + gh: joerick/pyinstrument + ci: [github] os: [windows, apple, linux] - notes: A simple C extension, without external dependencies + notes: Python profiler with a C extension. No external dependencies. - name: websockets gh: python-websockets/websockets @@ -182,7 +182,7 @@ - name: python-rapidjson gh: python-rapidjson/python-rapidjson - ci: [travisci, gitlab, appveyor] + ci: [travisci, gitlab] os: [windows, linux] - name: jq.py diff --git a/docs/data/readme_icons/appveyor.svg b/docs/data/readme_icons/appveyor.svg deleted file mode 100644 index 6fa0bac27..000000000 --- a/docs/data/readme_icons/appveyor.svg +++ /dev/null @@ -1 +0,0 @@ -AppVeyor icon \ No newline at end of file diff --git a/docs/working-examples.md b/docs/working-examples.md index 366d6f257..9f254988f 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -75,7 +75,7 @@ title: Working examples | [KDEpy][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Kernel Density Estimation in Python | | [dd-trace-py][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub | | [tgcalls][] | ![github icon][] | ![apple icon][] ![windows icon][] | Python `pybind11` binding to Telegram's WebRTC library with third party dependencies like `OpenSSL`, `MozJPEG`, `FFmpeg`, etc. | -| [python-rapidjson][] | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson | +| [python-rapidjson][] | ![travisci icon][] ![gitlab icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson | | [pybind11 python_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a Python-based build system | | [sourmash][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. | | [abess][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A fast best-subset selection library. It uses cibuildwheel to build a large project with C++ extensions. | @@ -115,7 +115,7 @@ title: Working examples | [CorrectionLib][] | ![github icon][] | ![apple icon][] ![linux icon][] | Structured JSON powered correction library for HEP, designed for the CMS experiment at CERN. | | [xmlstarlet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. | | [werpy][] | ![github icon][] | ![windows icon][] ![linux icon][] ![apple icon][] | An ultra-fast python package using optimized dynamic programming to compute the Word Error Rate (WER). | -| [pyinstrument_cext][] | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies | +| [pyinstrument_cext][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies | | [pybind11 cross build example][] | ![github icon][] ![gitlab icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Same as pybind11 cmake_example but used to demo Linux ARM + Windows + macOS builds on GitLab | [scikit-learn]: https://github.com/scikit-learn/scikit-learn @@ -228,7 +228,6 @@ title: Working examples [pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext [pybind11 cross build example]: https://github.com/wbarnha/pybind_cmake_example_crossbuild -[appveyor icon]: data/readme_icons/appveyor.svg [github icon]: data/readme_icons/github.svg [azurepipelines icon]: data/readme_icons/azurepipelines.svg [circleci icon]: data/readme_icons/circleci.svg diff --git a/examples/appveyor-minimal.yml b/examples/appveyor-minimal.yml deleted file mode 100644 index 446c2c912..000000000 --- a/examples/appveyor-minimal.yml +++ /dev/null @@ -1,18 +0,0 @@ -environment: - matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2204 - APPVEYOR_JOB_NAME: "linux-x64" - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - APPVEYOR_JOB_NAME: "windows-x64" - - APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma - APPVEYOR_JOB_NAME: "macos-x64" - -stack: python 3.12 - -install: python -m pip install cibuildwheel==2.23.3 - -build_script: python -m cibuildwheel --output-dir wheelhouse - -artifacts: - - path: "wheelhouse\\*.whl" - name: Wheels diff --git a/pyproject.toml b/pyproject.toml index 9ab482337..1495b9b32 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,6 @@ authors = [ { name = "Joe Rickerby", email = "joerick@mac.com" }, ] keywords = [ - "appveyor", "ci", "linux", "macos", diff --git a/test/test_cpp_standards.py b/test/test_cpp_standards.py index bb884ad8e..85fcb6d96 100644 --- a/test/test_cpp_standards.py +++ b/test/test_cpp_standards.py @@ -1,7 +1,4 @@ -import os - import jinja2 -import pytest from . import utils from .test_projects import TestProject @@ -100,9 +97,6 @@ def test_cpp17(tmp_path): """ cpp17_project.generate(project_dir) - if os.environ.get("APPVEYOR_BUILD_WORKER_IMAGE", "") == "Visual Studio 2015": - pytest.skip("Visual Studio 2015 does not support C++17") - add_env = {} if utils.platform == "macos": add_env["MACOSX_DEPLOYMENT_TARGET"] = "10.13" From 5622cc698811beace37bd8c8a4419bee81f11a9f Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Mon, 12 May 2025 18:54:02 +0200 Subject: [PATCH 1030/1105] Add Python 3.14 preview (#2390) * feat: add CPython 3.14 beta 1 * fix tests --- README.md | 1 + cibuildwheel/platforms/macos.py | 2 + cibuildwheel/resources/build-platforms.toml | 40 ++++++++++++++ .../resources/constraints-pyodide312.txt | 6 +-- .../resources/constraints-python310.txt | 4 +- .../resources/constraints-python311.txt | 4 +- .../resources/constraints-python312.txt | 4 +- .../resources/constraints-python313.txt | 4 +- .../resources/constraints-python314.txt | 28 ++++++++++ .../resources/constraints-python38.txt | 2 +- .../resources/constraints-python39.txt | 4 +- cibuildwheel/resources/constraints.txt | 4 +- .../resources/free-threaded-enable-314.xml | 14 +++++ .../resources/pinned_docker_images.cfg | 54 +++++++++---------- cibuildwheel/resources/virtualenv.toml | 2 +- cibuildwheel/util/resources.py | 1 + docs/options.md | 1 + noxfile.py | 4 +- test/test_emulation.py | 2 +- test/utils.py | 11 ++-- unit_test/option_prepare_test.py | 1 + 21 files changed, 142 insertions(+), 51 deletions(-) create mode 100644 cibuildwheel/resources/constraints-python314.txt create mode 100644 cibuildwheel/resources/free-threaded-enable-314.xml diff --git a/README.md b/README.md index d9f258e38..21049c093 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ While cibuildwheel itself requires a recent Python version to run (we support th | CPython 3.11 | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | N/A | N/A | | CPython 3.12 | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | N/A | ✅⁴ | | CPython 3.13³ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | ✅ | N/A | +| CPython 3.14³ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | ✅ | N/A | | PyPy 3.8 v7.3 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | N/A | N/A | N/A | | PyPy 3.9 v7.3 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | N/A | N/A | N/A | | PyPy 3.10 v7.3 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | N/A | N/A | N/A | diff --git a/cibuildwheel/platforms/macos.py b/cibuildwheel/platforms/macos.py index 420e16139..e2f5b9115 100644 --- a/cibuildwheel/platforms/macos.py +++ b/cibuildwheel/platforms/macos.py @@ -158,6 +158,8 @@ def install_cpython(_tmp: Path, version: str, url: str, free_threading: bool) -> if version.startswith("3.13"): # Python 3.13 is the first version to have a free-threading option args += ["-applyChoiceChangesXML", str(resources.FREE_THREAD_ENABLE_313.resolve())] + elif version.startswith("3.14"): + args += ["-applyChoiceChangesXML", str(resources.FREE_THREAD_ENABLE_314.resolve())] call("sudo", "installer", "-pkg", pkg_path, *args, "-target", "/") pkg_path.unlink() env = os.environ.copy() diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index 15f534022..973154586 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -7,6 +7,8 @@ python_configurations = [ { identifier = "cp312-manylinux_x86_64", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-manylinux_x86_64", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-manylinux_x86_64", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp314-manylinux_x86_64", version = "3.14", path_str = "/opt/python/cp314-cp314" }, + { identifier = "cp314t-manylinux_x86_64", version = "3.14", path_str = "/opt/python/cp314-cp314t" }, { identifier = "cp38-manylinux_i686", version = "3.8", path_str = "/opt/python/cp38-cp38" }, { identifier = "cp39-manylinux_i686", version = "3.9", path_str = "/opt/python/cp39-cp39" }, { identifier = "cp310-manylinux_i686", version = "3.10", path_str = "/opt/python/cp310-cp310" }, @@ -14,6 +16,8 @@ python_configurations = [ { identifier = "cp312-manylinux_i686", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-manylinux_i686", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-manylinux_i686", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp314-manylinux_i686", version = "3.14", path_str = "/opt/python/cp314-cp314" }, + { identifier = "cp314t-manylinux_i686", version = "3.14", path_str = "/opt/python/cp314-cp314t" }, { identifier = "pp38-manylinux_x86_64", version = "3.8", path_str = "/opt/python/pp38-pypy38_pp73" }, { identifier = "pp39-manylinux_x86_64", version = "3.9", path_str = "/opt/python/pp39-pypy39_pp73" }, { identifier = "pp310-manylinux_x86_64", version = "3.10", path_str = "/opt/python/pp310-pypy310_pp73" }, @@ -26,6 +30,8 @@ python_configurations = [ { identifier = "cp312-manylinux_aarch64", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-manylinux_aarch64", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-manylinux_aarch64", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp314-manylinux_aarch64", version = "3.14", path_str = "/opt/python/cp314-cp314" }, + { identifier = "cp314t-manylinux_aarch64", version = "3.14", path_str = "/opt/python/cp314-cp314t" }, { identifier = "cp38-manylinux_ppc64le", version = "3.8", path_str = "/opt/python/cp38-cp38" }, { identifier = "cp39-manylinux_ppc64le", version = "3.9", path_str = "/opt/python/cp39-cp39" }, { identifier = "cp310-manylinux_ppc64le", version = "3.10", path_str = "/opt/python/cp310-cp310" }, @@ -33,6 +39,8 @@ python_configurations = [ { identifier = "cp312-manylinux_ppc64le", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-manylinux_ppc64le", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-manylinux_ppc64le", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp314-manylinux_ppc64le", version = "3.14", path_str = "/opt/python/cp314-cp314" }, + { identifier = "cp314t-manylinux_ppc64le", version = "3.14", path_str = "/opt/python/cp314-cp314t" }, { identifier = "cp38-manylinux_s390x", version = "3.8", path_str = "/opt/python/cp38-cp38" }, { identifier = "cp39-manylinux_s390x", version = "3.9", path_str = "/opt/python/cp39-cp39" }, { identifier = "cp310-manylinux_s390x", version = "3.10", path_str = "/opt/python/cp310-cp310" }, @@ -40,6 +48,8 @@ python_configurations = [ { identifier = "cp312-manylinux_s390x", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-manylinux_s390x", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-manylinux_s390x", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp314-manylinux_s390x", version = "3.14", path_str = "/opt/python/cp314-cp314" }, + { identifier = "cp314t-manylinux_s390x", version = "3.14", path_str = "/opt/python/cp314-cp314t" }, { identifier = "cp38-manylinux_armv7l", version = "3.8", path_str = "/opt/python/cp38-cp38" }, { identifier = "cp39-manylinux_armv7l", version = "3.9", path_str = "/opt/python/cp39-cp39" }, { identifier = "cp310-manylinux_armv7l", version = "3.10", path_str = "/opt/python/cp310-cp310" }, @@ -47,6 +57,8 @@ python_configurations = [ { identifier = "cp312-manylinux_armv7l", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-manylinux_armv7l", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-manylinux_armv7l", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp314-manylinux_armv7l", version = "3.14", path_str = "/opt/python/cp314-cp314" }, + { identifier = "cp314t-manylinux_armv7l", version = "3.14", path_str = "/opt/python/cp314-cp314t" }, { identifier = "cp38-manylinux_riscv64", version = "3.8", path_str = "/opt/python/cp38-cp38" }, { identifier = "cp39-manylinux_riscv64", version = "3.9", path_str = "/opt/python/cp39-cp39" }, { identifier = "cp310-manylinux_riscv64", version = "3.10", path_str = "/opt/python/cp310-cp310" }, @@ -54,6 +66,8 @@ python_configurations = [ { identifier = "cp312-manylinux_riscv64", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-manylinux_riscv64", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-manylinux_riscv64", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp314-manylinux_riscv64", version = "3.14", path_str = "/opt/python/cp314-cp314" }, + { identifier = "cp314t-manylinux_riscv64", version = "3.14", path_str = "/opt/python/cp314-cp314t" }, { identifier = "pp38-manylinux_aarch64", version = "3.8", path_str = "/opt/python/pp38-pypy38_pp73" }, { identifier = "pp39-manylinux_aarch64", version = "3.9", path_str = "/opt/python/pp39-pypy39_pp73" }, { identifier = "pp310-manylinux_aarch64", version = "3.10", path_str = "/opt/python/pp310-pypy310_pp73" }, @@ -70,6 +84,8 @@ python_configurations = [ { identifier = "cp312-musllinux_x86_64", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-musllinux_x86_64", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-musllinux_x86_64", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp314-musllinux_x86_64", version = "3.14", path_str = "/opt/python/cp314-cp314" }, + { identifier = "cp314t-musllinux_x86_64", version = "3.14", path_str = "/opt/python/cp314-cp314t" }, { identifier = "cp38-musllinux_i686", version = "3.8", path_str = "/opt/python/cp38-cp38" }, { identifier = "cp39-musllinux_i686", version = "3.9", path_str = "/opt/python/cp39-cp39" }, { identifier = "cp310-musllinux_i686", version = "3.10", path_str = "/opt/python/cp310-cp310" }, @@ -77,6 +93,8 @@ python_configurations = [ { identifier = "cp312-musllinux_i686", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-musllinux_i686", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-musllinux_i686", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp314-musllinux_i686", version = "3.14", path_str = "/opt/python/cp314-cp314" }, + { identifier = "cp314t-musllinux_i686", version = "3.14", path_str = "/opt/python/cp314-cp314t" }, { identifier = "cp38-musllinux_aarch64", version = "3.8", path_str = "/opt/python/cp38-cp38" }, { identifier = "cp39-musllinux_aarch64", version = "3.9", path_str = "/opt/python/cp39-cp39" }, { identifier = "cp310-musllinux_aarch64", version = "3.10", path_str = "/opt/python/cp310-cp310" }, @@ -84,6 +102,8 @@ python_configurations = [ { identifier = "cp312-musllinux_aarch64", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-musllinux_aarch64", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-musllinux_aarch64", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp314-musllinux_aarch64", version = "3.14", path_str = "/opt/python/cp314-cp314" }, + { identifier = "cp314t-musllinux_aarch64", version = "3.14", path_str = "/opt/python/cp314-cp314t" }, { identifier = "cp38-musllinux_ppc64le", version = "3.8", path_str = "/opt/python/cp38-cp38" }, { identifier = "cp39-musllinux_ppc64le", version = "3.9", path_str = "/opt/python/cp39-cp39" }, { identifier = "cp310-musllinux_ppc64le", version = "3.10", path_str = "/opt/python/cp310-cp310" }, @@ -91,6 +111,8 @@ python_configurations = [ { identifier = "cp312-musllinux_ppc64le", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-musllinux_ppc64le", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-musllinux_ppc64le", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp314-musllinux_ppc64le", version = "3.14", path_str = "/opt/python/cp314-cp314" }, + { identifier = "cp314t-musllinux_ppc64le", version = "3.14", path_str = "/opt/python/cp314-cp314t" }, { identifier = "cp38-musllinux_s390x", version = "3.8", path_str = "/opt/python/cp38-cp38" }, { identifier = "cp39-musllinux_s390x", version = "3.9", path_str = "/opt/python/cp39-cp39" }, { identifier = "cp310-musllinux_s390x", version = "3.10", path_str = "/opt/python/cp310-cp310" }, @@ -98,6 +120,8 @@ python_configurations = [ { identifier = "cp312-musllinux_s390x", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-musllinux_s390x", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-musllinux_s390x", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp314-musllinux_s390x", version = "3.14", path_str = "/opt/python/cp314-cp314" }, + { identifier = "cp314t-musllinux_s390x", version = "3.14", path_str = "/opt/python/cp314-cp314t" }, { identifier = "cp38-musllinux_armv7l", version = "3.8", path_str = "/opt/python/cp38-cp38" }, { identifier = "cp39-musllinux_armv7l", version = "3.9", path_str = "/opt/python/cp39-cp39" }, { identifier = "cp310-musllinux_armv7l", version = "3.10", path_str = "/opt/python/cp310-cp310" }, @@ -105,6 +129,8 @@ python_configurations = [ { identifier = "cp312-musllinux_armv7l", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-musllinux_armv7l", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-musllinux_armv7l", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp314-musllinux_armv7l", version = "3.14", path_str = "/opt/python/cp314-cp314" }, + { identifier = "cp314t-musllinux_armv7l", version = "3.14", path_str = "/opt/python/cp314-cp314t" }, { identifier = "cp38-musllinux_riscv64", version = "3.8", path_str = "/opt/python/cp38-cp38" }, { identifier = "cp39-musllinux_ricv64", version = "3.9", path_str = "/opt/python/cp39-cp39" }, { identifier = "cp310-musllinux_riscv64", version = "3.10", path_str = "/opt/python/cp310-cp310" }, @@ -112,6 +138,8 @@ python_configurations = [ { identifier = "cp312-musllinux_riscv64", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { identifier = "cp313-musllinux_riscv64", version = "3.13", path_str = "/opt/python/cp313-cp313" }, { identifier = "cp313t-musllinux_riscv64", version = "3.13", path_str = "/opt/python/cp313-cp313t" }, + { identifier = "cp314-musllinux_riscv64", version = "3.14", path_str = "/opt/python/cp314-cp314" }, + { identifier = "cp314t-musllinux_riscv64", version = "3.14", path_str = "/opt/python/cp314-cp314t" }, ] [macos] @@ -137,6 +165,12 @@ python_configurations = [ { identifier = "cp313t-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, { identifier = "cp313t-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, { identifier = "cp313t-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, + { identifier = "cp314-macosx_x86_64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" }, + { identifier = "cp314-macosx_arm64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" }, + { identifier = "cp314-macosx_universal2", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" }, + { identifier = "cp314t-macosx_x86_64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" }, + { identifier = "cp314t-macosx_arm64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" }, + { identifier = "cp314t-macosx_universal2", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" }, { 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" }, { identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.16-macos_x86_64.tar.bz2" }, @@ -165,12 +199,18 @@ python_configurations = [ { identifier = "cp313t-win32", version = "3.13.3", arch = "32" }, { identifier = "cp313-win_amd64", version = "3.13.3", arch = "64" }, { identifier = "cp313t-win_amd64", version = "3.13.3", arch = "64" }, + { identifier = "cp314-win32", version = "3.14.0-b1", arch = "32" }, + { identifier = "cp314t-win32", version = "3.14.0-b1", arch = "32" }, + { identifier = "cp314-win_amd64", version = "3.14.0-b1", arch = "64" }, + { identifier = "cp314t-win_amd64", version = "3.14.0-b1", 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.10", arch = "ARM64" }, { identifier = "cp313-win_arm64", version = "3.13.3", arch = "ARM64" }, { identifier = "cp313t-win_arm64", version = "3.13.3", arch = "ARM64" }, + { identifier = "cp314-win_arm64", version = "3.14.0-b1", arch = "ARM64" }, + { identifier = "cp314t-win_arm64", version = "3.14.0-b1", arch = "ARM64" }, { 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" }, { identifier = "pp310-win_amd64", version = "3.10", arch = "64", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.19-win64.zip" }, diff --git a/cibuildwheel/resources/constraints-pyodide312.txt b/cibuildwheel/resources/constraints-pyodide312.txt index 2580c967b..bfe80a4ac 100644 --- a/cibuildwheel/resources/constraints-pyodide312.txt +++ b/cibuildwheel/resources/constraints-pyodide312.txt @@ -19,7 +19,7 @@ charset-normalizer==3.4.2 # via requests click==8.1.8 # via typer -cmake==4.0.0 +cmake==4.0.2 # via pyodide-build distlib==0.3.9 # via virtualenv @@ -50,7 +50,7 @@ packaging==25.0 # unearth pip==25.1.1 # via -r .nox/update_constraints/tmp/constraints-pyodide.in -platformdirs==4.3.7 +platformdirs==4.3.8 # via virtualenv pydantic==2.11.4 # via @@ -105,7 +105,7 @@ unearth==0.17.5 # via pyodide-build urllib3==2.4.0 # via requests -virtualenv==20.30.0 +virtualenv==20.31.2 # via # build # pyodide-build diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index 3f3ca6dca..5883ddfe0 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -20,7 +20,7 @@ packaging==25.0 # delocate pip==25.1.1 # via -r cibuildwheel/resources/constraints.in -platformdirs==4.3.7 +platformdirs==4.3.8 # via virtualenv pyproject-hooks==1.2.0 # via build @@ -28,7 +28,7 @@ tomli==2.2.1 # via build typing-extensions==4.13.2 # via delocate -virtualenv==20.30.0 +virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in zipp==3.21.0 # via importlib-metadata diff --git a/cibuildwheel/resources/constraints-python311.txt b/cibuildwheel/resources/constraints-python311.txt index b3f0cf64c..0cff478d6 100644 --- a/cibuildwheel/resources/constraints-python311.txt +++ b/cibuildwheel/resources/constraints-python311.txt @@ -18,11 +18,11 @@ packaging==25.0 # delocate pip==25.1.1 # via -r cibuildwheel/resources/constraints.in -platformdirs==4.3.7 +platformdirs==4.3.8 # via virtualenv pyproject-hooks==1.2.0 # via build typing-extensions==4.13.2 # via delocate -virtualenv==20.30.0 +virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python312.txt b/cibuildwheel/resources/constraints-python312.txt index b3f0cf64c..0cff478d6 100644 --- a/cibuildwheel/resources/constraints-python312.txt +++ b/cibuildwheel/resources/constraints-python312.txt @@ -18,11 +18,11 @@ packaging==25.0 # delocate pip==25.1.1 # via -r cibuildwheel/resources/constraints.in -platformdirs==4.3.7 +platformdirs==4.3.8 # via virtualenv pyproject-hooks==1.2.0 # via build typing-extensions==4.13.2 # via delocate -virtualenv==20.30.0 +virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python313.txt b/cibuildwheel/resources/constraints-python313.txt index b3f0cf64c..0cff478d6 100644 --- a/cibuildwheel/resources/constraints-python313.txt +++ b/cibuildwheel/resources/constraints-python313.txt @@ -18,11 +18,11 @@ packaging==25.0 # delocate pip==25.1.1 # via -r cibuildwheel/resources/constraints.in -platformdirs==4.3.7 +platformdirs==4.3.8 # via virtualenv pyproject-hooks==1.2.0 # via build typing-extensions==4.13.2 # via delocate -virtualenv==20.30.0 +virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python314.txt b/cibuildwheel/resources/constraints-python314.txt new file mode 100644 index 000000000..0cff478d6 --- /dev/null +++ b/cibuildwheel/resources/constraints-python314.txt @@ -0,0 +1,28 @@ +# This file was autogenerated by uv via the following command: +# nox -s update_constraints +altgraph==0.17.4 + # via macholib +build==1.2.2.post1 + # via -r cibuildwheel/resources/constraints.in +delocate==0.13.0 + # via -r cibuildwheel/resources/constraints.in +distlib==0.3.9 + # via virtualenv +filelock==3.18.0 + # via virtualenv +macholib==1.16.3 + # via delocate +packaging==25.0 + # via + # build + # delocate +pip==25.1.1 + # via -r cibuildwheel/resources/constraints.in +platformdirs==4.3.8 + # via virtualenv +pyproject-hooks==1.2.0 + # via build +typing-extensions==4.13.2 + # via delocate +virtualenv==20.31.2 + # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index 490e373a9..2c40131f4 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -28,7 +28,7 @@ tomli==2.2.1 # via build typing-extensions==4.13.2 # via delocate -virtualenv==20.30.0 +virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in zipp==3.20.2 # via importlib-metadata diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index 3f3ca6dca..5883ddfe0 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -20,7 +20,7 @@ packaging==25.0 # delocate pip==25.1.1 # via -r cibuildwheel/resources/constraints.in -platformdirs==4.3.7 +platformdirs==4.3.8 # via virtualenv pyproject-hooks==1.2.0 # via build @@ -28,7 +28,7 @@ tomli==2.2.1 # via build typing-extensions==4.13.2 # via delocate -virtualenv==20.30.0 +virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in zipp==3.21.0 # via importlib-metadata diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index b3f0cf64c..0cff478d6 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -18,11 +18,11 @@ packaging==25.0 # delocate pip==25.1.1 # via -r cibuildwheel/resources/constraints.in -platformdirs==4.3.7 +platformdirs==4.3.8 # via virtualenv pyproject-hooks==1.2.0 # via build typing-extensions==4.13.2 # via delocate -virtualenv==20.30.0 +virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/free-threaded-enable-314.xml b/cibuildwheel/resources/free-threaded-enable-314.xml new file mode 100644 index 000000000..88fa8dd98 --- /dev/null +++ b/cibuildwheel/resources/free-threaded-enable-314.xml @@ -0,0 +1,14 @@ + + + + + + attributeSetting + 1 + choiceAttribute + selected + choiceIdentifier + org.python.Python.PythonTFramework-3.14 + + + diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 3d1b3283c..1ff2bef8d 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,47 +1,47 @@ [x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.03-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.03-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.04.26-0 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.05.03-1 +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 [i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.03-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.05.03-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.10-2 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.05.10-2 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.03-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.03-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.26-0 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.05.03-1 +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 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.05.03-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.05.03-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.04.26-0 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.05.03-1 +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 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.05.03-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.05.03-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.04.26-0 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.05.03-1 +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 [pypy_x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.03-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.03-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.04.26-0 +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 [pypy_i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.03-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.10-2 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.03-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.03-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.04.26-0 +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 [armv7l] -manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.05.03-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.05.03-1 +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 [riscv64] diff --git a/cibuildwheel/resources/virtualenv.toml b/cibuildwheel/resources/virtualenv.toml index e9b284617..9e5d08c24 100644 --- a/cibuildwheel/resources/virtualenv.toml +++ b/cibuildwheel/resources/virtualenv.toml @@ -1 +1 @@ -default = { version = "20.30.0", url = "https://github.com/pypa/get-virtualenv/blob/20.30.0/public/virtualenv.pyz?raw=true" } +default = { version = "20.31.2", url = "https://github.com/pypa/get-virtualenv/blob/20.31.2/public/virtualenv.pyz?raw=true" } diff --git a/cibuildwheel/util/resources.py b/cibuildwheel/util/resources.py index e27f1f892..40e085d68 100644 --- a/cibuildwheel/util/resources.py +++ b/cibuildwheel/util/resources.py @@ -8,6 +8,7 @@ PATH: Final[Path] = Path(__file__).parent.parent / "resources" INSTALL_CERTIFI_SCRIPT: Final[Path] = PATH / "install_certifi.py" FREE_THREAD_ENABLE_313: Final[Path] = PATH / "free-threaded-enable-313.xml" +FREE_THREAD_ENABLE_314: Final[Path] = PATH / "free-threaded-enable-314.xml" NODEJS: Final[Path] = PATH / "nodejs.toml" DEFAULTS: Final[Path] = PATH / "defaults.toml" PINNED_DOCKER_IMAGES: Final[Path] = PATH / "pinned_docker_images.cfg" diff --git a/docs/options.md b/docs/options.md index c36c423ab..1a79d3750 100644 --- a/docs/options.md +++ b/docs/options.md @@ -58,6 +58,7 @@ When setting the options, you can use shell-style globbing syntax, as per [fnmat | Python 3.11 | cp311-macosx_x86_64
cp311-macosx_universal2
cp311-macosx_arm64 | cp311-win_amd64
cp311-win32
cp311-win_arm64 | cp311-manylinux_x86_64
cp311-manylinux_i686
cp311-musllinux_x86_64
cp311-musllinux_i686 | cp311-manylinux_aarch64
cp311-manylinux_ppc64le
cp311-manylinux_s390x
cp311-manylinux_armv7l
cp311-manylinux_riscv64
cp311-musllinux_aarch64
cp311-musllinux_ppc64le
cp311-musllinux_s390x
cp311-musllinux_armv7l
cp311-musllinux_riscv64 | | | Python 3.12 | cp312-macosx_x86_64
cp312-macosx_universal2
cp312-macosx_arm64 | cp312-win_amd64
cp312-win32
cp312-win_arm64 | cp312-manylinux_x86_64
cp312-manylinux_i686
cp312-musllinux_x86_64
cp312-musllinux_i686 | cp312-manylinux_aarch64
cp312-manylinux_ppc64le
cp312-manylinux_s390x
cp312-manylinux_armv7l
cp312-manylinux_riscv64
cp312-musllinux_aarch64
cp312-musllinux_ppc64le
cp312-musllinux_s390x
cp312-musllinux_armv7l
cp312-musllinux_riscv64 | | | Python 3.13 | cp313-macosx_x86_64
cp313-macosx_universal2
cp313-macosx_arm64 | cp313-win_amd64
cp313-win32
cp313-win_arm64 | cp313-manylinux_x86_64
cp313-manylinux_i686
cp313-musllinux_x86_64
cp313-musllinux_i686 | cp313-manylinux_aarch64
cp313-manylinux_ppc64le
cp313-manylinux_s390x
cp313-manylinux_armv7l
cp313-manylinux_riscv64
cp313-musllinux_aarch64
cp313-musllinux_ppc64le
cp313-musllinux_s390x
cp313-musllinux_armv7l
cp313-musllinux_riscv64 | cp313-ios_arm64_iphoneos
cp313-ios_arm64_iphonesimulator
cp313-ios_x86_64_iphonesimulator | +| Python 3.14 | cp314-macosx_x86_64
cp314-macosx_universal2
cp314-macosx_arm64 | cp314-win_amd64
cp314-win32
cp314-win_arm64 | cp314-manylinux_x86_64
cp314-manylinux_i686
cp314-musllinux_x86_64
cp314-musllinux_i686 | cp314-manylinux_aarch64
cp314-manylinux_ppc64le
cp314-manylinux_s390x
cp314-manylinux_armv7l
cp314-manylinux_riscv64
cp314-musllinux_aarch64
cp314-musllinux_ppc64le
cp314-musllinux_s390x
cp314-musllinux_armv7l
cp314-musllinux_riscv64 | | | PyPy3.8 v7.3 | pp38-macosx_x86_64
pp38-macosx_arm64 | pp38-win_amd64 | pp38-manylinux_x86_64
pp38-manylinux_i686 | pp38-manylinux_aarch64 | | | PyPy3.9 v7.3 | pp39-macosx_x86_64
pp39-macosx_arm64 | pp39-win_amd64 | pp39-manylinux_x86_64
pp39-manylinux_i686 | pp39-manylinux_aarch64 | | | PyPy3.10 v7.3 | pp310-macosx_x86_64
pp310-macosx_arm64 | pp310-win_amd64 | pp310-manylinux_x86_64
pp310-manylinux_i686 | pp310-manylinux_aarch64 | | diff --git a/noxfile.py b/noxfile.py index 356bb8946..b018a952d 100755 --- a/noxfile.py +++ b/noxfile.py @@ -73,7 +73,7 @@ def update_constraints(session: nox.Session) -> None: if session.venv_backend != "uv": session.install("uv>=0.1.23") - for minor_version in range(8, 14): + for minor_version in range(8, 15): python_version = f"3.{minor_version}" env = os.environ.copy() # CUSTOM_COMPILE_COMMAND is a pip-compile option that tells users how to @@ -92,7 +92,7 @@ def update_constraints(session: nox.Session) -> None: ) shutil.copyfile( - resources / "constraints-python312.txt", + resources / "constraints-python314.txt", resources / "constraints.txt", ) diff --git a/test/test_emulation.py b/test/test_emulation.py index 0d218b000..9ffdc6de8 100644 --- a/test/test_emulation.py +++ b/test/test_emulation.py @@ -35,7 +35,7 @@ def test(tmp_path, request): "CIBW_TEST_COMMAND": "pytest ./test", "CIBW_ARCHS": archs, # TODO remove me once proper support is added - "CIBW_MANYLINUX_RISCV64_IMAGE": "ghcr.io/mayeut/manylinux_2_31:2025.03.02-1", + "CIBW_MANYLINUX_RISCV64_IMAGE": "ghcr.io/mayeut/manylinux_2_35:2025.05.11-1", "CIBW_SKIP": "*-musllinux_riscv64", }, ) diff --git a/test/utils.py b/test/utils.py index 452d002fb..7e566f503 100644 --- a/test/utils.py +++ b/test/utils.py @@ -228,7 +228,7 @@ def _expected_wheels( "armv7l": ["manylinux_2_17", "manylinux2014", "manylinux_2_31"], "i686": ["manylinux_2_5", "manylinux1", "manylinux_2_17", "manylinux2014"], "x86_64": ["manylinux_2_5", "manylinux1", "manylinux_2_28"], - "riscv64": ["manylinux_2_31"], + "riscv64": ["manylinux_2_31", "manylinux_2_35"], }.get(machine_arch, ["manylinux_2_17", "manylinux2014", "manylinux_2_28"]) if musllinux_versions is None: @@ -247,9 +247,12 @@ def _expected_wheels( ] if EnableGroup.CPythonFreeThreading in enable_groups: - python_abi_tags += [ - "cp313-cp313t", - ] + python_abi_tags.append("cp313-cp313t") + + if EnableGroup.CPythonPrerelease in enable_groups: + python_abi_tags.append("cp314-cp314") + if EnableGroup.CPythonFreeThreading in enable_groups: + python_abi_tags.append("cp314-cp314t") if EnableGroup.PyPy in enable_groups: python_abi_tags += [ diff --git a/unit_test/option_prepare_test.py b/unit_test/option_prepare_test.py index 3356c523a..09ff57525 100644 --- a/unit_test/option_prepare_test.py +++ b/unit_test/option_prepare_test.py @@ -120,6 +120,7 @@ def test_build_with_override_launches(monkeypatch, tmp_path): monkeypatch.chdir(pkg_dir) monkeypatch.setattr(sys, "argv", ["cibuildwheel", "--platform=linux"]) + monkeypatch.delenv("CIBW_ENABLE", raising=False) main() From e7dcb31aa7a1b6b9e7fc4384df89217bbe8a5c94 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 13 May 2025 01:28:55 -0400 Subject: [PATCH 1031/1105] [pre-commit.ci] pre-commit autoupdate (#2392) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.8 → v0.11.9](https://github.com/astral-sh/ruff-pre-commit/compare/v0.11.8...v0.11.9) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 41be3c2a2..7d2c65182 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.8 + rev: v0.11.9 hooks: - id: ruff args: ["--fix", "--show-fixes"] From d193a8eff5d1ae3a95278a090f85336657817229 Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Wed, 14 May 2025 10:06:34 -0400 Subject: [PATCH 1032/1105] tests: fix ci (#2391) * Update dependencies * tests: disable color for Pyodide test Signed-off-by: Henry Schreiner * fix: nist.gov doesn't work anymore for this test Signed-off-by: Henry Schreiner * fix: limit click for typer Signed-off-by: Henry Schreiner * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: Henry Schreiner Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- cibuildwheel/resources/constraints-pyodide312.txt | 4 +++- docs/working-examples.md | 12 ++++++------ noxfile.py | 4 +++- test/test_build_frontend_args.py | 1 + test/test_ssl.py | 2 +- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/cibuildwheel/resources/constraints-pyodide312.txt b/cibuildwheel/resources/constraints-pyodide312.txt index bfe80a4ac..5e1c9ca5c 100644 --- a/cibuildwheel/resources/constraints-pyodide312.txt +++ b/cibuildwheel/resources/constraints-pyodide312.txt @@ -18,7 +18,9 @@ certifi==2025.4.26 charset-normalizer==3.4.2 # via requests click==8.1.8 - # via typer + # via + # -r .nox/update_constraints/tmp/constraints-pyodide.in + # typer cmake==4.0.2 # via pyodide-build distlib==0.3.9 diff --git a/docs/working-examples.md b/docs/working-examples.md index 9f254988f..825b516e9 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -28,6 +28,7 @@ title: Working examples | [PyGame][] | ![github icon][] | ![apple icon][] ![linux icon][] | 🐍🎮 pygame (the library) is a Free and Open Source python programming language library for making multimedia applications like games built on top of the excellent SDL library. C, Python, Native, OpenGL. | | [asyncpg][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A fast PostgreSQL Database Client Library for Python/asyncio. | | [cmake][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | +| [pyinstrument][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python profiler with a C extension. No external dependencies. | | [scikit-image][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Image processing library. Uses cibuildwheel to build and test a project that uses Cython with platform-native code. | | [PyOxidizer][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A modern Python application packaging and distribution tool | | [twisted-iocpsupport][] | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. | @@ -98,14 +99,14 @@ title: Working examples | [boost-histogram][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. | | [Python-WebRTC][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | a Python extension that provides bindings to WebRTC M92 | | [Imagecodecs (fork)][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. | -| [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 | | [fathon][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms | +| [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 | | [Arbor][] | ![github icon][] | ![apple icon][] ![linux icon][] | Arbor is a multi-compartment neuron simulation library; compatible with next-generation accelerators; best-practices applied to research software; focused on community-driven development. Includes a [small script](https://github.com/arbor-sim/arbor/blob/master/scripts/patchwheel.py) patching `rpath` in bundled libraries. | | [clang-format][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. | | [polaroid][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. | -| [cf-units][] | ![github icon][] | ![apple icon][] ![linux icon][] | Units of measure as required by the Climate and Forecast (CF) Metadata Conventions | | [etebase-py][] | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. | | [ninja][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | +| [cf-units][] | ![github icon][] | ![apple icon][] ![linux icon][] | Units of measure as required by the Climate and Forecast (CF) Metadata Conventions | | [numpythia][] | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy | | [pyjet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy | | [ril][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A python binding to Rust Imaging library using maturin and Pyo3, utilizes Github Action cache to improve speed. Builds abi3 wheels. | @@ -115,7 +116,6 @@ title: Working examples | [CorrectionLib][] | ![github icon][] | ![apple icon][] ![linux icon][] | Structured JSON powered correction library for HEP, designed for the CMS experiment at CERN. | | [xmlstarlet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. | | [werpy][] | ![github icon][] | ![windows icon][] ![linux icon][] ![apple icon][] | An ultra-fast python package using optimized dynamic programming to compute the Word Error Rate (WER). | -| [pyinstrument_cext][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies | | [pybind11 cross build example][] | ![github icon][] ![gitlab icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Same as pybind11 cmake_example but used to demo Linux ARM + Windows + macOS builds on GitLab | [scikit-learn]: https://github.com/scikit-learn/scikit-learn @@ -138,6 +138,7 @@ title: Working examples [PyGame]: https://github.com/pygame/pygame [asyncpg]: https://github.com/MagicStack/asyncpg [cmake]: https://github.com/scikit-build/cmake-python-distributions +[pyinstrument]: https://github.com/joerick/pyinstrument [scikit-image]: https://github.com/scikit-image/scikit-image [PyOxidizer]: https://github.com/indygreg/PyOxidizer [twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport @@ -208,14 +209,14 @@ title: Working examples [boost-histogram]: https://github.com/scikit-hep/boost-histogram [Python-WebRTC]: https://github.com/MarshalX/python-webrtc [Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build -[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example [fathon]: https://github.com/stfbnc/fathon +[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example [Arbor]: https://github.com/arbor-sim/arbor [clang-format]: https://github.com/ssciwr/clang-format-wheel [polaroid]: https://github.com/daggy1234/polaroid -[cf-units]: https://github.com/SciTools/cf-units [etebase-py]: https://github.com/etesync/etebase-py [ninja]: https://github.com/scikit-build/ninja-python-distributions +[cf-units]: https://github.com/SciTools/cf-units [numpythia]: https://github.com/scikit-hep/numpythia [pyjet]: https://github.com/scikit-hep/pyjet [ril]: https://github.com/Cryptex-github/ril-py @@ -225,7 +226,6 @@ title: Working examples [CorrectionLib]: https://github.com/cms-nanoAOD/correctionlib [xmlstarlet]: https://github.com/dimitern/xmlstarlet [werpy]: https://github.com/analyticsinmotion/werpy -[pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext [pybind11 cross build example]: https://github.com/wbarnha/pybind_cmake_example_crossbuild [github icon]: data/readme_icons/github.svg diff --git a/noxfile.py b/noxfile.py index b018a952d..ba3ce2ee8 100755 --- a/noxfile.py +++ b/noxfile.py @@ -103,7 +103,9 @@ def update_constraints(session: nox.Session) -> None: pyodide_build_version = pyodide["pyodide_build_version"] output_file = resources / f"constraints-pyodide{python_version.replace('.', '')}.txt" tmp_file = Path(session.create_tmp()) / "constraints-pyodide.in" - tmp_file.write_text(f"pip\nbuild[virtualenv]\npyodide-build=={pyodide_build_version}") + tmp_file.write_text( + f"pip\nbuild[virtualenv]\npyodide-build=={pyodide_build_version}\nclick<8.2" + ) session.run( "uv", "pip", diff --git a/test/test_build_frontend_args.py b/test/test_build_frontend_args.py index b508728e4..bffdd14ff 100644 --- a/test/test_build_frontend_args.py +++ b/test/test_build_frontend_args.py @@ -22,6 +22,7 @@ def test_build_frontend_args(tmp_path, capfd, frontend_name): add_env = {"CIBW_BUILD_FRONTEND": f"{frontend_name}; args: -h"} if utils.platform == "pyodide": add_env["TERM"] = "dumb" # disable color / style + add_env["NO_COLOR"] = "1" with pytest.raises(subprocess.CalledProcessError): utils.cibuildwheel_run(project_dir, add_env=add_env, single_python=True) diff --git a/test/test_ssl.py b/test/test_ssl.py index 5283a59d4..89ad4b80a 100644 --- a/test/test_ssl.py +++ b/test/test_ssl.py @@ -10,7 +10,7 @@ from urllib.request import urlopen context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) - data = urlopen("https://www.nist.gov/", context=context) + data = urlopen("https://tls-v1-2.badssl.com/", context=context) data = urlopen("https://raw.githubusercontent.com/pypa/cibuildwheel/main/CI.md", context=context) data = urlopen("https://raw.githubusercontent.com/pypa/cibuildwheel/main/CI.md") """ From cab1ff4076a47d93939d411708486a3062cc5731 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 14 May 2025 13:04:07 -0400 Subject: [PATCH 1033/1105] fix: support Python 3.14's color CLI (#2394) Signed-off-by: Henry Schreiner --- .github/workflows/test.yml | 2 ++ bin/generate_schema.py | 7 ++++++- bin/run_tests.py | 6 +++++- bin/sample_build.py | 6 +++++- cibuildwheel/__main__.py | 6 +++++- pyproject.toml | 1 + test/test_projects/__main__.py | 8 ++++++-- 7 files changed, 30 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d860ef40b..379edcdc0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,6 +46,8 @@ jobs: include: - os: ubuntu-latest python_version: '3.11' + - os: ubuntu-latest + python_version: '3.14' timeout-minutes: 180 steps: - uses: actions/checkout@v4 diff --git a/bin/generate_schema.py b/bin/generate_schema.py index 728a5a56c..e5758fd77 100755 --- a/bin/generate_schema.py +++ b/bin/generate_schema.py @@ -6,12 +6,17 @@ import argparse import copy +import functools import json +import sys from typing import Any import yaml -parser = argparse.ArgumentParser() +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.add_argument("--schemastore", action="http://github.com/store_true", help="Generate schema_store version") args = parser.parse_args() diff --git a/bin/run_tests.py b/bin/run_tests.py index b807938b1..1c0923948 100755 --- a/bin/run_tests.py +++ b/bin/run_tests.py @@ -2,6 +2,7 @@ import argparse +import functools import os import subprocess import sys @@ -13,7 +14,10 @@ else: default_cpu_count = os.process_cpu_count() or 2 - parser = argparse.ArgumentParser() + 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.add_argument( "--run-podman", action="http://github.com/store_true", default=False, help="run podman tests (linux only)" ) diff --git a/bin/sample_build.py b/bin/sample_build.py index 41371da10..d98ce28ed 100755 --- a/bin/sample_build.py +++ b/bin/sample_build.py @@ -2,6 +2,7 @@ import argparse +import functools import os import subprocess import sys @@ -12,7 +13,10 @@ # move cwd to the project root os.chdir(Path(__file__).resolve().parents[1]) - parser = argparse.ArgumentParser(description="Runs a sample build") + 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.add_argument("project_python_path", nargs="?", default="test.test_0_basic.basic_project") options = parser.parse_args() diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index eded443de..934d80c4e 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -1,6 +1,7 @@ import argparse import contextlib import dataclasses +import functools import os import shutil import sys @@ -79,7 +80,10 @@ def main_inner(global_options: GlobalOptions) -> None: rather than exiting directly. """ - parser = argparse.ArgumentParser( + 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="Build wheels for all the platforms.", epilog=""" Most options are supplied via environment variables or in diff --git a/pyproject.toml b/pyproject.toml index 1495b9b32..18585c549 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,6 +32,7 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Software Development :: Build Tools", ] diff --git a/test/test_projects/__main__.py b/test/test_projects/__main__.py index c7c725831..2809b17b1 100644 --- a/test/test_projects/__main__.py +++ b/test/test_projects/__main__.py @@ -1,13 +1,17 @@ +import argparse +import functools import importlib import subprocess import sys import tempfile -from argparse import ArgumentParser from pathlib import Path def main() -> None: - parser = ArgumentParser( + 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( prog="python -m test.test_projects", description="Generate a test project to check it out" ) parser.add_argument( From c2cffa3d1eb3059af30053a376657dabd8607e1a Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 15 May 2025 09:06:48 -0400 Subject: [PATCH 1034/1105] feat: adding pypy-eol enable group (#2393) --- bin/generate_schema.py | 1 + .../resources/cibuildwheel.schema.json | 1 + cibuildwheel/selector.py | 5 +- docs/options.md | 1 + test/utils.py | 5 +- unit_test/build_selector_test.py | 69 ++++++++++++++----- unit_test/option_prepare_test.py | 2 +- 7 files changed, 64 insertions(+), 20 deletions(-) diff --git a/bin/generate_schema.py b/bin/generate_schema.py index e5758fd77..ac97f8e9b 100755 --- a/bin/generate_schema.py +++ b/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 diff --git a/cibuildwheel/resources/cibuildwheel.schema.json b/cibuildwheel/resources/cibuildwheel.schema.json index 46ad0020f..8ffa0b75e 100644 --- a/cibuildwheel/resources/cibuildwheel.schema.json +++ b/cibuildwheel/resources/cibuildwheel.schema.json @@ -16,6 +16,7 @@ "cpython-freethreading", "cpython-prerelease", "pypy", + "pypy-eol", "cpython-experimental-riscv64" ] }, diff --git a/cibuildwheel/selector.py b/cibuildwheel/selector.py index 2d78aea0e..c3f9dea4b 100644 --- a/cibuildwheel/selector.py +++ b/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" diff --git a/docs/options.md b/docs/options.md index 1a79d3750..2b8113970 100644 --- a/docs/options.md +++ b/docs/options.md @@ -321,6 +321,7 @@ values are: The build identifiers for those variants have a `t` suffix in their `python_tag` (e.g. `cp313t-manylinux_x86_64`). - `pypy`: Enable PyPy. +- `pypy-eol`: Enable PyPy versions that have passed end of life (if still available). - `cpython-experimental-riscv64`: Enable experimental riscv64 builds. Those builds are disabled by default as they can't be uploaded to PyPI and a PEP will most likely be required before this can happen. diff --git a/test/utils.py b/test/utils.py index 7e566f503..1ed93642c 100644 --- a/test/utils.py +++ b/test/utils.py @@ -254,10 +254,13 @@ def _expected_wheels( if EnableGroup.CPythonFreeThreading in enable_groups: python_abi_tags.append("cp314-cp314t") - if EnableGroup.PyPy in enable_groups: + if EnableGroup.PyPyEoL in enable_groups: python_abi_tags += [ "pp38-pypy38_pp73", "pp39-pypy39_pp73", + ] + if EnableGroup.PyPy in enable_groups: + python_abi_tags += [ "pp310-pypy310_pp73", "pp311-pypy311_pp73", ] diff --git a/unit_test/build_selector_test.py b/unit_test/build_selector_test.py index ea72bf7c2..6da657fca 100644 --- a/unit_test/build_selector_test.py +++ b/unit_test/build_selector_test.py @@ -14,8 +14,8 @@ def test_build(): assert build_selector("cp311-manylinux_x86_64") assert build_selector("cp312-manylinux_x86_64") assert build_selector("cp313-manylinux_x86_64") - assert build_selector("pp36-manylinux_x86_64") - assert build_selector("pp37-manylinux_x86_64") + assert build_selector("pp310-manylinux_x86_64") + assert build_selector("pp311-manylinux_x86_64") assert build_selector("cp36-manylinux_i686") assert build_selector("cp37-manylinux_i686") assert build_selector("cp36-macosx_intel") @@ -23,20 +23,20 @@ def test_build(): assert build_selector("cp39-macosx_intel") assert build_selector("cp39-macosx_universal2") assert build_selector("cp39-macosx_arm64") - assert not build_selector("pp36-macosx_intel") - assert not build_selector("pp37-macosx_intel") + assert not build_selector("pp310-macosx_intel") + assert not build_selector("pp311-macosx_intel") assert build_selector("cp36-win32") assert build_selector("cp37-win32") - assert not build_selector("pp36-win32") - assert not build_selector("pp37-win32") + assert not build_selector("pp310-win32") + assert not build_selector("pp311-win32") assert build_selector("cp36-win_amd64") assert build_selector("cp37-win_amd64") assert build_selector("cp310-win_amd64") assert build_selector("cp311-win_amd64") assert build_selector("cp312-win_amd64") assert build_selector("cp313-win_amd64") - assert not build_selector("pp36-win_amd64") - assert not build_selector("pp37-win_amd64") + assert not build_selector("pp310-win_amd64") + assert not build_selector("pp311-win_amd64") def test_build_filter_pre(): @@ -53,24 +53,59 @@ def test_build_filter_pre(): assert not build_selector("cp313t-manylinux_x86_64") -def test_skip(): +def test_build_filter_pypy(): build_selector = BuildSelector( build_config="*", - skip_config="pp36-* cp3?-manylinux_i686 cp36-win* *-win32", + skip_config="", enable=frozenset([EnableGroup.PyPy]), ) + assert build_selector("pp310-manylinux_x86_64") + assert build_selector("pp311-manylinux_x86_64") + assert not build_selector("pp38-manylinux_x86_64") + assert not build_selector("pp39-manylinux_x86_64") - assert not build_selector("pp36-manylinux_x86_64") - assert build_selector("pp37-manylinux_x86_64") + +def test_build_filter_pypy_eol(): + build_selector = BuildSelector( + build_config="*", + skip_config="", + enable=frozenset([EnableGroup.PyPyEoL]), + ) + assert not build_selector("pp310-manylinux_x86_64") + assert not build_selector("pp311-manylinux_x86_64") + assert build_selector("pp38-manylinux_x86_64") + assert build_selector("pp39-manylinux_x86_64") + + +def test_build_filter_pypy_all(): + build_selector = BuildSelector( + build_config="*", + skip_config="", + enable=frozenset([EnableGroup.PyPyEoL, EnableGroup.PyPy]), + ) + assert build_selector("pp310-manylinux_x86_64") + assert build_selector("pp311-manylinux_x86_64") assert build_selector("pp38-manylinux_x86_64") - assert build_selector("pp37-manylinux_i686") - assert build_selector("pp38-manylinux_i686") + assert build_selector("pp39-manylinux_x86_64") + + +def test_skip(): + build_selector = BuildSelector( + build_config="*", + skip_config="pp310-* cp3?-manylinux_i686 cp36-win* *-win32", + enable=frozenset([EnableGroup.PyPy]), + ) + + assert not build_selector("pp310-manylinux_x86_64") + assert build_selector("pp311-manylinux_x86_64") + assert not build_selector("pp37-manylinux_i686") + assert not build_selector("pp38-manylinux_i686") assert build_selector("cp36-manylinux_x86_64") assert build_selector("cp37-manylinux_x86_64") assert not build_selector("cp36-manylinux_i686") assert not build_selector("cp37-manylinux_i686") - assert not build_selector("pp36-macosx_10_6_intel") - assert build_selector("pp37-macosx_10_6_intel") + assert not build_selector("pp39-macosx_10_6_intel") + assert build_selector("pp311-macosx_10_6_intel") assert build_selector("cp36-macosx_10_6_intel") assert build_selector("cp37-macosx_10_6_intel") assert not build_selector("cp36-win32") @@ -117,7 +152,7 @@ def test_build_limited_python(): build_config="*", skip_config="", requires_python=SpecifierSet(">=3.7"), - enable=frozenset([EnableGroup.PyPy]), + enable=frozenset([EnableGroup.PyPy, EnableGroup.PyPyEoL]), ) assert not build_selector("cp36-manylinux_x86_64") diff --git a/unit_test/option_prepare_test.py b/unit_test/option_prepare_test.py index 09ff57525..2f87044ad 100644 --- a/unit_test/option_prepare_test.py +++ b/unit_test/option_prepare_test.py @@ -104,7 +104,7 @@ def test_build_with_override_launches(monkeypatch, tmp_path): [tool.cibuildwheel] manylinux-x86_64-image = "manylinux_2_28" musllinux-x86_64-image = "musllinux_1_2" -enable = ["pypy", "graalpy", "cpython-freethreading"] +enable = ["pypy", "pypy-eol", "graalpy", "cpython-freethreading"] # Before Python 3.10, use manylinux2014 [[tool.cibuildwheel.overrides]] From 166465b56d3a317a12fae0c7eed538fcdd480a43 Mon Sep 17 00:00:00 2001 From: Jinzhe Zeng Date: Fri, 16 May 2025 13:41:19 +0800 Subject: [PATCH 1035/1105] doc: update Windows ARM for GH Actions (#2396) It's no more cross compilation and can run tests. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21049c093..bb046a070 100644 --- a/README.md +++ b/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 | ✅ | ✅ | | ✅ | ✅ | | ✅³ | From 1bc7e904b8fcefa45e255b671f0304d211314a05 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Fri, 16 May 2025 11:11:16 +0100 Subject: [PATCH 1036/1105] Improve integration test options (#2385) * Improve integration test options - Keep the platform and enable options in os.environ, don't duplicate state in utils - Provide more user-friendly options for setting enable and platform in integration tests * Ensure that CIBW_ENABLE is set in the test process * Use get_enable_groups() where necessary --- .github/workflows/test.yml | 2 +- docs/contributing.md | 4 +-- test/conftest.py | 56 +++++++++++++++++++++++++++----- test/test_0_basic.py | 3 +- test/test_abi_variants.py | 4 +-- test/test_before_build.py | 4 +-- test/test_before_test.py | 2 +- test/test_build_frontend_args.py | 4 +-- test/test_container_engine.py | 4 +-- test/test_container_images.py | 2 +- test/test_cpp_standards.py | 8 ++--- test/test_dependency_versions.py | 16 +++++---- test/test_emulation.py | 2 +- test/test_environment.py | 4 +-- test/test_ios.py | 10 +++--- test/test_linux_python.py | 2 +- test/test_macos_archs.py | 12 +++---- test/test_manylinuxXXXX_only.py | 2 +- test/test_musllinux_X_Y_only.py | 2 +- test/test_pep518.py | 4 +-- test/test_troubleshooting.py | 4 +-- test/test_wheel_tag.py | 2 +- test/test_windows.py | 2 +- test/utils.py | 50 ++++++++++++++++++---------- 24 files changed, 130 insertions(+), 75 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 379edcdc0..92d2d659b 100644 --- a/.github/workflows/test.yml +++ b/.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 diff --git a/docs/contributing.md b/docs/contributing.md index 86cd49bdf..40ebaa8b6 100644 --- a/docs/contributing.md +++ b/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 diff --git a/test/conftest.py b/test/conftest.py index 8c3e15221..88d6175b6 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -9,12 +9,11 @@ from cibuildwheel.architecture import Architecture from cibuildwheel.ci import detect_ci_provider from cibuildwheel.options import CommandLineArguments, Options +from cibuildwheel.selector import EnableGroup +from cibuildwheel.typing import PLATFORMS from cibuildwheel.venv import find_uv -from .utils import EMULATED_ARCHS, platform - -# default to just cpython -DEFAULT_CIBW_ENABLE = "cpython-freethreading cpython-prerelease cpython-experimental-riscv64" +from .utils import DEFAULT_CIBW_ENABLE, EMULATED_ARCHS, get_platform def pytest_addoption(parser: pytest.Parser) -> None: @@ -32,8 +31,47 @@ def pytest_addoption(parser: pytest.Parser) -> None: default=False, help="macOS cp38 uses the universal2 installer", ) + parser.addoption( + "--enable", + action="http://github.com/store", + default=None, + help="Set the CIBW_ENABLE environment variable for all tests.", + ) + parser.addoption( + "--platform", + action="http://github.com/store", + default=None, + help="Set the CIBW_PLATFORM environment variable for all tests.", + ) + + +def pytest_configure(config): + flag_enable = config.getoption("--enable") + flag_platform = config.getoption("--platform") + + if flag_enable is not None and "CIBW_ENABLE" in os.environ: + msg = ( + "Both --enable pytest option and CIBW_ENABLE environment variable are set. " + "Please specify only one." + ) + raise pytest.UsageError(msg) + if flag_platform is not None and "CIBW_PLATFORM" in os.environ: + msg = ( + "Both --platform pytest option and CIBW_PLATFORM environment variable are set. " + "Please specify only one." + ) + raise pytest.UsageError(msg) + + if flag_enable is not None: + EnableGroup.parse_option_value(flag_enable) + os.environ["CIBW_ENABLE"] = flag_enable + if flag_enable is None and "CIBW_ENABLE" not in os.environ: + # Set default value for CIBW_ENABLE + os.environ["CIBW_ENABLE"] = DEFAULT_CIBW_ENABLE - os.environ.setdefault("CIBW_ENABLE", DEFAULT_CIBW_ENABLE) + if flag_platform is not None: + assert flag_platform in PLATFORMS, f"Invalid platform: {flag_platform}" + os.environ["CIBW_PLATFORM"] = flag_platform def docker_warmup(request: pytest.FixtureRequest) -> None: @@ -91,7 +129,7 @@ def docker_warmup_fixture( request: pytest.FixtureRequest, tmp_path_factory: pytest.TempPathFactory, worker_id: str ) -> None: # if we're in CI testing linux, let's warm-up docker images - if detect_ci_provider() is None or platform != "linux": + if detect_ci_provider() is None or get_platform() != "linux": return None if request.config.getoption("--run-emulation", default=None) is not None: # emulation tests only run one test in CI, caching the image only slows down the test @@ -116,7 +154,7 @@ def docker_warmup_fixture( @pytest.fixture(params=["pip", "build"]) def build_frontend_env_nouv(request: pytest.FixtureRequest) -> dict[str, str]: frontend = request.param - if platform == "pyodide" and frontend == "pip": + if get_platform() == "pyodide" and frontend == "pip": pytest.skip("Can't use pip as build frontend for pyodide platform") return {"CIBW_BUILD_FRONTEND": frontend} @@ -125,7 +163,7 @@ def build_frontend_env_nouv(request: pytest.FixtureRequest) -> dict[str, str]: @pytest.fixture def build_frontend_env(build_frontend_env_nouv: dict[str, str]) -> dict[str, str]: frontend = build_frontend_env_nouv["CIBW_BUILD_FRONTEND"] - if frontend != "build" or platform == "pyodide" or find_uv() is None: + if frontend != "build" or get_platform() == "pyodide" or find_uv() is None: return build_frontend_env_nouv return {"CIBW_BUILD_FRONTEND": "build[uv]"} @@ -134,7 +172,7 @@ def build_frontend_env(build_frontend_env_nouv: dict[str, str]) -> dict[str, str @pytest.fixture def docker_cleanup() -> Generator[None, None, None]: def get_images() -> set[str]: - if detect_ci_provider() is None or platform != "linux": + if detect_ci_provider() is None or get_platform() != "linux": return set() images = subprocess.run( ["docker", "image", "ls", "--format", "{{json .ID}}"], diff --git a/test/test_0_basic.py b/test/test_0_basic.py index d0503c105..c1a8dfcbf 100644 --- a/test/test_0_basic.py +++ b/test/test_0_basic.py @@ -1,4 +1,3 @@ -import os import textwrap import pytest @@ -40,7 +39,7 @@ def test(tmp_path, build_frontend_env, capfd): expected_wheels = utils.expected_wheels("spam", "0.1.0") assert set(actual_wheels) == set(expected_wheels) - enable_groups = EnableGroup.parse_option_value(os.environ.get("CIBW_ENABLE", "")) + enable_groups = utils.get_enable_groups() if EnableGroup.GraalPy not in enable_groups: # Verify pip warning not shown captured = capfd.readouterr() diff --git a/test/test_abi_variants.py b/test/test_abi_variants.py index 62f03850f..780f6d908 100644 --- a/test/test_abi_variants.py +++ b/test/test_abi_variants.py @@ -47,7 +47,7 @@ def test_abi3(tmp_path): ) # check that the expected wheels are produced - if utils.platform == "pyodide": + if utils.get_platform() == "pyodide": # there's only 1 possible configuration for pyodide, cp312 expected_wheels = utils.expected_wheels("spam", "0.1.0", python_abi_tags=["cp310-abi3"]) else: @@ -196,7 +196,7 @@ def test_abi_none(tmp_path, capfd): # check that each wheel was built once, and reused captured = capfd.readouterr() assert "Building wheel..." in captured.out - if utils.platform == "pyodide": + if utils.get_platform() == "pyodide": # there's only 1 possible configuration for pyodide, we won't see the message expected on following builds assert "Found previously built wheel" not in captured.out else: diff --git a/test/test_before_build.py b/test/test_before_build.py index 9494de7bd..767bb06cc 100644 --- a/test/test_before_build.py +++ b/test/test_before_build.py @@ -6,7 +6,7 @@ from . import test_projects, utils # pyodide does not support building without isolation, need to check the base_prefix -SYS_PREFIX = f"sys.{'base_' if utils.platform == 'pyodide' else ''}prefix" +SYS_PREFIX = f"sys.{'base_' if utils.get_platform() == 'pyodide' else ''}prefix" project_with_before_build_asserts = test_projects.new_c_project( @@ -45,7 +45,7 @@ def test(tmp_path): f'''python -c "import pathlib, sys; pathlib.Path('{{project}}/pythonprefix_bb.txt').write_text({SYS_PREFIX})"''' ) frontend = "build" - if utils.platform != "pyodide": + if utils.get_platform() != "pyodide": before_build = f"python -m pip install setuptools && {before_build}" frontend = f"{frontend};args: --no-isolation" diff --git a/test/test_before_test.py b/test/test_before_test.py index a3700f843..c6ed5a7bb 100644 --- a/test/test_before_test.py +++ b/test/test_before_test.py @@ -43,7 +43,7 @@ def test(tmp_path, build_frontend_env): '''python -c "import pathlib, sys; pathlib.Path('{project}/pythonprefix_bt.txt').write_text(sys.prefix)"''', ] - if utils.platform == "pyodide": + if utils.get_platform() == "pyodide": before_test_steps.extend( ["pyodide build {project}/dependency", "pip install --find-links dist/ spam"] ) diff --git a/test/test_build_frontend_args.py b/test/test_build_frontend_args.py index bffdd14ff..83c0a1775 100644 --- a/test/test_build_frontend_args.py +++ b/test/test_build_frontend_args.py @@ -20,7 +20,7 @@ def test_build_frontend_args(tmp_path, capfd, frontend_name): # the build will fail because the frontend is called with '-h' - it prints the help message add_env = {"CIBW_BUILD_FRONTEND": f"{frontend_name}; args: -h"} - if utils.platform == "pyodide": + if utils.get_platform() == "pyodide": add_env["TERM"] = "dumb" # disable color / style add_env["NO_COLOR"] = "1" with pytest.raises(subprocess.CalledProcessError): @@ -33,7 +33,7 @@ def test_build_frontend_args(tmp_path, capfd, frontend_name): if frontend_name == "pip": assert "Usage:" in captured.out assert "Wheel Options:" in captured.out - elif utils.platform == "pyodide": + elif utils.get_platform() == "pyodide": assert "Usage: pyodide build" in captured.out else: assert "usage:" in captured.out diff --git a/test/test_container_engine.py b/test/test_container_engine.py index 4503b3b4e..510916f06 100644 --- a/test/test_container_engine.py +++ b/test/test_container_engine.py @@ -6,7 +6,7 @@ def test_podman(tmp_path, capfd, request): - if utils.platform != "linux": + if utils.get_platform() != "linux": pytest.skip("the test is only relevant to the linux build") if not request.config.getoption("--run-podman"): @@ -36,7 +36,7 @@ def test_podman(tmp_path, capfd, request): def test_create_args(tmp_path, capfd): - if utils.platform != "linux": + if utils.get_platform() != "linux": pytest.skip("the test is only relevant to the linux build") project_dir = tmp_path / "project" diff --git a/test/test_container_images.py b/test/test_container_images.py index f1d4fda8b..02263c649 100644 --- a/test/test_container_images.py +++ b/test/test_container_images.py @@ -23,7 +23,7 @@ @pytest.mark.usefixtures("docker_cleanup") def test(tmp_path): - if utils.platform != "linux": + if utils.get_platform() != "linux": pytest.skip("the test is only relevant to the linux build") if platform.machine() not in ["x86_64", "i686"]: pytest.skip( diff --git a/test/test_cpp_standards.py b/test/test_cpp_standards.py index 85fcb6d96..fb7a0a84e 100644 --- a/test/test_cpp_standards.py +++ b/test/test_cpp_standards.py @@ -57,7 +57,7 @@ def test_cpp11(tmp_path): project_dir = tmp_path / "project" cpp11_project = cpp_test_project.copy() cpp11_project.template_context["extra_compile_args"] = ( - ["/std:c++11"] if utils.platform == "windows" else ["-std=c++11"] + ["/std:c++11"] if utils.get_platform() == "windows" else ["-std=c++11"] ) cpp11_project.template_context["spam_cpp_top_level_add"] = "#include " cpp11_project.generate(project_dir) @@ -73,7 +73,7 @@ def test_cpp14(tmp_path): project_dir = tmp_path / "project" cpp14_project = cpp_test_project.copy() cpp14_project.template_context["extra_compile_args"] = ( - ["/std:c++14"] if utils.platform == "windows" else ["-std=c++14"] + ["/std:c++14"] if utils.get_platform() == "windows" else ["-std=c++14"] ) cpp14_project.template_context["spam_cpp_top_level_add"] = "int a = 100'000;" cpp14_project.generate(project_dir) @@ -89,7 +89,7 @@ def test_cpp17(tmp_path): project_dir = tmp_path / "project" cpp17_project = cpp_test_project.copy() cpp17_project.template_context["extra_compile_args"] = [ - "/std:c++17" if utils.platform == "windows" else "-std=c++17" + "/std:c++17" if utils.get_platform() == "windows" else "-std=c++17" ] cpp17_project.template_context["spam_cpp_top_level_add"] = r""" #include @@ -98,7 +98,7 @@ def test_cpp17(tmp_path): cpp17_project.generate(project_dir) add_env = {} - if utils.platform == "macos": + if utils.get_platform() == "macos": add_env["MACOSX_DEPLOYMENT_TARGET"] = "10.13" actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env, single_python=True) diff --git a/test/test_dependency_versions.py b/test/test_dependency_versions.py index d4b9416f3..6e29adef1 100644 --- a/test/test_dependency_versions.py +++ b/test/test_dependency_versions.py @@ -53,11 +53,15 @@ def get_versions_from_constraint_file(constraint_file: Path) -> dict[str, str]: @pytest.mark.parametrize("python_version", ["3.8", "3.12"]) def test_pinned_versions(tmp_path, python_version, build_frontend_env_nouv): - if utils.platform == "linux": + if utils.get_platform() == "linux": pytest.skip("linux doesn't pin individual tool versions, it pins manylinux images instead") - if python_version != "3.12" and utils.platform == "pyodide": + if python_version != "3.12" and utils.get_platform() == "pyodide": pytest.skip(f"pyodide does not support Python {python_version}") - if python_version == "3.8" and utils.platform == "windows" and platform.machine() == "ARM64": + if ( + python_version == "3.8" + and utils.get_platform() == "windows" + and platform.machine() == "ARM64" + ): pytest.skip(f"Windows ARM64 does not support Python {python_version}") project_dir = tmp_path / "project" @@ -96,7 +100,7 @@ def test_pinned_versions(tmp_path, python_version, build_frontend_env_nouv): @pytest.mark.parametrize("method", ["inline", "file"]) def test_dependency_constraints(method, tmp_path, build_frontend_env_nouv): - if utils.platform == "linux": + if utils.get_platform() == "linux": pytest.skip("linux doesn't pin individual tool versions, it pins manylinux images instead") project_dir = tmp_path / "project" @@ -129,7 +133,7 @@ def test_dependency_constraints(method, tmp_path, build_frontend_env_nouv): build_environment = {} if ( - utils.platform == "windows" + utils.get_platform() == "windows" and method == "file" and build_frontend_env_nouv["CIBW_BUILD_FRONTEND"] == "build" ): @@ -159,7 +163,7 @@ def test_dependency_constraints(method, tmp_path, build_frontend_env_nouv): expected_wheels = utils.expected_wheels("spam", "0.1.0") if ( - utils.platform == "windows" + utils.get_platform() == "windows" and method == "file" and build_frontend_env_nouv["CIBW_BUILD_FRONTEND"] == "build" ): diff --git a/test/test_emulation.py b/test/test_emulation.py index 9ffdc6de8..9749d9da0 100644 --- a/test/test_emulation.py +++ b/test/test_emulation.py @@ -53,7 +53,7 @@ def test(tmp_path, request): def test_setting_arch_on_other_platforms(tmp_path, capfd): - if utils.platform == "linux": + if utils.get_platform() == "linux": pytest.skip("this test checks the behaviour on platforms other than linux") project_dir = tmp_path / "project" diff --git a/test/test_environment.py b/test/test_environment.py index 6e7ed6fd8..ee50155b5 100644 --- a/test/test_environment.py +++ b/test/test_environment.py @@ -64,7 +64,7 @@ def test_overridden_path(tmp_path, capfd): output_dir.mkdir() # mess up PATH, somehow - if utils.platform == "linux": + if utils.get_platform() == "linux": with pytest.raises(subprocess.CalledProcessError): utils.cibuildwheel_run( project_dir, @@ -128,7 +128,7 @@ def test_overridden_pip_constraint(tmp_path, build_frontend): ) project.generate(project_dir) - if utils.platform == "linux": + if utils.get_platform() == "linux": # put the constraints file in the project directory, so it's available # in the docker container constraints_file = project_dir / "constraints.txt" diff --git a/test/test_ios.py b/test/test_ios.py index c3cfa61af..7c5080da5 100644 --- a/test/test_ios.py +++ b/test/test_ios.py @@ -38,7 +38,7 @@ def test_platform(self): ], ) def test_ios_platforms(tmp_path, build_config, monkeypatch, capfd): - if utils.platform != "macos": + if utils.get_platform() != "macos": pytest.skip("this test can only run on macOS") if utils.get_xcode_version() < (13, 0): pytest.skip("this test only works with Xcode 13.0 or greater") @@ -103,7 +103,7 @@ def test_ios_platforms(tmp_path, build_config, monkeypatch, capfd): def test_no_test_sources(tmp_path, capfd): """Build will fail if test-sources isn't defined.""" - if utils.platform != "macos": + if utils.get_platform() != "macos": pytest.skip("this test can only run on macOS") if utils.get_xcode_version() < (13, 0): pytest.skip("this test only works with Xcode 13.0 or greater") @@ -130,7 +130,7 @@ def test_no_test_sources(tmp_path, capfd): def test_missing_xbuild_tool(tmp_path, capfd): """Build will fail if xbuild-tools references a non-existent tool.""" - if utils.platform != "macos": + if utils.get_platform() != "macos": pytest.skip("this test can only run on macOS") if utils.get_xcode_version() < (13, 0): pytest.skip("this test only works with Xcode 13.0 or greater") @@ -158,7 +158,7 @@ def test_missing_xbuild_tool(tmp_path, capfd): def test_no_xbuild_tool_definition(tmp_path, capfd): """Build will succeed with a warning if there is no xbuild-tools definition.""" - if utils.platform != "macos": + if utils.get_platform() != "macos": pytest.skip("this test can only run on macOS") if utils.get_xcode_version() < (13, 0): pytest.skip("this test only works with Xcode 13.0 or greater") @@ -203,7 +203,7 @@ def test_no_xbuild_tool_definition(tmp_path, capfd): def test_empty_xbuild_tool_definition(tmp_path, capfd): """Build will succeed with no warning if there is an empty xbuild-tools definition.""" - if utils.platform != "macos": + if utils.get_platform() != "macos": pytest.skip("this test can only run on macOS") if utils.get_xcode_version() < (13, 0): pytest.skip("this test only works with Xcode 13.0 or greater") diff --git a/test/test_linux_python.py b/test/test_linux_python.py index 7c5f58a56..48a70c2e1 100644 --- a/test/test_linux_python.py +++ b/test/test_linux_python.py @@ -7,7 +7,7 @@ def test_python_exist(tmp_path, capfd): - if utils.platform != "linux": + if utils.get_platform() != "linux": pytest.skip("the test is only relevant to the linux build") machine = platform.machine() if machine not in ["x86_64", "i686"]: diff --git a/test/test_macos_archs.py b/test/test_macos_archs.py index 848303ec8..f38cff567 100644 --- a/test/test_macos_archs.py +++ b/test/test_macos_archs.py @@ -20,7 +20,7 @@ def test_cross_compiled_build(tmp_path): - if utils.platform != "macos": + if utils.get_platform() != "macos": pytest.skip("this test is only relevant to macos") if utils.get_xcode_version() < (12, 2): pytest.skip("this test only works with Xcode 12.2 or greater") @@ -54,7 +54,7 @@ def test_cross_compiled_build(tmp_path): ], ) def test_cross_compiled_test(tmp_path, capfd, build_universal2, test_config): - if utils.platform != "macos": + if utils.get_platform() != "macos": pytest.skip("this test is only relevant to macos") if utils.get_xcode_version() < (12, 2): pytest.skip("this test only works with Xcode 12.2 or greater") @@ -114,7 +114,7 @@ def test_cross_compiled_test(tmp_path, capfd, build_universal2, test_config): def test_deployment_target_warning_is_firing(tmp_path, capfd): # force the warning to check that we can detect it if it happens - if utils.platform != "macos": + if utils.get_platform() != "macos": pytest.skip("this test is only relevant to macos") project_dir = tmp_path / "project" @@ -136,7 +136,7 @@ def test_deployment_target_warning_is_firing(tmp_path, capfd): @pytest.mark.parametrize("skip_arm64_test", [False, True]) def test_universal2_testing_on_x86_64(tmp_path, capfd, skip_arm64_test): - if utils.platform != "macos": + if utils.get_platform() != "macos": pytest.skip("this test is only relevant to macos") if utils.get_xcode_version() < (12, 2): pytest.skip("this test only works with Xcode 12.2 or greater") @@ -176,7 +176,7 @@ def test_universal2_testing_on_x86_64(tmp_path, capfd, skip_arm64_test): def test_universal2_testing_on_arm64(build_frontend_env, tmp_path, capfd): # cibuildwheel should test the universal2 wheel on both x86_64 and arm64, when run on arm64 - if utils.platform != "macos": + if utils.get_platform() != "macos": pytest.skip("this test is only relevant to macos") if platform.machine() != "arm64": pytest.skip("this test only works on arm64") @@ -206,7 +206,7 @@ def test_universal2_testing_on_arm64(build_frontend_env, tmp_path, capfd): def test_cp38_arm64_testing(tmp_path, capfd, request): - if utils.platform != "macos": + if utils.get_platform() != "macos": pytest.skip("this test is only relevant to macos") if utils.get_xcode_version() < (12, 2): pytest.skip("this test only works with Xcode 12.2 or greater") diff --git a/test/test_manylinuxXXXX_only.py b/test/test_manylinuxXXXX_only.py index c8d2c6d99..5f0839711 100644 --- a/test/test_manylinuxXXXX_only.py +++ b/test/test_manylinuxXXXX_only.py @@ -62,7 +62,7 @@ ) @pytest.mark.usefixtures("docker_cleanup") def test(manylinux_image, tmp_path): - if utils.platform != "linux": + if utils.get_platform() != "linux": pytest.skip("the container image test is only relevant to the linux build") elif manylinux_image in {"manylinux_2_28", "manylinux_2_34"} and platform.machine() == "i686": pytest.skip(f"{manylinux_image} doesn't exist for i686 architecture") diff --git a/test/test_musllinux_X_Y_only.py b/test/test_musllinux_X_Y_only.py index f8396aa6a..5e2f2e246 100644 --- a/test/test_musllinux_X_Y_only.py +++ b/test/test_musllinux_X_Y_only.py @@ -28,7 +28,7 @@ ) @pytest.mark.usefixtures("docker_cleanup") def test(musllinux_image, tmp_path): - if utils.platform != "linux": + if utils.get_platform() != "linux": pytest.skip("the container image test is only relevant to the linux build") project_dir = tmp_path / "project" diff --git a/test/test_pep518.py b/test/test_pep518.py index c861f0da3..d519cc297 100644 --- a/test/test_pep518.py +++ b/test/test_pep518.py @@ -37,7 +37,7 @@ def test_pep518(tmp_path, build_frontend_env): # from a virtualenv seeded executable. See # https://github.com/oracle/graalpython/issues/491 and remove this once # fixed upstream. - if build_frontend_env["CIBW_BUILD_FRONTEND"] == "build" and utils.platform == "windows": + if build_frontend_env["CIBW_BUILD_FRONTEND"] == "build" and utils.get_platform() == "windows": build_frontend_env["CIBW_SKIP"] = "gp*" # build the wheels @@ -50,7 +50,7 @@ def test_pep518(tmp_path, build_frontend_env): # from a virtualenv seeded executable. See # https://github.com/oracle/graalpython/issues/491 and remove this once # fixed upstream. - if build_frontend_env["CIBW_BUILD_FRONTEND"] == "build" and utils.platform == "windows": + if build_frontend_env["CIBW_BUILD_FRONTEND"] == "build" and utils.get_platform() == "windows": expected_wheels = [w for w in expected_wheels if "graalpy" not in w] assert set(actual_wheels) == set(expected_wheels) diff --git a/test/test_troubleshooting.py b/test/test_troubleshooting.py index 7039c2687..1b8e8a37f 100644 --- a/test/test_troubleshooting.py +++ b/test/test_troubleshooting.py @@ -15,7 +15,7 @@ def test_failed_build_with_so_files(tmp_path, capfd, build_frontend_env, project if project_contains_so_files: project.files["libnothing.so"] = "" - if utils.platform != "linux": + if utils.get_platform() != "linux": pytest.skip("this test is only relevant to the linux build") project_dir = tmp_path / "project" @@ -36,7 +36,7 @@ def test_failed_build_with_so_files(tmp_path, capfd, build_frontend_env, project @pytest.mark.parametrize("project_contains_so_files", [False, True]) def test_failed_repair_with_so_files(tmp_path, capfd, project_contains_so_files): - if utils.platform != "linux": + if utils.get_platform() != "linux": pytest.skip("this test is only relevant to the linux build") project = new_c_project() diff --git a/test/test_wheel_tag.py b/test/test_wheel_tag.py index 580481ff9..09c99ccae 100644 --- a/test/test_wheel_tag.py +++ b/test/test_wheel_tag.py @@ -6,7 +6,7 @@ def test_wheel_tag_is_correct_when_using_macosx_deployment_target(tmp_path): - if utils.platform != "macos": + if utils.get_platform() != "macos": pytest.skip("This test is only relevant to MACOSX_DEPLOYMENT_TARGET") project_dir = tmp_path / "project" diff --git a/test/test_windows.py b/test/test_windows.py index 142fccf25..073669ba7 100644 --- a/test/test_windows.py +++ b/test/test_windows.py @@ -39,7 +39,7 @@ def skip_if_no_msvc(arm64: bool = False) -> None: @pytest.mark.parametrize("use_pyproject_toml", [True, False]) def test_wheel_tag_is_correct_when_using_windows_cross_compile(tmp_path, use_pyproject_toml): - if utils.platform != "windows": + if utils.get_platform() != "windows": pytest.skip("This test is only relevant to Windows") skip_if_no_msvc(arm64=True) diff --git a/test/utils.py b/test/utils.py index 1ed93642c..dfc66aabd 100644 --- a/test/utils.py +++ b/test/utils.py @@ -34,18 +34,29 @@ CIProvider.cirrus_ci: False, }.get(detect_ci_provider(), True) -platform = os.environ.get("CIBW_PLATFORM", "") -if platform: - pass -elif sys.platform.startswith("linux"): - platform = "linux" -elif sys.platform.startswith("darwin"): - platform = "macos" -elif sys.platform.startswith(("win32", "cygwin")): - platform = "windows" -else: - msg = f"Unsupported platform {sys.platform!r}" - raise Exception(msg) + +def get_platform() -> str: + """Return the current platform as determined by CIBW_PLATFORM or sys.platform.""" + platform = os.environ.get("CIBW_PLATFORM", "") + if platform: + return platform + elif sys.platform.startswith("linux"): + return "linux" + elif sys.platform.startswith("darwin"): + return "macos" + elif sys.platform.startswith(("win32", "cygwin")): + return "windows" + else: + msg = f"Unsupported platform {sys.platform!r}" + raise Exception(msg) + + +DEFAULT_CIBW_ENABLE = "cpython-freethreading cpython-prerelease cpython-experimental-riscv64" + + +def get_enable_groups() -> frozenset[EnableGroup]: + value = os.environ.get("CIBW_ENABLE", DEFAULT_CIBW_ENABLE) + return EnableGroup.parse_option_value(value) def cibuildwheel_get_build_identifiers( @@ -74,7 +85,7 @@ def cibuildwheel_get_build_identifiers( def _update_pip_cache_dir(env: dict[str, str]) -> None: # Fix for pip concurrency bug https://github.com/pypa/pip/issues/11340 # See https://github.com/pypa/cibuildwheel/issues/1254 for discussion. - if platform == "linux": + if get_platform() == "linux": return if "PIP_CACHE_DIR" in env: return @@ -168,12 +179,12 @@ def expected_wheels( """ if machine_arch is None: machine_arch = pm.machine() - if platform == "linux": + if get_platform() == "linux": machine_arch = arch_name_for_linux(machine_arch) architectures = [machine_arch] if not single_arch: - if platform == "linux": + if get_platform() == "linux": if machine_arch == "x86_64": architectures.append("i686") elif ( @@ -182,7 +193,7 @@ def expected_wheels( and _AARCH64_CAN_RUN_ARMV7 ): architectures.append("armv7l") - elif platform == "windows" and machine_arch == "AMD64": + elif get_platform() == "windows" and machine_arch == "AMD64": architectures.append("x86") return [ @@ -216,6 +227,8 @@ def _expected_wheels( """ Returns a list of expected wheels from a run of cibuildwheel. """ + platform = get_platform() + # per PEP 425 (https://www.python.org/dev/peps/pep-0425/), wheel files shall have name of the form # {distribution}-{version}(-{build tag})?-{python tag}-{abi tag}-{platform tag}.whl # {python tag} and {abi tag} are closely related to the python interpreter used to build the wheel @@ -246,6 +259,7 @@ def _expected_wheels( "cp313-cp313", ] + enable_groups = get_enable_groups() if EnableGroup.CPythonFreeThreading in enable_groups: python_abi_tags.append("cp313-cp313t") @@ -378,12 +392,12 @@ def get_xcode_version() -> tuple[int, int]: def skip_if_pyodide(reason: str) -> Any: - return pytest.mark.skipif(platform == "pyodide", reason=reason) + return pytest.mark.skipif(get_platform() == "pyodide", reason=reason) def invoke_pytest() -> str: # see https://github.com/pyodide/pyodide/issues/4802 - if platform == "pyodide" and sys.platform.startswith("darwin"): + if get_platform() == "pyodide" and sys.platform.startswith("darwin"): return "python -m pytest" return "pytest" From 898f0a45c106f5342c70b1e2fc29afadd28a81d5 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 19 May 2025 03:42:23 +0100 Subject: [PATCH 1037/1105] fix: change to the iOS testing option semantics (#2363) * Change to the iOS testing option semantics Don't assume the presence of `python -m` in the test command. Less magic and allows more option reuse between platforms. * Update schema * Add a test for this warning * Don't try to execute a test-command when it doesn't look like a module * Update docs/options.md Co-authored-by: Malcolm Smith * Only allow invalid test command if the first part is 'pytest' * Responses to code review from @freakboy3742 * Fixes post-merge --------- Co-authored-by: Malcolm Smith --- cibuildwheel/platforms/ios.py | 41 +++++++++- cibuildwheel/util/helpers.py | 15 ++++ docs/options.md | 11 ++- test/test_ios.py | 136 ++++++++++++++++++++++------------ test/utils.py | 60 +++++++++++---- 5 files changed, 195 insertions(+), 68 deletions(-) diff --git a/cibuildwheel/platforms/ios.py b/cibuildwheel/platforms/ios.py index 3473ef740..9e06ecd07 100644 --- a/cibuildwheel/platforms/ios.py +++ b/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,6 +593,43 @@ 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", @@ -600,7 +637,7 @@ def build(options: Options, tmp_path: Path) -> None: "run", *(["--verbose"] if build_options.build_verbosity > 0 else []), "--", - *(shlex.split(build_options.test_command)), + *test_command_parts, env=build_env, ) failed = False diff --git a/cibuildwheel/util/helpers.py b/cibuildwheel/util/helpers.py index dbef452c0..363fd3345 100644 --- a/cibuildwheel/util/helpers.py +++ b/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, diff --git a/docs/options.md b/docs/options.md index 2b8113970..d24db227b 100644 --- a/docs/options.md +++ b/docs/options.md @@ -1253,7 +1253,7 @@ run your test suite. On all platforms other than iOS, the command is run in a shell, so you can write things like `cmd1 && cmd2`. -On iOS, the value of the `CIBW_TEST_COMMAND` setting is interpreted as the arguments to pass to `python -m` - that is, a Python module name, followed by arguments that will be assigned to `sys.argv`. Shell commands cannot be used. +On iOS, the value of the `CIBW_TEST_COMMAND` setting must follow the format `python -m MODULE [ARGS...]` - where MODULE is a Python module name, followed by arguments that will be assigned to `sys.argv`. Other commands cannot be used. Platform-specific environment variables are also available:
`CIBW_TEST_COMMAND_MACOS` | `CIBW_TEST_COMMAND_WINDOWS` | `CIBW_TEST_COMMAND_LINUX` | `CIBW_TEST_COMMAND_IOS` | `CIBW_TEST_COMMAND_PYODIDE` @@ -1273,6 +1273,10 @@ Platform-specific environment variables are also available:
CIBW_TEST_COMMAND: > pytest ./tests && python ./test.py + + # run tests on ios + CIBW_TEST_SOURCES_IOS: tests + CIBW_TEST_COMMAND_IOS: python -m pytest ./tests ``` !!! tab examples "pyproject.toml" @@ -1290,6 +1294,11 @@ Platform-specific environment variables are also available:
"pytest ./tests", "python ./test.py", ] + + # run tests on ios + [tool.cibuildwheel.ios] + test-sources = ["tests"] + test-command = "python -m pytest ./tests" ``` In configuration files, you can use an array, and the items will be joined with `&&`. diff --git a/test/test_ios.py b/test/test_ios.py index 7c5080da5..39d54ae91 100644 --- a/test/test_ios.py +++ b/test/test_ios.py @@ -4,6 +4,7 @@ import platform import shutil import subprocess +import textwrap import pytest @@ -73,28 +74,17 @@ def test_ios_platforms(tmp_path, build_config, monkeypatch, capfd): "CIBW_BUILD": "cp313-*", "CIBW_XBUILD_TOOLS": "does-exist", "CIBW_TEST_SOURCES": "tests", - "CIBW_TEST_COMMAND": "unittest discover tests test_platform.py", + "CIBW_TEST_COMMAND": "python -m unittest discover tests test_platform.py", "CIBW_BUILD_VERBOSITY": "1", **build_config, }, ) # The expected wheels were produced. - ios_version = os.getenv("IPHONEOS_DEPLOYMENT_TARGET", "13.0").replace(".", "_") - platform_machine = platform.machine() - - if platform_machine == "x86_64": - expected_wheels = { - f"spam-0.1.0-cp313-cp313-ios_{ios_version}_x86_64_iphonesimulator.whl", - } - - elif platform_machine == "arm64": - expected_wheels = { - f"spam-0.1.0-cp313-cp313-ios_{ios_version}_arm64_iphoneos.whl", - f"spam-0.1.0-cp313-cp313-ios_{ios_version}_arm64_iphonesimulator.whl", - } - - assert set(actual_wheels) == expected_wheels + expected_wheels = utils.expected_wheels( + "spam", "0.1.0", platform="ios", python_abi_tags=["cp313-cp313"] + ) + assert set(actual_wheels) == set(expected_wheels) # The user was notified that the cross-build tool was found. captured = capfd.readouterr() @@ -119,7 +109,7 @@ def test_no_test_sources(tmp_path, capfd): add_env={ "CIBW_PLATFORM": "ios", "CIBW_BUILD": "cp313-*", - "CIBW_TEST_COMMAND": "tests", + "CIBW_TEST_COMMAND": "python -m tests", }, ) @@ -146,7 +136,7 @@ def test_missing_xbuild_tool(tmp_path, capfd): add_env={ "CIBW_PLATFORM": "ios", "CIBW_BUILD": "cp313-*", - "CIBW_TEST_COMMAND": "tests", + "CIBW_TEST_COMMAND": "python -m tests", "CIBW_XBUILD_TOOLS": "does-not-exist", }, ) @@ -180,21 +170,13 @@ def test_no_xbuild_tool_definition(tmp_path, capfd): ) # The expected wheels were produced. - ios_version = os.getenv("IPHONEOS_DEPLOYMENT_TARGET", "13.0").replace(".", "_") - platform_machine = platform.machine() - - if platform_machine == "x86_64": - expected_wheels = { - f"spam-0.1.0-cp313-cp313-ios_{ios_version}_x86_64_iphonesimulator.whl", - } - - elif platform_machine == "arm64": - expected_wheels = { - f"spam-0.1.0-cp313-cp313-ios_{ios_version}_arm64_iphoneos.whl", - f"spam-0.1.0-cp313-cp313-ios_{ios_version}_arm64_iphonesimulator.whl", - } - - assert set(actual_wheels) == expected_wheels + expected_wheels = utils.expected_wheels( + "spam", + "0.1.0", + platform="ios", + python_abi_tags=["cp313-cp313"], + ) + assert set(actual_wheels) == set(expected_wheels) # The user was notified that there was no cross-build tool definition. captured = capfd.readouterr() @@ -225,23 +207,79 @@ def test_empty_xbuild_tool_definition(tmp_path, capfd): }, ) - # The expected wheels were produced. - ios_version = os.getenv("IPHONEOS_DEPLOYMENT_TARGET", "13.0").replace(".", "_") - platform_machine = platform.machine() - - if platform_machine == "x86_64": - expected_wheels = { - f"spam-0.1.0-cp313-cp313-ios_{ios_version}_x86_64_iphonesimulator.whl", - } - - elif platform_machine == "arm64": - expected_wheels = { - f"spam-0.1.0-cp313-cp313-ios_{ios_version}_arm64_iphoneos.whl", - f"spam-0.1.0-cp313-cp313-ios_{ios_version}_arm64_iphonesimulator.whl", - } - - assert set(actual_wheels) == expected_wheels + expected_wheels = utils.expected_wheels( + "spam", "0.1.0", platform="ios", python_abi_tags=["cp313-cp313"] + ) + assert set(actual_wheels) == set(expected_wheels) # The warnings about cross-build notifications were silenced. captured = capfd.readouterr() assert "Your project configuration does not define any cross-build tools." not in captured.err + + +@pytest.mark.serial +def test_ios_test_command_without_python_dash_m(tmp_path, capfd): + """pytest should be able to run without python -m, but it should warn.""" + if utils.get_platform() != "macos": + pytest.skip("this test can only run on macOS") + if utils.get_xcode_version() < (13, 0): + pytest.skip("this test only works with Xcode 13.0 or greater") + + project_dir = tmp_path / "project" + + project = test_projects.new_c_project() + project.files["tests/__init__.py"] = "" + project.files["tests/test_spam.py"] = textwrap.dedent(""" + import spam + def test_spam(): + assert spam.filter("spam") == 0 + assert spam.filter("ham") != 0 + """) + project.generate(project_dir) + + actual_wheels = utils.cibuildwheel_run( + project_dir, + add_env={ + "CIBW_PLATFORM": "ios", + "CIBW_BUILD": "cp313-*", + "CIBW_TEST_COMMAND": "pytest ./tests", + "CIBW_TEST_SOURCES": "tests", + "CIBW_TEST_REQUIRES": "pytest", + "CIBW_XBUILD_TOOLS": "", + }, + ) + + expected_wheels = utils.expected_wheels( + "spam", "0.1.0", platform="ios", python_abi_tags=["cp313-cp313"] + ) + assert set(actual_wheels) == set(expected_wheels) + + out, err = capfd.readouterr() + + assert "iOS tests configured with a test command which doesn't start with 'python -m'" in err + + +def test_ios_test_command_invalid(tmp_path, capfd): + """Test command should raise an error if it's clearly invalid.""" + if utils.get_platform() != "macos": + pytest.skip("this test can only run on macOS") + if utils.get_xcode_version() < (13, 0): + pytest.skip("this test only works with Xcode 13.0 or greater") + + project_dir = tmp_path / "project" + basic_project = test_projects.new_c_project() + basic_project.files["./my_test_script.sh"] = "echo hello" + basic_project.generate(project_dir) + + with pytest.raises(subprocess.CalledProcessError): + utils.cibuildwheel_run( + project_dir, + add_env={ + "CIBW_PLATFORM": "ios", + "CIBW_TEST_COMMAND": "./my_test_script.sh", + "CIBW_TEST_SOURCES": "./my_test_script.sh", + "CIBW_XBUILD_TOOLS": "", + }, + ) + out, err = capfd.readouterr() + assert "iOS tests configured with a test command which doesn't start with 'python -m'" in err diff --git a/test/utils.py b/test/utils.py index dfc66aabd..028e88863 100644 --- a/test/utils.py +++ b/test/utils.py @@ -167,8 +167,10 @@ def expected_wheels( package_version: str, manylinux_versions: list[str] | None = None, musllinux_versions: list[str] | None = None, - macosx_deployment_target: str = "10.9", + macosx_deployment_target: str | None = None, + iphoneos_deployment_target: str | None = None, machine_arch: str | None = None, + platform: str | None = None, python_abi_tags: list[str] | None = None, include_universal2: bool = False, single_python: bool = False, @@ -177,14 +179,22 @@ def expected_wheels( """ Returns the expected wheels from a run of cibuildwheel. """ + platform = platform or get_platform() + if machine_arch is None: machine_arch = pm.machine() - if get_platform() == "linux": + if platform == "linux": machine_arch = arch_name_for_linux(machine_arch) + if macosx_deployment_target is None: + macosx_deployment_target = os.environ.get("MACOSX_DEPLOYMENT_TARGET", "10.9") + + if iphoneos_deployment_target is None: + iphoneos_deployment_target = os.environ.get("IPHONEOS_DEPLOYMENT_TARGET", "13.0") + architectures = [machine_arch] if not single_arch: - if get_platform() == "linux": + if platform == "linux": if machine_arch == "x86_64": architectures.append("i686") elif ( @@ -193,22 +203,24 @@ def expected_wheels( and _AARCH64_CAN_RUN_ARMV7 ): architectures.append("armv7l") - elif get_platform() == "windows" and machine_arch == "AMD64": + elif platform == "windows" and machine_arch == "AMD64": architectures.append("x86") return [ wheel for architecture in architectures for wheel in _expected_wheels( - package_name, - package_version, - architecture, - manylinux_versions, - musllinux_versions, - macosx_deployment_target, - python_abi_tags, - include_universal2, - single_python, + package_name=package_name, + package_version=package_version, + machine_arch=architecture, + manylinux_versions=manylinux_versions, + musllinux_versions=musllinux_versions, + macosx_deployment_target=macosx_deployment_target, + iphoneos_deployment_target=iphoneos_deployment_target, + platform=platform, + python_abi_tags=python_abi_tags, + include_universal2=include_universal2, + single_python=single_python, ) ] @@ -220,6 +232,8 @@ def _expected_wheels( manylinux_versions: list[str] | None, musllinux_versions: list[str] | None, macosx_deployment_target: str, + iphoneos_deployment_target: str, + platform: str, python_abi_tags: list[str] | None, include_universal2: bool, single_python: bool, @@ -227,8 +241,6 @@ def _expected_wheels( """ Returns a list of expected wheels from a run of cibuildwheel. """ - platform = get_platform() - # per PEP 425 (https://www.python.org/dev/peps/pep-0425/), wheel files shall have name of the form # {distribution}-{version}(-{build tag})?-{python tag}-{abi tag}-{platform tag}.whl # {python tag} and {abi tag} are closely related to the python interpreter used to build the wheel @@ -249,7 +261,9 @@ def _expected_wheels( if platform == "pyodide" and python_abi_tags is None: python_abi_tags = ["cp312-cp312"] - if python_abi_tags is None: + elif platform == "ios" and python_abi_tags is None: + python_abi_tags = ["cp313-cp313"] + elif python_abi_tags is None: python_abi_tags = [ "cp38-cp38", "cp39-cp39", @@ -353,6 +367,20 @@ def _expected_wheels( if include_universal2: platform_tags.append(f"macosx_{min_macosx.replace('.', '_')}_universal2") + elif platform == "ios": + if machine_arch == "x86_64": + platform_tags = [ + f"ios_{iphoneos_deployment_target.replace('.', '_')}_x86_64_iphonesimulator" + ] + elif machine_arch == "arm64": + platform_tags = [ + f"ios_{iphoneos_deployment_target.replace('.', '_')}_arm64_iphoneos", + f"ios_{iphoneos_deployment_target.replace('.', '_')}_arm64_iphonesimulator", + ] + else: + msg = f"Unsupported architecture {machine_arch!r} for iOS" + raise Exception(msg) + elif platform == "pyodide": platform_tags = ["pyodide_2024_0_wasm32"] From 1fe8e55c67c890e048366956a3e8b570e4d42e89 Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 08:52:26 +0100 Subject: [PATCH 1038/1105] [Bot] Update dependencies (#2400) Update dependencies Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> --- .../resources/constraints-pyodide312.txt | 2 +- cibuildwheel/resources/nodejs.toml | 4 +- .../resources/pinned_docker_images.cfg | 54 +++++++++---------- docs/working-examples.md | 24 ++++----- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/cibuildwheel/resources/constraints-pyodide312.txt b/cibuildwheel/resources/constraints-pyodide312.txt index 5e1c9ca5c..702ea12d2 100644 --- a/cibuildwheel/resources/constraints-pyodide312.txt +++ b/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 diff --git a/cibuildwheel/resources/nodejs.toml b/cibuildwheel/resources/nodejs.toml index 9674bc39f..fc3fd2168 100644 --- a/cibuildwheel/resources/nodejs.toml +++ b/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" diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 1ff2bef8d..20956fba4 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/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] diff --git a/docs/working-examples.md b/docs/working-examples.md index 825b516e9..facc03ba0 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -52,8 +52,8 @@ title: Working examples | [PyYAML][] | ![github icon][] | ![apple icon][] | Canonical source repository for PyYAML | | [pikepdf][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by QPDF | | [numexpr][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, Pandas, PyTables and more | -| [Wrapt][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python module for decorators, wrappers and monkey patching. | | [h5py][] | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. | +| [Wrapt][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python module for decorators, wrappers and monkey patching. | | [envd][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A machine learning development environment build tool | | [Psycopg 3][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A modern implementation of a PostgreSQL adapter for Python | | [OpenColorIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A color management framework for visual effects and animation. | @@ -67,8 +67,8 @@ title: Working examples | [DeepForest][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) | | [AutoPy][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | | [H3-py][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system | -| [mosec][] | ![github icon][] | ![linux icon][] ![apple icon][] | A machine learning model serving framework powered by Rust | | [time-machine][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. | +| [mosec][] | ![github icon][] | ![linux icon][] ![apple icon][] | A machine learning model serving framework powered by Rust | | [Picologging][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A high-performance logging library for Python. | | [pybind11 cmake_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system | | [markupsafe][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. | @@ -76,8 +76,8 @@ title: Working examples | [KDEpy][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Kernel Density Estimation in Python | | [dd-trace-py][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub | | [tgcalls][] | ![github icon][] | ![apple icon][] ![windows icon][] | Python `pybind11` binding to Telegram's WebRTC library with third party dependencies like `OpenSSL`, `MozJPEG`, `FFmpeg`, etc. | -| [python-rapidjson][] | ![travisci icon][] ![gitlab icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson | | [pybind11 python_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a Python-based build system | +| [python-rapidjson][] | ![travisci icon][] ![gitlab icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson | | [sourmash][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. | | [abess][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A fast best-subset selection library. It uses cibuildwheel to build a large project with C++ extensions. | | [python-snappy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for the snappy google library | @@ -97,15 +97,15 @@ title: Working examples | [bx-python][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | A library that includes Cython extensions. | | [pybase64][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python | | [boost-histogram][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. | -| [Python-WebRTC][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | a Python extension that provides bindings to WebRTC M92 | | [Imagecodecs (fork)][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. | -| [fathon][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms | +| [Python-WebRTC][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | a Python extension that provides bindings to WebRTC M92 | | [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 | +| [fathon][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms | | [Arbor][] | ![github icon][] | ![apple icon][] ![linux icon][] | Arbor is a multi-compartment neuron simulation library; compatible with next-generation accelerators; best-practices applied to research software; focused on community-driven development. Includes a [small script](https://github.com/arbor-sim/arbor/blob/master/scripts/patchwheel.py) patching `rpath` in bundled libraries. | | [clang-format][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. | | [polaroid][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. | -| [etebase-py][] | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. | | [ninja][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | +| [etebase-py][] | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. | | [cf-units][] | ![github icon][] | ![apple icon][] ![linux icon][] | Units of measure as required by the Climate and Forecast (CF) Metadata Conventions | | [numpythia][] | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy | | [pyjet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy | @@ -162,8 +162,8 @@ title: Working examples [PyYAML]: https://github.com/yaml/pyyaml [pikepdf]: https://github.com/pikepdf/pikepdf [numexpr]: https://github.com/pydata/numexpr -[Wrapt]: https://github.com/GrahamDumpleton/wrapt [h5py]: https://github.com/h5py/h5py +[Wrapt]: https://github.com/GrahamDumpleton/wrapt [envd]: https://github.com/tensorchord/envd [Psycopg 3]: https://github.com/psycopg/psycopg [OpenColorIO]: https://github.com/AcademySoftwareFoundation/OpenColorIO @@ -177,8 +177,8 @@ title: Working examples [DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest [AutoPy]: https://github.com/autopilot-rs/autopy [H3-py]: https://github.com/uber/h3-py -[mosec]: https://github.com/mosecorg/mosec [time-machine]: https://github.com/adamchainz/time-machine +[mosec]: https://github.com/mosecorg/mosec [Picologging]: https://github.com/microsoft/picologging [pybind11 cmake_example]: https://github.com/pybind/cmake_example [markupsafe]: https://github.com/pallets/markupsafe @@ -186,8 +186,8 @@ title: Working examples [KDEpy]: https://github.com/tommyod/KDEpy [dd-trace-py]: https://github.com/DataDog/dd-trace-py [tgcalls]: https://github.com/MarshalX/tgcalls -[python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson [pybind11 python_example]: https://github.com/pybind/python_example +[python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson [sourmash]: https://github.com/sourmash-bio/sourmash [abess]: https://github.com/abess-team/abess [python-snappy]: https://github.com/intake/python-snappy @@ -207,15 +207,15 @@ title: Working examples [bx-python]: https://github.com/bxlab/bx-python [pybase64]: https://github.com/mayeut/pybase64 [boost-histogram]: https://github.com/scikit-hep/boost-histogram -[Python-WebRTC]: https://github.com/MarshalX/python-webrtc [Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build -[fathon]: https://github.com/stfbnc/fathon +[Python-WebRTC]: https://github.com/MarshalX/python-webrtc [pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example +[fathon]: https://github.com/stfbnc/fathon [Arbor]: https://github.com/arbor-sim/arbor [clang-format]: https://github.com/ssciwr/clang-format-wheel [polaroid]: https://github.com/daggy1234/polaroid -[etebase-py]: https://github.com/etesync/etebase-py [ninja]: https://github.com/scikit-build/ninja-python-distributions +[etebase-py]: https://github.com/etesync/etebase-py [cf-units]: https://github.com/SciTools/cf-units [numpythia]: https://github.com/scikit-hep/numpythia [pyjet]: https://github.com/scikit-hep/pyjet From e46e9516d96d9e4857c94eb5c7c0bea83b0d6c45 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 19 May 2025 09:04:40 +0100 Subject: [PATCH 1039/1105] Fix release script --- bin/bump_version.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/bump_version.py b/bin/bump_version.py index 9e1a3592d..452dfa066 100755 --- a/bin/bump_version.py +++ b/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{}"), ] From 90a0ddeff0f23eebc21630e65d66d0f4955e9b94 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 19 May 2025 09:29:14 +0100 Subject: [PATCH 1040/1105] Bump version: v3.0.0b1 --- README.md | 51 ++++++++++++-------------- cibuildwheel/__init__.py | 2 +- docs/changelog.md | 22 +++++++++++ docs/faq.md | 6 +-- examples/azure-pipelines-minimal.yml | 6 +-- examples/circleci-minimal.yml | 6 +-- examples/cirrus-ci-intel-mac.yml | 2 +- examples/cirrus-ci-minimal.yml | 2 +- examples/github-deploy.yml | 2 +- examples/github-minimal.yml | 2 +- examples/github-pipx.yml | 2 +- examples/github-with-qemu.yml | 2 +- examples/gitlab-minimal.yml | 6 +-- examples/gitlab-with-qemu.yml | 2 +- examples/travis-ci-deploy.yml | 2 +- examples/travis-ci-minimal.yml | 2 +- examples/travis-ci-test-and-deploy.yml | 4 +- pyproject.toml | 2 +- 18 files changed, 70 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index bb046a070..e20e0a6fc 100644 --- a/README.md +++ b/README.md @@ -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,27 @@ Changelog +### v3.0.0 + +Not yet released, but available for testing + +#### 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 +250,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 +259,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) - --- diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index c142a69b0..3996ce876 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1 +1 @@ -__version__ = "2.23.3" +__version__ = "3.0.0b1" diff --git a/docs/changelog.md b/docs/changelog.md index a633ea807..38009b370 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -4,6 +4,27 @@ title: Changelog # Changelog +### v3.0.0 + +Not yet released, but available for testing + +#### 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 +37,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 diff --git a/docs/faq.md b/docs/faq.md index 1d968d657..44c914786 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -60,7 +60,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: pypa/cibuildwheel@v2.23.3 +uses: pypa/cibuildwheel@v3.0.0b1 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. @@ -82,7 +82,7 @@ The second option, and the only one that supports other CI systems, is using a ` ```bash # requirements-cibw.txt -cibuildwheel==2.23.3 +cibuildwheel==3.0.0b1 ``` Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this: @@ -247,7 +247,7 @@ Solutions to this vary, but the simplest is to use pipx: # most runners have pipx preinstalled, but in case you don't python3 -m pip install pipx -pipx run cibuildwheel==2.23.3 --output-dir wheelhouse +pipx run cibuildwheel==3.0.0b1 --output-dir wheelhouse pipx run twine upload wheelhouse/*.whl ``` diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index db66bfddd..fa727b9a9 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -6,7 +6,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - pip3 install cibuildwheel==2.23.3 + pip3 install cibuildwheel==3.0.0b1 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -20,7 +20,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - python3 -m pip install cibuildwheel==2.23.3 + python3 -m pip install cibuildwheel==3.0.0b1 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -34,7 +34,7 @@ jobs: - bash: | set -o errexit python -m pip install --upgrade pip - pip install cibuildwheel==2.23.3 + pip install cibuildwheel==3.0.0b1 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index 426cd648b..21a8b5dfa 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -11,7 +11,7 @@ jobs: - run: name: Build the Linux wheels. command: | - python3 -m pip install --user cibuildwheel==2.23.3 + python3 -m pip install --user cibuildwheel==3.0.0b1 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -28,7 +28,7 @@ jobs: - run: name: Build the Linux aarch64 wheels. command: | - python3 -m pip install --user cibuildwheel==2.23.3 + python3 -m pip install --user cibuildwheel==3.0.0b1 python3 -m cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -44,7 +44,7 @@ jobs: name: Build the OS X wheels. command: | sudo softwareupdate --install-rosetta --agree-to-license # for python<=3.8 or x86_64/universal2 tests - pip3 install cibuildwheel==2.23.3 + pip3 install cibuildwheel==3.0.0b1 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ diff --git a/examples/cirrus-ci-intel-mac.yml b/examples/cirrus-ci-intel-mac.yml index 324f075fb..dfc75146d 100644 --- a/examples/cirrus-ci-intel-mac.yml +++ b/examples/cirrus-ci-intel-mac.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==2.23.3 + - python -m pip install cibuildwheel==3.0.0b1 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index 8f69603cf..f601f3f30 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==2.23.3 + - python -m pip install cibuildwheel==3.0.0b1 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index dee716845..4888f19e9 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v2.23.3 + uses: pypa/cibuildwheel@v3.0.0b1 env: CIBW_PLATFORM: ${{ matrix.platform }} CIBW_ARCHS: ${{ matrix.archs }} diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index c4c154a0a..a0102bb0f 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v2.23.3 + uses: pypa/cibuildwheel@v3.0.0b1 # env: # CIBW_SOME_OPTION: value # ... diff --git a/examples/github-pipx.yml b/examples/github-pipx.yml index 0dc07457f..14775233a 100644 --- a/examples/github-pipx.yml +++ b/examples/github-pipx.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - run: pipx run cibuildwheel==2.23.3 + run: pipx run cibuildwheel==3.0.0b1 - uses: actions/upload-artifact@v4 with: diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index 91f3be9de..c0325f9b8 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -21,7 +21,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.23.3 + uses: pypa/cibuildwheel@v3.0.0b1 env: # configure cibuildwheel on Linux to build native archs ('auto'), # and to split the remaining architectures between the x86_64 and diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index 7441a0e63..40ef7e3d5 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -12,7 +12,7 @@ linux: DOCKER_TLS_CERTDIR: "" script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==2.23.3 + - python -m pip install cibuildwheel==3.0.0b1 - cibuildwheel --output-dir wheelhouse artifacts: paths: @@ -23,7 +23,7 @@ windows: before_script: - choco install python -y --version 3.12.4 - choco install git.install -y - - py -m pip install cibuildwheel==2.23.3 + - py -m pip install cibuildwheel==3.0.0b1 script: - py -m cibuildwheel --output-dir wheelhouse --platform windows artifacts: @@ -35,7 +35,7 @@ windows: macos: image: macos-14-xcode-15 before_script: - - python3 -m pip install cibuildwheel==2.23.3 + - python3 -m pip install cibuildwheel==3.0.0b1 script: - python3 -m cibuildwheel --output-dir wheelhouse artifacts: diff --git a/examples/gitlab-with-qemu.yml b/examples/gitlab-with-qemu.yml index 2a6bc55ae..abb1b682d 100644 --- a/examples/gitlab-with-qemu.yml +++ b/examples/gitlab-with-qemu.yml @@ -14,7 +14,7 @@ linux: - curl -sSL https://get.docker.com/ | sh # Warning: This is extremely slow, be careful with how many wheels you build - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - python -m pip install cibuildwheel==2.23.3 + - python -m pip install cibuildwheel==3.0.0b1 # Assuming your CI runner's default architecture is x86_64... - cibuildwheel --output-dir wheelhouse --platform linux --archs aarch64 artifacts: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index a7c24a318..7a307e706 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -20,7 +20,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==2.23.3 + - python3 -m pip install cibuildwheel==3.0.0b1 script: # build the wheels, put them into './dist' diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index f4592899a..8b6077435 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -26,7 +26,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==2.23.3 + - python3 -m pip install cibuildwheel==3.0.0b1 script: # build the wheels, put them into './wheelhouse' diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index 0725a74fb..9f3176575 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -52,7 +52,7 @@ jobs: - stage: deploy name: Build and deploy Linux wheels services: docker - install: python3 -m pip install cibuildwheel==2.23.3 twine + install: python3 -m pip install cibuildwheel==3.0.0b1 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl # Deploy on windows @@ -60,7 +60,7 @@ jobs: name: Build and deploy Windows wheels os: windows language: shell - install: python3 -m pip install cibuildwheel==2.23.3 twine + install: python3 -m pip install cibuildwheel==3.0.0b1 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl diff --git a/pyproject.toml b/pyproject.toml index 18585c549..cb5ae27a6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "cibuildwheel" -version = "2.23.3" +version = "3.0.0b1" description = "Build Python wheels on CI with minimal configuration." readme = "README.md" license = "BSD-2-Clause" From bd641d11deff8220530f9ceb03e7b9a7a8a660b3 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 19 May 2025 10:02:39 +0100 Subject: [PATCH 1041/1105] Add docs note --- README.md | 4 +++- docs/changelog.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e20e0a6fc..7f609295b 100644 --- a/README.md +++ b/README.md @@ -219,7 +219,9 @@ Changelog ### v3.0.0 -Not yet released, but available for testing +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 diff --git a/docs/changelog.md b/docs/changelog.md index 38009b370..0ae1f7d1f 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -6,7 +6,9 @@ title: Changelog ### v3.0.0 -Not yet released, but available for testing +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 From 9dd7192d89877be92c53db5f1035cca2ae801241 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 19 May 2025 16:58:28 +0100 Subject: [PATCH 1042/1105] ci: fix failing tests due to rate-limiting (#2401) raw.githubusercontent.com URLs are rate-limited now, change URLs --- test/test_ssl.py | 4 ++-- unit_test/download_test.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test_ssl.py b/test/test_ssl.py index 89ad4b80a..e4ff24e91 100644 --- a/test/test_ssl.py +++ b/test/test_ssl.py @@ -10,9 +10,9 @@ from urllib.request import urlopen context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) + # badssl.com is a HTTPS test server that can be used to test SSL connections data = urlopen("https://tls-v1-2.badssl.com/", context=context) - data = urlopen("https://raw.githubusercontent.com/pypa/cibuildwheel/main/CI.md", context=context) - data = urlopen("https://raw.githubusercontent.com/pypa/cibuildwheel/main/CI.md") + data = urlopen("https://tls-v1-2.badssl.com/") """ ) ) diff --git a/unit_test/download_test.py b/unit_test/download_test.py index ca54e9dca..4c5f9edc8 100644 --- a/unit_test/download_test.py +++ b/unit_test/download_test.py @@ -5,7 +5,7 @@ from cibuildwheel.util.file import download -DOWNLOAD_URL = "https://raw.githubusercontent.com/pypa/cibuildwheel/v1.6.3/requirements-dev.txt" +DOWNLOAD_URL = "https://cdn.jsdelivr.net/gh/pypa/cibuildwheel@v1.6.3/requirements-dev.txt" def test_download(monkeypatch, tmp_path): From fcdbed860ec362051a8fbd7e411610c460f63309 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Tue, 20 May 2025 13:41:26 +0100 Subject: [PATCH 1043/1105] Add TEST_ENVIRONMENT option and set PYTHONSAFEPATH=1 in the test env (#2388) * Add TEST_ENVIRONMENT option and set PYTHONSAFEPATH=1 in the test env Closes https://github.com/pypa/cibuildwheel/issues/2358 * Add toml docs examples * Add TOML examples * Use double-quotes for windows --- bin/generate_schema.py | 4 ++ cibuildwheel/options.py | 11 ++++++ cibuildwheel/platforms/ios.py | 14 ++++--- cibuildwheel/platforms/linux.py | 4 ++ cibuildwheel/platforms/macos.py | 7 ++++ cibuildwheel/platforms/pyodide.py | 6 +++ cibuildwheel/platforms/windows.py | 7 ++++ .../resources/cibuildwheel.schema.json | 39 +++++++++++++++++++ cibuildwheel/resources/defaults.toml | 1 + docs/options.md | 36 +++++++++++++++++ test/test_testing.py | 22 +++++++++++ 11 files changed, 146 insertions(+), 5 deletions(-) diff --git a/bin/generate_schema.py b/bin/generate_schema.py index ac97f8e9b..116a0aeb9 100755 --- a/bin/generate_schema.py +++ b/bin/generate_schema.py @@ -221,6 +221,9 @@ test-skip: description: Skip running tests on some builds. type: string_array + test-environment: + description: Set environment variables for the test environment + type: string_table """ schema = yaml.safe_load(starter) @@ -300,6 +303,7 @@ test-extras: {"$ref": "#/$defs/inherit"} test-sources: {"$ref": "#/$defs/inherit"} test-requires: {"$ref": "#/$defs/inherit"} + test-environment: {"$ref": "#/$defs/inherit"} """ ) diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index fa1d1c046..94ffcefcb 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -107,6 +107,7 @@ class BuildOptions: test_requires: list[str] test_extras: str test_groups: list[str] + test_environment: ParsedEnvironment build_verbosity: int build_frontend: BuildFrontendConfig | None config_settings: str @@ -739,6 +740,15 @@ def _compute_build_options(self, identifier: str | None) -> BuildOptions: "test-sources", option_format=ListFormat(sep=" ", quote=shlex.quote) ) ) + test_environment_config = self.reader.get( + "test-environment", option_format=EnvironmentFormat() + ) + try: + test_environment = parse_environment(test_environment_config) + except (EnvironmentParseError, ValueError) as e: + msg = f"Malformed environment option {test_environment_config!r}" + raise errors.ConfigurationError(msg) from e + test_requires = self.reader.get( "test-requires", option_format=ListFormat(sep=" ") ).split() @@ -844,6 +854,7 @@ def _compute_build_options(self, identifier: str | None) -> BuildOptions: globals=self.globals, test_command=test_command, test_sources=test_sources, + test_environment=test_environment, test_requires=[*test_requires, *test_requirements_from_groups], test_extras=test_extras, test_groups=test_groups, diff --git a/cibuildwheel/platforms/ios.py b/cibuildwheel/platforms/ios.py index 9e06ecd07..dc4911f75 100644 --- a/cibuildwheel/platforms/ios.py +++ b/cibuildwheel/platforms/ios.py @@ -536,13 +536,17 @@ def build(options: Options, tmp_path: Path) -> None: elif config.arch != os.uname().machine: log.step("Skipping tests on non-native simulator architecture") else: + test_env = build_options.test_environment.as_dictionary( + prev_environment=build_env + ) + if build_options.before_test: before_test_prepared = prepare_command( build_options.before_test, project=".", package=build_options.package_dir, ) - shell(before_test_prepared, env=env) + shell(before_test_prepared, env=test_env) log.step("Setting up test harness...") # Clone the testbed project into the build directory @@ -552,7 +556,7 @@ def build(options: Options, tmp_path: Path) -> None: target_install_path / "testbed", "clone", testbed_path, - env=build_env, + env=test_env, ) if not build_options.test_sources: @@ -574,7 +578,7 @@ def build(options: Options, tmp_path: Path) -> None: # the test requirements. Use the --platform tag to force # the installation of iOS wheels; this requires the use of # --only-binary=:all: - ios_version = build_env["IPHONEOS_DEPLOYMENT_TARGET"] + ios_version = test_env["IPHONEOS_DEPLOYMENT_TARGET"] platform_tag = f"ios_{ios_version.replace('.', '_')}_{config.arch}_{config.sdk}" call( @@ -589,7 +593,7 @@ def build(options: Options, tmp_path: Path) -> None: testbed_path / "iOSTestbed" / "app_packages", f"{test_wheel}{build_options.test_extras}", *build_options.test_requires, - env=build_env, + env=test_env, ) log.step("Running test suite...") @@ -638,7 +642,7 @@ def build(options: Options, tmp_path: Path) -> None: *(["--verbose"] if build_options.build_verbosity > 0 else []), "--", *test_command_parts, - env=build_env, + env=test_env, ) failed = False except subprocess.CalledProcessError: diff --git a/cibuildwheel/platforms/linux.py b/cibuildwheel/platforms/linux.py index 28650525e..5ffd5a2ef 100644 --- a/cibuildwheel/platforms/linux.py +++ b/cibuildwheel/platforms/linux.py @@ -361,6 +361,10 @@ def build_in_container( virtualenv_env = env.copy() virtualenv_env["PATH"] = f"{venv_dir / 'bin'}:{virtualenv_env['PATH']}" virtualenv_env["VIRTUAL_ENV"] = str(venv_dir) + virtualenv_env["PYTHONSAFEPATH"] = "1" + virtualenv_env = build_options.test_environment.as_dictionary( + prev_environment=virtualenv_env + ) if build_options.before_test: before_test_prepared = prepare_command( diff --git a/cibuildwheel/platforms/macos.py b/cibuildwheel/platforms/macos.py index e2f5b9115..d64917368 100644 --- a/cibuildwheel/platforms/macos.py +++ b/cibuildwheel/platforms/macos.py @@ -648,6 +648,13 @@ def build(options: Options, tmp_path: Path) -> None: virtualenv_env["MACOSX_DEPLOYMENT_TARGET"] = get_test_macosx_deployment_target() + # see https://github.com/pypa/cibuildwheel/issues/2358 for discussion + virtualenv_env["PYTHONSAFEPATH"] = "1" + + virtualenv_env = build_options.test_environment.as_dictionary( + prev_environment=virtualenv_env + ) + # check that we are using the Python from the virtual environment call_with_arch("which", "python", env=virtualenv_env) diff --git a/cibuildwheel/platforms/pyodide.py b/cibuildwheel/platforms/pyodide.py index 1c05dd0cd..77e3b9a81 100644 --- a/cibuildwheel/platforms/pyodide.py +++ b/cibuildwheel/platforms/pyodide.py @@ -380,6 +380,12 @@ def build(options: Options, tmp_path: Path) -> None: ) virtualenv_env["VIRTUAL_ENV"] = str(venv_dir) + virtualenv_env["PYTHONSAFEPATH"] = "1" + + virtualenv_env = build_options.test_environment.as_dictionary( + prev_environment=virtualenv_env + ) + # check that we are using the Python from the virtual environment call("which", "python", env=virtualenv_env) diff --git a/cibuildwheel/platforms/windows.py b/cibuildwheel/platforms/windows.py index 91e72404b..4e59275bf 100644 --- a/cibuildwheel/platforms/windows.py +++ b/cibuildwheel/platforms/windows.py @@ -558,6 +558,13 @@ def build(options: Options, tmp_path: Path) -> None: pip_version=pip_version, ) + # see https://github.com/pypa/cibuildwheel/issues/2358 for discussion + virtualenv_env["PYTHONSAFEPATH"] = "1" + + virtualenv_env = build_options.test_environment.as_dictionary( + prev_environment=virtualenv_env + ) + # check that we are using the Python from the virtual environment call("where", "python", env=virtualenv_env) diff --git a/cibuildwheel/resources/cibuildwheel.schema.json b/cibuildwheel/resources/cibuildwheel.schema.json index 8ffa0b75e..6a71543bf 100644 --- a/cibuildwheel/resources/cibuildwheel.schema.json +++ b/cibuildwheel/resources/cibuildwheel.schema.json @@ -544,6 +544,24 @@ ], "title": "CIBW_TEST_SKIP" }, + "test-environment": { + "description": "Set environment variables for the test environment", + "oneOf": [ + { + "type": "string" + }, + { + "type": "object", + "additionalProperties": false, + "patternProperties": { + ".+": { + "type": "string" + } + } + } + ], + "title": "CIBW_TEST_ENVIRONMENT" + }, "overrides": { "type": "array", "description": "An overrides array", @@ -610,6 +628,9 @@ }, "test-requires": { "$ref": "#/$defs/inherit" + }, + "test-environment": { + "$ref": "#/$defs/inherit" } } }, @@ -714,6 +735,9 @@ }, "test-requires": { "$ref": "#/properties/test-requires" + }, + "test-environment": { + "$ref": "#/properties/test-environment" } } } @@ -836,6 +860,9 @@ }, "test-requires": { "$ref": "#/properties/test-requires" + }, + "test-environment": { + "$ref": "#/properties/test-environment" } } }, @@ -890,6 +917,9 @@ }, "test-requires": { "$ref": "#/properties/test-requires" + }, + "test-environment": { + "$ref": "#/properties/test-environment" } } }, @@ -957,6 +987,9 @@ }, "test-requires": { "$ref": "#/properties/test-requires" + }, + "test-environment": { + "$ref": "#/properties/test-environment" } } }, @@ -1011,6 +1044,9 @@ }, "test-requires": { "$ref": "#/properties/test-requires" + }, + "test-environment": { + "$ref": "#/properties/test-environment" } } }, @@ -1065,6 +1101,9 @@ }, "test-requires": { "$ref": "#/properties/test-requires" + }, + "test-environment": { + "$ref": "#/properties/test-environment" } } } diff --git a/cibuildwheel/resources/defaults.toml b/cibuildwheel/resources/defaults.toml index 4d03394fd..f0010806e 100644 --- a/cibuildwheel/resources/defaults.toml +++ b/cibuildwheel/resources/defaults.toml @@ -24,6 +24,7 @@ test-sources = [] test-requires = [] test-extras = [] test-groups = [] +test-environment = {} container-engine = "docker" diff --git a/docs/options.md b/docs/options.md index d24db227b..1f4d4d120 100644 --- a/docs/options.md +++ b/docs/options.md @@ -1539,6 +1539,42 @@ This option is not supported in the overrides section in `pyproject.toml`. test-skip = "*-macosx_arm64 *-macosx_universal2:arm64" ``` +### `CIBW_TEST_ENVIRONMENT` {: #test-environment} + +> Set environment variables for the test environment + +A space-separated list of environment variables to set in the test environment. + +The syntax is the same as for [`CIBW_ENVIRONMENT`](#environment). + +cibuildwheel sets the variable [`PYTHONSAFEPATH`](https://docs.python.org/3/using/cmdline.html#envvar-PYTHONSAFEPATH) to avoid picking up in-tree dependencies when running the tests - we want to test the installed wheel, not the in-tree version. However, this can be overridden by setting `PYTHONSAFEPATH` to an empty string. + +Platform-specific environment variables are also available:
+`CIBW_TEST_ENVIRONMENT_MACOS` | `CIBW_TEST_ENVIRONMENT_WINDOWS` | `CIBW_TEST_ENVIRONMENT_LINUX` | `CIBW_TEST_ENVIRONMENT_IOS` | `CIBW_TEST_ENVIRONMENT_PYODIDE` + +#### Examples + +!!! tab examples "Environment variables" + + ```yaml + # Set the environment variable MY_ENV_VAR to "my_value" in the test environment + CIBW_TEST_ENVIRONMENT: MY_ENV_VAR=my_value + + # Unset PYTHONSAFEPATH in the test environment + CIBW_TEST_ENVIRONMENT: PYTHONSAFEPATH= + ``` + +!!! tab examples "pyproject.toml" + + ```toml + [tool.cibuildwheel] + # Set the environment variable MY_ENV_VAR to "my_value" in the test environment + test-environment = { MY_ENV_VAR="my_value" } + + # Unset PYTHONSAFEPATH in the test environment + test-environment = { PYTHONSAFEPATH="" } + ``` + ## Debugging ### `CIBW_DEBUG_KEEP_CONTAINER` diff --git a/test/test_testing.py b/test/test_testing.py index 9b7364f99..5caa35e42 100644 --- a/test/test_testing.py +++ b/test/test_testing.py @@ -66,6 +66,12 @@ def test_uname(self): bits = struct.calcsize("P") * 8 if bits == 32: self.assertIn(platform.machine(), ["i686", "armv7l","armv8l", "wasm32"]) + + def test_pythonsafepath(self): + # check that the PYTHONSAFEPATH environment variable is set + value = os.environ.get("PYTHONSAFEPATH") + self.assertIsNotNone(value) + self.assertNotEqual(value, "") ''' @@ -229,3 +235,19 @@ def test_test_sources(tmp_path): # also check that we got the right wheels expected_wheels = utils.expected_wheels("spam", "0.1.0") assert set(actual_wheels) == set(expected_wheels) + + +def test_test_environment(tmp_path): + project_dir = tmp_path / "project" + test_projects.new_c_project().generate(project_dir) + + actual_wheels = utils.cibuildwheel_run( + project_dir, + add_env={ + "CIBW_TEST_ENVIRONMENT": "MYVAR=somevalue PYTHONSAFEPATH=", + "CIBW_TEST_COMMAND": "python -c \"import os; assert os.environ.get('MYVAR') == 'somevalue'; assert os.environ.get('PYTHONSAFEPATH') == ''\"", + }, + ) + # also check that we got the right wheels + expected_wheels = utils.expected_wheels("spam", "0.1.0") + assert set(actual_wheels) == set(expected_wheels) From c3c260dff7f0543dd9ba6666cf85264b999bc017 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 20 May 2025 13:43:19 +0100 Subject: [PATCH 1044/1105] [pre-commit.ci] pre-commit autoupdate (#2403) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.9 → v0.11.10](https://github.com/astral-sh/ruff-pre-commit/compare/v0.11.9...v0.11.10) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7d2c65182..2705e71a6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.9 + rev: v0.11.10 hooks: - id: ruff args: ["--fix", "--show-fixes"] From 163864158d0ee5319d281a1ddfafd43a13e987cd Mon Sep 17 00:00:00 2001 From: Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com> Date: Wed, 21 May 2025 02:29:58 +0530 Subject: [PATCH 1045/1105] feat: Pyodide improvements: version setting, standalone environments (#2002) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix a typo: pyoodide ➡️ pyodide * Add `pyodide_build_version` attribute * Add version to xbuildenv log step * Add version to Emscripten log step * Use `pyodide-build`'s version for updating constraints * Bump Pyodide constraints by updating `pyodide-build` * Add a schema for `pyodide-version` * Update Pyodide constraints * Bump `pyodide-build` to new 0.29.0 * Test out another Pyodide identifier * Update outdated Pyodide constraints * Add Pyodide version to temp directory name * Remove Pyodide 0.26.1 from build configurations * Retrieve + validate + install specific xbuildenvs * Test wheel builds with Pyodide 0.26.2 * Add correct Pyodide version to identifier temp dir * Don't pre-call Pyodide xbuildenv search * Fetch just the stable Pyodide versions * Refactor search + validation + install into one step * Move all of it under a lock * Reorder xbuildenv installation * Add env and cwd to xbuildenv search call * Temporarily lower to 0.26.2 target * Separate out search, validate, install; again * Run xbuildenv search in `CIBW_CACHE_PATH` * Remove prior `PYODIDE_ROOT` env vars, copy envs * Validate doesn't need to depend on searching * Add file lock when searching xbuildenvs * Test the original version: 0.26.1 * Update Pyodide constraints * Update constraints for `pyodide-build` 0.29.0 again * Bump Pyodide from version 0.26.1 ➡️ version 0.26.4 * Add note on compatibility for macOS + other archs * Note Pyodide version for Pyodide identifier * Docs about `CIBW_PYODIDE_VERSION` * Don't fetch just the stable versions * Discard a variable that's not used later * Rename `search_xbuildenv` ➡️ `get_xbuildenv_versions` * `validate_xbuildenv` ➡️ `validate_xbuildenv_version` * Replace ordered comment, add newline * Replace sentence on macOS support Co-Authored-By: Hood Chatham * Capitalise: "pyodide" ➡️ "Pyodide" Co-Authored-By: Hood Chatham * "work" ➡️ "may succeed" Co-Authored-By: Hood Chatham * Add another job to test a custom Pyodide version * Handle "v"-prefixed + non-prefixed versions * Convert to a proper toml-able option, and remove some hardcoded versions This removes the enscripten and pyodide-build version specs from pyproject.toml - pyodide-build is spec'd in the constraints file, and the emscripten version can be read from the pyodide-build output. * Add a schema entry * Add docs for CIBW_PYODIDE_VERSION * Rephrase * Add tests for pyodide-version * Apply suggestions from code review * Add python_build_standalone util * Hook up to python-build-standalone, removing dependency on host python * Remove python hard-code in action.yml * Add log step * Add workaround for https://github.com/pyodide/pyodide-build/issues/143 * Add emscripten pytest test * Remove unneeded checks * Fix a pytest invoke for emscripten * Generate pyodide-build constraints from the pinned pyodide version * Remove pyodide python-build-standalone workaround * Fixup paths from newer version of pyodide-build * Fix/skip some failing tests * Use `python -m pytest` on pyodide, even on Linux * Docs fixes * Don't call the github API at runtime, cache the release assets instead * Ignore pylint false positive * Add version auto-updating for pyodide * Add support for pyodide 3.13. * Fix tests for multiple pyodide wheels * Remove workaround for unreleased pyodide-build * Rename to "test_pyodide" * Fix pathname confusion * Remove extra github actions job * Fix expectation for test_abi_none * Fix the custom_repair_wheel test to actually have clashing names * Fix pinned version test * Document test-command limitation * Remove pyodide 0.28.0a1 for now * Update constraints files * Docs/test fixes post removing pyodide cp313 * Fix ABI test expectation * Docs improvements * Improve some comments * Remove logic duplication * remove pyodide special casing * Refactor constraints code to use a utility script, circumventing import issues * chore: nicer nox env Signed-off-by: Henry Schreiner * fix: typo in variable name found by copilot Signed-off-by: Henry Schreiner * Apply suggestions from code review * Some more Pyodide version updates in the docs section * We haven't released Pyodide v0.27.6 yet * Back to the Github URL for cross-build-environments * `pyodide-build`, not `emsdk` for Windows skips Co-Authored-By: Hood Chatham * Move to a separate `_json_request` function Co-Authored-By: Hood Chatham * Rename "retries" ➡️ "retry_count" * Add some type hints * Copy env vars before `UV_CUSTOM_COMPILE_COMMAND` * Use `HTTPError.headers.get` instead * Remove extra end quote * Change download tests URL to `https://badssl.com/` Co-Authored-By: Joe Rickerby <1244307+joerick@users.noreply.github.com> * Download size changes, too * Use jsdelivr for Github asset mirroring * Bump to Pyodide v0.27.6 * Fix unit tests * Move to pyodide v0.27.6 again * Bump to pyodide-build 0.30.4 * Use new URL for cross-build environments metadata Co-authored-by: Joe Rickerby * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: Henry Schreiner Co-authored-by: Hood Chatham Co-authored-by: Joe Rickerby Co-authored-by: Henry Schreiner Co-authored-by: Joe Rickerby <1244307+joerick@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 15 +- action.yml | 3 +- bin/generate_pyodide_constraints.py | 69 +++ bin/generate_schema.py | 3 + bin/update_python_build_standalone.py | 59 +++ bin/update_pythons.py | 53 ++- cibuildwheel/extra.py | 71 ++- cibuildwheel/options.py | 4 + cibuildwheel/platforms/pyodide.py | 184 ++++++-- cibuildwheel/resources/build-platforms.toml | 2 +- .../resources/cibuildwheel.schema.json | 23 + .../resources/constraints-pyodide312.txt | 12 +- cibuildwheel/resources/defaults.toml | 2 + .../python-build-standalone-releases.json | 425 ++++++++++++++++++ cibuildwheel/util/packaging.py | 3 + cibuildwheel/util/python_build_standalone.py | 181 ++++++++ cibuildwheel/util/resources.py | 1 + docs/options.md | 73 ++- docs/platforms.md | 20 +- noxfile.py | 30 +- test/test_abi_variants.py | 19 +- test/test_custom_repair_wheel.py | 12 +- test/test_dependency_versions.py | 5 +- test/test_environment.py | 7 +- test/test_pep518.py | 13 +- test/{test_emscripten.py => test_pyodide.py} | 73 ++- test/test_testing.py | 2 +- test/utils.py | 12 +- unit_test/options_test.py | 5 + unit_test/utils_test.py | 32 ++ 30 files changed, 1298 insertions(+), 115 deletions(-) create mode 100755 bin/generate_pyodide_constraints.py create mode 100755 bin/update_python_build_standalone.py create mode 100644 cibuildwheel/resources/python-build-standalone-releases.json create mode 100644 cibuildwheel/util/python_build_standalone.py rename test/{test_emscripten.py => test_pyodide.py} (52%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 92d2d659b..684c76cf4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -195,7 +195,7 @@ jobs: run: uv run --no-sync pytest --run-emulation ${{ matrix.arch }} test/test_emulation.py test-pyodide: - name: Test cibuildwheel building Pyodide wheels + name: Test pyodide needs: lint runs-on: ubuntu-24.04 timeout-minutes: 180 @@ -222,6 +222,19 @@ jobs: env: CIBW_PLATFORM: pyodide + - name: Run a sample build (GitHub Action) for an overridden Pyodide version + uses: ./ + with: + package-dir: sample_proj + output-dir: wheelhouse + # In case this breaks at any point in time, switch to using the latest version + # available or any other version that is not the same as the default one set + # in cibuildwheel/resources/build-platforms.toml. + env: + CIBW_PLATFORM: pyodide + CIBW_BUILD: "cp312*" + CIBW_PYODIDE_VERSION: "0.27.6" + - name: Run tests with 'CIBW_PLATFORM' set to 'pyodide' run: | uv run --no-sync ./bin/run_tests.py diff --git a/action.yml b/action.yml index 4f8ff6796..3e19ab982 100644 --- a/action.yml +++ b/action.yml @@ -24,11 +24,10 @@ branding: runs: using: composite steps: - # Set up the version of Python that supports pyodide - uses: actions/setup-python@v5 id: python with: - python-version: "3.12" + python-version: "3.11 - 3.13" update-environment: false - id: cibw diff --git a/bin/generate_pyodide_constraints.py b/bin/generate_pyodide_constraints.py new file mode 100755 index 000000000..e378dd8ee --- /dev/null +++ b/bin/generate_pyodide_constraints.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python3 + +import sys +import textwrap +from pathlib import Path + +import click + +from cibuildwheel.extra import get_pyodide_xbuildenv_info + + +@click.command() +@click.argument( + "pyodide-version", + type=str, +) +@click.option( + "--output-file", + type=click.Path(), + default=None, + help="Output file to write the constraints to. If not provided, the constraints will be printed to stdout.", +) +def generate_pyodide_constraints(pyodide_version: str, output_file: str | None = None) -> None: + """ + Generate constraints for a specific Pyodide version. The constraints are + generated based on the Pyodide version's xbuildenv info, which is retrieved + from the Pyodide repository. + + These constraints should then be 'pinned' using `uv pip compile`. + + Example usage: + + bin/generate_pyodide_constraints.py 0.27.0 + """ + xbuildenv_info = get_pyodide_xbuildenv_info() + try: + pyodide_version_xbuildenv_info = xbuildenv_info["releases"][pyodide_version] + except KeyError as e: + msg = f"Pyodide version {pyodide_version} not found in xbuildenv info. Versions available: {', '.join(xbuildenv_info['releases'].keys())}" + raise click.BadParameter(msg) from e + + pyodide_build_min_version = pyodide_version_xbuildenv_info.get("min_pyodide_build_version") + pyodide_build_max_version = pyodide_version_xbuildenv_info.get("max_pyodide_build_version") + + pyodide_build_specifier_parts: list[str] = [] + + if pyodide_build_min_version: + pyodide_build_specifier_parts.append(f">={pyodide_build_min_version}") + if pyodide_build_max_version: + pyodide_build_specifier_parts.append(f"<={pyodide_build_max_version}") + + pyodide_build_specifier = ",".join(pyodide_build_specifier_parts) + + constraints_txt = textwrap.dedent(f""" + pip + build[virtualenv] + pyodide-build{pyodide_build_specifier} + click<8.2 + """) + + if output_file is None: + print(constraints_txt) + else: + Path(output_file).write_text(constraints_txt) + print(f"Constraints written to {output_file}", file=sys.stderr) + + +if __name__ == "__main__": + generate_pyodide_constraints() diff --git a/bin/generate_schema.py b/bin/generate_schema.py index 116a0aeb9..2c51597fd 100755 --- a/bin/generate_schema.py +++ b/bin/generate_schema.py @@ -197,6 +197,9 @@ xbuild-tools: description: Binaries on the path that should be included in an isolated cross-build environment type: string_array + pyodide-version: + type: string + description: Specify the version of Pyodide to use repair-wheel-command: description: Execute a shell command to repair each built wheel. type: string_array diff --git a/bin/update_python_build_standalone.py b/bin/update_python_build_standalone.py new file mode 100755 index 000000000..516920144 --- /dev/null +++ b/bin/update_python_build_standalone.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python3 + +import json + +from cibuildwheel.extra import github_api_request +from cibuildwheel.util.python_build_standalone import ( + PythonBuildStandaloneAsset, + PythonBuildStandaloneReleaseData, +) +from cibuildwheel.util.resources import PYTHON_BUILD_STANDALONE_RELEASES + + +def main() -> None: + """ + This script updates the vendored list of release assets to the latest + version of astral-sh/python-build-standalone. + """ + + # Get the latest release tag from the GitHub API + latest_release = github_api_request("repos/astral-sh/python-build-standalone/releases/latest") + latest_tag = latest_release["tag_name"] + + # Get the list of assets for the latest release + github_assets = github_api_request( + f"repos/astral-sh/python-build-standalone/releases/tags/{latest_tag}" + )["assets"] + + assets: list[PythonBuildStandaloneAsset] = [] + + for github_asset in github_assets: + name = github_asset["name"] + if not name.endswith("install_only.tar.gz"): + continue + url = github_asset["browser_download_url"] + assets.append({"name": name, "url": url}) + + # Write the assets to the JSON file. One day, we might need to support + # multiple releases, but for now, we only support the latest one + json_file_contents: PythonBuildStandaloneReleaseData = { + "releases": [ + { + "tag": latest_tag, + "assets": assets, + } + ] + } + + with PYTHON_BUILD_STANDALONE_RELEASES.open("w", encoding="utf-8") as f: + json.dump(json_file_contents, f, indent=2) + # Add a trailing newline, our pre-commit hook requires it + f.write("\n") + + print( + f"Updated {PYTHON_BUILD_STANDALONE_RELEASES.name} with {len(assets)} assets for tag {latest_tag}" + ) + + +if __name__ == "__main__": + main() diff --git a/bin/update_pythons.py b/bin/update_pythons.py index 75de60a64..60b99f2aa 100755 --- a/bin/update_pythons.py +++ b/bin/update_pythons.py @@ -19,7 +19,7 @@ from rich.logging import RichHandler from rich.syntax import Syntax -from cibuildwheel.extra import dump_python_configurations +from cibuildwheel.extra import dump_python_configurations, get_pyodide_xbuildenv_info log = logging.getLogger("cibw") @@ -57,7 +57,14 @@ class ConfigApple(TypedDict): url: str -AnyConfig = ConfigWinCP | ConfigWinPP | ConfigWinGP | ConfigApple +class ConfigPyodide(TypedDict): + identifier: str + version: str + default_pyodide_version: str + node_version: str + + +AnyConfig = ConfigWinCP | ConfigWinPP | ConfigWinGP | ConfigApple | ConfigPyodide # The following set of "Versions" classes allow the initial call to the APIs to @@ -347,6 +354,39 @@ def update_version_ios(self, identifier: str, version: Version) -> ConfigApple | return None +class PyodideVersions: + def __init__(self) -> None: + xbuildenv_info = get_pyodide_xbuildenv_info() + self.releases = xbuildenv_info["releases"] + + def update_version_pyodide( + self, identifier: str, version: Version, spec: Specifier, node_version: str + ) -> ConfigPyodide | None: + # get releases that match the python version + releases = [ + r for r in self.releases.values() if spec.contains(Version(r["python_version"])) + ] + # sort by version, latest first + releases.sort(key=lambda r: Version(r["version"]), reverse=True) + + if not releases: + msg = f"Pyodide not found for {spec}!" + raise ValueError(msg) + + final_releases = [r for r in releases if not Version(r["version"]).is_prerelease] + + # prefer a final release if available, otherwise use the latest + # pre-release + release = final_releases[0] if final_releases else releases[0] + + return ConfigPyodide( + identifier=identifier, + version=str(version), + default_pyodide_version=release["version"], + node_version=node_version, + ) + + # This is a universal interface to all the above Versions classes. Given an # identifier, it updates a config dict. @@ -369,6 +409,8 @@ def __init__(self) -> None: self.graalpy = GraalPyVersions() + self.pyodide = PyodideVersions() + def update_config(self, config: MutableMapping[str, str]) -> None: identifier = config["identifier"] version = Version(config["version"]) @@ -407,6 +449,10 @@ def update_config(self, config: MutableMapping[str, str]) -> None: config_update = self.windows_arm64.update_version_windows(spec) elif "ios" in identifier: config_update = self.ios_cpython.update_version_ios(identifier, version) + elif "pyodide" in identifier: + config_update = self.pyodide.update_version_pyodide( + identifier, version, spec, config["node_version"] + ) assert config_update is not None, f"{identifier} not found!" config.update(**config_update) @@ -445,6 +491,9 @@ def update_pythons(force: bool, level: str) -> None: for config in configs["ios"]["python_configurations"]: all_versions.update_config(config) + for config in configs["pyodide"]["python_configurations"]: + all_versions.update_config(config) + result_toml = dump_python_configurations(configs) rich.print() # spacer diff --git a/cibuildwheel/extra.py b/cibuildwheel/extra.py index 774447c33..e13df6e0b 100644 --- a/cibuildwheel/extra.py +++ b/cibuildwheel/extra.py @@ -2,9 +2,16 @@ These are utilities for the `/bin` scripts, not for the `cibuildwheel` program. """ +import json +import time +import typing +import urllib.error +import urllib.request from collections.abc import Mapping, Sequence from io import StringIO -from typing import Protocol +from typing import Any, NotRequired, Protocol + +from cibuildwheel import __version__ as cibw_version __all__ = ("Printable", "dump_python_configurations") @@ -30,3 +37,65 @@ def dump_python_configurations( output.write("\n") # Strip the final newline, to avoid two blank lines at the end. return output.getvalue()[:-1] + + +def _json_request(request: urllib.request.Request, timeout: int = 30) -> dict[str, Any]: + with urllib.request.urlopen(request, timeout=timeout) as response: + return typing.cast(dict[str, Any], json.load(response)) + + +def github_api_request(path: str, *, max_retries: int = 3) -> dict[str, Any]: + """ + Makes a GitHub API request to the given path and returns the JSON response. + """ + api_url = f"https://api.github.com/%7Bpath%7D" + headers = { + "Accept": "application/vnd.github.v3+json", + "User-Agent": f"cibuildwheel/{cibw_version}", + } + request = urllib.request.Request(api_url, headers=headers) + + for retry_count in range(max_retries): + try: + return _json_request(request) + except (urllib.error.URLError, TimeoutError) as e: + # pylint: disable=E1101 + if ( + isinstance(e, urllib.error.HTTPError) + and (e.code == 403 or e.code == 429) + and e.headers.get("x-ratelimit-remaining") == "0" + ): + reset_time = int(e.headers.get("x-ratelimit-reset", 0)) + wait_time = max(0, reset_time - int(e.headers.get("date", 0))) + print(f"Github rate limit exceeded. Waiting for {wait_time} seconds.") + time.sleep(wait_time) + else: + print(f"Retrying GitHub API request due to error: {e}") + + if retry_count == max_retries - 1: + print(f"GitHub API request failed (Network error: {e}). Check network connection.") + raise e + + # Should never be reached but to keep the type checker happy + msg = "Unexpected execution path in github_api_request" + raise RuntimeError(msg) + + +class PyodideXBuildEnvRelease(typing.TypedDict): + version: str + python_version: str + emscripten_version: str + min_pyodide_build_version: NotRequired[str] + max_pyodide_build_version: NotRequired[str] + + +class PyodideXBuildEnvInfo(typing.TypedDict): + releases: dict[str, PyodideXBuildEnvRelease] + + +def get_pyodide_xbuildenv_info() -> PyodideXBuildEnvInfo: + xbuildenv_info_url = ( + "https://pyodide.github.io/pyodide/api/pyodide-cross-build-environments.json" + ) + with urllib.request.urlopen(xbuildenv_info_url) as response: + return typing.cast(PyodideXBuildEnvInfo, json.loads(response.read().decode("utf-8"))) diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index 94ffcefcb..5a9c96c25 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -112,6 +112,7 @@ class BuildOptions: build_frontend: BuildFrontendConfig | None config_settings: str container_engine: OCIContainerEngineConfig + pyodide_version: str | None @property def package_dir(self) -> Path: @@ -850,6 +851,8 @@ def _compute_build_options(self, identifier: str | None) -> BuildOptions: msg = f"Failed to parse container config. {e}" raise errors.ConfigurationError(msg) from e + pyodide_version = self.reader.get("pyodide-version", env_plat=False) + return BuildOptions( globals=self.globals, test_command=test_command, @@ -871,6 +874,7 @@ def _compute_build_options(self, identifier: str | None) -> BuildOptions: build_frontend=build_frontend, config_settings=config_settings, container_engine=container_engine, + pyodide_version=pyodide_version or None, ) def check_for_invalid_configuration(self, identifiers: Iterable[str]) -> None: diff --git a/cibuildwheel/platforms/pyodide.py b/cibuildwheel/platforms/pyodide.py index 77e3b9a81..dc6b5c6a4 100644 --- a/cibuildwheel/platforms/pyodide.py +++ b/cibuildwheel/platforms/pyodide.py @@ -1,13 +1,15 @@ import functools +import json import os import shutil import sys import tomllib +import typing from collections.abc import Set from dataclasses import dataclass from pathlib import Path from tempfile import TemporaryDirectory -from typing import Final +from typing import Final, TypedDict from filelock import FileLock @@ -28,8 +30,12 @@ extract_zip, move_file, ) -from ..util.helpers import prepare_command +from ..util.helpers import prepare_command, unwrap, unwrap_preserving_paragraphs from ..util.packaging import combine_constraints, find_compatible_wheel, get_pip_version +from ..util.python_build_standalone import ( + PythonBuildStandaloneError, + create_python_build_standalone_environment, +) from ..venv import constraint_flags, virtualenv IS_WIN: Final[bool] = sys.platform.startswith("win") @@ -39,12 +45,23 @@ class PythonConfiguration: version: str identifier: str - pyodide_version: str - pyodide_build_version: str - emscripten_version: str + default_pyodide_version: str node_version: str +class PyodideXBuildEnvInfoVersionRange(TypedDict): + min: str | None + max: str | None + + +class PyodideXBuildEnvInfo(TypedDict): + version: str + python: str + emscripten: str + pyodide_build: PyodideXBuildEnvInfoVersionRange + compatible: bool + + @functools.cache def ensure_node(major_version: str) -> Path: with resources.NODEJS.open("rb") as f: @@ -77,8 +94,6 @@ def ensure_node(major_version: str) -> Path: def install_emscripten(tmp: Path, version: str) -> Path: - # We don't need to match the emsdk version to the version we install, but - # we do for stability url = f"https://github.com/emscripten-core/emsdk/archive/refs/tags/%7Bversion%7D.zip" installation_path = CIBW_CACHE_PATH / f"emsdk-{version}" emsdk_path = installation_path / f"emsdk-{version}/emsdk" @@ -96,16 +111,82 @@ def install_emscripten(tmp: Path, version: str) -> Path: return emcc_path +def get_all_xbuildenv_version_info(env: dict[str, str]) -> list[PyodideXBuildEnvInfo]: + xbuildenvs_info_str = call( + "pyodide", + "xbuildenv", + "search", + "--json", + "--all", + env=env, + cwd=CIBW_CACHE_PATH, + capture_stdout=True, + ).strip() + + xbuildenvs_info = json.loads(xbuildenvs_info_str) + + if "environments" not in xbuildenvs_info: + msg = f"Invalid xbuildenvs info, got {xbuildenvs_info}" + raise ValueError(msg) + + return typing.cast(list[PyodideXBuildEnvInfo], xbuildenvs_info["environments"]) + + +def get_xbuildenv_version_info( + env: dict[str, str], version: str, pyodide_build_version: str +) -> PyodideXBuildEnvInfo: + xbuildenvs_info = get_all_xbuildenv_version_info(env) + for xbuildenv_info in xbuildenvs_info: + if xbuildenv_info["version"] == version: + return xbuildenv_info + + msg = unwrap(f""" + Could not find Pyodide cross-build environment version {version} in the available + versions as reported by pyodide-build v{pyodide_build_version}. + Available pyodide xbuildenv versions are: + {", ".join(e["version"] for e in xbuildenvs_info if e["compatible"])} + """) + raise errors.FatalError(msg) + + +# The default pyodide xbuildenv version that's specified in +# build-platforms.toml is compatible with the pyodide-build version that's +# pinned in the bundled constraints file. But if the user changes +# pyodide-version and/or dependency-constraints in the cibuildwheel config, we +# need to check if the xbuildenv version is compatible with the pyodide-build +# version. +def validate_pyodide_build_version( + xbuildenv_info: PyodideXBuildEnvInfo, pyodide_build_version: str +) -> None: + """ + Validate the Pyodide version is compatible with the installed + pyodide-build version. + """ + + pyodide_version = xbuildenv_info["version"] + + if not xbuildenv_info["compatible"]: + msg = unwrap_preserving_paragraphs(f""" + The Pyodide xbuildenv version {pyodide_version} is not compatible + with the pyodide-build version {pyodide_build_version}. Please use + the 'pyodide xbuildenv search --all' command to find a compatible + version. + + Set the pyodide-build version using the `dependency-constraints` + option, or set the Pyodide xbuildenv version using the + `pyodide-version` option. + """) + raise errors.FatalError(msg) + + def install_xbuildenv(env: dict[str, str], pyodide_build_version: str, pyodide_version: str) -> str: """Install a particular Pyodide xbuildenv version and set a path to the Pyodide root.""" - # Since pyodide-build was unvendored from Pyodide v0.27.0, the versions of pyodide-build are - # not guaranteed to match the versions of Pyodide or be in sync with them. Hence, we shall - # specify the pyodide-build version in the root path, which will set up the xbuildenv for - # the requested Pyodide version. - pyodide_root = ( - CIBW_CACHE_PATH - / f".pyodide-xbuildenv-{pyodide_build_version}/{pyodide_version}/xbuildenv/pyodide-root" - ) + # Since pyodide-build was unvendored from Pyodide v0.27.0, the versions of + # pyodide-build are uncoupled from the versions of Pyodide. So, we specify + # both the pyodide-build version and the Pyodide version in the temp path. + xbuildenv_cache_path = CIBW_CACHE_PATH / f"pyodide-build-{pyodide_build_version}" + pyodide_root = xbuildenv_cache_path / pyodide_version / "xbuildenv" / "pyodide-root" + with FileLock(CIBW_CACHE_PATH / "xbuildenv.lock"): if pyodide_root.exists(): return str(pyodide_root) @@ -114,31 +195,36 @@ def install_xbuildenv(env: dict[str, str], pyodide_build_version: str, pyodide_v # PYODIDE_ROOT so copy it first. env = dict(env) env.pop("PYODIDE_ROOT", None) + + # Install the xbuildenv call( "pyodide", "xbuildenv", "install", + "--path", + str(xbuildenv_cache_path), pyodide_version, env=env, cwd=CIBW_CACHE_PATH, ) - return str(pyodide_root) + assert pyodide_root.exists() + return str(pyodide_root) -def get_base_python(identifier: str) -> Path: - implementation_id = identifier.split("-")[0] - majorminor = implementation_id[len("cp") :] - version_info = (int(majorminor[0]), int(majorminor[1:])) - if version_info == sys.version_info[:2]: - return Path(sys.executable) - major_minor = ".".join(str(v) for v in version_info) - python_name = f"python{major_minor}" - which_python = shutil.which(python_name) - if which_python is None: - msg = f"CPython {major_minor} is not installed." - raise errors.FatalError(msg) - return Path(which_python) +def get_base_python(tmp: Path, python_configuration: PythonConfiguration) -> Path: + try: + return create_python_build_standalone_environment( + python_version=python_configuration.version, + temp_dir=tmp, + cache_dir=CIBW_CACHE_PATH, + ) + except PythonBuildStandaloneError as e: + msg = unwrap(f""" + Failed to create a Python build environment: + {e} + """) + raise errors.FatalError(msg) from e def setup_python( @@ -146,10 +232,13 @@ def setup_python( python_configuration: PythonConfiguration, constraints_path: Path | None, environment: ParsedEnvironment, + user_pyodide_version: str | None, ) -> dict[str, str]: - base_python = get_base_python(python_configuration.identifier) + log.step("Installing a base python environment...") + base_python = get_base_python(tmp / "base", python_configuration) log.step("Setting up build environment...") + pyodide_version = user_pyodide_version or python_configuration.default_pyodide_version venv_path = tmp / "venv" env = virtualenv(python_configuration.version, base_python, venv_path, None, use_uv=False) venv_bin_path = venv_path / "bin" @@ -201,15 +290,28 @@ def setup_python( env=env, ) - log.step(f"Installing Emscripten version: {python_configuration.emscripten_version} ...") - emcc_path = install_emscripten(tmp, python_configuration.emscripten_version) + pyodide_build_version = call( + "python", + "-c", + "from importlib.metadata import version; print(version('pyodide-build'))", + env=env, + capture_stdout=True, + ).strip() + + xbuildenv_info = get_xbuildenv_version_info(env, pyodide_version, pyodide_build_version) + validate_pyodide_build_version( + xbuildenv_info=xbuildenv_info, + pyodide_build_version=pyodide_build_version, + ) + + emscripten_version = xbuildenv_info["emscripten"] + log.step(f"Installing Emscripten version: {emscripten_version} ...") + emcc_path = install_emscripten(tmp, emscripten_version) env["PATH"] = os.pathsep.join([str(emcc_path.parent), env["PATH"]]) - log.step(f"Installing Pyodide xbuildenv version: {python_configuration.pyodide_version} ...") - env["PYODIDE_ROOT"] = install_xbuildenv( - env, python_configuration.pyodide_build_version, python_configuration.pyodide_version - ) + log.step(f"Installing Pyodide xbuildenv version: {pyodide_version} ...") + env["PYODIDE_ROOT"] = install_xbuildenv(env, pyodide_build_version, pyodide_version) return env @@ -259,6 +361,7 @@ def build(options: Options, tmp_path: Path) -> None: log.build_start(config.identifier) identifier_tmp_dir = tmp_path / config.identifier + built_wheel_dir = identifier_tmp_dir / "built_wheel" repaired_wheel_dir = identifier_tmp_dir / "repaired_wheel" identifier_tmp_dir.mkdir() @@ -270,10 +373,11 @@ def build(options: Options, tmp_path: Path) -> None: ) env = setup_python( - identifier_tmp_dir / "build", - config, - constraints_path, - build_options.environment, + tmp=identifier_tmp_dir / "build", + python_configuration=config, + constraints_path=constraints_path, + environment=build_options.environment, + user_pyodide_version=build_options.pyodide_version, ) pip_version = get_pip_version(env) # The Pyodide command line runner mounts all directories in the host diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index 973154586..2875f9f24 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -220,7 +220,7 @@ python_configurations = [ [pyodide] python_configurations = [ - { 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" }, + { identifier = "cp312-pyodide_wasm32", version = "3.12", default_pyodide_version = "0.27.6", node_version = "v22" }, ] [ios] diff --git a/cibuildwheel/resources/cibuildwheel.schema.json b/cibuildwheel/resources/cibuildwheel.schema.json index 6a71543bf..a66b0aa77 100644 --- a/cibuildwheel/resources/cibuildwheel.schema.json +++ b/cibuildwheel/resources/cibuildwheel.schema.json @@ -424,6 +424,11 @@ ], "title": "CIBW_XBUILD_TOOLS" }, + "pyodide-version": { + "type": "string", + "description": "Specify the version of Pyodide to use", + "title": "CIBW_PYODIDE_VERSION" + }, "repair-wheel-command": { "description": "Execute a shell command to repair each built wheel.", "oneOf": [ @@ -718,6 +723,9 @@ "xbuild-tools": { "$ref": "#/properties/xbuild-tools" }, + "pyodide-version": { + "$ref": "#/properties/pyodide-version" + }, "repair-wheel-command": { "$ref": "#/properties/repair-wheel-command" }, @@ -830,6 +838,9 @@ "xbuild-tools": { "$ref": "#/properties/xbuild-tools" }, + "pyodide-version": { + "$ref": "#/properties/pyodide-version" + }, "repair-wheel-command": { "description": "Execute a shell command to repair each built wheel.", "oneOf": [ @@ -900,6 +911,9 @@ "xbuild-tools": { "$ref": "#/properties/xbuild-tools" }, + "pyodide-version": { + "$ref": "#/properties/pyodide-version" + }, "repair-wheel-command": { "$ref": "#/properties/repair-wheel-command" }, @@ -957,6 +971,9 @@ "xbuild-tools": { "$ref": "#/properties/xbuild-tools" }, + "pyodide-version": { + "$ref": "#/properties/pyodide-version" + }, "repair-wheel-command": { "description": "Execute a shell command to repair each built wheel.", "oneOf": [ @@ -1027,6 +1044,9 @@ "xbuild-tools": { "$ref": "#/properties/xbuild-tools" }, + "pyodide-version": { + "$ref": "#/properties/pyodide-version" + }, "repair-wheel-command": { "$ref": "#/properties/repair-wheel-command" }, @@ -1084,6 +1104,9 @@ "xbuild-tools": { "$ref": "#/properties/xbuild-tools" }, + "pyodide-version": { + "$ref": "#/properties/pyodide-version" + }, "repair-wheel-command": { "$ref": "#/properties/repair-wheel-command" }, diff --git a/cibuildwheel/resources/constraints-pyodide312.txt b/cibuildwheel/resources/constraints-pyodide312.txt index 702ea12d2..e9116769d 100644 --- a/cibuildwheel/resources/constraints-pyodide312.txt +++ b/cibuildwheel/resources/constraints-pyodide312.txt @@ -4,7 +4,7 @@ annotated-types==0.7.0 # via pydantic anyio==4.9.0 # via httpx -auditwheel-emscripten==0.0.16 +auditwheel-emscripten==0.1.0 # via pyodide-build build==1.2.2.post1 # via @@ -21,8 +21,6 @@ click==8.1.8 # via # -r .nox/update_constraints/tmp/constraints-pyodide.in # typer -cmake==4.0.2 - # via pyodide-build distlib==0.3.9 # via virtualenv filelock==3.18.0 @@ -53,7 +51,9 @@ packaging==25.0 pip==25.1.1 # via -r .nox/update_constraints/tmp/constraints-pyodide.in platformdirs==4.3.8 - # via virtualenv + # via + # pyodide-build + # virtualenv pydantic==2.11.4 # via # pyodide-build @@ -62,9 +62,9 @@ pydantic-core==2.33.2 # via pydantic pygments==2.19.1 # via rich -pyodide-build==0.29.2 +pyodide-build==0.30.4 # via -r .nox/update_constraints/tmp/constraints-pyodide.in -pyodide-cli==0.2.4 +pyodide-cli==0.3.0 # via # auditwheel-emscripten # pyodide-build diff --git a/cibuildwheel/resources/defaults.toml b/cibuildwheel/resources/defaults.toml index f0010806e..396c1d3cc 100644 --- a/cibuildwheel/resources/defaults.toml +++ b/cibuildwheel/resources/defaults.toml @@ -28,6 +28,8 @@ test-environment = {} container-engine = "docker" +pyodide-version = "" + manylinux-x86_64-image = "manylinux_2_28" manylinux-i686-image = "manylinux2014" manylinux-aarch64-image = "manylinux_2_28" diff --git a/cibuildwheel/resources/python-build-standalone-releases.json b/cibuildwheel/resources/python-build-standalone-releases.json new file mode 100644 index 000000000..407b0318c --- /dev/null +++ b/cibuildwheel/resources/python-build-standalone-releases.json @@ -0,0 +1,425 @@ +{ + "releases": [ + { + "tag": "20250409", + "assets": [ + { + "name": "cpython-3.10.17+20250409-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-aarch64-apple-darwin-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-aarch64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-i686-pc-windows-msvc-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-riscv64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-s390x-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64-apple-darwin-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64-pc-windows-msvc-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.10.17+20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-aarch64-apple-darwin-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-aarch64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-i686-pc-windows-msvc-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-riscv64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-s390x-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64-apple-darwin-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64-pc-windows-msvc-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.11.12+20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-aarch64-apple-darwin-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-aarch64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-i686-pc-windows-msvc-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-riscv64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-s390x-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64-apple-darwin-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64-pc-windows-msvc-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-aarch64-apple-darwin-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-aarch64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-i686-pc-windows-msvc-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-riscv64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-s390x-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64-apple-darwin-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64-pc-windows-msvc-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.13.3+20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.14.0a6+20250409-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-aarch64-apple-darwin-install_only.tar.gz" + }, + { + "name": "cpython-3.14.0a6+20250409-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-aarch64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.14.0a6+20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz" + }, + { + "name": "cpython-3.14.0a6+20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + }, + { + "name": "cpython-3.14.0a6+20250409-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-i686-pc-windows-msvc-install_only.tar.gz" + }, + { + "name": "cpython-3.14.0a6+20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.14.0a6+20250409-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-riscv64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.14.0a6+20250409-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-s390x-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.14.0a6+20250409-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-x86_64-apple-darwin-install_only.tar.gz" + }, + { + "name": "cpython-3.14.0a6+20250409-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-x86_64-pc-windows-msvc-install_only.tar.gz" + }, + { + "name": "cpython-3.14.0a6+20250409-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-x86_64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.14.0a6+20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.14.0a6+20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.14.0a6+20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-aarch64-apple-darwin-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-aarch64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-i686-pc-windows-msvc-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-riscv64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-s390x-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64-apple-darwin-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64-pc-windows-msvc-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + } + ] + } + ] +} diff --git a/cibuildwheel/util/packaging.py b/cibuildwheel/util/packaging.py index f6619dd92..310778198 100644 --- a/cibuildwheel/util/packaging.py +++ b/cibuildwheel/util/packaging.py @@ -165,6 +165,9 @@ def find_compatible_wheel(wheels: Sequence[T], identifier: str) -> T | None: continue if not tag.platform.endswith(f"_{arch}"): continue + elif platform.startswith("pyodide"): + # each Pyodide version has its own platform tag + continue else: # Windows should exactly match if tag.platform != platform: diff --git a/cibuildwheel/util/python_build_standalone.py b/cibuildwheel/util/python_build_standalone.py new file mode 100644 index 000000000..95721ee54 --- /dev/null +++ b/cibuildwheel/util/python_build_standalone.py @@ -0,0 +1,181 @@ +import fnmatch +import functools +import json +import platform +import typing +from pathlib import Path + +from filelock import FileLock + +from cibuildwheel.util.file import download, extract_tar +from cibuildwheel.util.resources import PYTHON_BUILD_STANDALONE_RELEASES + + +class PythonBuildStandaloneAsset(typing.TypedDict): + name: str + url: str + + +class PythonBuildStandaloneRelease(typing.TypedDict): + tag: str + assets: list[PythonBuildStandaloneAsset] + + +class PythonBuildStandaloneReleaseData(typing.TypedDict): + releases: list[PythonBuildStandaloneRelease] + + +@functools.cache +def get_python_build_standalone_release_data() -> PythonBuildStandaloneReleaseData: + with open(PYTHON_BUILD_STANDALONE_RELEASES, "rb") as f: + return typing.cast(PythonBuildStandaloneReleaseData, json.load(f)) + + +class PythonBuildStandaloneError(Exception): + """Errors related to python-build-standalone.""" + + +def _get_platform_identifiers() -> tuple[str, str, str | None]: + """ + Detects the current platform and returns architecture, platform, and libc + identifiers. + """ + system = platform.system() + machine = platform.machine() + machine_lower = machine.lower() + + arch_identifier: str + platform_identifier: str + libc_identifier: str | None = None + + # Map Architecture + if machine_lower in ["x86_64", "amd64"]: + arch_identifier = "x86_64" + elif machine_lower in ["aarch64", "arm64"]: + arch_identifier = "aarch64" + else: + msg = f"Unsupported architecture: {system} {machine}. Cannot download appropriate Python build." + raise PythonBuildStandaloneError(msg) + + # Map OS + Libc + if system == "Linux": + platform_identifier = "unknown-linux" + libc_identifier = "musl" if "musl" in (platform.libc_ver() or ("", "")) else "gnu" + elif system == "Darwin": + platform_identifier = "apple-darwin" + elif system == "Windows": + platform_identifier = "pc-windows-msvc" + else: + msg = f"Unsupported operating system: {system}. Cannot download appropriate Python build." + raise PythonBuildStandaloneError(msg) + + print( + f"Detected platform: arch='{arch_identifier}', platform='{platform_identifier}', libc='{libc_identifier}'" + ) + return arch_identifier, platform_identifier, libc_identifier + + +def _get_pbs_asset( + *, + python_version: str, + arch_identifier: str, + platform_identifier: str, + libc_identifier: str | None, +) -> tuple[str, str, str]: + """Finds the asset, returning (tag, filename, url).""" + release_data = get_python_build_standalone_release_data() + + expected_suffix = f"{arch_identifier}-{platform_identifier}" + if libc_identifier: + expected_suffix += f"-{libc_identifier}" + expected_suffix += "-install_only.tar.gz" + + asset_pattern = f"cpython-{python_version}.*-{expected_suffix}" + print(f"Looking for file with pattern {asset_pattern}") + + for release in release_data["releases"]: + for asset in release["assets"]: + asset_name = asset["name"] + if not fnmatch.fnmatch(asset_name, asset_pattern): + continue + + asset_url = asset["url"] + return release["tag"], asset_url, asset_name + + # If loop completes without finding a match + msg = f"Could not find python-build-standalone release asset matching {asset_pattern!r}." + raise PythonBuildStandaloneError(msg) + + +def _download_or_get_from_cache(asset_url: str, asset_filename: str, cache_dir: Path) -> Path: + with FileLock(cache_dir / (asset_filename + ".lock")): + asset_cache_path = cache_dir / asset_filename + if asset_cache_path.is_file(): + print(f"Using cached python_build_standalone: {asset_cache_path}") + return asset_cache_path + + print(f"Downloading python_build_standalone: {asset_url} to {asset_cache_path}") + download(asset_url, asset_cache_path) + return asset_cache_path + + +def _find_python_executable(extracted_dir: Path) -> Path: + """Finds the python executable within the extracted directory structure.""" + # Structure is typically 'python/bin/python' or 'python/python.exe' + base_install_dir = extracted_dir / "python" + + if platform.system() == "Windows": + executable_path = base_install_dir / "python.exe" + else: + executable_path = base_install_dir / "bin" / "python" + + if not executable_path.is_file(): + msg = f"Could not locate python executable at expected path {executable_path} within {extracted_dir}." + raise PythonBuildStandaloneError(msg) + + print(f"Found python executable: {executable_path}") + return executable_path.resolve() # Return absolute path + + +def create_python_build_standalone_environment( + python_version: str, temp_dir: Path, cache_dir: Path +) -> Path: + """ + Returns a Python environment from python-build-standalone, downloading it + if necessary using a cache, and expanding it into a fresh base path. + + Args: + python_version: The Python version string (e.g., "3.12"). + temp_dir: A directory where the Python environment will be created. + cache_dir: A directory to store/retrieve downloaded archives. + + Returns: + The absolute path to the python executable within the created environment (in temp_dir). + + Raises: + PythonBuildStandaloneError: If the platform is unsupported, the build cannot be found, + download/extraction fails, or configuration is invalid. + """ + + print(f"Creating python-build-standalone environment: version={python_version}") + + arch_id, platform_id, libc_id = _get_platform_identifiers() + + pbs_tag, asset_url, asset_filename = _get_pbs_asset( + python_version=python_version, + arch_identifier=arch_id, + platform_identifier=platform_id, + libc_identifier=libc_id, + ) + + print(f"Using python-build-standalone release: {pbs_tag}") + + archive_path = _download_or_get_from_cache( + asset_url=asset_url, asset_filename=asset_filename, cache_dir=cache_dir + ) + + python_base_dir = temp_dir / "pbs" + assert not python_base_dir.exists() + extract_tar(archive_path, python_base_dir) + + return _find_python_executable(python_base_dir) diff --git a/cibuildwheel/util/resources.py b/cibuildwheel/util/resources.py index 40e085d68..a3cef7815 100644 --- a/cibuildwheel/util/resources.py +++ b/cibuildwheel/util/resources.py @@ -16,6 +16,7 @@ CONSTRAINTS: Final[Path] = PATH / "constraints.txt" VIRTUALENV: Final[Path] = PATH / "virtualenv.toml" CIBUILDWHEEL_SCHEMA: Final[Path] = PATH / "cibuildwheel.schema.json" +PYTHON_BUILD_STANDALONE_RELEASES: Final[Path] = PATH / "python-build-standalone-releases.json" # this value is cached because it's used a lot in unit tests diff --git a/docs/options.md b/docs/options.md index 1f4d4d120..3bd90369f 100644 --- a/docs/options.md +++ b/docs/options.md @@ -17,7 +17,9 @@ Default: `auto` - For `linux`, you need [Docker or Podman](#container-engine) running, on Linux, macOS, or Windows. - For `macos` and `windows`, you need to be running on the respective system, with a working compiler toolchain installed - Xcode Command Line tools for macOS, and MSVC for Windows. - For `ios` you need to be running on macOS, with Xcode and the iOS simulator installed. -- For `pyodide` you need to be on an x86-64 linux runner and `python3.12` must be available in `PATH`. +- For `pyodide`, you need a Linux or macOS machine. + +Check the [platforms](platforms.md) page for more information on platform requirements. This option can also be set using the [command-line option](#command-line) `--platform`. This option is not available in the `pyproject.toml` config. @@ -49,20 +51,19 @@ When both options are specified, both conditions are applied and only builds wit When setting the options, you can use shell-style globbing syntax, as per [fnmatch](https://docs.python.org/3/library/fnmatch.html) with the addition of curly bracket syntax `{option1,option2}`, provided by [bracex](https://pypi.org/project/bracex/). All the build identifiers supported by cibuildwheel are shown below:
- -| | macOS | Windows | Linux Intel | Linux Other | iOS | -|---------------|------------------------------------------------------------------------|-----------------------------------------------------|-----------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------| -| Python 3.8 | cp38-macosx_x86_64
cp38-macosx_universal2
cp38-macosx_arm64 | cp38-win_amd64
cp38-win32 | cp38-manylinux_x86_64
cp38-manylinux_i686
cp38-musllinux_x86_64
cp38-musllinux_i686 | cp38-manylinux_aarch64
cp38-manylinux_ppc64le
cp38-manylinux_s390x
cp38-manylinux_armv7l
cp38-manylinux_riscv64
cp38-musllinux_aarch64
cp38-musllinux_ppc64le
cp38-musllinux_s390x
cp38-musllinux_armv7l
cp38-musllinux_riscv64 | | -| Python 3.9 | cp39-macosx_x86_64
cp39-macosx_universal2
cp39-macosx_arm64 | cp39-win_amd64
cp39-win32
cp39-win_arm64 | cp39-manylinux_x86_64
cp39-manylinux_i686
cp39-musllinux_x86_64
cp39-musllinux_i686 | cp39-manylinux_aarch64
cp39-manylinux_ppc64le
cp39-manylinux_s390x
cp39-manylinux_armv7l
cp39-manylinux_riscv64
cp39-musllinux_aarch64
cp39-musllinux_ppc64le
cp39-musllinux_s390x
cp39-musllinux_armv7l
cp39-musllinux_riscv64 | | -| Python 3.10 | cp310-macosx_x86_64
cp310-macosx_universal2
cp310-macosx_arm64 | cp310-win_amd64
cp310-win32
cp310-win_arm64 | cp310-manylinux_x86_64
cp310-manylinux_i686
cp310-musllinux_x86_64
cp310-musllinux_i686 | cp310-manylinux_aarch64
cp310-manylinux_ppc64le
cp310-manylinux_s390x
cp310-manylinux_armv7l
cp310-manylinux_riscv64
cp310-musllinux_aarch64
cp310-musllinux_ppc64le
cp310-musllinux_s390x
cp310-musllinux_armv7l
cp310-musllinux_riscv64 | | -| Python 3.11 | cp311-macosx_x86_64
cp311-macosx_universal2
cp311-macosx_arm64 | cp311-win_amd64
cp311-win32
cp311-win_arm64 | cp311-manylinux_x86_64
cp311-manylinux_i686
cp311-musllinux_x86_64
cp311-musllinux_i686 | cp311-manylinux_aarch64
cp311-manylinux_ppc64le
cp311-manylinux_s390x
cp311-manylinux_armv7l
cp311-manylinux_riscv64
cp311-musllinux_aarch64
cp311-musllinux_ppc64le
cp311-musllinux_s390x
cp311-musllinux_armv7l
cp311-musllinux_riscv64 | | -| Python 3.12 | cp312-macosx_x86_64
cp312-macosx_universal2
cp312-macosx_arm64 | cp312-win_amd64
cp312-win32
cp312-win_arm64 | cp312-manylinux_x86_64
cp312-manylinux_i686
cp312-musllinux_x86_64
cp312-musllinux_i686 | cp312-manylinux_aarch64
cp312-manylinux_ppc64le
cp312-manylinux_s390x
cp312-manylinux_armv7l
cp312-manylinux_riscv64
cp312-musllinux_aarch64
cp312-musllinux_ppc64le
cp312-musllinux_s390x
cp312-musllinux_armv7l
cp312-musllinux_riscv64 | | -| Python 3.13 | cp313-macosx_x86_64
cp313-macosx_universal2
cp313-macosx_arm64 | cp313-win_amd64
cp313-win32
cp313-win_arm64 | cp313-manylinux_x86_64
cp313-manylinux_i686
cp313-musllinux_x86_64
cp313-musllinux_i686 | cp313-manylinux_aarch64
cp313-manylinux_ppc64le
cp313-manylinux_s390x
cp313-manylinux_armv7l
cp313-manylinux_riscv64
cp313-musllinux_aarch64
cp313-musllinux_ppc64le
cp313-musllinux_s390x
cp313-musllinux_armv7l
cp313-musllinux_riscv64 | cp313-ios_arm64_iphoneos
cp313-ios_arm64_iphonesimulator
cp313-ios_x86_64_iphonesimulator | -| Python 3.14 | cp314-macosx_x86_64
cp314-macosx_universal2
cp314-macosx_arm64 | cp314-win_amd64
cp314-win32
cp314-win_arm64 | cp314-manylinux_x86_64
cp314-manylinux_i686
cp314-musllinux_x86_64
cp314-musllinux_i686 | cp314-manylinux_aarch64
cp314-manylinux_ppc64le
cp314-manylinux_s390x
cp314-manylinux_armv7l
cp314-manylinux_riscv64
cp314-musllinux_aarch64
cp314-musllinux_ppc64le
cp314-musllinux_s390x
cp314-musllinux_armv7l
cp314-musllinux_riscv64 | | -| PyPy3.8 v7.3 | pp38-macosx_x86_64
pp38-macosx_arm64 | pp38-win_amd64 | pp38-manylinux_x86_64
pp38-manylinux_i686 | pp38-manylinux_aarch64 | | -| PyPy3.9 v7.3 | pp39-macosx_x86_64
pp39-macosx_arm64 | pp39-win_amd64 | pp39-manylinux_x86_64
pp39-manylinux_i686 | pp39-manylinux_aarch64 | | -| PyPy3.10 v7.3 | pp310-macosx_x86_64
pp310-macosx_arm64 | pp310-win_amd64 | pp310-manylinux_x86_64
pp310-manylinux_i686 | pp310-manylinux_aarch64 | | -| PyPy3.11 v7.3 | pp311-macosx_x86_64
pp311-macosx_arm64 | pp311-win_amd64 | pp311-manylinux_x86_64
pp311-manylinux_i686 | pp311-manylinux_aarch64 | | +| | macOS | Windows | Linux Intel | Linux Other | iOS | pyodide (WASM) | +|---------------|------------------------------------------------------------------------|-----------------------------------------------------|-----------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|----------------------| +| Python 3.8 | cp38-macosx_x86_64
cp38-macosx_universal2
cp38-macosx_arm64 | cp38-win_amd64
cp38-win32 | cp38-manylinux_x86_64
cp38-manylinux_i686
cp38-musllinux_x86_64
cp38-musllinux_i686 | cp38-manylinux_aarch64
cp38-manylinux_ppc64le
cp38-manylinux_s390x
cp38-manylinux_armv7l
cp38-manylinux_riscv64
cp38-musllinux_aarch64
cp38-musllinux_ppc64le
cp38-musllinux_s390x
cp38-musllinux_armv7l
cp38-musllinux_riscv64 | | | +| Python 3.9 | cp39-macosx_x86_64
cp39-macosx_universal2
cp39-macosx_arm64 | cp39-win_amd64
cp39-win32
cp39-win_arm64 | cp39-manylinux_x86_64
cp39-manylinux_i686
cp39-musllinux_x86_64
cp39-musllinux_i686 | cp39-manylinux_aarch64
cp39-manylinux_ppc64le
cp39-manylinux_s390x
cp39-manylinux_armv7l
cp39-manylinux_riscv64
cp39-musllinux_aarch64
cp39-musllinux_ppc64le
cp39-musllinux_s390x
cp39-musllinux_armv7l
cp39-musllinux_riscv64 | | | +| Python 3.10 | cp310-macosx_x86_64
cp310-macosx_universal2
cp310-macosx_arm64 | cp310-win_amd64
cp310-win32
cp310-win_arm64 | cp310-manylinux_x86_64
cp310-manylinux_i686
cp310-musllinux_x86_64
cp310-musllinux_i686 | cp310-manylinux_aarch64
cp310-manylinux_ppc64le
cp310-manylinux_s390x
cp310-manylinux_armv7l
cp310-manylinux_riscv64
cp310-musllinux_aarch64
cp310-musllinux_ppc64le
cp310-musllinux_s390x
cp310-musllinux_armv7l
cp310-musllinux_riscv64 | | | +| Python 3.11 | cp311-macosx_x86_64
cp311-macosx_universal2
cp311-macosx_arm64 | cp311-win_amd64
cp311-win32
cp311-win_arm64 | cp311-manylinux_x86_64
cp311-manylinux_i686
cp311-musllinux_x86_64
cp311-musllinux_i686 | cp311-manylinux_aarch64
cp311-manylinux_ppc64le
cp311-manylinux_s390x
cp311-manylinux_armv7l
cp311-manylinux_riscv64
cp311-musllinux_aarch64
cp311-musllinux_ppc64le
cp311-musllinux_s390x
cp311-musllinux_armv7l
cp311-musllinux_riscv64 | | | +| Python 3.12 | cp312-macosx_x86_64
cp312-macosx_universal2
cp312-macosx_arm64 | cp312-win_amd64
cp312-win32
cp312-win_arm64 | cp312-manylinux_x86_64
cp312-manylinux_i686
cp312-musllinux_x86_64
cp312-musllinux_i686 | cp312-manylinux_aarch64
cp312-manylinux_ppc64le
cp312-manylinux_s390x
cp312-manylinux_armv7l
cp312-manylinux_riscv64
cp312-musllinux_aarch64
cp312-musllinux_ppc64le
cp312-musllinux_s390x
cp312-musllinux_armv7l
cp312-musllinux_riscv64 | | cp312-pyodide_wasm32 | +| Python 3.13 | cp313-macosx_x86_64
cp313-macosx_universal2
cp313-macosx_arm64 | cp313-win_amd64
cp313-win32
cp313-win_arm64 | cp313-manylinux_x86_64
cp313-manylinux_i686
cp313-musllinux_x86_64
cp313-musllinux_i686 | cp313-manylinux_aarch64
cp313-manylinux_ppc64le
cp313-manylinux_s390x
cp313-manylinux_armv7l
cp313-manylinux_riscv64
cp313-musllinux_aarch64
cp313-musllinux_ppc64le
cp313-musllinux_s390x
cp313-musllinux_armv7l
cp313-musllinux_riscv64 | cp313-ios_arm64_iphoneos
cp313-ios_arm64_iphonesimulator
cp313-ios_x86_64_iphonesimulator | | +| Python 3.14 | cp314-macosx_x86_64
cp314-macosx_universal2
cp314-macosx_arm64 | cp314-win_amd64
cp314-win32
cp314-win_arm64 | cp314-manylinux_x86_64
cp314-manylinux_i686
cp314-musllinux_x86_64
cp314-musllinux_i686 | cp314-manylinux_aarch64
cp314-manylinux_ppc64le
cp314-manylinux_s390x
cp314-manylinux_armv7l
cp314-manylinux_riscv64
cp314-musllinux_aarch64
cp314-musllinux_ppc64le
cp314-musllinux_s390x
cp314-musllinux_armv7l
cp314-musllinux_riscv64 | | | +| PyPy3.8 v7.3 | pp38-macosx_x86_64
pp38-macosx_arm64 | pp38-win_amd64 | pp38-manylinux_x86_64
pp38-manylinux_i686 | pp38-manylinux_aarch64 | | | +| PyPy3.9 v7.3 | pp39-macosx_x86_64
pp39-macosx_arm64 | pp39-win_amd64 | pp39-manylinux_x86_64
pp39-manylinux_i686 | pp39-manylinux_aarch64 | | | +| PyPy3.10 v7.3 | pp310-macosx_x86_64
pp310-macosx_arm64 | pp310-win_amd64 | pp310-manylinux_x86_64
pp310-manylinux_i686 | pp310-manylinux_aarch64 | | | +| PyPy3.11 v7.3 | pp311-macosx_x86_64
pp311-macosx_arm64 | pp311-win_amd64 | pp311-manylinux_x86_64
pp311-manylinux_i686 | pp311-manylinux_aarch64 | | | The list of supported and currently selected build identifiers can also be retrieved by passing the `--print-build-identifiers` flag to cibuildwheel. The format is `python_tag-platform_tag`, with tags similar to those in [PEP 425](https://www.python.org/dev/peps/pep-0425/#details). @@ -70,9 +71,6 @@ The format is `python_tag-platform_tag`, with tags similar to those in [PEP 425] Windows arm64 platform support is experimental. Linux riscv64 platform support is experimental and requires an explicit opt-in through [CIBW_ENABLE](#enable). -For an experimental WebAssembly build with `--platform pyodide`, -`cp312-pyodide_wasm32` is the only platform identifier. - See the [cibuildwheel 2 documentation](https://cibuildwheel.pypa.io/en/2.x/) for past end-of-life versions of Python. #### Examples @@ -1223,6 +1221,45 @@ Platform-specific environment variables are also available:
dependency-versions = { packages = ["pyodide-build==0.29.1"] } ``` +### `CIBW_PYODIDE_VERSION` {: #pyodide-version} + +> Specify the Pyodide version to use for `pyodide` platform builds + +This option allows you to specify a specific version of Pyodide to be used when building wheels for the `pyodide` platform. If unset, cibuildwheel will use a pinned Pyodide version. + +This option is particularly useful for: + +- Testing against specific Pyodide alpha or older releases. +- Ensuring reproducibility by targeting a known Pyodide version. + +The available Pyodide versions are determined by the version of `pyodide-build` being used. You can list the compatible versions using the command `pyodide xbuildenv search --all` as described in the [Pyodide platform documentation](platforms.md#pyodide-choosing-a-version). + +!!! tip + You can set the version of `pyodide-build` using the [`CIBW_DEPENDENCY_VERSIONS`](#dependency-versions) option. + +#### Examples + +!!! tab examples "Environment variables" + + ```yaml + # Build Pyodide wheels using Pyodide version 0.27.6 + CIBW_PYODIDE_VERSION: 0.27.6 + + # Build Pyodide wheels using a specific alpha release + CIBW_PYODIDE_VERSION: 0.28.0a2 + ``` + +!!! tab examples "pyproject.toml" + + ```toml + [tool.cibuildwheel.pyodide] + # Build Pyodide wheels using Pyodide version 0.27.6 + pyodide-version = "0.27.6" + + [tool.cibuildwheel.pyodide] + # Build Pyodide wheels using a specific alpha release + pyodide-version = "0.28.0a2" + ``` ## Testing diff --git a/docs/platforms.md b/docs/platforms.md index 115e91455..c4ffb9af6 100644 --- a/docs/platforms.md +++ b/docs/platforms.md @@ -3,7 +3,7 @@ title: Platforms --- # Platforms -## Linux +## Linux {: #linux} ### System requirements @@ -31,7 +31,7 @@ Linux wheels are built in [`manylinux`/`musllinux` containers](https://github.co - Alternative Docker images can be specified with the `CIBW_MANYLINUX_*_IMAGE`/`CIBW_MUSLLINUX_*_IMAGE` options to allow for a custom, preconfigured build environment for the Linux builds. See [options](options.md#linux-image) for more details. -## macOS +## macOS {: #macos} ### System requirements @@ -138,7 +138,7 @@ Regarding testing, As a workaround, the tag can be fixed before running delocate to repair the wheel. The [`wheel tags`](https://wheel.readthedocs.io/en/stable/reference/wheel_tags.html) command is ideal for this. See [this workflow](https://gist.github.com/anderssonjohan/49f07e33fc5cb2420515a8ac76dc0c95#file-build-pendulum-wheels-yml-L39-L53) for an example usage of `wheel tags`. -## Windows +## Windows {: #windows} ### System requirements @@ -160,15 +160,23 @@ By default, `ARM64` is not enabled when running on non-ARM64 runners. Use [`CIBW Pyodide is offered as an experimental feature in cibuildwheel. -### Prerequisites +### System requirements -You need to have a matching host version of Python (unlike all other cibuildwheel platforms). Linux host highly recommended; macOS hosts may work (e.g. invoking `pytest` directly in [`CIBW_TEST_COMMAND`](options.md#test-command) is [currently failing](https://github.com/pyodide/pyodide/issues/4802)) and Windows hosts will not work. +Pyodide builds require a Linux or macOS machine. ### Specifying a pyodide build You must target pyodide with `--platform pyodide` (or use `--only` on the identifier). -## iOS +### Choosing a Pyodide version {: #pyodide-choosing-a-version} + +It is also possible to target a specific Pyodide version by setting the `CIBW_PYODIDE_VERSION` option to the desired version. Users are responsible for setting an appropriate Pyodide version according to the `pyodide-build` version. A list is available in Pyodide's [cross-build environments metadata file](https://github.com/pyodide/pyodide/blob/main/pyodide-cross-build-environments.json), which can be viewed more easily by installing `pyodide-build` from PyPI and using `pyodide xbuildenv search --all` to see a compatibility table. + +### Running tests + +Currently, it's recommended to run tests using a `python -m` entrypoint, rather than a command line entrypoint, or a shell script. This is because custom entrypoints have some issues in the Pyodide virtual environment. For example, `pytest` may not work as a command line entrypoint, but will work as a `python -m pytest` entrypoint. + +## iOS {: #ios} ### System requirements diff --git a/noxfile.py b/noxfile.py index ba3ce2ee8..a31c147f6 100755 --- a/noxfile.py +++ b/noxfile.py @@ -68,17 +68,20 @@ def update_constraints(session: nox.Session) -> None: Update the dependencies inplace. """ + session.install("-e.", "click") + resources = Path("cibuildwheel/resources") if session.venv_backend != "uv": session.install("uv>=0.1.23") + # CUSTOM_COMPILE_COMMAND is a pip-compile option that tells users how to + # regenerate the constraints files + env = os.environ.copy() + env["UV_CUSTOM_COMPILE_COMMAND"] = f"nox -s {session.name}" + for minor_version in range(8, 15): python_version = f"3.{minor_version}" - env = os.environ.copy() - # CUSTOM_COMPILE_COMMAND is a pip-compile option that tells users how to - # regenerate the constraints files - env["UV_CUSTOM_COMPILE_COMMAND"] = f"nox -s {session.name}" output_file = resources / f"constraints-python{python_version.replace('.', '')}.txt" session.run( "uv", @@ -100,12 +103,19 @@ def update_constraints(session: nox.Session) -> None: pyodides = build_platforms["pyodide"]["python_configurations"] for pyodide in pyodides: python_version = ".".join(pyodide["version"].split(".")[:2]) - pyodide_build_version = pyodide["pyodide_build_version"] - output_file = resources / f"constraints-pyodide{python_version.replace('.', '')}.txt" + pyodide_version = pyodide["default_pyodide_version"] + tmp_file = Path(session.create_tmp()) / "constraints-pyodide.in" - tmp_file.write_text( - f"pip\nbuild[virtualenv]\npyodide-build=={pyodide_build_version}\nclick<8.2" + + session.run( + "python", + "bin/generate_pyodide_constraints.py", + "--output-file", + tmp_file, + pyodide_version, ) + + output_file = resources / f"constraints-pyodide{python_version.replace('.', '')}.txt" session.run( "uv", "pip", @@ -121,7 +131,8 @@ def update_constraints(session: nox.Session) -> None: @nox.session(default=False, tags=["update"]) def update_pins(session: nox.Session) -> None: """ - Update the python, docker and virtualenv pins version inplace. + Update the python, docker, virtualenv, node, and python-build-standalone + version pins inplace. """ pyproject = nox.project.load_toml() session.install("-e.", *nox.project.dependency_groups(pyproject, "bin")) @@ -129,6 +140,7 @@ def update_pins(session: nox.Session) -> None: session.run("python", "bin/update_docker.py") session.run("python", "bin/update_virtualenv.py", "--force") session.run("python", "bin/update_nodejs.py", "--force") + session.run("python", "bin/update_python_build_standalone.py") @nox.session(default=False, reuse_venv=True, tags=["update"]) diff --git a/test/test_abi_variants.py b/test/test_abi_variants.py index 780f6d908..d3734ae64 100644 --- a/test/test_abi_variants.py +++ b/test/test_abi_variants.py @@ -48,8 +48,13 @@ def test_abi3(tmp_path): # check that the expected wheels are produced if utils.get_platform() == "pyodide": - # there's only 1 possible configuration for pyodide, cp312 - expected_wheels = utils.expected_wheels("spam", "0.1.0", python_abi_tags=["cp310-abi3"]) + # there's only 1 possible configuration for pyodide, cp312. It builds + # a wheel that is tagged abi3, compatible back to 3.10 + expected_wheels = utils.expected_wheels( + "spam", + "0.1.0", + python_abi_tags=["cp310-abi3"], + ) else: expected_wheels = utils.expected_wheels( "spam", @@ -189,15 +194,17 @@ def test_abi_none(tmp_path, capfd): }, ) - # check that the expected wheels are produced expected_wheels = utils.expected_wheels("ctypesexample", "1.0.0", python_abi_tags=["py3-none"]) + # check that the expected wheels are produced assert set(actual_wheels) == set(expected_wheels) - # check that each wheel was built once, and reused captured = capfd.readouterr() - assert "Building wheel..." in captured.out + if utils.get_platform() == "pyodide": - # there's only 1 possible configuration for pyodide, we won't see the message expected on following builds + # pyodide builds a different platform tag for each python version, so + # wheels are not reused assert "Found previously built wheel" not in captured.out else: + # check that each wheel was built once, and reused + assert "Building wheel..." in captured.out assert "Found previously built wheel" in captured.out diff --git a/test/test_custom_repair_wheel.py b/test/test_custom_repair_wheel.py index bd22d6343..5af012653 100644 --- a/test/test_custom_repair_wheel.py +++ b/test/test_custom_repair_wheel.py @@ -16,6 +16,11 @@ wheel = Path(sys.argv[1]) dest_dir = Path(sys.argv[2]) platform = wheel.stem.split("-")[-1] +if platform.startswith("pyodide"): + # for the sake of this test, munge the pyodide platforms into one, it's + # not valid, but it does activate the uniqueness check + platform = "pyodide" + name = f"spam-0.1.0-py2-none-{platform}.whl" dest = dest_dir / name dest_dir.mkdir(parents=True, exist_ok=True) @@ -48,11 +53,6 @@ def test(tmp_path, capfd): assert "Build failed because a wheel named" in captured.err assert exc_info.value.returncode == 6 else: - # We only produced one wheel (currently Pyodide) + # We only produced one wheel (perhaps Pyodide) # check that it has the right name - # - # As far as I can tell, this is the only full test coverage for - # CIBW_REPAIR_WHEEL_COMMAND so this is useful even in the case when no - # error is raised - assert "spam-0.1.0-py2-none-pyodide" in captured.out assert result[0].startswith("spam-0.1.0-py2-none-") diff --git a/test/test_dependency_versions.py b/test/test_dependency_versions.py index 6e29adef1..5aa84a506 100644 --- a/test/test_dependency_versions.py +++ b/test/test_dependency_versions.py @@ -70,7 +70,10 @@ def test_pinned_versions(tmp_path, python_version, build_frontend_env_nouv): version_no_dot = python_version.replace(".", "") build_environment = {} build_pattern = f"[cp]p{version_no_dot}-*" - constraint_filename = f"constraints-python{version_no_dot}.txt" + if utils.get_platform() == "pyodide": + constraint_filename = f"constraints-pyodide{version_no_dot}.txt" + else: + constraint_filename = f"constraints-python{version_no_dot}.txt" constraint_file = resources.PATH / constraint_filename constraint_versions = get_versions_from_constraint_file(constraint_file) diff --git a/test/test_environment.py b/test/test_environment.py index ee50155b5..30bab81f5 100644 --- a/test/test_environment.py +++ b/test/test_environment.py @@ -100,7 +100,12 @@ def test_overridden_path(tmp_path, capfd): "build_frontend", [ pytest.param("pip", marks=utils.skip_if_pyodide("No pip for pyodide")), - "build", + pytest.param( + "build", + marks=utils.skip_if_pyodide( + "pyodide doesn't support multiple values for PIP_CONSTRAINT" + ), + ), ], ) def test_overridden_pip_constraint(tmp_path, build_frontend): diff --git a/test/test_pep518.py b/test/test_pep518.py index d519cc297..702e7f185 100644 --- a/test/test_pep518.py +++ b/test/test_pep518.py @@ -60,12 +60,19 @@ def test_pep518(tmp_path, build_frontend_env): assert not (project_dir / "42").exists() assert not (project_dir / "4.1.2").exists() - # pypa/build creates a "build" folder & a "*.egg-info" folder for the wheel being built, - # this should be harmless so remove them + # pypa/build creates a "build" folder & a "*.egg-info" folder for the + # wheel being built, this should be harmless so remove them. pyodide-build + # creates a ".pyodide_build" folder, but this is gitignored with a + # .gitignore file inside. contents = [ item for item in project_dir.iterdir() - if item.name != "build" and not item.name.endswith(".egg-info") + if item.name != "build" + and not item.name.endswith(".egg-info") + and item.name != ".pyodide_build" ] + print("Project contents after build:") + print("\n".join(f" {f}" for f in contents)) + assert len(contents) == len(basic_project.files) diff --git a/test/test_emscripten.py b/test/test_pyodide.py similarity index 52% rename from test/test_emscripten.py rename to test/test_pyodide.py index 897cd67f1..e1dbbd56e 100644 --- a/test/test_emscripten.py +++ b/test/test_pyodide.py @@ -1,10 +1,10 @@ -import shutil +import contextlib +import subprocess import sys import textwrap import pytest -from cibuildwheel.ci import CIProvider, detect_ci_provider from cibuildwheel.util.file import CIBW_CACHE_PATH from . import test_projects, utils @@ -43,13 +43,7 @@ def check_node(): @pytest.mark.parametrize("use_pyproject_toml", [True, False]) def test_pyodide_build(tmp_path, use_pyproject_toml): if sys.platform == "win32": - pytest.skip("emsdk doesn't work correctly on Windows") - - if not shutil.which("python3.12"): - pytest.skip("Python 3.12 not installed") - - if detect_ci_provider() == CIProvider.travis_ci: - pytest.skip("Python 3.12 is just a non-working pyenv shim") + pytest.skip("pyodide-build doesn't work correctly on Windows") if use_pyproject_toml: basic_project.files["pyproject.toml"] = textwrap.dedent( @@ -84,3 +78,64 @@ def test_pyodide_build(tmp_path, use_pyproject_toml): print("expected_wheels", expected_wheels) assert set(actual_wheels) == set(expected_wheels) + + +def test_pyodide_version_incompatible(tmp_path, capfd): + if sys.platform == "win32": + pytest.skip("pyodide-build doesn't work correctly on Windows") + + basic_project.generate(tmp_path) + + with pytest.raises(subprocess.CalledProcessError): + utils.cibuildwheel_run( + tmp_path, + add_args=["--platform", "pyodide"], + add_env={ + "CIBW_DEPENDENCY_VERSIONS": "packages: pyodide-build==0.29.3", + "CIBW_PYODIDE_VERSION": "0.26.0a6", + }, + ) + + out, err = capfd.readouterr() + + assert "is not compatible with the pyodide-build version" in err + + +@pytest.mark.parametrize("expect_failure", [True, False]) +def test_pyodide_build_and_test(tmp_path, expect_failure): + if sys.platform == "win32": + pytest.skip("pyodide-build doesn't work correctly on Windows") + + if expect_failure: + basic_project.files["test/spam_test.py"] = textwrap.dedent(r""" + def test_filter(): + assert 0 == 1 + """) + else: + basic_project.files["test/spam_test.py"] = textwrap.dedent(r""" + import spam + def test_filter(): + assert spam.filter("spam") == 0 + """) + basic_project.generate(tmp_path) + + context = ( + pytest.raises(subprocess.CalledProcessError) if expect_failure else contextlib.nullcontext() + ) + with context: + # build the wheels + actual_wheels = utils.cibuildwheel_run( + tmp_path, + add_args=["--platform", "pyodide"], + add_env={ + "CIBW_TEST_REQUIRES": "pytest", + "CIBW_TEST_COMMAND": "python -m pytest", + }, + ) + # check that the expected wheels are produced + expected_wheels = [ + "spam-0.1.0-cp312-cp312-pyodide_2024_0_wasm32.whl", + ] + print("actual_wheels", actual_wheels) + print("expected_wheels", expected_wheels) + assert set(actual_wheels) == set(expected_wheels) diff --git a/test/test_testing.py b/test/test_testing.py index 5caa35e42..88054c545 100644 --- a/test/test_testing.py +++ b/test/test_testing.py @@ -224,10 +224,10 @@ def test_test_sources(tmp_path): project_dir, add_env={ "CIBW_TEST_REQUIRES": "pytest", - "CIBW_TEST_COMMAND": "pytest", # pytest fails on GraalPy 24.2.0 on Windows so we skip it there # until https://github.com/oracle/graalpython/issues/490 is fixed "CIBW_TEST_COMMAND_WINDOWS": "where graalpy || pytest", + "CIBW_TEST_COMMAND": utils.invoke_pytest(), "CIBW_TEST_SOURCES": "test", }, ) diff --git a/test/utils.py b/test/utils.py index 028e88863..55b492a81 100644 --- a/test/utils.py +++ b/test/utils.py @@ -382,7 +382,15 @@ def _expected_wheels( raise Exception(msg) elif platform == "pyodide": - platform_tags = ["pyodide_2024_0_wasm32"] + platform_tags = { + "cp312-cp312": ["pyodide_2024_0_wasm32"], + "cp313-cp313": ["pyodide_2025_0_wasm32"], + }.get(python_abi_tag, []) + + if not platform_tags: + # for example if the python tag is `none` or `abi3`, all + # platform tags are built with that python tag + platform_tags = ["pyodide_2024_0_wasm32"] else: msg = f"Unsupported platform {platform!r}" @@ -425,7 +433,7 @@ def skip_if_pyodide(reason: str) -> Any: def invoke_pytest() -> str: # see https://github.com/pyodide/pyodide/issues/4802 - if get_platform() == "pyodide" and sys.platform.startswith("darwin"): + if get_platform() == "pyodide": return "python -m pytest" return "pytest" diff --git a/unit_test/options_test.py b/unit_test/options_test.py index fbf181754..9e5a1f089 100644 --- a/unit_test/options_test.py +++ b/unit_test/options_test.py @@ -34,6 +34,8 @@ environment-pass = ["EXAMPLE_ENV"] +pyodide-version = "0.27.6" + [tool.cibuildwheel.macos] test-requires = "else" @@ -88,6 +90,9 @@ def test_options_1(tmp_path, monkeypatch): assert local.test_sources == ["test", "other dir"] assert local.manylinux_images["x86_64"] == pinned_x86_64_container_image["manylinux_2_34"] + local = options.build_options("cp312-pyodide_wasm32") + assert local.pyodide_version == "0.27.6" + def test_passthrough(tmp_path, monkeypatch): with tmp_path.joinpath("pyproject.toml").open("w") as f: diff --git a/unit_test/utils_test.py b/unit_test/utils_test.py index 3c4a58859..8b0be33d3 100644 --- a/unit_test/utils_test.py +++ b/unit_test/utils_test.py @@ -12,6 +12,8 @@ format_safe, parse_key_value_string, prepare_command, + unwrap, + unwrap_preserving_paragraphs, ) from cibuildwheel.util.packaging import find_compatible_wheel @@ -363,3 +365,33 @@ def test_copy_test_sources_alternate_copy_into(sample_project): ], any_order=True, ) + + +def test_unwrap(): + assert ( + unwrap(""" + This is a + multiline + string + """) + == "This is a multiline string" + ) + + +def test_unwrap_preserving_paragraphs(): + assert ( + unwrap(""" + This is a + multiline + string + """) + == "This is a multiline string" + ) + assert ( + unwrap_preserving_paragraphs(""" + paragraph one + + paragraph two + """) + == "paragraph one\n\nparagraph two" + ) From 327f5c327dcf37610148cf8e1e93a9a086c0da2c Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 22 May 2025 06:01:58 -0400 Subject: [PATCH 1046/1105] ci: add labels to autoupdate (#2408) Signed-off-by: Henry Schreiner --- .github/workflows/update-dependencies.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index c22469df6..2f856d47e 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -55,3 +55,7 @@ jobs: sign-commits: true token: ${{ steps.generate-token.outputs.token }} delete-branch: true + labels: | + CI: GraalPy + CI: PyPy + dependencies From 1bfec0e7c948aa3901e1cdf127b0a31b9edc1212 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sun, 25 May 2025 07:58:13 -0400 Subject: [PATCH 1047/1105] chore: move codespell config to pyproject.toml (#2409) * chore: move codespell config to pyproject.toml Signed-off-by: Henry Schreiner * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: Henry Schreiner Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- pyproject.toml | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2705e71a6..2304b31fe 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -75,7 +75,7 @@ repos: rev: v2.4.1 hooks: - id: codespell - args: ["-L", "sur,assertin,hep", "-w"] + args: ["-w"] exclude: ^docs/working-examples\.md$ # Autogenerated diff --git a/pyproject.toml b/pyproject.toml index cb5ae27a6..601e384ef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -231,3 +231,14 @@ ignore = ["PC170", "PP303"] [tool.check-wheel-contents] ignore = ["W002"] # constraints-*.txt are allowed to be duplicates of one another + +[tool.codespell] +ignore-words-list = [ + "sur", + "assertin", +] +skip = [ + '^docs/working-examples\.md', + 'htmlcov', + 'all_known_setup.yaml', +] From dded469d60a95bc989b3dc6bd965103d9227e2fa Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sun, 25 May 2025 13:02:14 +0100 Subject: [PATCH 1048/1105] Bump version: v3.0.0b2 --- README.md | 25 ++++++++++++++++--------- cibuildwheel/__init__.py | 2 +- docs/changelog.md | 16 +++++++++++++++- docs/faq.md | 6 +++--- examples/azure-pipelines-minimal.yml | 6 +++--- examples/circleci-minimal.yml | 6 +++--- examples/cirrus-ci-intel-mac.yml | 2 +- examples/cirrus-ci-minimal.yml | 2 +- examples/github-deploy.yml | 2 +- examples/github-minimal.yml | 2 +- examples/github-pipx.yml | 2 +- examples/github-with-qemu.yml | 2 +- examples/gitlab-minimal.yml | 6 +++--- examples/gitlab-with-qemu.yml | 2 +- examples/travis-ci-deploy.yml | 2 +- examples/travis-ci-minimal.yml | 2 +- examples/travis-ci-test-and-deploy.yml | 4 ++-- pyproject.toml | 2 +- 18 files changed, 56 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 7f609295b..2de5577d5 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ jobs: - uses: actions/setup-python@v5 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==3.0.0b1 + run: python -m pip install cibuildwheel==3.0.0b2 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -223,6 +223,16 @@ 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. +Known issues: +- ⚠️ The CWD for test-command has changed in v3.0, but that is still [being debated](https://github.com/pypa/cibuildwheel/issues/2406), it might change before the final release. Please provide feedback on the aforementioned issue if you do (or don't!) encounter issues with this. + +#### v3.0.0b2 + +_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_ @@ -232,7 +242,11 @@ _19 May 2025_ - ✨ 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!\] +- ✨ 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). + - ✨ 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) @@ -254,13 +268,6 @@ _24 March 2025_ - 🛠 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 - -_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) - --- diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index 3996ce876..c9e418604 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1 +1 @@ -__version__ = "3.0.0b1" +__version__ = "3.0.0b2" diff --git a/docs/changelog.md b/docs/changelog.md index 0ae1f7d1f..740f82b41 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -10,6 +10,16 @@ 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. +Known issues: +- ⚠️ The CWD for test-command has changed in v3.0, but that is still [being debated](https://github.com/pypa/cibuildwheel/issues/2406), it might change before the final release. Please provide feedback on the aforementioned issue if you do (or don't!) encounter issues with this. + +#### v3.0.0b2 + +_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_ @@ -19,7 +29,11 @@ _19 May 2025_ - ✨ 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!\] +- ✨ 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). + - ✨ 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) diff --git a/docs/faq.md b/docs/faq.md index 44c914786..42e38c4bb 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -60,7 +60,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: pypa/cibuildwheel@v3.0.0b1 +uses: pypa/cibuildwheel@v3.0.0b2 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. @@ -82,7 +82,7 @@ The second option, and the only one that supports other CI systems, is using a ` ```bash # requirements-cibw.txt -cibuildwheel==3.0.0b1 +cibuildwheel==3.0.0b2 ``` Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this: @@ -247,7 +247,7 @@ Solutions to this vary, but the simplest is to use pipx: # most runners have pipx preinstalled, but in case you don't python3 -m pip install pipx -pipx run cibuildwheel==3.0.0b1 --output-dir wheelhouse +pipx run cibuildwheel==3.0.0b2 --output-dir wheelhouse pipx run twine upload wheelhouse/*.whl ``` diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index fa727b9a9..de5fee7a1 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -6,7 +6,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - pip3 install cibuildwheel==3.0.0b1 + pip3 install cibuildwheel==3.0.0b2 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -20,7 +20,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - python3 -m pip install cibuildwheel==3.0.0b1 + python3 -m pip install cibuildwheel==3.0.0b2 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -34,7 +34,7 @@ jobs: - bash: | set -o errexit python -m pip install --upgrade pip - pip install cibuildwheel==3.0.0b1 + pip install cibuildwheel==3.0.0b2 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index 21a8b5dfa..45bd7ac90 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -11,7 +11,7 @@ jobs: - run: name: Build the Linux wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0b1 + python3 -m pip install --user cibuildwheel==3.0.0b2 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -28,7 +28,7 @@ jobs: - run: name: Build the Linux aarch64 wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0b1 + python3 -m pip install --user cibuildwheel==3.0.0b2 python3 -m cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -44,7 +44,7 @@ jobs: name: Build the OS X wheels. command: | sudo softwareupdate --install-rosetta --agree-to-license # for python<=3.8 or x86_64/universal2 tests - pip3 install cibuildwheel==3.0.0b1 + pip3 install cibuildwheel==3.0.0b2 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ diff --git a/examples/cirrus-ci-intel-mac.yml b/examples/cirrus-ci-intel-mac.yml index dfc75146d..ddbfac6ff 100644 --- a/examples/cirrus-ci-intel-mac.yml +++ b/examples/cirrus-ci-intel-mac.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0b1 + - python -m pip install cibuildwheel==3.0.0b2 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index f601f3f30..bc6a655aa 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0b1 + - python -m pip install cibuildwheel==3.0.0b2 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index 4888f19e9..da63c0922 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b1 + uses: pypa/cibuildwheel@v3.0.0b2 env: CIBW_PLATFORM: ${{ matrix.platform }} CIBW_ARCHS: ${{ matrix.archs }} diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index a0102bb0f..838d5b395 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b1 + uses: pypa/cibuildwheel@v3.0.0b2 # env: # CIBW_SOME_OPTION: value # ... diff --git a/examples/github-pipx.yml b/examples/github-pipx.yml index 14775233a..166c6162a 100644 --- a/examples/github-pipx.yml +++ b/examples/github-pipx.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - run: pipx run cibuildwheel==3.0.0b1 + run: pipx run cibuildwheel==3.0.0b2 - uses: actions/upload-artifact@v4 with: diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index c0325f9b8..1db755101 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -21,7 +21,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b1 + uses: pypa/cibuildwheel@v3.0.0b2 env: # configure cibuildwheel on Linux to build native archs ('auto'), # and to split the remaining architectures between the x86_64 and diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index 40ef7e3d5..420dce8cb 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -12,7 +12,7 @@ linux: DOCKER_TLS_CERTDIR: "" script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==3.0.0b1 + - python -m pip install cibuildwheel==3.0.0b2 - cibuildwheel --output-dir wheelhouse artifacts: paths: @@ -23,7 +23,7 @@ windows: before_script: - choco install python -y --version 3.12.4 - choco install git.install -y - - py -m pip install cibuildwheel==3.0.0b1 + - py -m pip install cibuildwheel==3.0.0b2 script: - py -m cibuildwheel --output-dir wheelhouse --platform windows artifacts: @@ -35,7 +35,7 @@ windows: macos: image: macos-14-xcode-15 before_script: - - python3 -m pip install cibuildwheel==3.0.0b1 + - python3 -m pip install cibuildwheel==3.0.0b2 script: - python3 -m cibuildwheel --output-dir wheelhouse artifacts: diff --git a/examples/gitlab-with-qemu.yml b/examples/gitlab-with-qemu.yml index abb1b682d..937cd8f35 100644 --- a/examples/gitlab-with-qemu.yml +++ b/examples/gitlab-with-qemu.yml @@ -14,7 +14,7 @@ linux: - curl -sSL https://get.docker.com/ | sh # Warning: This is extremely slow, be careful with how many wheels you build - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - python -m pip install cibuildwheel==3.0.0b1 + - python -m pip install cibuildwheel==3.0.0b2 # Assuming your CI runner's default architecture is x86_64... - cibuildwheel --output-dir wheelhouse --platform linux --archs aarch64 artifacts: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index 7a307e706..976b55323 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -20,7 +20,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0b1 + - python3 -m pip install cibuildwheel==3.0.0b2 script: # build the wheels, put them into './dist' diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index 8b6077435..d8018a40b 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -26,7 +26,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0b1 + - python3 -m pip install cibuildwheel==3.0.0b2 script: # build the wheels, put them into './wheelhouse' diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index 9f3176575..3b6c211e0 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -52,7 +52,7 @@ jobs: - stage: deploy name: Build and deploy Linux wheels services: docker - install: python3 -m pip install cibuildwheel==3.0.0b1 twine + install: python3 -m pip install cibuildwheel==3.0.0b2 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl # Deploy on windows @@ -60,7 +60,7 @@ jobs: name: Build and deploy Windows wheels os: windows language: shell - install: python3 -m pip install cibuildwheel==3.0.0b1 twine + install: python3 -m pip install cibuildwheel==3.0.0b2 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl diff --git a/pyproject.toml b/pyproject.toml index cb5ae27a6..d2b8cf705 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "cibuildwheel" -version = "3.0.0b1" +version = "3.0.0b2" description = "Build Python wheels on CI with minimal configuration." readme = "README.md" license = "BSD-2-Clause" From e2b64318229bced9568d6b5f7b9c11ba0a702c02 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 26 May 2025 00:35:27 -0400 Subject: [PATCH 1049/1105] docs: flip TOML and envvars order (#2389) --- docs/extra.css | 36 ++ docs/options.md | 1071 ++++++++++++++++++++++++++--------------------- docs/setup.md | 36 +- 3 files changed, 658 insertions(+), 485 deletions(-) diff --git a/docs/extra.css b/docs/extra.css index df7103cea..ecd99f667 100644 --- a/docs/extra.css +++ b/docs/extra.css @@ -45,6 +45,42 @@ h1, h2, h3, h4, h5, h6 { border-bottom: 1px solid #e1e4e5; margin-bottom: 0.8em; padding-bottom: 0.2em; + scroll-margin: 1.5em 0; +} + +/* make it so tables can overflow the content area, make the most of the content area */ +.wy-nav-content-wrap { + container-type: inline-size; +} +.wy-table-responsive { + overflow-x: auto; + overflow-y: hidden; + position: relative; + left: -3.236em; + max-width: calc(100cqw); + width: fit-content; + min-width: calc(100% + 3.236em + 3.236em); +} +.rst-content .section .wy-table-responsive .docutils { + padding-left: 3.236em; + padding-right: 3.236em; +} +.rst-content .section .wy-table-responsive .docutils thead, +.rst-content .section .wy-table-responsive .docutils tbody { + background-color: white; +} +@media screen and (max-width: 768px) { + .wy-table-responsive { + left: -1em; + } + .rst-content .section .wy-table-responsive .docutils { + padding-left: 1em; + padding-right: 1em; + } +} + +.wy-nav-content { + max-width: 900px; } .rst-content blockquote { diff --git a/docs/options.md b/docs/options.md index 3bd90369f..3ade43d93 100644 --- a/docs/options.md +++ b/docs/options.md @@ -4,7 +4,7 @@ ## Build selection -### `CIBW_PLATFORM` {: #platform} +### `platform` {: #platform cmd-line env-var } > Override the auto-detected target platform @@ -40,13 +40,13 @@ This option can also be set using the [command-line option](#command-line) `--pl not require `--platform` or `--arch`, and will override any build/skip configuration. -### `CIBW_BUILD`, `CIBW_SKIP` {: #build-skip} +### `build`, `skip` {: #build-skip toml env-var } > Choose the Python versions to build List of builds to build and skip. Each build has an identifier like `cp38-manylinux_x86_64` or `cp37-macosx_x86_64` - you can list specific ones to build and cibuildwheel will only build those, and/or list ones to skip and cibuildwheel won't try to build them. -When both options are specified, both conditions are applied and only builds with a tag that matches `CIBW_BUILD` and does not match `CIBW_SKIP` will be built. +When both options are specified, both conditions are applied and only builds with a tag that matches `build` and does not match `skip` will be built. When setting the options, you can use shell-style globbing syntax, as per [fnmatch](https://docs.python.org/3/library/fnmatch.html) with the addition of curly bracket syntax `{option1,option2}`, provided by [bracex](https://pypi.org/project/bracex/). All the build identifiers supported by cibuildwheel are shown below: @@ -64,99 +64,107 @@ When setting the options, you can use shell-style globbing syntax, as per [fnmat | PyPy3.9 v7.3 | pp39-macosx_x86_64
pp39-macosx_arm64 | pp39-win_amd64 | pp39-manylinux_x86_64
pp39-manylinux_i686 | pp39-manylinux_aarch64 | | | | PyPy3.10 v7.3 | pp310-macosx_x86_64
pp310-macosx_arm64 | pp310-win_amd64 | pp310-manylinux_x86_64
pp310-manylinux_i686 | pp310-manylinux_aarch64 | | | | PyPy3.11 v7.3 | pp311-macosx_x86_64
pp311-macosx_arm64 | pp311-win_amd64 | pp311-manylinux_x86_64
pp311-manylinux_i686 | pp311-manylinux_aarch64 | | | +| GraalPy v24.2 | gp242-macosx_x86_64
gp242-macosx_arm64 | gp242-win_amd64 | gp242-manylinux_x86_64 | gp242-manylinux_aarch64 | | | The list of supported and currently selected build identifiers can also be retrieved by passing the `--print-build-identifiers` flag to cibuildwheel. The format is `python_tag-platform_tag`, with tags similar to those in [PEP 425](https://www.python.org/dev/peps/pep-0425/#details). Windows arm64 platform support is experimental. -Linux riscv64 platform support is experimental and requires an explicit opt-in through [CIBW_ENABLE](#enable). +Linux riscv64 platform support is experimental and requires an explicit opt-in through [`enable`](#enable). See the [cibuildwheel 2 documentation](https://cibuildwheel.pypa.io/en/2.x/) for past end-of-life versions of Python. #### Examples -!!! tab examples "Environment variables" +!!! tab examples "pyproject.toml" - ```yaml + ```toml + [tool.cibuildwheel] # Only build on CPython 3.8 - CIBW_BUILD: cp38-* + build = "cp38-*" # Skip building on CPython 3.8 on the Mac - CIBW_SKIP: cp38-macosx_x86_64 + skip = "cp38-macosx_x86_64" # Skip building on CPython 3.8 on all platforms - CIBW_SKIP: cp38-* + skip = "cp38-*" # Skip CPython 3.8 on Windows - CIBW_SKIP: cp38-win* + skip = "cp38-win*" # Skip CPython 3.8 on 32-bit Windows - CIBW_SKIP: cp38-win32 + skip = "cp38-win32" # Skip CPython 3.8 and CPython 3.9 - CIBW_SKIP: cp38-* cp39-* + skip = ["cp38-*", "cp39-*"] # Skip Python 3.8 on Linux - CIBW_SKIP: cp38-manylinux* + skip = "cp38-manylinux*" # Skip 32-bit builds - CIBW_SKIP: "*-win32 *-manylinux_i686" + skip = ["*-win32", "*-manylinux_i686"] # Disable building PyPy wheels on all platforms - CIBW_SKIP: pp* + skip = "pp*" ``` - Separate multiple selectors with a space. - -!!! tab examples "pyproject.toml" +!!! tab examples "Environment variables" - ```toml - [tool.cibuildwheel] + ```yaml # Only build on CPython 3.8 - build = "cp38-*" + CIBW_BUILD: cp38-* # Skip building on CPython 3.8 on the Mac - skip = "cp38-macosx_x86_64" + CIBW_SKIP: cp38-macosx_x86_64 # Skip building on CPython 3.8 on all platforms - skip = "cp38-*" + CIBW_SKIP: cp38-* # Skip CPython 3.8 on Windows - skip = "cp38-win*" + CIBW_SKIP: cp38-win* # Skip CPython 3.8 on 32-bit Windows - skip = "cp38-win32" + CIBW_SKIP: cp38-win32 # Skip CPython 3.8 and CPython 3.9 - skip = ["cp38-*", "cp39-*"] + CIBW_SKIP: cp38-* cp39-* # Skip Python 3.8 on Linux - skip = "cp38-manylinux*" + CIBW_SKIP: cp38-manylinux* # Skip 32-bit builds - skip = ["*-win32", "*-manylinux_i686"] + CIBW_SKIP: "*-win32 *-manylinux_i686" # Disable building PyPy wheels on all platforms - skip = "pp*" + CIBW_SKIP: pp* ``` + Separate multiple selectors with a space. + + + It is generally recommended to set `CIBW_BUILD` as an environment variable, though `skip` tends to be useful in a config file; you can statically declare that you don't - support PyPy, for example. + support a specific build, for example. -### `CIBW_ARCHS` {: #archs} +### `archs` {: #archs cmd-line env-var toml } > Change the architectures built on your machine by default. A list of architectures to build. @@ -188,10 +196,10 @@ Options: - `auto32`: Just the 32-bit auto archs - `native`: the native arch of the build machine - Matches [`platform.machine()`](https://docs.python.org/3/library/platform.html#platform.machine). - `all` : expands to all the architectures supported on this OS. You may want - to use [CIBW_BUILD](#build-skip) with this option to target specific + to use [`build`](#build-skip) with this option to target specific architectures via build selectors. -Linux riscv64 platform support is experimental and requires an explicit opt-in through [CIBW_ENABLE](#enable). +Linux riscv64 platform support is experimental and requires an explicit opt-in through [`enable`](#enable). Default: `auto` @@ -203,7 +211,7 @@ Default: `auto` | macOS / Intel | `x86_64` | `x86_64` | `x86_64` | | | macOS / Apple Silicon | `arm64` | `arm64` | `arm64` | | | iOS on macOS / Intel | `x86_64_iphonesimulator` | `x86_64_iphonesimulator` | `x86_64_iphonesimulator` | | -| iOS on macOS / Apple Silicon | `arm64_iphonesimulator` | `arm64_iphoneos` `arm64_iphonesimulator` | `arm64_iphoneos` `arm64_iphonesimulator` | | +| iOS on macOS / Apple Silicon | `arm64_iphonesimulator` | `arm64_iphoneos` `arm64_iphonesimulator` | `arm64_iphoneos` `arm64_iphonesimulator` | If not listed above, `auto` is the same as `native`. @@ -218,40 +226,42 @@ This option can also be set using the [command-line option](#command-line) #### Examples -!!! tab examples "Environment variables" +!!! tab examples "pyproject.toml" - ```yaml + ```toml # Build `universal2` and `arm64` wheels on an Intel runner. # Note that the `arm64` wheel and the `arm64` part of the `universal2` # wheel cannot be tested in this configuration. - CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" + [tool.cibuildwheel.macos] + archs = ["x86_64", "universal2", "arm64"] # On an Linux Intel runner with qemu installed, build Intel and ARM wheels - CIBW_ARCHS_LINUX: "auto aarch64" + [tool.cibuildwheel.linux] + archs = ["auto", "aarch64"] ``` - Separate multiple archs with a space. - -!!! tab examples "pyproject.toml" +!!! tab examples "Environment variables" - ```toml + ```yaml # Build `universal2` and `arm64` wheels on an Intel runner. # Note that the `arm64` wheel and the `arm64` part of the `universal2` # wheel cannot be tested in this configuration. - [tool.cibuildwheel.macos] - archs = ["x86_64", "universal2", "arm64"] + CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" # On an Linux Intel runner with qemu installed, build Intel and ARM wheels - [tool.cibuildwheel.linux] - archs = ["auto", "aarch64"] + CIBW_ARCHS_LINUX: "auto aarch64" ``` + Separate multiple archs with a space. + + + It is generally recommended to use the environment variable or command-line option for Linux, as selecting archs often depends on your specific runner having qemu installed. -### `CIBW_PROJECT_REQUIRES_PYTHON` {: #requires-python} +### `project-requires-python` {: #requires-python env-var} > Manually set the Python compatibility of your project By default, cibuildwheel reads your package's Python compatibility from @@ -301,7 +311,7 @@ the package is compatible with all versions of Python that it can build. CIBW_PROJECT_REQUIRES_PYTHON: ">=3.8" ``` -### `CIBW_ENABLE` {: #enable} +### `enable` {: #enable toml env-var} > Enable building with extra categories of selectors present. This option lets you opt-in to non-default builds, like pre-releases and @@ -343,16 +353,34 @@ This option doesn't support overrides or platform specific variants; it is intended as a way to acknowledge that a project is aware that these extra selectors exist. If you need to enable/disable it per platform or python version, set this option to `true` and use -[`CIBW_BUILD`](#build-skip)/[`CIBW_SKIP`](#build-skip) options to filter the +[`build`](#build-skip)/[`skip`](#build-skip) options to filter the builds. Unlike all other cibuildwheel options, the environment variable setting will only add to the TOML config; you can't remove an enable by setting an empty or -partial list in environment variables; use `CIBW_SKIP` instead. +partial list in environment variables; use `CIBW_SKIP` instead. This way, if +you apply `cpython-prerelease` during the beta period using `CIBW_ENABLE` +without disabling your other enables. #### Examples +!!! tab examples "pyproject.toml" + + ```toml + [tool.cibuildwheel] + # Enable free-threaded support + enable = ["cpython-freethreading"] + + # Skip building free-threaded compatible wheels on Windows + enable = ["cpython-freethreading"] + skip = "*t-win*" + + # Include all PyPy versions + enable = ["pypy", "pypy-eol"] + ``` + + !!! tab examples "Environment variables" ```yaml @@ -368,28 +396,14 @@ partial list in environment variables; use `CIBW_SKIP` instead. # Skip building free-threaded compatible wheels on Windows CIBW_ENABLE: cpython-freethreading CIBW_SKIP: *t-win* - ``` - - It is generally recommended to use `cpython-freethreading` in a config - file as you can statically declare that you support free-threaded builds. - -!!! tab examples "pyproject.toml" - - ```toml - [tool.cibuildwheel] - # Enable free-threaded support - enable = ["cpython-freethreading"] - # Skip building free-threaded compatible wheels on Windows - enable = ["cpython-freethreading"] - skip = "*t-win*" + # Include all PyPy versions + CIBW_ENABLE = pypy pypy-eol ``` - It is generally not recommended to use `cpython-prerelease` in a config file, - as it's intended for testing pre-releases for a 2-3 month period only. -### `CIBW_ALLOW_EMPTY` {: #allow-empty} +### `allow-empty` {: #allow-empty cmd-line env-var} > Suppress the error code if no wheels match the specified build identifiers When none of the specified build identifiers match any available versions, @@ -413,7 +427,7 @@ This option can also be set using the [command-line option](#command-line) ## Build customization -### `CIBW_BUILD_FRONTEND` {: #build-frontend} +### `build-frontend` {: #build-frontend toml env-var} > Set the tool to use to build, either "build" (default), "build\[uv\]", or "pip" Options: @@ -452,46 +466,42 @@ optional `args` option. #### Examples -!!! tab examples "Environment variables" - - ```yaml - # Switch to using build - CIBW_BUILD_FRONTEND: "build" +!!! tab examples "pyproject.toml" - # Ensure pip is used even if the default changes in the future - CIBW_BUILD_FRONTEND: "pip" + ```toml + [tool.cibuildwheel] + # Switch to using pip + build-frontend = "pip" # supply an extra argument to 'pip wheel' - CIBW_BUILD_FRONTEND: "pip; args: --no-build-isolation" + build-frontend = { name = "pip", args = ["--no-build-isolation"] } # Use uv and build - CIBW_BUILD_FRONTEND: "build[uv]" + build-frontend = "build[uv]" # Use uv and build with an argument - CIBW_BUILD_FRONTEND: "build[uv]; args: --no-isolation" + build-frontend = { name = "build[uv]", args = ["--no-isolation"] } ``` -!!! tab examples "pyproject.toml" - - ```toml - [tool.cibuildwheel] - # Switch to using build - build-frontend = "build" +!!! tab examples "Environment variables" - # Ensure pip is used even if the default changes in the future - build-frontend = "pip" + ```yaml + # Switch to using pip + CIBW_BUILD_FRONTEND: "pip" # supply an extra argument to 'pip wheel' - build-frontend = { name = "pip", args = ["--no-build-isolation"] } + CIBW_BUILD_FRONTEND: "pip; args: --no-build-isolation" # Use uv and build - build-frontend = "build[uv]" + CIBW_BUILD_FRONTEND: "build[uv]" # Use uv and build with an argument - build-frontend = { name = "build[uv]", args = ["--no-isolation"] } + CIBW_BUILD_FRONTEND: "build[uv]; args: --no-isolation" ``` -### `CIBW_CONFIG_SETTINGS` {: #config-settings} + + +### `config-settings` {: #config-settings env-var toml} > Specify config-settings for the build backend. Specify config settings for the build backend. Each space separated @@ -508,21 +518,23 @@ Platform-specific environment variables also available:
#### Examples +!!! tab examples "pyproject.toml" + + ```toml + [tool.cibuildwheel.config-settings] + --build-option = "--use-mypyc" + ``` + !!! tab examples "Environment variables" ```yaml CIBW_CONFIG_SETTINGS: "--build-option=--use-mypyc" ``` -!!! tab examples "pyproject.toml" - ```toml - [tool.cibuildwheel.config-settings] - --build-option = "--use-mypyc" - ``` -### `CIBW_ENVIRONMENT` {: #environment} +### `environment` {: #environment env-var toml} > Set environment variables A list of environment variables to set during the build and test phases. Bash syntax should be used, even on Windows. @@ -538,35 +550,6 @@ Platform-specific environment variables are also available:
#### Examples -!!! tab examples "Environment variables" - - ```yaml - # Set some compiler flags - CIBW_ENVIRONMENT: CFLAGS='-g -Wall' CXXFLAGS='-Wall' - - # Append a directory to the PATH variable (this is expanded in the build environment) - CIBW_ENVIRONMENT: PATH=$PATH:/usr/local/bin - - # Prepend a directory containing spaces on Windows. - CIBW_ENVIRONMENT_WINDOWS: > - PATH="C:\\Program Files\\PostgreSQL\\13\\bin;$PATH" - - # Set BUILD_TIME to the output of the `date` command - CIBW_ENVIRONMENT: BUILD_TIME="$(date)" - - # Supply options to `pip` to affect how it downloads dependencies - CIBW_ENVIRONMENT: PIP_EXTRA_INDEX_URL=https://pypi.myorg.com/simple - - # Any pip command-line options can be set using the PIP_ prefix - # https://pip.pypa.io/en/stable/topics/configuration/#environment-variables - CIBW_ENVIRONMENT: PIP_GLOBAL_OPTION="build_ext -j4" - - # Set two flags on linux only - CIBW_ENVIRONMENT_LINUX: BUILD_TIME="$(date)" SAMPLE_TEXT="sample text" - ``` - - Separate multiple values with a space. - !!! tab examples "pyproject.toml" ```toml @@ -604,7 +587,36 @@ Platform-specific environment variables are also available:
SAMPLE_TEXT = "sample text" ``` - In configuration mode, you can use a [TOML][] table instead of a raw string as shown above. + In configuration files, you can use a [TOML][] table instead of a raw string as shown above. + +!!! tab examples "Environment variables" + + ```yaml + # Set some compiler flags + CIBW_ENVIRONMENT: CFLAGS='-g -Wall' CXXFLAGS='-Wall' + + # Append a directory to the PATH variable (this is expanded in the build environment) + CIBW_ENVIRONMENT: PATH=$PATH:/usr/local/bin + + # Prepend a directory containing spaces on Windows. + CIBW_ENVIRONMENT_WINDOWS: > + PATH="C:\\Program Files\\PostgreSQL\\13\\bin;$PATH" + + # Set BUILD_TIME to the output of the `date` command + CIBW_ENVIRONMENT: BUILD_TIME="$(date)" + + # Supply options to `pip` to affect how it downloads dependencies + CIBW_ENVIRONMENT: PIP_EXTRA_INDEX_URL=https://pypi.myorg.com/simple + + # Any pip command-line options can be set using the PIP_ prefix + # https://pip.pypa.io/en/stable/topics/configuration/#environment-variables + CIBW_ENVIRONMENT: PIP_GLOBAL_OPTION="build_ext -j4" + + # Set two flags on linux only + CIBW_ENVIRONMENT_LINUX: BUILD_TIME="$(date)" SAMPLE_TEXT="sample text" + ``` + + Separate multiple values with a space. !!! note cibuildwheel always defines the environment variable `CIBUILDWHEEL=1`. This can be useful for [building wheels with optional extensions](faq.md#optional-extensions). @@ -612,7 +624,7 @@ Platform-specific environment variables are also available:
!!! note To do its work, cibuildwheel sets the variables `VIRTUALENV_PIP`, `DIST_EXTRA_CONFIG`, `SETUPTOOLS_EXT_SUFFIX`, `PIP_DISABLE_PIP_VERSION_CHECK`, `PIP_ROOT_USER_ACTION`, and it extends the variables `PATH` and `PIP_CONSTRAINT`. Your assignments to these options might be replaced or extended. -### `CIBW_ENVIRONMENT_PASS_LINUX` {: #environment-pass} +### `environment-pass` {: #environment-pass env-var="CIBW_ENVIRONMENT_PASS_LINUX" toml} > Set environment variables on the host to pass-through to the container. A list of environment variables to pass into the linux container during each build and test. It has no effect on the other platforms, which can already access all environment variables directly. @@ -624,33 +636,33 @@ To specify more than one environment variable, separate the variable names by sp #### Examples -!!! tab examples "Environment passthrough" +!!! tab examples "pyproject.toml" + + ```toml + [tool.cibuildwheel.linux] - ```yaml # Export a variable - CIBW_ENVIRONMENT_PASS_LINUX: CFLAGS + environment-pass = ["CFLAGS"] # Set two flags variables - CIBW_ENVIRONMENT_PASS_LINUX: BUILD_TIME SAMPLE_TEXT + environment-pass = ["BUILD_TIME", "SAMPLE_TEXT"] ``` - Separate multiple values with a space. - -!!! tab examples "pyproject.toml" + In configuration files, you can use a [TOML][] list instead of a raw string as shown above. - ```toml - [tool.cibuildwheel.linux] +!!! tab examples "Environment variables" + ```yaml # Export a variable - environment-pass = ["CFLAGS"] + CIBW_ENVIRONMENT_PASS_LINUX: CFLAGS # Set two flags variables - environment-pass = ["BUILD_TIME", "SAMPLE_TEXT"] + CIBW_ENVIRONMENT_PASS_LINUX: BUILD_TIME SAMPLE_TEXT ``` - In configuration mode, you can use a [TOML][] list instead of a raw string as shown above. + Separate multiple values with a space. -### `CIBW_BEFORE_ALL` {: #before-all} +### `before-all` {: #before-all env-var toml} > Execute a shell command on the build system before any wheels are built. Shell command that runs before any builds are run, to build or install parts that do not depend on the specific version of Python. @@ -659,7 +671,7 @@ This option is very useful for the Linux build, where builds take place in isola The placeholder `{package}` can be used here; it will be replaced by the path to the package being built by cibuildwheel. -On Windows and macOS, the version of Python available inside `CIBW_BEFORE_ALL` is whatever is available on the host machine. On Linux, a modern Python version is available on PATH. +On Windows and macOS, the version of Python available inside `before-all` is whatever is available on the host machine. On Linux, a modern Python version is available on PATH. This option has special behavior in the overrides section in `pyproject.toml`. On linux, overriding it triggers a new container launch. It cannot be overridden @@ -670,30 +682,10 @@ Platform-specific environment variables also available:
!!! note - This command is executed in a different Python environment from the builds themselves. So you can't `pip install` a Python dependency in CIBW_BEFORE_ALL and use it in the build. Instead, look at [`CIBW_BEFORE_BUILD`](#before-build), or, if your project uses pyproject.toml, the [build-system.requires](https://peps.python.org/pep-0518/#build-system-table) field. + This command is executed in a different Python environment from the builds themselves. So you can't `pip install` a Python dependency in `before-all` and use it in the build. Instead, look at [`before-build`](#before-build), or, if your project uses pyproject.toml, the [build-system.requires](https://peps.python.org/pep-0518/#build-system-table) field. #### Examples -!!! tab examples "Environment variables" - - ```yaml - # Build third party library - CIBW_BEFORE_ALL: make -C third_party_lib - - # Install system library - CIBW_BEFORE_ALL_LINUX: yum install -y libffi-devel - - # Chain multiple commands using && and > in a YAML file, like: - CIBW_BEFORE_ALL: > - yum install bzip2 -y && - make third_party - ``` - - For multiline commands, see the last example. The character `>` means that - whitespace is collapsed to a single line, and '&&' between each command - ensures that errors are not ignored. [Further reading on multiline YAML - here.](https://yaml-multiline.info). - !!! tab examples "pyproject.toml" ```toml @@ -714,14 +706,36 @@ Platform-specific environment variables also available:
In configuration files, you can use a TOML array, and each line will be run sequentially - joined with `&&`. -Note that manylinux_2_31 builds occur inside a debian derivative docker container, where -manylinux2014 builds occur inside a CentOS one. So for `manylinux_2_31` the `CIBW_BEFORE_ALL_LINUX` command -must use `apt-get -y` instead. - -### `CIBW_BEFORE_BUILD` {: #before-build} -> Execute a shell command preparing each wheel's build +!!! tab examples "Environment variables" -A shell command to run before building the wheel. This option allows you to run a command in **each** Python environment before the `pip wheel` command. This is useful if you need to set up some dependency so it's available during the build. + ```yaml + # Build third party library + CIBW_BEFORE_ALL: make -C third_party_lib + + # Install system library + CIBW_BEFORE_ALL_LINUX: yum install -y libffi-devel + + # Chain multiple commands using && and > in a YAML file, like: + CIBW_BEFORE_ALL: > + yum install bzip2 -y && + make third_party + ``` + + For multiline commands, see the last example. The character `>` means that + whitespace is collapsed to a single line, and '&&' between each command + ensures that errors are not ignored. [Further reading on multiline YAML + here.](https://yaml-multiline.info). + + +Note that `manylinux_2_31` builds occur inside a Debian derivative docker +container, where `manylinux2014` builds occur inside a CentOS one. So for +`manylinux_2_31` the `before-all` command must use `apt-get -y` +instead. + +### `before-build` {: #before-build env-var toml} +> Execute a shell command preparing each wheel's build + +A shell command to run before building the wheel. This option allows you to run a command in **each** Python environment before the `pip wheel` command. This is useful if you need to set up some dependency so it's available during the build. If dependencies are required to build your wheel (for example if you include a header from a Python module), instead of using this command, we recommend adding requirements to a `pyproject.toml` file's `build-system.requires` array instead. This is reproducible, and users who do not get your wheels (such as Alpine or ClearLinux users) will still benefit. @@ -734,22 +748,6 @@ Platform-specific environment variables are also available:
#### Examples -!!! tab examples "Environment variables" - - ```yaml - # Install something required for the build (you might want to use pyproject.toml instead) - CIBW_BEFORE_BUILD: pip install pybind11 - - # Chain commands using && - CIBW_BEFORE_BUILD_LINUX: python scripts/install-deps.py && make clean - - # Run a script that's inside your project - CIBW_BEFORE_BUILD: bash scripts/prepare_for_build.sh - - # If cibuildwheel is called with a package_dir argument, it's available as {package} - CIBW_BEFORE_BUILD: "{package}/script/prepare_for_build.sh" - ``` - !!! tab examples "pyproject.toml" ```toml @@ -773,9 +771,27 @@ Platform-specific environment variables are also available:
before-build = "{package}/script/prepare_for_build.sh" ``` - In configuration mode, you can use a array, and the items will be joined with `&&`. In TOML, using a single-quote string will avoid escapes - useful for + In configuration files, you can use a array, and the items will be joined + with `&&`. In TOML, using a single-quote string will avoid escapes - useful for Windows paths. +!!! tab examples "Environment variables" + + ```yaml + # Install something required for the build (you might want to use pyproject.toml instead) + CIBW_BEFORE_BUILD: pip install pybind11 + + # Chain commands using && + CIBW_BEFORE_BUILD_LINUX: python scripts/install-deps.py && make clean + + # Run a script that's inside your project + CIBW_BEFORE_BUILD: bash scripts/prepare_for_build.sh + + # If cibuildwheel is called with a package_dir argument, it's available as {package} + CIBW_BEFORE_BUILD: "{package}/script/prepare_for_build.sh" + ``` + + !!! note If you need Python dependencies installed for the build, we recommend using `pyproject.toml`'s `build-system.requires` instead. This is an example @@ -785,8 +801,7 @@ Platform-specific environment variables are also available:
requires = [ "setuptools>=42", "Cython", - "numpy==1.13.3; python_version<'3.5'", - "oldest-supported-numpy; python_version>='3.5'", + "numpy", ] build-backend = "setuptools.build_meta" @@ -794,59 +809,53 @@ Platform-specific environment variables are also available:
This [PEP 517][]/[PEP 518][] style build allows you to completely control the build environment in cibuildwheel, [PyPA-build][], and pip, doesn't force downstream users to install anything they don't need, and lets you do - more complex pinning (Cython, for example, requires a wheel to be built - with an equal or earlier version of NumPy; pinning in this way is the only - way to ensure your module works on all available NumPy versions). + more complex pinning. [PyPA-build]: https://pypa-build.readthedocs.io/en/latest/ [PEP 517]: https://www.python.org/dev/peps/pep-0517/ [PEP 518]: https://www.python.org/dev/peps/pep-0517/ -### `CIBW_XBUILD_TOOLS` {: #xbuild-tools} +### `xbuild-tools` {: #xbuild-tools env-var toml} > Binaries on the path that should be included in an isolated cross-build environment. When building in a cross-platform environment, it is sometimes necessary to isolate the ``PATH`` so that binaries from the build machine don't accidentally get linked into the cross-platform binary. However, this isolation process will also hide tools that might be required to build your wheel. -If there are binaries present on the `PATH` when you invoke cibuildwheel, and those binaries are required to build your wheels, those binaries can be explicitly included in the isolated cross-build environment using `CIBW_XBUILD_TOOLS`. The binaries listed in this setting will be linked into an isolated location, and that isolated location will be put on the `PATH` of the isolated environment. You do not need to provide the full path to the binary - only the executable name that would be found by the shell. +If there are binaries present on the `PATH` when you invoke cibuildwheel, and those binaries are required to build your wheels, those binaries can be explicitly included in the isolated cross-build environment using `xbuild-tools`. The binaries listed in this setting will be linked into an isolated location, and that isolated location will be put on the `PATH` of the isolated environment. You do not need to provide the full path to the binary - only the executable name that would be found by the shell. If you declare a tool as a cross-build tool, and that tool cannot be found in the runtime environment, an error will be raised. -If you do not define `CIBW_XBUILD_TOOLS`, and you build for a platform that uses a cross-platform environment, a warning will be raised. If your project does not require any cross-build tools, you can set `CIBW_XBUILD_TOOLS` to an empty list to silence this warning. +If you do not define `xbuild-tools`, and you build for a platform that uses a cross-platform environment, a warning will be raised. If your project does not require any cross-build tools, you can set `xbuild-tools` to an empty list to silence this warning. -*Any* tool used by the build process must be included in the `CIBW_XBUILD_TOOLS` list, not just tools that cibuildwheel will invoke directly. For example, if your build invokes `cmake`, and the `cmake` script invokes `magick` to perform some image transformations, both `cmake` and `magick` must be included in your safe tools list. +*Any* tool used by the build process must be included in the `xbuild-tools` list, not just tools that cibuildwheel will invoke directly. For example, if your build invokes `cmake`, and the `cmake` script invokes `magick` to perform some image transformations, both `cmake` and `magick` must be included in your safe tools list. Platform-specific environment variables are also available on platforms that use cross-platform environment isolation:
`CIBW_XBUILD_TOOLS_IOS` #### Examples -!!! tab examples "Environment variables" +!!! tab examples "pyproject.toml" - ```yaml + ```toml + [tool.cibuildwheel] # Allow access to the cmake and rustc binaries in the isolated cross-build environment. - CIBW_XBUILD_TOOLS: cmake rustc - ``` + xbuild-tools = ["cmake", "rustc"] - ```yaml # No cross-build tools are required - CIBW_XBUILD_TOOLS: + xbuild-tools = [] ``` -!!! tab examples "pyproject.toml" +!!! tab examples "Environment variables" - ```toml - [tool.cibuildwheel] + ```yaml # Allow access to the cmake and rustc binaries in the isolated cross-build environment. - xbuild-tools = ["cmake", "rustc"] - ``` + CIBW_XBUILD_TOOLS: cmake rustc - ```toml - [tool.cibuildwheel] # No cross-build tools are required - xbuild-tools = [] + CIBW_XBUILD_TOOLS: ``` -### `CIBW_REPAIR_WHEEL_COMMAND` {: #repair-wheel-command} + +### `repair-wheel-command` {: #repair-wheel-command env-var toml} > Execute a shell command to repair each built wheel Default: @@ -888,36 +897,6 @@ Platform-specific environment variables are also available:
#### Examples -!!! tab examples "Environment variables" - - ```yaml - # Use delvewheel on windows - CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel" - CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel}" - - # Don't repair macOS wheels - CIBW_REPAIR_WHEEL_COMMAND_MACOS: "" - - # Pass the `--lib-sdir .` flag to auditwheel on Linux - CIBW_REPAIR_WHEEL_COMMAND_LINUX: "auditwheel repair --lib-sdir . -w {dest_dir} {wheel}" - - # Multi-line example - use && to join on all platforms - CIBW_REPAIR_WHEEL_COMMAND: > - python scripts/repair_wheel.py -w {dest_dir} {wheel} && - python scripts/check_repaired_wheel.py -w {dest_dir} {wheel} - - # Use abi3audit to catch issues with Limited API wheels - CIBW_REPAIR_WHEEL_COMMAND_LINUX: > - auditwheel repair -w {dest_dir} {wheel} && - pipx run abi3audit --strict --report {wheel} - CIBW_REPAIR_WHEEL_COMMAND_MACOS: > - delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} && - pipx run abi3audit --strict --report {wheel} - CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: > - copy {wheel} {dest_dir} && - pipx run abi3audit --strict --report {wheel} - ``` - !!! tab examples "pyproject.toml" ```toml @@ -959,45 +938,76 @@ Platform-specific environment variables are also available:
] ``` - In configuration mode, you can use an inline array, and the items will be joined with `&&`. + In configuration files, you can use an inline array, and the items will be joined with `&&`. + + +!!! tab examples "Environment variables" + + ```yaml + # Use delvewheel on windows + CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel" + CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel}" + + # Don't repair macOS wheels + CIBW_REPAIR_WHEEL_COMMAND_MACOS: "" + + # Pass the `--lib-sdir .` flag to auditwheel on Linux + CIBW_REPAIR_WHEEL_COMMAND_LINUX: "auditwheel repair --lib-sdir . -w {dest_dir} {wheel}" + + # Multi-line example - use && to join on all platforms + CIBW_REPAIR_WHEEL_COMMAND: > + python scripts/repair_wheel.py -w {dest_dir} {wheel} && + python scripts/check_repaired_wheel.py -w {dest_dir} {wheel} + + # Use abi3audit to catch issues with Limited API wheels + CIBW_REPAIR_WHEEL_COMMAND_LINUX: > + auditwheel repair -w {dest_dir} {wheel} && + pipx run abi3audit --strict --report {wheel} + CIBW_REPAIR_WHEEL_COMMAND_MACOS: > + delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} && + pipx run abi3audit --strict --report {wheel} + CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: > + copy {wheel} {dest_dir} && + pipx run abi3audit --strict --report {wheel} + ``` -### `CIBW_MANYLINUX_*_IMAGE`, `CIBW_MUSLLINUX_*_IMAGE` {: #linux-image} +### `manylinux-*-image`, `musllinux-*-image` {: #linux-image env-var toml} > Specify manylinux / musllinux container images The available options are: -| Option | Default | -|-----------------------------------|-----------------------------------------------------------------| -| CIBW_MANYLINUX_X86_64_IMAGE | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_x86_64) | -| CIBW_MANYLINUX_I686_IMAGE | [`manylinux2014`](https://quay.io/pypa/manylinux2014_i686) | -| CIBW_MANYLINUX_PYPY_X86_64_IMAGE | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_x86_64) | -| CIBW_MANYLINUX_AARCH64_IMAGE | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_aarch64) | -| CIBW_MANYLINUX_PPC64LE_IMAGE | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_ppc64le) | -| CIBW_MANYLINUX_S390X_IMAGE | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_s390x) | -| CIBW_MANYLINUX_ARMV7L_IMAGE | [`manylinux_2_31`](https://quay.io/pypa/manylinux_2_31_armv7l) | -| CIBW_MANYLINUX_RISCV64_IMAGE | No default | -| CIBW_MANYLINUX_PYPY_AARCH64_IMAGE | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_aarch64) | -| CIBW_MANYLINUX_PYPY_I686_IMAGE | [`manylinux2014`](https://quay.io/pypa/manylinux2014_i686) | -| CIBW_MUSLLINUX_X86_64_IMAGE | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_x86_64) | -| CIBW_MUSLLINUX_I686_IMAGE | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_i686) | -| CIBW_MUSLLINUX_AARCH64_IMAGE | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_aarch64) | -| CIBW_MUSLLINUX_PPC64LE_IMAGE | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_ppc64le) | -| CIBW_MUSLLINUX_S390X_IMAGE | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_s390x) | -| CIBW_MUSLLINUX_ARMV7L_IMAGE | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_armv7l) | -| CIBW_MUSLLINUX_RISCV64_IMAGE | No default | +| Option | Default | +|--------------------------------|-----------------------------------------------------------------| +| `manylinux-x86-64-image` | [`manylinux-2-28`](https://quay.io/pypa/manylinux-2-28-x86-64) | +| `manylinux-i686-image` | [`manylinux2014`](https://quay.io/pypa/manylinux2014-i686) | +| `manylinux-pypy-x86-64-image` | [`manylinux-2-28`](https://quay.io/pypa/manylinux-2-28-x86-64) | +| `manylinux-aarch64-image` | [`manylinux-2-28`](https://quay.io/pypa/manylinux-2-28-aarch64) | +| `manylinux-ppc64le-image` | [`manylinux-2-28`](https://quay.io/pypa/manylinux-2-28-ppc64le) | +| `manylinux-s390x-image` | [`manylinux-2-28`](https://quay.io/pypa/manylinux-2-28-s390x) | +| `manylinux-armv7l-image` | [`manylinux-2-31`](https://quay.io/pypa/manylinux-2-31-armv7l) | +| `manylinux-riscv64-image` | No default | +| `manylinux-pypy-aarch64-image` | [`manylinux-2-28`](https://quay.io/pypa/manylinux-2-28-aarch64) | +| `manylinux-pypy-i686-image` | [`manylinux2014`](https://quay.io/pypa/manylinux2014-i686) | +| `musllinux-x86-64-image` | [`musllinux-1-2`](https://quay.io/pypa/musllinux-1-2-x86-64) | +| `musllinux-i686-image` | [`musllinux-1-2`](https://quay.io/pypa/musllinux-1-2-i686) | +| `musllinux-aarch64-image` | [`musllinux-1-2`](https://quay.io/pypa/musllinux-1-2-aarch64) | +| `musllinux-ppc64le-image` | [`musllinux-1-2`](https://quay.io/pypa/musllinux-1-2-ppc64le) | +| `musllinux-s390x-image` | [`musllinux-1-2`](https://quay.io/pypa/musllinux-1-2-s390x) | +| `musllinux-armv7l-image` | [`musllinux-1-2`](https://quay.io/pypa/musllinux-1-2-armv7l) | +| `musllinux-riscv64-image` | No default | Set the Docker image to be used for building [manylinux / musllinux](https://github.com/pypa/manylinux) wheels. -For `CIBW_MANYLINUX_*_IMAGE`, except `CIBW_MANYLINUX_ARMV7L_IMAGE`, the value of this option can either be set to `manylinux2014`, `manylinux_2_28` or `manylinux_2_34` to use a pinned version of the [official manylinux images](https://github.com/pypa/manylinux). Alternatively, set these options to any other valid Docker image name. +For `manylinux-*-image`, except `manylinux-armv7l-image`, the value of this option can either be set to `manylinux2014`, `manylinux_2_28` or `manylinux_2_34` to use a pinned version of the [official manylinux images](https://github.com/pypa/manylinux). Alternatively, set these options to any other valid Docker image name. `manylinux_2_28` and `manylinux_2_34` are not supported for `i686` architecture. -For `CIBW_MANYLINUX_ARMV7L_IMAGE`, the value of this option can either be set to `manylinux_2_31` or a custom image. Support is experimental for now. The `manylinux_2_31` value is only available for `armv7`. +For `manylinux-armv7l-image`, the value of this option can either be set to `manylinux_2_31` or a custom image. Support is experimental for now. The `manylinux_2_31` value is only available for `armv7`. -For `CIBW_MUSLLINUX_*_IMAGE`, the value of this option can either be set to `musllinux_1_2` or a custom image. +For `musllinux-*-image`, the value of this option can either be set to `musllinux_1_2` or a custom image. If this option is blank, it will fall though to the next available definition (environment variable -> pyproject.toml -> default). @@ -1023,30 +1033,6 @@ Auditwheel detects the version of the manylinux / musllinux standard in the imag #### Examples -!!! tab examples "Environment variables" - - ```yaml - # Build using the manylinux2014 image - CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - CIBW_MANYLINUX_I686_IMAGE: manylinux2014 - CIBW_MANYLINUX_PYPY_X86_64_IMAGE: manylinux2014 - CIBW_MANYLINUX_PYPY_I686_IMAGE: manylinux2014 - - # Build using the latest manylinux2010 release - CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2010_x86_64:latest - CIBW_MANYLINUX_I686_IMAGE: quay.io/pypa/manylinux2010_i686:latest - CIBW_MANYLINUX_PYPY_X86_64_IMAGE: quay.io/pypa/manylinux2010_x86_64:latest - CIBW_MANYLINUX_PYPY_I686_IMAGE: quay.io/pypa/manylinux2010_i686:latest - - # Build using a different image from the docker registry - CIBW_MANYLINUX_X86_64_IMAGE: dockcross/manylinux-x64 - CIBW_MANYLINUX_I686_IMAGE: dockcross/manylinux-x86 - - # Build musllinux wheels using the musllinux_1_1 image - CIBW_MUSLLINUX_X86_64_IMAGE: quay.io/pypa/musllinux_1_1_x86_64:latest - CIBW_MUSLLINUX_I686_IMAGE: quay.io/pypa/musllinux_1_1_i686:latest - ``` - !!! tab examples "pyproject.toml" ```toml @@ -1075,8 +1061,32 @@ Auditwheel detects the version of the manylinux / musllinux standard in the imag Like any other option, these can be placed in `[tool.cibuildwheel.linux]` if you prefer; they have no effect on `macos` and `windows`. +!!! tab examples "Environment variables" -### `CIBW_CONTAINER_ENGINE` {: #container-engine} + ```yaml + # Build using the manylinux2014 image + CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 + CIBW_MANYLINUX_I686_IMAGE: manylinux2014 + CIBW_MANYLINUX_PYPY_X86_64_IMAGE: manylinux2014 + CIBW_MANYLINUX_PYPY_I686_IMAGE: manylinux2014 + + # Build using the latest manylinux2010 release + CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2010_x86_64:latest + CIBW_MANYLINUX_I686_IMAGE: quay.io/pypa/manylinux2010_i686:latest + CIBW_MANYLINUX_PYPY_X86_64_IMAGE: quay.io/pypa/manylinux2010_x86_64:latest + CIBW_MANYLINUX_PYPY_I686_IMAGE: quay.io/pypa/manylinux2010_i686:latest + + # Build using a different image from the docker registry + CIBW_MANYLINUX_X86_64_IMAGE: dockcross/manylinux-x64 + CIBW_MANYLINUX_I686_IMAGE: dockcross/manylinux-x86 + + # Build musllinux wheels using the musllinux_1_1 image + CIBW_MUSLLINUX_X86_64_IMAGE: quay.io/pypa/musllinux_1_1_x86_64:latest + CIBW_MUSLLINUX_I686_IMAGE: quay.io/pypa/musllinux_1_1_i686:latest + ``` + + +### `container-engine` {: #container-engine env-var toml} > Specify the container engine to use when building Linux wheels Options: @@ -1110,35 +1120,36 @@ Options can be supplied after the name. #### Examples -!!! tab examples "Environment variables" +!!! tab examples "pyproject.toml" - ```yaml + ```toml + [tool.cibuildwheel] # use podman instead of docker - CIBW_CONTAINER_ENGINE: podman + container-engine = "podman" # pass command line options to 'docker create' - CIBW_CONTAINER_ENGINE: "docker; create_args: --gpus all" + container-engine = { name = "docker", create-args = ["--gpus", "all"]} # disable the /host mount - CIBW_CONTAINER_ENGINE: "docker; disable_host_mount: true" + container-engine = { name = "docker", disable-host-mount = true } ``` -!!! tab examples "pyproject.toml" +!!! tab examples "Environment variables" - ```toml - [tool.cibuildwheel] + ```yaml # use podman instead of docker - container-engine = "podman" + CIBW_CONTAINER_ENGINE: podman # pass command line options to 'docker create' - container-engine = { name = "docker", create-args = ["--gpus", "all"]} + CIBW_CONTAINER_ENGINE: "docker; create_args: --gpus all" # disable the /host mount - container-engine = { name = "docker", disable-host-mount = true } + CIBW_CONTAINER_ENGINE: "docker; disable_host_mount: true" ``` -### `CIBW_DEPENDENCY_VERSIONS` {: #dependency-versions} + +### `dependency-versions` {: #dependency-versions env-var toml} > Control the versions of the tools cibuildwheel uses @@ -1146,7 +1157,7 @@ Options: `pinned` `latest` `packages: SPECIFIER...` `` Default: `pinned` -If `CIBW_DEPENDENCY_VERSIONS` is `pinned`, cibuildwheel uses versions of tools +If `dependency-versions` is `pinned`, cibuildwheel uses versions of tools like `pip`, `setuptools`, `virtualenv` that were pinned with that release of cibuildwheel. This represents a known-good set of dependencies, and is recommended for build repeatability. @@ -1163,7 +1174,7 @@ specifiers inline with the `packages: SPECIFIER...` syntax. !!! note If you need different dependencies for each python version, provide them in the same folder with a `-pythonXY` suffix. e.g. if your - `CIBW_DEPENDENCY_VERSIONS=./constraints.txt`, cibuildwheel will use + `dependency-versions="./constraints.txt"`, cibuildwheel will use `./constraints-python38.txt` on Python 3.8, or fallback to `./constraints.txt` if that's not found. @@ -1173,55 +1184,57 @@ Platform-specific environment variables are also available:
!!! note This option does not affect the tools used on the Linux build - those versions are bundled with the manylinux/musllinux image that cibuildwheel uses. To change - dependency versions on Linux, use the [CIBW_MANYLINUX_* / CIBW_MUSLLINUX_*](#linux-image) + dependency versions on Linux, use the [`manylinux-*` / `musllinux-*`](#linux-image) options. #### Examples -!!! tab examples "Environment variables" +!!! tab examples "pyproject.toml" - ```yaml + ```toml + [tool.cibuildwheel] # Use tools versions that are bundled with cibuildwheel (this is the default) - CIBW_DEPENDENCY_VERSIONS: pinned + dependency-versions = "pinned" # Use the latest versions available on PyPI - CIBW_DEPENDENCY_VERSIONS: latest + dependency-versions = "latest" # Use your own pip constraints file - CIBW_DEPENDENCY_VERSIONS: ./constraints.txt + dependency-versions = { file = "./constraints.txt" } # Specify requirements inline - CIBW_DEPENDENCY_VERSIONS: "packages: auditwheel==6.2.0" + dependency-versions = { packages = ["auditwheel==6.2.0"] } + [tool.cibuildwheel.pyodide] # Choose a specific pyodide-build version - CIBW_DEPENDENCY_VERSIONS_PYODIDE: "packages: pyodide-build==0.29.1" - - # Use shell-style quoting around spaces package specifiers - CIBW_DEPENDENCY_VERSIONS: "packages: 'pip >=16.0.0, !=17'" + dependency-versions = { packages = ["pyodide-build==0.29.1"] } ``` -!!! tab examples "pyproject.toml" +!!! tab examples "Environment variables" - ```toml - [tool.cibuildwheel] + ```yaml # Use tools versions that are bundled with cibuildwheel (this is the default) - dependency-versions = "pinned" + CIBW_DEPENDENCY_VERSIONS: pinned # Use the latest versions available on PyPI - dependency-versions = "latest" + CIBW_DEPENDENCY_VERSIONS: latest # Use your own pip constraints file - dependency-versions = { file = "./constraints.txt" } + CIBW_DEPENDENCY_VERSIONS: ./constraints.txt # Specify requirements inline - dependency-versions = { packages = ["auditwheel==6.2.0"] } + CIBW_DEPENDENCY_VERSIONS: "packages: auditwheel==6.2.0" - [tool.cibuildwheel.pyodide] # Choose a specific pyodide-build version - dependency-versions = { packages = ["pyodide-build==0.29.1"] } + CIBW_DEPENDENCY_VERSIONS_PYODIDE: "packages: pyodide-build==0.29.1" + + # Use shell-style quoting around spaces package specifiers + CIBW_DEPENDENCY_VERSIONS: "packages: 'pip >=16.0.0, !=17'" ``` -### `CIBW_PYODIDE_VERSION` {: #pyodide-version} + + +### `pyodide-version` {: #pyodide-version toml env-var } > Specify the Pyodide version to use for `pyodide` platform builds @@ -1235,20 +1248,10 @@ This option is particularly useful for: The available Pyodide versions are determined by the version of `pyodide-build` being used. You can list the compatible versions using the command `pyodide xbuildenv search --all` as described in the [Pyodide platform documentation](platforms.md#pyodide-choosing-a-version). !!! tip - You can set the version of `pyodide-build` using the [`CIBW_DEPENDENCY_VERSIONS`](#dependency-versions) option. + You can set the version of `pyodide-build` using the [`dependency-versions`](#dependency-versions) option. #### Examples -!!! tab examples "Environment variables" - - ```yaml - # Build Pyodide wheels using Pyodide version 0.27.6 - CIBW_PYODIDE_VERSION: 0.27.6 - - # Build Pyodide wheels using a specific alpha release - CIBW_PYODIDE_VERSION: 0.28.0a2 - ``` - !!! tab examples "pyproject.toml" ```toml @@ -1261,9 +1264,20 @@ The available Pyodide versions are determined by the version of `pyodide-build` pyodide-version = "0.28.0a2" ``` +!!! tab examples "Environment variables" + + ```yaml + # Build Pyodide wheels using Pyodide version 0.27.6 + CIBW_PYODIDE_VERSION: 0.27.6 + + # Build Pyodide wheels using a specific alpha release + CIBW_PYODIDE_VERSION: 0.28.0a2 + ``` + + ## Testing -### `CIBW_TEST_COMMAND` {: #test-command} +### `test-command` {: #test-command env-var toml} > The command to test each built wheel Shell command to run tests after the build. The wheel will be installed @@ -1271,7 +1285,7 @@ automatically and available for import from the tests. If this variable is not set, your wheel will not be installed after building. By default, tests are executed from your project directory. When specifying -`CIBW_TEST_COMMAND`, you can optionally use the placeholders `{package}` and +`test-command`, you can optionally use the placeholders `{package}` and `{project}` to pass in the location of your test code: - `{package}` is the path to the package being built - the `package_dir` @@ -1284,38 +1298,21 @@ Using `{package}` or `{project}` used to be required, but since cibuildwheel use relative paths in your test command, and they will be relative to the project root. -Alternatively, you can use the [`CIBW_TEST_SOURCES`](#test-sources) setting to +Alternatively, you can use the [`test-sources`](#test-sources) setting to create a temporary folder populated with a specific subset of project files to run your test suite. On all platforms other than iOS, the command is run in a shell, so you can write things like `cmd1 && cmd2`. -On iOS, the value of the `CIBW_TEST_COMMAND` setting must follow the format `python -m MODULE [ARGS...]` - where MODULE is a Python module name, followed by arguments that will be assigned to `sys.argv`. Other commands cannot be used. +On iOS, the value of the `test-command` setting must follow the format `python +-m MODULE [ARGS...]` - where MODULE is a Python module name, followed by +arguments that will be assigned to `sys.argv`. Other commands cannot be used. Platform-specific environment variables are also available:
`CIBW_TEST_COMMAND_MACOS` | `CIBW_TEST_COMMAND_WINDOWS` | `CIBW_TEST_COMMAND_LINUX` | `CIBW_TEST_COMMAND_IOS` | `CIBW_TEST_COMMAND_PYODIDE` #### Examples -!!! tab examples "Environment variables" - - ```yaml - # Run the package tests using `pytest` - CIBW_TEST_COMMAND: pytest ./tests - - # Trigger an install of the package, but run nothing of note - CIBW_TEST_COMMAND: "echo Wheel installed" - - # Multi-line example - join with && on all platforms - CIBW_TEST_COMMAND: > - pytest ./tests && - python ./test.py - - # run tests on ios - CIBW_TEST_SOURCES_IOS: tests - CIBW_TEST_COMMAND_IOS: python -m pytest ./tests - ``` - !!! tab examples "pyproject.toml" ```toml @@ -1340,7 +1337,26 @@ Platform-specific environment variables are also available:
In configuration files, you can use an array, and the items will be joined with `&&`. -### `CIBW_BEFORE_TEST` {: #before-test} +!!! tab examples "Environment variables" + + ```yaml + # Run the package tests using `pytest` + CIBW_TEST_COMMAND: pytest ./tests + + # Trigger an install of the package, but run nothing of note + CIBW_TEST_COMMAND: "echo Wheel installed" + + # Multi-line example - join with && on all platforms + CIBW_TEST_COMMAND: > + pytest ./tests && + python ./test.py + + # run tests on ios + CIBW_TEST_SOURCES_IOS: tests + CIBW_TEST_COMMAND_IOS: python -m pytest ./tests + ``` + +### `before-test` {: #before-test env-var toml} > Execute a shell command before testing each wheel A shell command to run in **each** test virtual environment, before your wheel is installed and tested. This is useful if you need to install a non-pip package, invoke pip with different environment variables, @@ -1355,26 +1371,6 @@ Platform-specific environment variables are also available:
#### Examples -!!! tab examples "Environment variables" - - ```yaml - # Install test dependencies with overwritten environment variables. - CIBW_BEFORE_TEST: CC=gcc CXX=g++ pip install -r requirements.txt - - # Chain commands using && - CIBW_BEFORE_TEST: rm -rf ./data/cache && mkdir -p ./data/cache - - # Install non pip python package - CIBW_BEFORE_TEST: > - cd some_dir && - ./configure && - make && - make install - - # Install python packages that are required to install test dependencies - CIBW_BEFORE_TEST: pip install cmake scikit-build - ``` - !!! tab examples "pyproject.toml" ```toml @@ -1404,8 +1400,28 @@ Platform-specific environment variables are also available:
In configuration files, you can use an array, and the items will be joined with `&&`. +!!! tab examples "Environment variables" + + ```yaml + # Install test dependencies with overwritten environment variables. + CIBW_BEFORE_TEST: CC=gcc CXX=g++ pip install -r requirements.txt + + # Chain commands using && + CIBW_BEFORE_TEST: rm -rf ./data/cache && mkdir -p ./data/cache + + # Install non pip python package + CIBW_BEFORE_TEST: > + cd some_dir && + ./configure && + make && + make install + + # Install python packages that are required to install test dependencies + CIBW_BEFORE_TEST: pip install cmake scikit-build + ``` + -### `CIBW_TEST_SOURCES` {: #test-sources} +### `test-sources` {: #test-sources env-var toml} > Files and folders from the source tree that are copied into an isolated tree before running the tests A space-separated list of files and folders, relative to the root of the @@ -1413,7 +1429,7 @@ project, required for running the tests. If specified, these files and folders will be copied into a temporary folder, and that temporary folder will be used as the working directory for running the test suite. -The use of `CIBW_TEST_SOURCES` is *required* for iOS builds. This is because the +The use of `test-sources` is *required* for iOS builds. This is because the simulator does not have access to the project directory, as it is not stored on the simulator device. On iOS, the files will be copied into the test application, rather than a temporary folder. @@ -1423,13 +1439,6 @@ Platform-specific environment variables are also available:
#### Examples -!!! tab examples "Environment variables" - - ```yaml - # Copy the "tests" folder, plus "data/test-image.png" from the source folder to the test folder. - CIBW_TEST_SOURCES: tests data/test-image.png - ``` - !!! tab examples "pyproject.toml" ```toml @@ -1440,8 +1449,15 @@ Platform-specific environment variables are also available:
In configuration files, you can use an array, and the items will be joined with a space. +!!! tab examples "Environment variables" + + ```yaml + # Copy the "tests" folder, plus "data/test-image.png" from the source folder to the test folder. + CIBW_TEST_SOURCES: tests data/test-image.png + ``` -### `CIBW_TEST_REQUIRES` {: #test-requires} + +### `test-requires` {: #test-requires env-var toml} > Install Python dependencies before running the tests Space-separated list of dependencies required for running the tests. @@ -1451,20 +1467,10 @@ Platform-specific environment variables are also available:
#### Examples -!!! tab examples "Environment variables" - - ```yaml - # Install pytest before running CIBW_TEST_COMMAND - CIBW_TEST_REQUIRES: pytest - - # Install specific versions of test dependencies - CIBW_TEST_REQUIRES: pytest==8.2.2 packaging==24.1 - ``` - !!! tab examples "pyproject.toml" ```toml - # Install pytest before running CIBW_TEST_COMMAND + # Install pytest before running test-command [tool.cibuildwheel] test-requires = "pytest" @@ -1475,15 +1481,26 @@ Platform-specific environment variables are also available:
In configuration files, you can use an array, and the items will be joined with a space. +!!! tab examples "Environment variables" + + ```yaml + # Install pytest before running CIBW_TEST_COMMAND + CIBW_TEST_REQUIRES: pytest + + # Install specific versions of test dependencies + CIBW_TEST_REQUIRES: pytest==8.2.2 packaging==24.1 + ``` + -### `CIBW_TEST_EXTRAS` {: #test-extras} + +### `test-extras` {: #test-extras env-var toml} > Install your wheel for testing using `extras_require` List of [extras_require](https://setuptools.pypa.io/en/latest/userguide/dependency_management.html#declaring-required-dependency) options that should be included when installing the wheel prior to running the tests. This can be used to avoid having to redefine test dependencies in -`CIBW_TEST_REQUIRES` if they are already defined in `pyproject.toml`, +`test-requires` if they are already defined in `pyproject.toml`, `setup.cfg` or `setup.py`. Platform-specific environment variables are also available:
@@ -1491,15 +1508,6 @@ Platform-specific environment variables are also available:
#### Examples -!!! tab examples "Environment variables" - - ```yaml - # Will cause the wheel to be installed with `pip install [test,qt]` - CIBW_TEST_EXTRAS: "test,qt" - ``` - - Separate multiple items with a comma. - !!! tab examples "pyproject.toml" ```toml @@ -1510,30 +1518,31 @@ Platform-specific environment variables are also available:
In configuration files, you can use an inline array, and the items will be joined with a comma. +!!! tab examples "Environment variables" + + ```yaml + # Will cause the wheel to be installed with `pip install [test,qt]` + CIBW_TEST_EXTRAS: "test,qt" + ``` + + Separate multiple items with a comma. + + -### `CIBW_TEST_GROUPS` {: #test-groups} +### `test-groups` {: #test-groups env-var toml} > Specify test dependencies from your project's `dependency-groups` List of [dependency-groups](https://peps.python.org/pep-0735) that should be included when installing the wheel prior to running the tests. This can be used to avoid having to redefine test dependencies in -`CIBW_TEST_REQUIRES` if they are already defined in `pyproject.toml`. +`test-requires` if they are already defined in `pyproject.toml`. Platform-specific environment variables are also available:
`CIBW_TEST_GROUPS_MACOS` | `CIBW_TEST_GROUPS_WINDOWS` | `CIBW_TEST_GROUPS_LINUX` | `CIBW_TEST_GROUPS_PYODIDE` #### Examples -!!! tab examples "Environment variables" - - ```yaml - # Will cause the wheel to be installed with these groups of dependencies - CIBW_TEST_GROUPS: "test qt" - ``` - - Separate multiple items with a space. - !!! tab examples "pyproject.toml" ```toml @@ -1544,10 +1553,20 @@ Platform-specific environment variables are also available:
In configuration files, you can use an inline array, and the items will be joined with a space. -### `CIBW_TEST_SKIP` {: #test-skip} + +!!! tab examples "Environment variables" + + ```yaml + # Will cause the wheel to be installed with these groups of dependencies + CIBW_TEST_GROUPS: "test qt" + ``` + + Separate multiple items with a space. + +### `test-skip` {: #test-skip env-var toml} > Skip running tests on some builds -This will skip testing on any identifiers that match the given skip patterns (see [`CIBW_SKIP`](#build-skip)). This can be used to mask out tests for wheels that have missing dependencies upstream that are slow or hard to build, or to skip slow tests on emulated architectures. +This will skip testing on any identifiers that match the given skip patterns (see [`skip`](#build-skip)). This can be used to mask out tests for wheels that have missing dependencies upstream that are slow or hard to build, or to skip slow tests on emulated architectures. With macOS `universal2` wheels, you can also skip the individual archs inside the wheel using an `:arch` suffix. For example, `cp39-macosx_universal2:x86_64` or `cp39-macosx_universal2:arm64`. @@ -1555,66 +1574,73 @@ This option is not supported in the overrides section in `pyproject.toml`. #### Examples -!!! tab examples "Environment variables" +!!! tab examples "pyproject.toml" - ```yaml + ```toml + [tool.cibuildwheel] # Will avoid testing on emulated architectures - CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x,armv7l}" + test-skip = "*-*linux_{aarch64,ppc64le,s390x,armv7l}" # Skip trying to test arm64 builds on Intel Macs - CIBW_TEST_SKIP: "*-macosx_arm64 *-macosx_universal2:arm64" + test-skip = "*-macosx_arm64 *-macosx_universal2:arm64" ``` -!!! tab examples "pyproject.toml" +!!! tab examples "Environment variables" - ```toml - [tool.cibuildwheel] + ```yaml # Will avoid testing on emulated architectures - test-skip = "*-*linux_{aarch64,ppc64le,s390x,armv7l}" + CIBW_TEST_SKIP: "*-*linux_{aarch64,ppc64le,s390x,armv7l}" # Skip trying to test arm64 builds on Intel Macs - test-skip = "*-macosx_arm64 *-macosx_universal2:arm64" + CIBW_TEST_SKIP: "*-macosx_arm64 *-macosx_universal2:arm64" ``` -### `CIBW_TEST_ENVIRONMENT` {: #test-environment} + +### `test-environment` {: #test-environment toml env-var } > Set environment variables for the test environment A space-separated list of environment variables to set in the test environment. -The syntax is the same as for [`CIBW_ENVIRONMENT`](#environment). +The syntax is the same as for [`environment`](#environment). -cibuildwheel sets the variable [`PYTHONSAFEPATH`](https://docs.python.org/3/using/cmdline.html#envvar-PYTHONSAFEPATH) to avoid picking up in-tree dependencies when running the tests - we want to test the installed wheel, not the in-tree version. However, this can be overridden by setting `PYTHONSAFEPATH` to an empty string. +cibuildwheel sets the variable +[`PYTHONSAFEPATH`](https://docs.python.org/3/using/cmdline.html#envvar-PYTHONSAFEPATH) +to avoid picking up in-tree dependencies when running the tests - we want to +test the installed wheel, not the in-tree version. However, this can be +overridden by setting `PYTHONSAFEPATH` to an empty string. Platform-specific environment variables are also available:
`CIBW_TEST_ENVIRONMENT_MACOS` | `CIBW_TEST_ENVIRONMENT_WINDOWS` | `CIBW_TEST_ENVIRONMENT_LINUX` | `CIBW_TEST_ENVIRONMENT_IOS` | `CIBW_TEST_ENVIRONMENT_PYODIDE` #### Examples -!!! tab examples "Environment variables" +!!! tab examples "pyproject.toml" - ```yaml + ```toml + [tool.cibuildwheel] # Set the environment variable MY_ENV_VAR to "my_value" in the test environment - CIBW_TEST_ENVIRONMENT: MY_ENV_VAR=my_value + test-environment = { MY_ENV_VAR="my_value" } # Unset PYTHONSAFEPATH in the test environment - CIBW_TEST_ENVIRONMENT: PYTHONSAFEPATH= + test-environment = { PYTHONSAFEPATH="" } ``` -!!! tab examples "pyproject.toml" +!!! tab examples "Environment variables" - ```toml - [tool.cibuildwheel] + ```yaml # Set the environment variable MY_ENV_VAR to "my_value" in the test environment - test-environment = { MY_ENV_VAR="my_value" } + CIBW_TEST_ENVIRONMENT: MY_ENV_VAR=my_value # Unset PYTHONSAFEPATH in the test environment - test-environment = { PYTHONSAFEPATH="" } + CIBW_TEST_ENVIRONMENT: PYTHONSAFEPATH= ``` + ## Debugging -### `CIBW_DEBUG_KEEP_CONTAINER` +### `debug-keep-container` {: #debug-keep-container env-var} +> Keep the container after running for debugging. Enable this flag to keep the container around for inspection after a build. This option is provided for debugging purposes only. @@ -1630,7 +1656,7 @@ Default: Off (0). export CIBW_DEBUG_KEEP_CONTAINER=TRUE ``` -### `CIBW_DEBUG_TRACEBACK` +### `debug-traceback` {: #debug-traceback cmd-line env-var} > Print full traceback when errors occur. Print a full traceback for the cibuildwheel process when errors occur. This @@ -1644,7 +1670,7 @@ This option can also be set using the [command-line option](#command-line) `--de export CIBW_DEBUG_TRACEBACK=TRUE ``` -### `CIBW_BUILD_VERBOSITY` {: #build-verbosity} +### `build-verbosity` {: #build-verbosity env-var toml} > Increase/decrease the output of the build This setting controls `-v`/`-q` flags to the build frontend. Since there is @@ -1672,6 +1698,14 @@ Platform-specific environment variables are also available:
#### Examples +!!! tab examples "pyproject.toml" + + ```toml + [tool.cibuildwheel] + # Ensure that the build backend output is present + build-verbosity = 1 + ``` + !!! tab examples "Environment variables" ```yaml @@ -1679,13 +1713,7 @@ Platform-specific environment variables are also available:
CIBW_BUILD_VERBOSITY: 1 ``` -!!! tab examples "pyproject.toml" - ```toml - [tool.cibuildwheel] - # Ensure that the build backend output is present - build-verbosity = 1 - ``` ## Command line {: #command-line} @@ -1712,6 +1740,7 @@ Specific error codes are defined: Some options support placeholders, like `{project}`, `{package}` or `{wheel}`, that are substituted by cibuildwheel before they are used. If, for some reason, you need to write the literal name of a placeholder, e.g. literally `{project}` in a command that would ordinarily substitute `{project}`, prefix it with a hash character - `#{project}`. This is only necessary in commands where the specific string between the curly brackets would be substituted - otherwise, strings not modified. @@ -1754,20 +1839,21 @@ Some options support placeholders, like `{project}`, `{package}` or `{wheel}`, t var headers = [] $('.rst-content h3') - .filter(function (i, el) { - return !!$(el).text().match(/(^([A-Z0-9, _*]| and )+)¶$/); - }) .each(function (i, el) { var optionName = $(el).text().replace('¶', ''); var description = $(el).next('blockquote').text() var header = $(el).prevAll('h2').first().text().replace('¶', '') var id = el.id; + if (optionName[0].match(/[A-Z]/)) { + // all the options are kebab-case, so this header isn't an option + return; + } + if (options[header] === undefined) { options[header] = []; headers.push(header); } - console.log(optionName, description, header); options[header].push({name: optionName, description, id}); }); @@ -1835,7 +1921,58 @@ Some options support placeholders, like `{project}`, `{package}` or `{wheel}`, t markdown += '|\n' } } - console.log('readme options markdown\n', markdown) + + // add the option tags to each heading + $('.rst-content h3') + .each(function (i, el) { + el.classList.add('option', 'clearfix'); + var optionName = $(el).text().replace('¶', ''); + + var cmdLine = el.getAttribute('cmd-line'); + var envVar = el.getAttribute('env-var'); + var toml = el.getAttribute('toml'); + + if (!(cmdLine || envVar || toml)) { + return; + } + + var badgesEl = $('
') + .appendTo(el); + + // fill default value + if (cmdLine == "cmd-line") { + cmdLine = '--'+optionName; + } + if (envVar == "env-var") { + envVar = optionName + .split(', ') + .map(opt => 'CIBW_'+opt.toUpperCase().replace(/-/g, '_')) + .join(', '); + } + if (toml == "toml") { + toml = optionName + } + + if (toml) { + badgesEl.append(' '+toml+''); + } + if (cmdLine) { + badgesEl.append(' '+cmdLine+''); + } + if (envVar) { + badgesEl.append(' '+envVar+''); + } + }); + + $('.toctree-l3') + .each(function (i, el) { + var tocEntryName = $(el).text() + var isOption = tocEntryName[0].match(/^[a-z]/); + if (isOption) { + $(el).addClass('option'); + } + }); }); + diff --git a/docs/setup.md b/docs/setup.md index c13fb972f..03a13491b 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -23,7 +23,24 @@ cibuildwheel !!!tip You can pass the `--platform linux` option to cibuildwheel to build Linux wheels, even if you're not on Linux. On most machines, the easiest builds to try are the Linux builds. You don't need any software installed except a Docker daemon, such as [Docker Desktop](https://www.docker.com/get-started/). Each platform that cibuildwheel supports has its own system requirements and platform-specific behaviors. See the [platforms page](platforms.md) for details. -You should see the builds taking place. You can experiment with [options](options.md) using environment variables or pyproject.toml. +You should see the builds taking place. You can experiment with [options](options.md) using pyproject.toml or environment variables. + +!!! tab "pyproject.toml" + + If you write your options into [`pyproject.toml`](configuration.md#configuration-file), you can work on your options locally, and they'll be automatically picked up when running in CI. + + > pyproject.toml + + ``` + [tool.cibuildwheel] + before-all = "uname -a" + ``` + + Then invoke cibuildwheel, like: + + ```console + cibuildwheel + ``` !!! tab "Environment variables" @@ -46,23 +63,6 @@ You should see the builds taking place. You can experiment with [options](option cibuildwheel ``` -!!! tab "pyproject.toml" - - If you write your options into [`pyproject.toml`](configuration.md#configuration-file), you can work on your options locally, and they'll be automatically picked up when running in CI. - - > pyproject.toml - - ``` - [tool.cibuildwheel] - before-all = "uname -a" - ``` - - Then invoke cibuildwheel, like: - - ```console - cibuildwheel - ``` - - Once you've got a build working locally, you can move on to [setting up a CI service](ci-services.md). - View the [full options reference](options.md) to see what cibuildwheel can do. - Check out the [FAQ](faq.md) for common questions. From b1d944060a188fc2d33c3c9080e2881a11669384 Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Mon, 26 May 2025 09:42:05 -0400 Subject: [PATCH 1050/1105] [Bot] Update dependencies (#2415) Update dependencies Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> --- .../resources/constraints-pyodide312.txt | 6 +- cibuildwheel/resources/nodejs.toml | 2 +- .../resources/pinned_docker_images.cfg | 54 +-- .../python-build-standalone-releases.json | 434 +++++++++--------- docs/working-examples.md | 8 +- 5 files changed, 260 insertions(+), 244 deletions(-) diff --git a/cibuildwheel/resources/constraints-pyodide312.txt b/cibuildwheel/resources/constraints-pyodide312.txt index e9116769d..5586115d0 100644 --- a/cibuildwheel/resources/constraints-pyodide312.txt +++ b/cibuildwheel/resources/constraints-pyodide312.txt @@ -54,7 +54,7 @@ platformdirs==4.3.8 # via # pyodide-build # virtualenv -pydantic==2.11.4 +pydantic==2.11.5 # via # pyodide-build # pyodide-lock @@ -81,7 +81,7 @@ rich==14.0.0 # pyodide-build # pyodide-cli # typer -ruamel-yaml==0.18.10 +ruamel-yaml==0.18.11 # via pyodide-build ruamel-yaml-clib==0.2.12 # via ruamel-yaml @@ -101,7 +101,7 @@ typing-extensions==4.13.2 # pydantic-core # typer # typing-inspection -typing-inspection==0.4.0 +typing-inspection==0.4.1 # via pydantic unearth==0.17.5 # via pyodide-build diff --git a/cibuildwheel/resources/nodejs.toml b/cibuildwheel/resources/nodejs.toml index fc3fd2168..2897eac28 100644 --- a/cibuildwheel/resources/nodejs.toml +++ b/cibuildwheel/resources/nodejs.toml @@ -1,3 +1,3 @@ url = "https://nodejs.org/dist/" -v22 = "v22.15.1" +v22 = "v22.16.0" v20 = "v20.19.2" diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 20956fba4..b137183d2 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,47 +1,47 @@ [x86_64] -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 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.24-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.24-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.24-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.05.24-1 [i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.16-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.05.16-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.24-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.05.24-1 [aarch64] -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 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.24-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.24-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.24-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.05.24-1 [ppc64le] -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 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.05.24-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.05.24-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.05.24-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.05.24-1 [s390x] -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 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.05.24-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.05.24-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.05.24-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.05.24-1 [pypy_x86_64] -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 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.24-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.24-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.24-1 [pypy_i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.16-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.24-1 [pypy_aarch64] -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 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.24-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.24-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.24-1 [armv7l] -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 +manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.05.24-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.05.24-1 [riscv64] diff --git a/cibuildwheel/resources/python-build-standalone-releases.json b/cibuildwheel/resources/python-build-standalone-releases.json index 407b0318c..bcbc196b7 100644 --- a/cibuildwheel/resources/python-build-standalone-releases.json +++ b/cibuildwheel/resources/python-build-standalone-releases.json @@ -1,423 +1,439 @@ { "releases": [ { - "tag": "20250409", + "tag": "20250517", "assets": [ { - "name": "cpython-3.10.17+20250409-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.10.17%2B20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.17+20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.11.12%2B20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.12+20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.12.10%2B20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.10+20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.13.3%2B20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.3+20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0a6+20250409-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.14.0a6+20250409-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a6+20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.14.0a6+20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.14.0a6+20250409-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.14.0a6+20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a6+20250409-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a6+20250409-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.14.0a6+20250409-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a6+20250409-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.14.0a6+20250409-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a6+20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0a6+20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a6+20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.14.0a6%2B20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.9.22+20250517-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250517-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.9.22+20250517-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.9.22+20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250517-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.22+20250517-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250517-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.22+20250517-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250517-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.22+20250517-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250409/cpython-3.9.22%2B20250409-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.22+20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.9.22+20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz" } ] } diff --git a/docs/working-examples.md b/docs/working-examples.md index facc03ba0..40631cddb 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -52,8 +52,8 @@ title: Working examples | [PyYAML][] | ![github icon][] | ![apple icon][] | Canonical source repository for PyYAML | | [pikepdf][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by QPDF | | [numexpr][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, Pandas, PyTables and more | -| [h5py][] | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. | | [Wrapt][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python module for decorators, wrappers and monkey patching. | +| [h5py][] | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. | | [envd][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A machine learning development environment build tool | | [Psycopg 3][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A modern implementation of a PostgreSQL adapter for Python | | [OpenColorIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A color management framework for visual effects and animation. | @@ -111,8 +111,8 @@ title: Working examples | [pyjet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy | | [ril][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A python binding to Rust Imaging library using maturin and Pyo3, utilizes Github Action cache to improve speed. Builds abi3 wheels. | | [SiPM][] | ![github icon][] | ![apple icon][] ![linux icon][] | High performance library for SiPM detectors simulation using C++17, OpenMP and AVX2 intrinsics. | -| [GSD][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Cython and NumPy project with 64-bit wheels. | | [aalink][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Async Python interface for Ableton Link. | +| [GSD][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Cython and NumPy project with 64-bit wheels. | | [CorrectionLib][] | ![github icon][] | ![apple icon][] ![linux icon][] | Structured JSON powered correction library for HEP, designed for the CMS experiment at CERN. | | [xmlstarlet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. | | [werpy][] | ![github icon][] | ![windows icon][] ![linux icon][] ![apple icon][] | An ultra-fast python package using optimized dynamic programming to compute the Word Error Rate (WER). | @@ -162,8 +162,8 @@ title: Working examples [PyYAML]: https://github.com/yaml/pyyaml [pikepdf]: https://github.com/pikepdf/pikepdf [numexpr]: https://github.com/pydata/numexpr -[h5py]: https://github.com/h5py/h5py [Wrapt]: https://github.com/GrahamDumpleton/wrapt +[h5py]: https://github.com/h5py/h5py [envd]: https://github.com/tensorchord/envd [Psycopg 3]: https://github.com/psycopg/psycopg [OpenColorIO]: https://github.com/AcademySoftwareFoundation/OpenColorIO @@ -221,8 +221,8 @@ title: Working examples [pyjet]: https://github.com/scikit-hep/pyjet [ril]: https://github.com/Cryptex-github/ril-py [SiPM]: https://github.com/EdoPro98/SimSiPM -[GSD]: https://github.com/glotzerlab/gsd [aalink]: https://github.com/artfwo/aalink +[GSD]: https://github.com/glotzerlab/gsd [CorrectionLib]: https://github.com/cms-nanoAOD/correctionlib [xmlstarlet]: https://github.com/dimitern/xmlstarlet [werpy]: https://github.com/analyticsinmotion/werpy From 2d6b40d66904a82ab87912e70d50ba9fd30519ab Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Mon, 26 May 2025 21:49:59 +0200 Subject: [PATCH 1051/1105] fix: rename `gp242` identifier to `gp311_242` (#2411) --- README.md | 28 ++++++++++----------- bin/update_pythons.py | 4 +++ cibuildwheel/logger.py | 5 +++- cibuildwheel/resources/build-platforms.toml | 10 ++++---- cibuildwheel/selector.py | 2 +- cibuildwheel/util/packaging.py | 1 + docs/options.md | 2 +- test/test_abi_variants.py | 2 +- unit_test/build_selector_test.py | 3 ++- unit_test/option_prepare_test.py | 6 ++--- 10 files changed, 36 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 2de5577d5..8d260da70 100644 --- a/README.md +++ b/README.md @@ -23,20 +23,20 @@ What does it do? While cibuildwheel itself requires a recent Python version to run (we support the last three releases), it can target the following versions to build wheels: -| | macOS Intel | macOS Apple Silicon | Windows 64bit | Windows 32bit | Windows Arm64 | manylinux
musllinux x86_64 | manylinux
musllinux i686 | manylinux
musllinux aarch64 | manylinux
musllinux ppc64le | manylinux
musllinux s390x | manylinux
musllinux armv7l | iOS | Pyodide | -|----------------|----|-----|-----|-----|-----|----|-----|----|-----|-----|---|-----|-----| -| CPython 3.8 | ✅ | ✅ | ✅ | ✅ | N/A | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | N/A | N/A | -| CPython 3.9 | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | N/A | N/A | -| CPython 3.10 | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | N/A | N/A | -| CPython 3.11 | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | N/A | N/A | -| CPython 3.12 | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | N/A | ✅⁴ | -| CPython 3.13³ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | ✅ | N/A | -| CPython 3.14³ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | ✅ | N/A | -| PyPy 3.8 v7.3 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | N/A | N/A | N/A | -| PyPy 3.9 v7.3 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | N/A | N/A | N/A | -| PyPy 3.10 v7.3 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | N/A | N/A | N/A | -| PyPy 3.11 v7.3 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | N/A | N/A | N/A | -| GraalPy 24.2 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | N/A | ✅¹ | N/A | N/A | N/A | N/A | N/A | +| | macOS Intel | macOS Apple Silicon | Windows 64bit | Windows 32bit | Windows Arm64 | manylinux
musllinux x86_64 | manylinux
musllinux i686 | manylinux
musllinux aarch64 | manylinux
musllinux ppc64le | manylinux
musllinux s390x | manylinux
musllinux armv7l | iOS | Pyodide | +|--------------------|----|-----|-----|-----|-----|----|-----|----|-----|-----|---|-----|-----| +| CPython 3.8 | ✅ | ✅ | ✅ | ✅ | N/A | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | N/A | N/A | +| CPython 3.9 | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | N/A | N/A | +| CPython 3.10 | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | N/A | N/A | +| CPython 3.11 | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | N/A | N/A | +| CPython 3.12 | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | N/A | ✅⁴ | +| CPython 3.13³ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | ✅ | N/A | +| CPython 3.14³ | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | ✅⁵ | ✅ | N/A | +| PyPy 3.8 v7.3 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | N/A | N/A | N/A | +| PyPy 3.9 v7.3 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | N/A | N/A | N/A | +| PyPy 3.10 v7.3 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | N/A | N/A | N/A | +| PyPy 3.11 v7.3 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | N/A | N/A | N/A | +| GraalPy 3.11 v24.2 | ✅ | ✅ | ✅ | N/A | N/A | ✅¹ | N/A | ✅¹ | N/A | N/A | N/A | N/A | N/A | ¹ PyPy & GraalPy are only supported for manylinux wheels.
² Windows arm64 support is experimental.
diff --git a/bin/update_pythons.py b/bin/update_pythons.py index 60b99f2aa..fa346281f 100755 --- a/bin/update_pythons.py +++ b/bin/update_pythons.py @@ -147,7 +147,11 @@ def update_version(self, identifier: str, spec: Specifier) -> AnyConfig: msg = f"{identifier} not supported yet on GraalPy" raise RuntimeError(msg) + gpspec_str = identifier.split("-")[0].split("_")[1] + gpspec = Specifier("==24.2.*") if gpspec_str == "242" else Specifier(f"=={gpspec_str}.*") + releases = [r for r in self.releases if spec.contains(r["python_version"])] + releases = [r for r in self.releases if gpspec.contains(r["graalpy_version"])] releases = sorted(releases, key=lambda r: r["graalpy_version"]) if not releases: diff --git a/cibuildwheel/logger.py b/cibuildwheel/logger.py index 80c2fb02e..cee94d666 100644 --- a/cibuildwheel/logger.py +++ b/cibuildwheel/logger.py @@ -237,7 +237,8 @@ def build_description_from_identifier(identifier: str) -> str: build_description = "" python_interpreter = python_identifier[0:2] - python_version = python_identifier[2:] + version_parts = python_identifier[2:].split("_") + python_version = version_parts[0] if python_interpreter == "cp": build_description += "CPython" @@ -250,6 +251,8 @@ def build_description_from_identifier(identifier: str) -> str: raise Exception(msg) build_description += f" {python_version[0]}.{python_version[1:]} " + if len(version_parts) > 1: + build_description += f"(ABI {version_parts[1]}) " try: build_description += PLATFORM_IDENTIFIER_DESCRIPTIONS[platform_identifier] diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index 2875f9f24..10af09281 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -22,7 +22,7 @@ python_configurations = [ { identifier = "pp39-manylinux_x86_64", version = "3.9", path_str = "/opt/python/pp39-pypy39_pp73" }, { identifier = "pp310-manylinux_x86_64", version = "3.10", path_str = "/opt/python/pp310-pypy310_pp73" }, { identifier = "pp311-manylinux_x86_64", version = "3.11", path_str = "/opt/python/pp311-pypy311_pp73" }, - { identifier = "gp242-manylinux_x86_64", version = "3.11", path_str = "/opt/python/graalpy311-graalpy242_311_native" }, + { identifier = "gp311_242-manylinux_x86_64", version = "3.11", path_str = "/opt/python/graalpy311-graalpy242_311_native" }, { identifier = "cp38-manylinux_aarch64", version = "3.8", path_str = "/opt/python/cp38-cp38" }, { identifier = "cp39-manylinux_aarch64", version = "3.9", path_str = "/opt/python/cp39-cp39" }, { identifier = "cp310-manylinux_aarch64", version = "3.10", path_str = "/opt/python/cp310-cp310" }, @@ -72,7 +72,7 @@ python_configurations = [ { identifier = "pp39-manylinux_aarch64", version = "3.9", path_str = "/opt/python/pp39-pypy39_pp73" }, { identifier = "pp310-manylinux_aarch64", version = "3.10", path_str = "/opt/python/pp310-pypy310_pp73" }, { identifier = "pp311-manylinux_aarch64", version = "3.11", path_str = "/opt/python/pp311-pypy311_pp73" }, - { identifier = "gp242-manylinux_aarch64", version = "3.11", path_str = "/opt/python/graalpy311-graalpy242_311_native" }, + { identifier = "gp311_242-manylinux_aarch64", version = "3.11", path_str = "/opt/python/graalpy311-graalpy242_311_native" }, { identifier = "pp38-manylinux_i686", version = "3.8", path_str = "/opt/python/pp38-pypy38_pp73" }, { identifier = "pp39-manylinux_i686", version = "3.9", path_str = "/opt/python/pp39-pypy39_pp73" }, { identifier = "pp310-manylinux_i686", version = "3.10", path_str = "/opt/python/pp310-pypy310_pp73" }, @@ -179,8 +179,8 @@ python_configurations = [ { identifier = "pp310-macosx_arm64", version = "3.10", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.19-macos_arm64.tar.bz2" }, { identifier = "pp311-macosx_x86_64", version = "3.11", url = "https://downloads.python.org/pypy/pypy3.11-v7.3.19-macos_x86_64.tar.bz2" }, { identifier = "pp311-macosx_arm64", version = "3.11", url = "https://downloads.python.org/pypy/pypy3.11-v7.3.19-macos_arm64.tar.bz2" }, - { identifier = "gp242-macosx_x86_64", version = "3.11", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.1/graalpy-24.2.1-macos-amd64.tar.gz" }, - { identifier = "gp242-macosx_arm64", version = "3.11", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.1/graalpy-24.2.1-macos-aarch64.tar.gz" }, + { identifier = "gp311_242-macosx_x86_64", version = "3.11", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.1/graalpy-24.2.1-macos-amd64.tar.gz" }, + { identifier = "gp311_242-macosx_arm64", version = "3.11", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.1/graalpy-24.2.1-macos-aarch64.tar.gz" }, ] [windows] @@ -215,7 +215,7 @@ python_configurations = [ { identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.16-win64.zip" }, { identifier = "pp310-win_amd64", version = "3.10", arch = "64", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.19-win64.zip" }, { identifier = "pp311-win_amd64", version = "3.11", arch = "64", url = "https://downloads.python.org/pypy/pypy3.11-v7.3.19-win64.zip" }, - { identifier = "gp242-win_amd64", version = "3.11", arch = "64", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.1/graalpy-24.2.1-windows-amd64.zip" }, + { identifier = "gp311_242-win_amd64", version = "3.11", arch = "64", url = "https://github.com/oracle/graalpython/releases/download/graal-24.2.1/graalpy-24.2.1-windows-amd64.zip" }, ] [pyodide] diff --git a/cibuildwheel/selector.py b/cibuildwheel/selector.py index c3f9dea4b..25f61176e 100644 --- a/cibuildwheel/selector.py +++ b/cibuildwheel/selector.py @@ -75,7 +75,7 @@ class BuildSelector: def __call__(self, build_id: str) -> bool: # Filter build selectors by python_requires if set if self.requires_python is not None: - py_ver_str = build_id.split("-")[0] + py_ver_str = build_id.split("-")[0].split("_")[0] py_ver_str = py_ver_str.removesuffix("t") major = int(py_ver_str[2]) minor = int(py_ver_str[3:]) diff --git a/cibuildwheel/util/packaging.py b/cibuildwheel/util/packaging.py index 310778198..b13ebc6bc 100644 --- a/cibuildwheel/util/packaging.py +++ b/cibuildwheel/util/packaging.py @@ -135,6 +135,7 @@ def find_compatible_wheel(wheels: Sequence[T], identifier: str) -> T | None: """ interpreter, platform = identifier.split("-", 1) + interpreter = interpreter.split("_")[0] free_threaded = interpreter.endswith("t") if free_threaded: interpreter = interpreter[:-1] diff --git a/docs/options.md b/docs/options.md index 3ade43d93..89e782bf5 100644 --- a/docs/options.md +++ b/docs/options.md @@ -64,7 +64,7 @@ When setting the options, you can use shell-style globbing syntax, as per [fnmat | PyPy3.9 v7.3 | pp39-macosx_x86_64
pp39-macosx_arm64 | pp39-win_amd64 | pp39-manylinux_x86_64
pp39-manylinux_i686 | pp39-manylinux_aarch64 | | | | PyPy3.10 v7.3 | pp310-macosx_x86_64
pp310-macosx_arm64 | pp310-win_amd64 | pp310-manylinux_x86_64
pp310-manylinux_i686 | pp310-manylinux_aarch64 | | | | PyPy3.11 v7.3 | pp311-macosx_x86_64
pp311-macosx_arm64 | pp311-win_amd64 | pp311-manylinux_x86_64
pp311-manylinux_i686 | pp311-manylinux_aarch64 | | | -| GraalPy v24.2 | gp242-macosx_x86_64
gp242-macosx_arm64 | gp242-win_amd64 | gp242-manylinux_x86_64 | gp242-manylinux_aarch64 | | | +| GraalPy 3.11 v24.2 | gp311_242-macosx_x86_64
gp311_242-macosx_arm64 | gp311_242-win_amd64 | gp311_242-manylinux_x86_64 | gp311_242-manylinux_aarch64 | | | The list of supported and currently selected build identifiers can also be retrieved by passing the `--print-build-identifiers` flag to cibuildwheel. The format is `python_tag-platform_tag`, with tags similar to those in [PEP 425](https://www.python.org/dev/peps/pep-0425/#details). diff --git a/test/test_abi_variants.py b/test/test_abi_variants.py index d3734ae64..f64f42485 100644 --- a/test/test_abi_variants.py +++ b/test/test_abi_variants.py @@ -41,7 +41,7 @@ def test_abi3(tmp_path): add_env={ # free_threaded, GraalPy, and PyPy do not have a Py_LIMITED_API equivalent, just build one of those # also limit the number of builds for test performance reasons - "CIBW_BUILD": "cp39-* cp310-* pp310-* gp242-* cp312-* cp313t-*", + "CIBW_BUILD": "cp39-* cp310-* pp310-* gp311_242-* cp312-* cp313t-*", "CIBW_ENABLE": "all", }, ) diff --git a/unit_test/build_selector_test.py b/unit_test/build_selector_test.py index 6da657fca..1c87c4264 100644 --- a/unit_test/build_selector_test.py +++ b/unit_test/build_selector_test.py @@ -152,7 +152,7 @@ def test_build_limited_python(): build_config="*", skip_config="", requires_python=SpecifierSet(">=3.7"), - enable=frozenset([EnableGroup.PyPy, EnableGroup.PyPyEoL]), + enable=frozenset([EnableGroup.PyPy, EnableGroup.PyPyEoL, EnableGroup.GraalPy]), ) assert not build_selector("cp36-manylinux_x86_64") @@ -165,6 +165,7 @@ def test_build_limited_python(): assert build_selector("cp37-win32") assert build_selector("cp38-win32") assert build_selector("pp37-win_amd64") + assert build_selector("gp311_242-win_amd64") def test_build_limited_python_partial(): diff --git a/unit_test/option_prepare_test.py b/unit_test/option_prepare_test.py index 2f87044ad..34f26eee6 100644 --- a/unit_test/option_prepare_test.py +++ b/unit_test/option_prepare_test.py @@ -14,7 +14,7 @@ from cibuildwheel.util import file DEFAULT_IDS = {"cp38", "cp39", "cp310", "cp311", "cp312", "cp313"} -ALL_IDS = DEFAULT_IDS | {"cp313t", "pp38", "pp39", "pp310", "pp311", "gp242"} +ALL_IDS = DEFAULT_IDS | {"cp313t", "pp38", "pp39", "pp310", "pp311", "gp311_242"} @pytest.fixture @@ -157,7 +157,7 @@ def test_build_with_override_launches(monkeypatch, tmp_path): "pp39", "pp310", "pp311", - "gp242", + "gp311_242", } } assert kwargs["options"].build_options("cp39-manylinux_x86_64").before_all == "" @@ -179,7 +179,7 @@ def test_build_with_override_launches(monkeypatch, tmp_path): "pp39", "pp310", "pp311", - "gp242", + "gp311_242", ] } From 2b4a8535d91d25a9d108e1bef35505d7c93e34fe Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 27 May 2025 11:42:21 +0800 Subject: [PATCH 1052/1105] fix: ensure that deep paths exist before copying files. (#2418) --- cibuildwheel/oci_container.py | 1 + unit_test/oci_container_test.py | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cibuildwheel/oci_container.py b/cibuildwheel/oci_container.py index fa3d77048..ebfe38fca 100644 --- a/cibuildwheel/oci_container.py +++ b/cibuildwheel/oci_container.py @@ -342,6 +342,7 @@ def copy_into(self, from_path: Path, to_path: PurePath) -> None: ) else: exec_process: subprocess.Popen[bytes] + self.call(["mkdir", "-p", to_path.parent]) with subprocess.Popen( [ self.engine.name, diff --git a/unit_test/oci_container_test.py b/unit_test/oci_container_test.py index c6ea3b645..373144a1b 100644 --- a/unit_test/oci_container_test.py +++ b/unit_test/oci_container_test.py @@ -239,16 +239,23 @@ def test_binary_output(container_engine): assert output == binary_data_string -def test_file_operation(tmp_path: Path, container_engine: OCIContainerEngineConfig) -> None: +@pytest.mark.parametrize( + "file_path", + ["test.dat", "path/to/test.dat"], +) +def test_file_operation( + tmp_path: Path, container_engine: OCIContainerEngineConfig, file_path: str +) -> None: with OCIContainer( engine=container_engine, image=DEFAULT_IMAGE, oci_platform=DEFAULT_OCI_PLATFORM ) as container: # test copying a file in test_binary_data = bytes(random.randrange(256) for _ in range(1000)) - original_test_file = tmp_path / "test.dat" + original_test_file = tmp_path / file_path + original_test_file.parent.mkdir(parents=True, exist_ok=True) original_test_file.write_bytes(test_binary_data) - dst_file = PurePath("/tmp/test.dat") + dst_file = PurePath("/tmp") / file_path container.copy_into(original_test_file, dst_file) From 3bbc772778a3745a594b02f62c7c9f00378d850a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 26 May 2025 23:42:40 -0400 Subject: [PATCH 1053/1105] [pre-commit.ci] pre-commit autoupdate (#2417) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.10 → v0.11.11](https://github.com/astral-sh/ruff-pre-commit/compare/v0.11.10...v0.11.11) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2304b31fe..22315221d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.10 + rev: v0.11.11 hooks: - id: ruff args: ["--fix", "--show-fixes"] From e92147f52a3f32818588e968f4be9315c8c35635 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Tue, 27 May 2025 04:44:39 +0100 Subject: [PATCH 1054/1105] [travis-ci] debugging ci failures on travis (#2387) * [travis-ci] debugging ci failures on travis * [travis-ci] Use JSON to encode env vars * [travis-ci] Use a more broadly compatible before_all command * Drop CIBW_ENABLE=all on Travis windows It doesn't fit into the time limit * [travis-ci] try upgrading certifi to get around SSL errors * Revert "[travis-ci] try upgrading certifi to get around SSL errors" This reverts commit 02eee0e1946d2116d1ce23ccd86945ad33d1ae24. * [travis-ci] upgrade windows certificates * [travis-ci] re-enable linux builds * Drop CIBW_ENABLE=all on Travis Linux It doesn't fit into the time limit --------- Co-authored-by: mayeut --- .travis.yml | 10 +++++++-- cibuildwheel/platforms/windows.py | 37 +++++++++++++------------------ test/test_before_all.py | 13 ++++++----- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4d1d72a3..d2082cc1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,8 @@ jobs: services: docker env: - PYTHON=python - - CIBW_ENABLE=all + # a build using CIBW_ENABLE=all does not fit into Travis' time limit, + # so only the defaults are tested - name: Linux | arm64 | Python 3.12 python: 3.12 @@ -42,10 +43,15 @@ jobs: os: windows language: shell before_install: + # http://woshub.com/updating-trusted-root-certificates-in-windows-10 + - certutil -generateSSTFromWU roots.sst + - powershell -Command 'Get-ChildItem -Path roots.sst | Import-Certificate -CertStoreLocation Cert:\LocalMachine\Root' + - rm -f roots.sst - choco upgrade python3 -y --version 3.12.8 --limit-output --params "/InstallDir:C:\\Python312" env: - PYTHON=C:\\Python312\\python - - CIBW_ENABLE=all + # a build using CIBW_ENABLE=all does not fit into Travis' time limit, + # so only the defaults are tested - name: Linux | s390x | Python 3.12 python: 3.12 diff --git a/cibuildwheel/platforms/windows.py b/cibuildwheel/platforms/windows.py index 4e59275bf..52e081f76 100644 --- a/cibuildwheel/platforms/windows.py +++ b/cibuildwheel/platforms/windows.py @@ -1,3 +1,4 @@ +import json import os import platform as platform_module import shutil @@ -350,28 +351,22 @@ def setup_python( text=True, ).strip() log.notice(f"Discovering Visual Studio for GraalPy at {vcpath}") - env.update( - dict( - [ - envvar.strip().split("=", 1) - for envvar in subprocess.check_output( - [ - f"{vcpath}\\Common7\\Tools\\vsdevcmd.bat", - "-no_logo", - "-arch=amd64", - "-host_arch=amd64", - "&&", - "set", - ], - shell=True, - text=True, - env=env, - ) - .strip() - .split("\n") - ] - ) + vcvars = subprocess.check_output( + [ + f"{vcpath}\\Common7\\Tools\\vsdevcmd.bat", + "-no_logo", + "-arch=amd64", + "-host_arch=amd64", + "&&", + "python", + "-c", + "import os, json, sys; json.dump(dict(os.environ), sys.stdout);", + ], + shell=True, + text=True, + env=env, ) + env.update(json.loads(vcvars)) return base_python, env diff --git a/test/test_before_all.py b/test/test_before_all.py index c7ec86240..f0c89972b 100644 --- a/test/test_before_all.py +++ b/test/test_before_all.py @@ -36,16 +36,19 @@ def test(tmp_path): with (project_dir / "text_info.txt").open(mode="w") as ff: print("dummy text", file=ff) - # build the wheels + # write python version information to a temporary file, this is checked in + # setup.py + # + # note, before_all runs in whatever the host environment is, `python` + # might be any version of python (even Python 2 on Travis ci!), so this is + # written to be broadly compatible before_all_command = ( - """python -c "import os, pathlib, sys; pathlib.Path('{project}/text_info.txt').write_text('sample text '+os.environ.get('TEST_VAL', ''))" && """ - '''python -c "import pathlib, sys; pathlib.Path('{project}/python_prefix.txt').write_text(sys.prefix)"''' + """python -c "import os, sys; f = open('{project}/text_info.txt', 'w'); f.write('sample text '+os.environ.get('TEST_VAL', '')); f.close()" && """ + '''python -c "import sys; f = open('{project}/python_prefix.txt', 'w'); f.write(sys.prefix); f.close()"''' ) actual_wheels = utils.cibuildwheel_run( project_dir, add_env={ - # write python version information to a temporary file, this is - # checked in setup.py "CIBW_BEFORE_ALL": before_all_command, "CIBW_BEFORE_ALL_LINUX": f'{before_all_command} && python -c "import sys; assert sys.version_info >= (3, 8)"', "CIBW_ENVIRONMENT": "TEST_VAL='123'", From b8814b814884040e7b66bd8e20a4820dfe8c825b Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 27 May 2025 19:32:14 -0400 Subject: [PATCH 1055/1105] chore: fix update script to handle pymanager addition to page (#2424) Signed-off-by: Henry Schreiner --- bin/update_pythons.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/update_pythons.py b/bin/update_pythons.py index fa346281f..d1058f452 100755 --- a/bin/update_pythons.py +++ b/bin/update_pythons.py @@ -280,8 +280,12 @@ def __init__(self) -> None: self.versions_dict: dict[Version, int] = {} for release in releases_info: - # Removing the prefix, Python 3.9 would use: release["name"].removeprefix("Python ") - version = Version(release["name"][7:]) + # Skip the pymanager releases + if not release["slug"].startswith("python"): + continue + + # Removing the prefix + version = Version(release["name"].removeprefix("Python ")) uri = int(release["resource_uri"].rstrip("/").split("/")[-1]) self.versions_dict[version] = uri From e18ab66cca43fc698bc90380cd2062b3a95571b7 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 27 May 2025 19:32:25 -0400 Subject: [PATCH 1056/1105] fix: pyodide missing wheel placeholder (#2421) Signed-off-by: Henry Schreiner --- cibuildwheel/platforms/pyodide.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cibuildwheel/platforms/pyodide.py b/cibuildwheel/platforms/pyodide.py index dc6b5c6a4..d4ee9a921 100644 --- a/cibuildwheel/platforms/pyodide.py +++ b/cibuildwheel/platforms/pyodide.py @@ -498,6 +498,7 @@ def build(options: Options, tmp_path: Path) -> None: build_options.before_test, project=".", package=build_options.package_dir, + wheel=repaired_wheel, ) shell(before_test_prepared, env=virtualenv_env) From db2d59be22f774aea1a52534918bd12b3d370965 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 28 May 2025 05:41:26 -0400 Subject: [PATCH 1057/1105] chore: use kw_only (Python 3.10+) on most dataclasses (#2422) * chore: use kw_only (Python 3.10+) on many dataclasses Signed-off-by: Henry Schreiner * fix: expose windows file to type checker Signed-off-by: Henry Schreiner --------- Signed-off-by: Henry Schreiner --- bin/update_docker.py | 4 ++-- bin/update_nodejs.py | 4 ++-- bin/update_virtualenv.py | 4 ++-- cibuildwheel/bashlex_eval.py | 4 ++-- cibuildwheel/environment.py | 2 +- cibuildwheel/frontend.py | 4 ++-- cibuildwheel/oci_container.py | 7 +++--- cibuildwheel/options.py | 6 ++--- cibuildwheel/platforms/ios.py | 4 ++-- cibuildwheel/platforms/linux.py | 6 ++--- cibuildwheel/platforms/macos.py | 4 ++-- cibuildwheel/platforms/pyodide.py | 4 ++-- cibuildwheel/platforms/windows.py | 4 ++-- cibuildwheel/selector.py | 6 ++--- cibuildwheel/util/packaging.py | 2 +- unit_test/get_platform_test.py | 38 +++++++++++++++++++++---------- 16 files changed, 59 insertions(+), 44 deletions(-) diff --git a/bin/update_docker.py b/bin/update_docker.py index efb90154e..3c6ef79ed 100755 --- a/bin/update_docker.py +++ b/bin/update_docker.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 import configparser -from dataclasses import dataclass +import dataclasses from pathlib import Path import requests @@ -11,7 +11,7 @@ RESOURCES = DIR.parent / "cibuildwheel/resources" -@dataclass(frozen=True) +@dataclasses.dataclass(frozen=True) class Image: manylinux_version: str platforms: list[str] diff --git a/bin/update_nodejs.py b/bin/update_nodejs.py index 3f9eb5260..a564fad00 100755 --- a/bin/update_nodejs.py +++ b/bin/update_nodejs.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 +import dataclasses import difflib import logging import tomllib -from dataclasses import dataclass from pathlib import Path from typing import Final @@ -27,7 +27,7 @@ NODEJS_INDEX: Final[str] = f"{NODEJS_DIST}index.json" -@dataclass(frozen=True, order=True) +@dataclasses.dataclass(frozen=True, order=True) class VersionTuple: version: Version version_string: str diff --git a/bin/update_virtualenv.py b/bin/update_virtualenv.py index c6cd1b0cb..6e38eadb6 100755 --- a/bin/update_virtualenv.py +++ b/bin/update_virtualenv.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 +import dataclasses import difflib import logging import subprocess import tomllib -from dataclasses import dataclass from pathlib import Path from typing import Final @@ -28,7 +28,7 @@ ) -@dataclass(frozen=True, order=True) +@dataclasses.dataclass(frozen=True, order=True) class VersionTuple: version: Version version_string: str diff --git a/cibuildwheel/bashlex_eval.py b/cibuildwheel/bashlex_eval.py index 6656d0a4d..3d1ac1185 100644 --- a/cibuildwheel/bashlex_eval.py +++ b/cibuildwheel/bashlex_eval.py @@ -1,3 +1,4 @@ +import dataclasses import subprocess from collections.abc import ( Callable, @@ -5,7 +6,6 @@ Mapping, Sequence, ) -from dataclasses import dataclass import bashlex @@ -17,7 +17,7 @@ def local_environment_executor(command: Sequence[str], env: Mapping[str, str]) - return subprocess.run(command, env=env, text=True, stdout=subprocess.PIPE, check=True).stdout -@dataclass(frozen=True) +@dataclasses.dataclass(frozen=True, kw_only=True) class NodeExecutionContext: environment: dict[str, str] input: str diff --git a/cibuildwheel/environment.py b/cibuildwheel/environment.py index d5a0796d1..a9a3f8627 100644 --- a/cibuildwheel/environment.py +++ b/cibuildwheel/environment.py @@ -102,7 +102,7 @@ def __eq__(self, other: object) -> bool: return False -@dataclasses.dataclass +@dataclasses.dataclass(kw_only=True) class ParsedEnvironment: assignments: list[EnvironmentAssignment] diff --git a/cibuildwheel/frontend.py b/cibuildwheel/frontend.py index 79796a1be..18157cdd0 100644 --- a/cibuildwheel/frontend.py +++ b/cibuildwheel/frontend.py @@ -1,7 +1,7 @@ +import dataclasses import shlex import typing from collections.abc import Sequence -from dataclasses import dataclass from typing import Literal, Self, get_args from .logger import log @@ -10,7 +10,7 @@ BuildFrontendName = Literal["pip", "build", "build[uv]"] -@dataclass(frozen=True) +@dataclasses.dataclass(frozen=True) class BuildFrontendConfig: name: BuildFrontendName args: Sequence[str] = () diff --git a/cibuildwheel/oci_container.py b/cibuildwheel/oci_container.py index ebfe38fca..59a1ca7e2 100644 --- a/cibuildwheel/oci_container.py +++ b/cibuildwheel/oci_container.py @@ -1,3 +1,4 @@ +import dataclasses import io import json import os @@ -10,7 +11,6 @@ import typing import uuid from collections.abc import Mapping, Sequence -from dataclasses import dataclass, field from enum import Enum from pathlib import Path, PurePath, PurePosixPath from types import TracebackType @@ -37,10 +37,11 @@ class OCIPlatform(Enum): S390X = "linux/s390x" -@dataclass(frozen=True) +@dataclasses.dataclass(frozen=True) class OCIContainerEngineConfig: name: ContainerEngineName - create_args: tuple[str, ...] = field(default_factory=tuple) + _: dataclasses.KW_ONLY + create_args: tuple[str, ...] = dataclasses.field(default_factory=tuple) disable_host_mount: bool = False @classmethod diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index 5a9c96c25..7c98f1e21 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -51,7 +51,7 @@ ) -@dataclasses.dataclass +@dataclasses.dataclass(kw_only=True) class CommandLineArguments: platform: Literal["auto", "linux", "macos", "windows"] | None archs: str | None @@ -80,7 +80,7 @@ def defaults(cls) -> Self: ) -@dataclasses.dataclass(frozen=True) +@dataclasses.dataclass(frozen=True, kw_only=True) class GlobalOptions: package_dir: Path output_dir: Path @@ -90,7 +90,7 @@ class GlobalOptions: allow_empty: bool -@dataclasses.dataclass(frozen=True) +@dataclasses.dataclass(frozen=True, kw_only=True) class BuildOptions: globals: GlobalOptions environment: ParsedEnvironment diff --git a/cibuildwheel/platforms/ios.py b/cibuildwheel/platforms/ios.py index dc4911f75..1235d92d6 100644 --- a/cibuildwheel/platforms/ios.py +++ b/cibuildwheel/platforms/ios.py @@ -1,5 +1,6 @@ from __future__ import annotations +import dataclasses import os import shlex import shutil @@ -7,7 +8,6 @@ import sys import textwrap from collections.abc import Sequence, Set -from dataclasses import dataclass from pathlib import Path from typing import assert_never @@ -42,7 +42,7 @@ from .macos import install_cpython as install_build_cpython -@dataclass(frozen=True) +@dataclasses.dataclass(frozen=True, kw_only=True) class PythonConfiguration: version: str identifier: str diff --git a/cibuildwheel/platforms/linux.py b/cibuildwheel/platforms/linux.py index 5ffd5a2ef..f31529cb8 100644 --- a/cibuildwheel/platforms/linux.py +++ b/cibuildwheel/platforms/linux.py @@ -1,10 +1,10 @@ import contextlib +import dataclasses import subprocess import sys import textwrap from collections import OrderedDict from collections.abc import Iterable, Iterator, Sequence, Set -from dataclasses import dataclass from pathlib import Path, PurePath, PurePosixPath from typing import assert_never @@ -32,7 +32,7 @@ } -@dataclass(frozen=True) +@dataclasses.dataclass(frozen=True, kw_only=True) class PythonConfiguration: version: str identifier: str @@ -43,7 +43,7 @@ def path(self) -> PurePosixPath: return PurePosixPath(self.path_str) -@dataclass(frozen=True) +@dataclasses.dataclass(frozen=True, kw_only=True) class BuildStep: platform_configs: list[PythonConfiguration] platform_tag: str diff --git a/cibuildwheel/platforms/macos.py b/cibuildwheel/platforms/macos.py index d64917368..1975c6633 100644 --- a/cibuildwheel/platforms/macos.py +++ b/cibuildwheel/platforms/macos.py @@ -1,3 +1,4 @@ +import dataclasses import functools import inspect import os @@ -8,7 +9,6 @@ import sys import typing from collections.abc import Set -from dataclasses import dataclass from pathlib import Path from typing import Literal, assert_never @@ -76,7 +76,7 @@ def get_macos_sdks() -> list[str]: return [m.group(1) for m in re.finditer(r"-sdk (macosx\S+)", output)] -@dataclass(frozen=True) +@dataclasses.dataclass(frozen=True, kw_only=True) class PythonConfiguration: version: str identifier: str diff --git a/cibuildwheel/platforms/pyodide.py b/cibuildwheel/platforms/pyodide.py index d4ee9a921..3159acd64 100644 --- a/cibuildwheel/platforms/pyodide.py +++ b/cibuildwheel/platforms/pyodide.py @@ -1,3 +1,4 @@ +import dataclasses import functools import json import os @@ -6,7 +7,6 @@ import tomllib import typing from collections.abc import Set -from dataclasses import dataclass from pathlib import Path from tempfile import TemporaryDirectory from typing import Final, TypedDict @@ -41,7 +41,7 @@ IS_WIN: Final[bool] = sys.platform.startswith("win") -@dataclass(frozen=True) +@dataclasses.dataclass(frozen=True, kw_only=True) class PythonConfiguration: version: str identifier: str diff --git a/cibuildwheel/platforms/windows.py b/cibuildwheel/platforms/windows.py index 52e081f76..ce2d312d1 100644 --- a/cibuildwheel/platforms/windows.py +++ b/cibuildwheel/platforms/windows.py @@ -1,3 +1,4 @@ +import dataclasses import json import os import platform as platform_module @@ -5,7 +6,6 @@ import subprocess import textwrap from collections.abc import MutableMapping, Set -from dataclasses import dataclass from functools import cache from pathlib import Path from typing import assert_never @@ -51,7 +51,7 @@ def get_nuget_args( ] -@dataclass(frozen=True) +@dataclasses.dataclass(frozen=True, kw_only=True) class PythonConfiguration: version: str arch: str diff --git a/cibuildwheel/selector.py b/cibuildwheel/selector.py index 25f61176e..42f4104be 100644 --- a/cibuildwheel/selector.py +++ b/cibuildwheel/selector.py @@ -1,5 +1,5 @@ +import dataclasses import itertools -from dataclasses import dataclass from enum import StrEnum from fnmatch import fnmatch from typing import Any @@ -58,7 +58,7 @@ def parse_option_value(cls, value: str) -> frozenset["EnableGroup"]: return frozenset(result) -@dataclass(frozen=True, kw_only=True) +@dataclasses.dataclass(frozen=True, kw_only=True) class BuildSelector: """ This class holds a set of build/skip patterns. You call an instance with a @@ -113,7 +113,7 @@ def options_summary(self) -> Any: } -@dataclass(frozen=True) +@dataclasses.dataclass(frozen=True, kw_only=True) class TestSelector: """ A build selector that can only skip tests according to a skip pattern. diff --git a/cibuildwheel/util/packaging.py b/cibuildwheel/util/packaging.py index b13ebc6bc..295bc091c 100644 --- a/cibuildwheel/util/packaging.py +++ b/cibuildwheel/util/packaging.py @@ -11,7 +11,7 @@ from .helpers import parse_key_value_string, unwrap -@dataclass() +@dataclass(kw_only=True) class DependencyConstraints: base_file_path: Path | None = None packages: list[str] = field(default_factory=list) diff --git a/unit_test/get_platform_test.py b/unit_test/get_platform_test.py index 9bd46cd99..320b73ae7 100644 --- a/unit_test/get_platform_test.py +++ b/unit_test/get_platform_test.py @@ -1,6 +1,8 @@ import contextlib import sys +from collections.abc import Generator from pathlib import Path +from typing import TYPE_CHECKING import pytest import setuptools._distutils.util @@ -10,23 +12,27 @@ from cibuildwheel.platforms.windows import PythonConfiguration, setup_setuptools_cross_compile # monkeypatching os.name is too flaky. E.g. It works on my machine, but fails in pipeline -if not sys.platform.startswith("win"): +if not sys.platform.startswith("win") and not TYPE_CHECKING: pytest.skip("Windows-only tests", allow_module_level=True) @contextlib.contextmanager -def patched_environment(monkeypatch: pytest.MonkeyPatch, environment: dict[str, str]): +def patched_environment( + monkeypatch: pytest.MonkeyPatch, environment: dict[str, str] +) -> Generator[None, None, None]: with monkeypatch.context() as mp: for envvar, val in environment.items(): mp.setenv(name=envvar, value=val) yield -def test_x86(tmp_path: Path, monkeypatch: pytest.MonkeyPatch): +def test_x86(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None: arch = "32" environment: dict[str, str] = {} - configuration = PythonConfiguration("irrelevant", arch, "irrelevant", None) + configuration = PythonConfiguration( + version="irrelevant", arch=arch, identifier="irrelevant", url=None + ) setup_setuptools_cross_compile(tmp_path, configuration, tmp_path, environment) with patched_environment(monkeypatch, environment): @@ -36,11 +42,13 @@ def test_x86(tmp_path: Path, monkeypatch: pytest.MonkeyPatch): assert target_platform == "win32" -def test_x64(tmp_path: Path, monkeypatch: pytest.MonkeyPatch): +def test_x64(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None: arch = "64" environment: dict[str, str] = {} - configuration = PythonConfiguration("irrelevant", arch, "irrelevant", None) + configuration = PythonConfiguration( + version="irrelevant", arch=arch, identifier="irrelevant", url=None + ) setup_setuptools_cross_compile(tmp_path, configuration, tmp_path, environment) with patched_environment(monkeypatch, environment): @@ -53,11 +61,13 @@ def test_x64(tmp_path: Path, monkeypatch: pytest.MonkeyPatch): @pytest.mark.skipif( detect_ci_provider() == CIProvider.azure_pipelines, reason="arm64 not recognised on azure" ) -def test_arm(tmp_path: Path, monkeypatch: pytest.MonkeyPatch): +def test_arm(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None: arch = "ARM64" environment: dict[str, str] = {} - configuration = PythonConfiguration("irrelevant", arch, "irrelevant", None) + configuration = PythonConfiguration( + version="irrelevant", arch=arch, identifier="irrelevant", url=None + ) setup_setuptools_cross_compile(tmp_path, configuration, tmp_path, environment) with patched_environment(monkeypatch, environment): @@ -67,21 +77,25 @@ def test_arm(tmp_path: Path, monkeypatch: pytest.MonkeyPatch): assert target_platform == "win-arm64" -def test_env_set(tmp_path: Path): +def test_env_set(tmp_path: Path) -> None: arch = "32" environment = {"VSCMD_ARG_TGT_ARCH": "x64"} - configuration = PythonConfiguration("irrelevant", arch, "irrelevant", None) + configuration = PythonConfiguration( + version="irrelevant", arch=arch, identifier="irrelevant", url=None + ) with pytest.raises(FatalError, match="VSCMD_ARG_TGT_ARCH"): setup_setuptools_cross_compile(tmp_path, configuration, tmp_path, environment) -def test_env_blank(tmp_path: Path, monkeypatch: pytest.MonkeyPatch): +def test_env_blank(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None: arch = "32" environment = {"VSCMD_ARG_TGT_ARCH": ""} - configuration = PythonConfiguration("irrelevant", arch, "irrelevant", None) + configuration = PythonConfiguration( + version="irrelevant", arch=arch, identifier="irrelevant", url=None + ) setup_setuptools_cross_compile(tmp_path, configuration, tmp_path, environment) with patched_environment(monkeypatch, environment): From 7298563b2557ef4f236a679e03183f465b5a2bb9 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 28 May 2025 16:04:55 +0100 Subject: [PATCH 1058/1105] docs: fix many/musllinux option names and values and other broken links (#2425) --- docs/configuration.md | 2 +- docs/deliver-to-pypi.md | 2 +- docs/faq.md | 4 ++-- docs/options.md | 30 +++++++++++++++--------------- docs/platforms.md | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index 0a0ce985f..ae5ffc334 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -66,7 +66,7 @@ cibuildwheel to run tests, add the following YAML to your CI config file: !!! tab "Gitlab CI" - > .gitlab-ci.yml ([docs](https://docs.gitlab.com/ee/ci/variables/README.html#create-a-custom-variable-in-gitlab-ciyml)) + > .gitlab-ci.yml ([docs](https://docs.gitlab.com/ci/yaml/#variables)) ```yaml linux: diff --git a/docs/deliver-to-pypi.md b/docs/deliver-to-pypi.md index 6453ff6f8..edd59b384 100644 --- a/docs/deliver-to-pypi.md +++ b/docs/deliver-to-pypi.md @@ -79,7 +79,7 @@ for an example configuration. ## Manual method -On your development machine, install [pipx](https://pypa.github.io/pipx/) and do the following: +On your development machine, install [pipx](https://pipx.pypa.io/) and do the following: ```bash # Either download the SDist from your CI, or make it: diff --git a/docs/faq.md b/docs/faq.md index 42e38c4bb..e132413b0 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -163,7 +163,7 @@ setuptools.setup( Your build might need some compiler flags to be set through environment variables. Consider incorporating these into your package, for example, in `setup.py` using [`extra_compile_args` or -`extra_link_args`](https://docs.python.org/3/distutils/setupscript.html#other-options). +`extra_link_args`](https://setuptools.pypa.io/en/latest/userguide/ext_modules.html#setuptools.Extension). ## Troubleshooting @@ -313,7 +313,7 @@ This error may happen when you install a library using a package manager like Ho ### Windows: 'ImportError: DLL load failed: The specific module could not be found' -Visual Studio and MSVC link the compiled binary wheels to the Microsoft Visual C++ Runtime. Normally, the C parts of the runtime are included with Python, but the C++ components are not. When compiling modules using C++, it is possible users will run into problems on systems that do not have the full set of runtime libraries installed. The solution is to ask users to download the corresponding Visual C++ Redistributable from the [Microsoft website](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) and install it. +Visual Studio and MSVC link the compiled binary wheels to the Microsoft Visual C++ Runtime. Normally, the C parts of the runtime are included with Python, but the C++ components are not. When compiling modules using C++, it is possible users will run into problems on systems that do not have the full set of runtime libraries installed. The solution is to ask users to download the corresponding Visual C++ Redistributable from the [Microsoft website](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist) and install it. Additionally, Visual Studio 2019 started linking to an even newer DLL, `VCRUNTIME140_1.dll`, besides the `VCRUNTIME140.dll` that is included with recent Python versions (starting from Python 3.5; see [here](https://wiki.python.org/moin/WindowsCompilers) for more details on the corresponding Visual Studio & MSVC versions used to compile the different Python versions). To avoid this extra dependency on `VCRUNTIME140_1.dll`, the [`/d2FH4-` flag](https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64/) can be added to the MSVC invocations (check out [this issue](https://github.com/pypa/cibuildwheel/issues/423) for details and references). CPython 3.8.3 and all versions after it have this extra DLL, so it is only needed for 3.8 and earlier. diff --git a/docs/options.md b/docs/options.md index 89e782bf5..1a49a03e3 100644 --- a/docs/options.md +++ b/docs/options.md @@ -982,22 +982,22 @@ The available options are: | Option | Default | |--------------------------------|-----------------------------------------------------------------| -| `manylinux-x86-64-image` | [`manylinux-2-28`](https://quay.io/pypa/manylinux-2-28-x86-64) | -| `manylinux-i686-image` | [`manylinux2014`](https://quay.io/pypa/manylinux2014-i686) | -| `manylinux-pypy-x86-64-image` | [`manylinux-2-28`](https://quay.io/pypa/manylinux-2-28-x86-64) | -| `manylinux-aarch64-image` | [`manylinux-2-28`](https://quay.io/pypa/manylinux-2-28-aarch64) | -| `manylinux-ppc64le-image` | [`manylinux-2-28`](https://quay.io/pypa/manylinux-2-28-ppc64le) | -| `manylinux-s390x-image` | [`manylinux-2-28`](https://quay.io/pypa/manylinux-2-28-s390x) | -| `manylinux-armv7l-image` | [`manylinux-2-31`](https://quay.io/pypa/manylinux-2-31-armv7l) | +| `manylinux_x86_64-image` | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_x86_64) | +| `manylinux-i686-image` | [`manylinux2014`](https://quay.io/pypa/manylinux2014_i686) | +| `manylinux-pypy_x86_64-image` | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_x86_64) | +| `manylinux-aarch64-image` | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_aarch64) | +| `manylinux-ppc64le-image` | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_ppc64le) | +| `manylinux-s390x-image` | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_s390x) | +| `manylinux-armv7l-image` | [`manylinux_2_31`](https://quay.io/pypa/manylinux_2_31_armv7l) | | `manylinux-riscv64-image` | No default | -| `manylinux-pypy-aarch64-image` | [`manylinux-2-28`](https://quay.io/pypa/manylinux-2-28-aarch64) | -| `manylinux-pypy-i686-image` | [`manylinux2014`](https://quay.io/pypa/manylinux2014-i686) | -| `musllinux-x86-64-image` | [`musllinux-1-2`](https://quay.io/pypa/musllinux-1-2-x86-64) | -| `musllinux-i686-image` | [`musllinux-1-2`](https://quay.io/pypa/musllinux-1-2-i686) | -| `musllinux-aarch64-image` | [`musllinux-1-2`](https://quay.io/pypa/musllinux-1-2-aarch64) | -| `musllinux-ppc64le-image` | [`musllinux-1-2`](https://quay.io/pypa/musllinux-1-2-ppc64le) | -| `musllinux-s390x-image` | [`musllinux-1-2`](https://quay.io/pypa/musllinux-1-2-s390x) | -| `musllinux-armv7l-image` | [`musllinux-1-2`](https://quay.io/pypa/musllinux-1-2-armv7l) | +| `manylinux-pypy_aarch64-image` | [`manylinux_2_28`](https://quay.io/pypa/manylinux_2_28_aarch64) | +| `manylinux-pypy_i686-image` | [`manylinux2014`](https://quay.io/pypa/manylinux2014_i686) | +| `musllinux_x86_64-image` | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_x86_64) | +| `musllinux-i686-image` | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_i686) | +| `musllinux-aarch64-image` | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_aarch64) | +| `musllinux-ppc64le-image` | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_ppc64le) | +| `musllinux-s390x-image` | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_s390x) | +| `musllinux-armv7l-image` | [`musllinux_1_2`](https://quay.io/pypa/musllinux_1_2_armv7l) | | `musllinux-riscv64-image` | No default | Set the Docker image to be used for building [manylinux / musllinux](https://github.com/pypa/manylinux) wheels. diff --git a/docs/platforms.md b/docs/platforms.md index c4ffb9af6..ca9c0f90c 100644 --- a/docs/platforms.md +++ b/docs/platforms.md @@ -152,7 +152,7 @@ In order to speed-up builds, cibuildwheel will cache the tools it needs to be re `cibuildwheel` supports cross-compiling `ARM64` wheels on all Windows runners, but a native ARM64 runner is required for testing. On non-native runners, tests for ARM64 wheels will be automatically skipped with a warning. Add `"*-win_arm64"` to your `CIBW_TEST_SKIP` setting to suppress the warning. -Cross-compilation on Windows relies on a supported build backend. Supported backends use an environment variable to specify their target platform (the one they are compiling native modules for, as opposed to the one they are running on), which is set in [cibuildwheels/windows.py](https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/windows.py) before building. Currently, `setuptools>=65.4.1` and `setuptools_rust` are the only supported backends. +Cross-compilation on Windows relies on a supported build backend. Supported backends use an environment variable to specify their target platform (the one they are compiling native modules for, as opposed to the one they are running on), which is set in [cibuildwheel's windows.py](https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/platforms/windows.py) before building. Currently, `setuptools>=65.4.1` and `setuptools_rust` are the only supported backends. By default, `ARM64` is not enabled when running on non-ARM64 runners. Use [`CIBW_ARCHS`](options.md#archs) to select it. From 63797729570cef6f8a55bec6b331c1e8107abf0d Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 28 May 2025 16:05:16 +0100 Subject: [PATCH 1059/1105] Revert to running tests from from a temp dir when test-sources is unset (#2420) * Revert to running tests from from a temp dir when test-sources is unset * Fix placeholders error message, add test for it * Add back {project} placeholders to CIBW_TEST_COMMAND in tests & docs * Update test/test_before_test.py --------- Co-authored-by: Henry Schreiner --- cibuildwheel/platforms/ios.py | 42 +++++++++---- cibuildwheel/platforms/linux.py | 10 +-- cibuildwheel/platforms/macos.py | 11 +++- cibuildwheel/platforms/pyodide.py | 10 +-- cibuildwheel/platforms/windows.py | 22 ++++--- .../resources/testing_temp_dir_file.py | 36 +++++++++++ cibuildwheel/util/resources.py | 1 + docs/configuration.md | 23 ++----- docs/options.md | 46 +++++++------- test/test_abi_variants.py | 2 +- test/test_before_test.py | 4 +- test/test_emulation.py | 2 +- test/test_ios.py | 41 +++++++++++- test/test_macos_archs.py | 2 - test/test_pyodide.py | 2 +- test/test_testing.py | 62 +++++++++++-------- 16 files changed, 209 insertions(+), 107 deletions(-) create mode 100644 cibuildwheel/resources/testing_temp_dir_file.py diff --git a/cibuildwheel/platforms/ios.py b/cibuildwheel/platforms/ios.py index 1235d92d6..660af67c1 100644 --- a/cibuildwheel/platforms/ios.py +++ b/cibuildwheel/platforms/ios.py @@ -559,19 +559,19 @@ def build(options: Options, tmp_path: Path) -> None: env=test_env, ) - if not build_options.test_sources: - # iOS requires an explicit test-sources, as the project directory - # isn't visible on the simulator. - - msg = "Testing on iOS requires a definition of test-sources." - raise errors.FatalError(msg) + testbed_app_path = testbed_path / "iOSTestbed" / "app" # Copy the test sources to the testbed app - copy_test_sources( - build_options.test_sources, - build_options.package_dir, - testbed_path / "iOSTestbed" / "app", - ) + if build_options.test_sources: + copy_test_sources( + build_options.test_sources, + build_options.package_dir, + testbed_app_path, + ) + else: + (testbed_app_path / "test_fail.py").write_text( + resources.TEST_FAIL_CWD_FILE.read_text() + ) log.step("Installing test requirements...") # Install the compiled wheel (with any test extras), plus @@ -598,6 +598,26 @@ def build(options: Options, tmp_path: Path) -> None: log.step("Running test suite...") + # iOS doesn't support placeholders in the test command, + # because the source dir isn't visible on the simulator. + if ( + "{project}" in build_options.test_command + or "{package}" in build_options.test_command + ): + msg = unwrap_preserving_paragraphs( + f""" + iOS tests configured with a test command that uses the "{{project}}" or + "{{package}}" placeholder. iOS tests cannot use placeholders, because the + source directory is not visible on the simulator. + + In addition, iOS tests must run as a Python module, so the test command + must begin with 'python -m'. + + Test command: {build_options.test_command!r} + """ + ) + 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] diff --git a/cibuildwheel/platforms/linux.py b/cibuildwheel/platforms/linux.py index f31529cb8..31f02cc85 100644 --- a/cibuildwheel/platforms/linux.py +++ b/cibuildwheel/platforms/linux.py @@ -398,9 +398,10 @@ def build_in_container( wheel=wheel_to_test, ) + test_cwd = testing_temp_dir / "test_cwd" + container.call(["mkdir", "-p", test_cwd]) + 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, @@ -408,8 +409,9 @@ def build_in_container( copy_into=container.copy_into, ) else: - # There are no test sources. Run the tests in the project directory. - test_cwd = PurePosixPath(container_project_path) + # Use the test_fail.py file to raise a nice error if the user + # tries to run tests in the cwd + container.copy_into(resources.TEST_FAIL_CWD_FILE, test_cwd / "test_fail.py") container.call(["sh", "-c", test_command_prepared], cwd=test_cwd, env=virtualenv_env) diff --git a/cibuildwheel/platforms/macos.py b/cibuildwheel/platforms/macos.py index 1975c6633..9dae02e5f 100644 --- a/cibuildwheel/platforms/macos.py +++ b/cibuildwheel/platforms/macos.py @@ -706,8 +706,9 @@ def build(options: Options, tmp_path: Path) -> None: wheel=repaired_wheel, ) + test_cwd = identifier_tmp_dir / "test_cwd" + if build_options.test_sources: - test_cwd = identifier_tmp_dir / "test_cwd" # only create test_cwd if it doesn't already exist - it # may have been created during a previous `testing_arch` if not test_cwd.exists(): @@ -718,8 +719,12 @@ def build(options: Options, tmp_path: Path) -> None: test_cwd, ) else: - # There are no test sources. Run the tests in the project directory. - test_cwd = Path.cwd() + # Use the test_fail.py file to raise a nice error if the user + # tries to run tests in the cwd + test_cwd.mkdir(exist_ok=True) + (test_cwd / "test_fail.py").write_text( + resources.TEST_FAIL_CWD_FILE.read_text() + ) shell_with_arch(test_command_prepared, cwd=test_cwd, env=virtualenv_env) diff --git a/cibuildwheel/platforms/pyodide.py b/cibuildwheel/platforms/pyodide.py index 3159acd64..fdabc3aa0 100644 --- a/cibuildwheel/platforms/pyodide.py +++ b/cibuildwheel/platforms/pyodide.py @@ -523,17 +523,19 @@ 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) + 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.cwd() + # Use the test_fail.py file to raise a nice error if the user + # tries to run tests in the cwd + (test_cwd / "test_fail.py").write_text(resources.TEST_FAIL_CWD_FILE.read_text()) shell(test_command_prepared, cwd=test_cwd, env=virtualenv_env) diff --git a/cibuildwheel/platforms/windows.py b/cibuildwheel/platforms/windows.py index ce2d312d1..17375fad4 100644 --- a/cibuildwheel/platforms/windows.py +++ b/cibuildwheel/platforms/windows.py @@ -588,24 +588,26 @@ def build(options: Options, tmp_path: Path) -> None: # run the tests from a temp dir, with an absolute path in the command # (this ensures that Python runs the tests against the installed wheel # and not the repo code) - test_command_prepared = prepare_command( - build_options.test_command, - project=Path.cwd(), - package=options.globals.package_dir.resolve(), - wheel=repaired_wheel, - ) + test_cwd = identifier_tmp_dir / "test_cwd" + test_cwd.mkdir() + if build_options.test_sources: - test_cwd = identifier_tmp_dir / "test_cwd" - test_cwd.mkdir() 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.cwd() + # Use the test_fail.py file to raise a nice error if the user + # tries to run tests in the cwd + (test_cwd / "test_fail.py").write_text(resources.TEST_FAIL_CWD_FILE.read_text()) + test_command_prepared = prepare_command( + build_options.test_command, + project=Path.cwd(), + package=options.globals.package_dir.resolve(), + wheel=repaired_wheel, + ) shell(test_command_prepared, cwd=test_cwd, env=virtualenv_env) # we're all done here; move it to output (remove if already exists) diff --git a/cibuildwheel/resources/testing_temp_dir_file.py b/cibuildwheel/resources/testing_temp_dir_file.py new file mode 100644 index 000000000..094f2f6fb --- /dev/null +++ b/cibuildwheel/resources/testing_temp_dir_file.py @@ -0,0 +1,36 @@ +# this file is copied to the testing cwd, to raise the below error message if +# pytest/unittest is run from there. + +import sys +import unittest +from typing import NoReturn + + +class TestStringMethods(unittest.TestCase): + def test_fail(self) -> NoReturn: + if sys.platform == "ios": + msg = ( + "You tried to run tests from the testbed app's working " + "directory, without specifying `test-sources`. " + "On iOS, you must copy your test files to the testbed app by " + "setting the `test-sources` option in your cibuildwheel " + "configuration." + ) + else: + msg = ( + "cibuildwheel executes tests from a different working directory to " + "your project. This ensures only your wheel is imported, preventing " + "Python from accessing files that haven't been packaged into the " + "wheel. " + "\n\n" + "Please specify a path to your tests when invoking pytest " + "using the {project} placeholder, e.g. `pytest {project}` or " + "`pytest {project}/tests`. cibuildwheel will replace {project} with " + "the path to your project. " + "\n\n" + "Alternatively, you can specify your test files using the " + "`test-sources` option, and cibuildwheel will copy them to the " + "working directory for testing." + ) + + self.fail(msg) diff --git a/cibuildwheel/util/resources.py b/cibuildwheel/util/resources.py index a3cef7815..0cb09a26d 100644 --- a/cibuildwheel/util/resources.py +++ b/cibuildwheel/util/resources.py @@ -17,6 +17,7 @@ VIRTUALENV: Final[Path] = PATH / "virtualenv.toml" CIBUILDWHEEL_SCHEMA: Final[Path] = PATH / "cibuildwheel.schema.json" PYTHON_BUILD_STANDALONE_RELEASES: Final[Path] = PATH / "python-build-standalone-releases.json" +TEST_FAIL_CWD_FILE: Final[Path] = PATH / "testing_temp_dir_file.py" # this value is cached because it's used a lot in unit tests diff --git a/docs/configuration.md b/docs/configuration.md index ae5ffc334..1f1736056 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -17,7 +17,7 @@ cibuildwheel to run tests, add the following YAML to your CI config file: ```yaml env: CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: "pytest ./tests" + CIBW_TEST_COMMAND: "pytest {project}/tests" ``` !!! tab "Azure Pipelines" @@ -27,7 +27,7 @@ cibuildwheel to run tests, add the following YAML to your CI config file: ```yaml variables: CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: "pytest ./tests" + CIBW_TEST_COMMAND: "pytest {project}/tests" ``` !!! tab "Travis CI" @@ -38,18 +38,7 @@ cibuildwheel to run tests, add the following YAML to your CI config file: env: global: - CIBW_TEST_REQUIRES=pytest - - CIBW_TEST_COMMAND="pytest ./tests" - ``` - -!!! tab "AppVeyor" - - > appveyor.yml ([docs](https://www.appveyor.com/docs/build-configuration/#environment-variables)) - - ```yaml - environment: - global: - CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: "pytest {project}\\tests" + - CIBW_TEST_COMMAND="pytest {project}/tests" ``` !!! tab "CircleCI" @@ -61,7 +50,7 @@ cibuildwheel to run tests, add the following YAML to your CI config file: job_name: environment: CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: "pytest ./tests" + CIBW_TEST_COMMAND: "pytest {project}/tests" ``` !!! tab "Gitlab CI" @@ -72,7 +61,7 @@ cibuildwheel to run tests, add the following YAML to your CI config file: linux: variables: CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: "pytest ./tests" + CIBW_TEST_COMMAND: "pytest {project}/tests" ``` !!! tab "Cirrus CI" @@ -82,7 +71,7 @@ cibuildwheel to run tests, add the following YAML to your CI config file: ```yaml env: CIBW_TEST_REQUIRES: pytest - CIBW_TEST_COMMAND: "pytest ./tests" + CIBW_TEST_COMMAND: "pytest {project}/tests" ``` ## Configuration file {: #configuration-file} diff --git a/docs/options.md b/docs/options.md index 1a49a03e3..95a82e3db 100644 --- a/docs/options.md +++ b/docs/options.md @@ -28,7 +28,7 @@ This option can also be set using the [command-line option](#command-line) `--pl ```bash export CIBW_BUILD='cp37-*' - export CIBW_TEST_COMMAND='pytest ./tests' + export CIBW_TEST_COMMAND='pytest {project}/tests' cibuildwheel --platform linux . ``` @@ -1284,23 +1284,23 @@ Shell command to run tests after the build. The wheel will be installed automatically and available for import from the tests. If this variable is not set, your wheel will not be installed after building. -By default, tests are executed from your project directory. When specifying -`test-command`, you can optionally use the placeholders `{package}` and -`{project}` to pass in the location of your test code: +To ensure the wheel is imported by your tests (instead of your source copy), +**Tests are executed from a temporary directory**, outside of your source +tree. To access your test code, you have a couple of options: -- `{package}` is the path to the package being built - the `package_dir` - argument supplied to cibuildwheel on the command line. -- `{project}` is an absolute path to the project root - the working directory - where cibuildwheel was called. +- You can use the [`test-sources`](#test-sources) setting to copy specific + files from your source tree into the temporary directory. When using + test-sources, use relative paths in your test command, as if they were + relative to the project root. -Using `{package}` or `{project}` used to be required, but since cibuildwheel -3.0, tests are run from the project root by default. This means that you can -use relative paths in your test command, and they will be relative to the -project root. +- You can use the `{package}` or `{project}` placeholders in your + `test-command` to refer to the package being built or the project root, + respectively. -Alternatively, you can use the [`test-sources`](#test-sources) setting to -create a temporary folder populated with a specific subset of project files to -run your test suite. + - `{package}` is the path to the package being built - the `package_dir` + argument supplied to cibuildwheel on the command line. + - `{project}` is an absolute path to the project root - the working + directory where cibuildwheel was called. On all platforms other than iOS, the command is run in a shell, so you can write things like `cmd1 && cmd2`. @@ -1318,18 +1318,18 @@ Platform-specific environment variables are also available:
```toml [tool.cibuildwheel] # Run the package tests using `pytest` - test-command = "pytest ./tests" + test-command = "pytest {project}/tests" # Trigger an install of the package, but run nothing of note test-command = "echo Wheel installed" # Multiline example test-command = [ - "pytest ./tests", - "python ./test.py", + "pytest {project}/tests", + "python {project}/test.py", ] - # run tests on ios + # run tests on ios - when test-sources is set, use relative paths, not {project} or {package} [tool.cibuildwheel.ios] test-sources = ["tests"] test-command = "python -m pytest ./tests" @@ -1341,17 +1341,17 @@ Platform-specific environment variables are also available:
```yaml # Run the package tests using `pytest` - CIBW_TEST_COMMAND: pytest ./tests + CIBW_TEST_COMMAND: pytest {project}/tests # Trigger an install of the package, but run nothing of note CIBW_TEST_COMMAND: "echo Wheel installed" # Multi-line example - join with && on all platforms CIBW_TEST_COMMAND: > - pytest ./tests && - python ./test.py + pytest {project}/tests && + python {project}/test.py - # run tests on ios + # run tests on ios - when test-sources is set, use relative paths, not {project} or {package} CIBW_TEST_SOURCES_IOS: tests CIBW_TEST_COMMAND_IOS: python -m pytest ./tests ``` diff --git a/test/test_abi_variants.py b/test/test_abi_variants.py index f64f42485..2a849f3a2 100644 --- a/test/test_abi_variants.py +++ b/test/test_abi_variants.py @@ -187,7 +187,7 @@ def test_abi_none(tmp_path, capfd): project_dir, add_env={ "CIBW_TEST_REQUIRES": "pytest", - "CIBW_TEST_COMMAND": f"{utils.invoke_pytest()} ./test", + "CIBW_TEST_COMMAND": f"{utils.invoke_pytest()} {{project}}/test", # limit the number of builds for test performance reasons "CIBW_BUILD": "cp38-* cp{}{}-* cp313t-* pp310-*".format(*utils.SINGLE_PYTHON_VERSION), "CIBW_ENABLE": "all", diff --git a/test/test_before_test.py b/test/test_before_test.py index c6ed5a7bb..3c722d089 100644 --- a/test/test_before_test.py +++ b/test/test_before_test.py @@ -62,10 +62,10 @@ def test(tmp_path, build_frontend_env): "CIBW_TEST_REQUIRES": "pytest", # the 'false ||' bit is to ensure this command runs in a shell on # mac/linux. - "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} ./test", + "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test", # pytest fails on GraalPy 24.2.0 on Windows so we skip it there # until https://github.com/oracle/graalpython/issues/490 is fixed - "CIBW_TEST_COMMAND_WINDOWS": "where graalpy || pytest ./test", + "CIBW_TEST_COMMAND_WINDOWS": "where graalpy || pytest {project}/test", **build_frontend_env, }, ) diff --git a/test/test_emulation.py b/test/test_emulation.py index 9749d9da0..4a749cfa3 100644 --- a/test/test_emulation.py +++ b/test/test_emulation.py @@ -32,7 +32,7 @@ def test(tmp_path, request): project_dir, add_env={ "CIBW_TEST_REQUIRES": "pytest", - "CIBW_TEST_COMMAND": "pytest ./test", + "CIBW_TEST_COMMAND": "pytest {project}/test", "CIBW_ARCHS": archs, # TODO remove me once proper support is added "CIBW_MANYLINUX_RISCV64_IMAGE": "ghcr.io/mayeut/manylinux_2_35:2025.05.11-1", diff --git a/test/test_ios.py b/test/test_ios.py index 39d54ae91..9ee588b26 100644 --- a/test/test_ios.py +++ b/test/test_ios.py @@ -91,8 +91,9 @@ def test_ios_platforms(tmp_path, build_config, monkeypatch, capfd): assert "'does-exist' will be included in the cross-build environment" in captured.out +@pytest.mark.serial def test_no_test_sources(tmp_path, capfd): - """Build will fail if test-sources isn't defined.""" + """Build will provide a helpful error if pytest is run and test-sources is not defined.""" if utils.get_platform() != "macos": pytest.skip("this test can only run on macOS") if utils.get_xcode_version() < (13, 0): @@ -109,13 +110,47 @@ def test_no_test_sources(tmp_path, capfd): add_env={ "CIBW_PLATFORM": "ios", "CIBW_BUILD": "cp313-*", - "CIBW_TEST_COMMAND": "python -m tests", + "CIBW_TEST_REQUIRES": "pytest", + "CIBW_TEST_COMMAND": "python -m pytest", + "CIBW_XBUILD_TOOLS": "", + }, + ) + + # The error message indicates the configuration issue. + captured = capfd.readouterr() + assert ( + "you must copy your test files to the testbed app by setting the `test-sources` option" + in captured.out + captured.err + ) + + +def test_ios_testing_with_placeholder(tmp_path, capfd): + """Build will run tests with the {project} placeholder.""" + if utils.get_platform() != "macos": + pytest.skip("this test can only run on macOS") + if utils.get_xcode_version() < (13, 0): + pytest.skip("this test only works with Xcode 13.0 or greater") + + project_dir = tmp_path / "project" + basic_project = test_projects.new_c_project() + basic_project.files.update(basic_project_files) + basic_project.generate(project_dir) + + with pytest.raises(subprocess.CalledProcessError): + utils.cibuildwheel_run( + project_dir, + add_env={ + "CIBW_PLATFORM": "ios", + "CIBW_BUILD": "cp313-*", + "CIBW_TEST_REQUIRES": "pytest", + "CIBW_TEST_COMMAND": "pytest {project}/tests", + "CIBW_XBUILD_TOOLS": "", }, ) # The error message indicates the configuration issue. captured = capfd.readouterr() - assert "Testing on iOS requires a definition of test-sources." in captured.err + assert "iOS tests cannot use placeholders" in captured.out + captured.err def test_missing_xbuild_tool(tmp_path, capfd): diff --git a/test/test_macos_archs.py b/test/test_macos_archs.py index f38cff567..f799e55b0 100644 --- a/test/test_macos_archs.py +++ b/test/test_macos_archs.py @@ -42,11 +42,9 @@ def test_cross_compiled_build(tmp_path): @pytest.mark.parametrize( "test_config", [ - # Run the test suite in the project folder { "CIBW_TEST_COMMAND": '''python -c "import platform; print('running tests on ' + platform.machine())"''', }, - # Nominate the set of test sources to copy { "CIBW_TEST_COMMAND": "python tests/test_suite.py", "CIBW_TEST_SOURCES": "tests", diff --git a/test/test_pyodide.py b/test/test_pyodide.py index e1dbbd56e..39bc2be32 100644 --- a/test/test_pyodide.py +++ b/test/test_pyodide.py @@ -129,7 +129,7 @@ def test_filter(): add_args=["--platform", "pyodide"], add_env={ "CIBW_TEST_REQUIRES": "pytest", - "CIBW_TEST_COMMAND": "python -m pytest", + "CIBW_TEST_COMMAND": "python -m pytest {project}", }, ) # check that the expected wheels are produced diff --git a/test/test_testing.py b/test/test_testing.py index 88054c545..f12e7b5d5 100644 --- a/test/test_testing.py +++ b/test/test_testing.py @@ -86,10 +86,10 @@ def test(tmp_path): "CIBW_TEST_REQUIRES": "pytest", # the 'false ||' bit is to ensure this command runs in a shell on # mac/linux. - "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} ./test", + "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test", # pytest fails on GraalPy 24.2.0 on Windows so we skip it there # until https://github.com/oracle/graalpython/issues/490 is fixed - "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest ./test", + "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest {project}/test", }, ) @@ -109,10 +109,10 @@ def test_extras_require(tmp_path): "CIBW_TEST_EXTRAS": "test", # the 'false ||' bit is to ensure this command runs in a shell on # mac/linux. - "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} ./test", + "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test", # pytest fails on GraalPy 24.2.0 on Windows so we skip it there # until https://github.com/oracle/graalpython/issues/490 is fixed - "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest ./test", + "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest {project}/test", }, single_python=True, ) @@ -143,10 +143,10 @@ def test_dependency_groups(tmp_path): "CIBW_TEST_GROUPS": "dev", # the 'false ||' bit is to ensure this command runs in a shell on # mac/linux. - "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} ./test", + "CIBW_TEST_COMMAND": f"false || {utils.invoke_pytest()} {{project}}/test", # pytest fails on GraalPy 24.2.0 on Windows so we skip it there # until https://github.com/oracle/graalpython/issues/490 is fixed - "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest ./test", + "CIBW_TEST_COMMAND_WINDOWS": "COLOR 00 || where graalpy || pytest {project}/test", }, single_python=True, ) @@ -178,7 +178,7 @@ def test_failing_test(tmp_path): output_dir=output_dir, add_env={ "CIBW_TEST_REQUIRES": "pytest", - "CIBW_TEST_COMMAND": f"{utils.invoke_pytest()} ./test", + "CIBW_TEST_COMMAND": f"{utils.invoke_pytest()} {{project}}/test", # CPython 3.8 when running on macOS arm64 is unusual. The build # always runs in x86_64, so the arm64 tests are not run. See # #1169 for reasons why. That means the build succeeds, which @@ -191,28 +191,40 @@ def test_failing_test(tmp_path): @pytest.mark.parametrize("test_runner", ["pytest", "unittest"]) -def test_bare_pytest_invocation(tmp_path: Path, test_runner: str) -> None: - """Check that if a user runs a bare test suite, it runs in the project folder""" +def test_bare_pytest_invocation( + tmp_path: Path, capfd: pytest.CaptureFixture[str], test_runner: str +) -> None: + """ + Check that if a user runs pytest in the the test cwd without setting + test-sources, it raises a helpful error + """ project_dir = tmp_path / "project" project_with_a_test.generate(project_dir) + output_dir = tmp_path / "output" - actual_wheels = utils.cibuildwheel_run( - project_dir, - add_env={ - "CIBW_TEST_REQUIRES": "pytest" if test_runner == "pytest" else "", - "CIBW_TEST_COMMAND": ( - # pytest fails on GraalPy 24.2.0 on Windows so we skip it there - # until https://github.com/oracle/graalpython/issues/490 fixed - "graalpy.exe -c 1 || python -m pytest" - if test_runner == "pytest" - else "python -m unittest discover test spam_test.py" - ), - }, - ) + with pytest.raises(subprocess.CalledProcessError): + utils.cibuildwheel_run( + project_dir, + output_dir=output_dir, + add_env={ + "CIBW_TEST_REQUIRES": "pytest" if test_runner == "pytest" else "", + "CIBW_TEST_COMMAND": ( + "python -m pytest" if test_runner == "pytest" else "python -m unittest" + ), + # Skip CPython 3.8 on macOS arm64, see comment above in + # 'test_failing_test' + "CIBW_SKIP": "cp38-macosx_arm64", + }, + ) - # check that we got the right wheels - expected_wheels = utils.expected_wheels("spam", "0.1.0") - assert set(actual_wheels) == set(expected_wheels) + assert len(list(output_dir.iterdir())) == 0 + + captured = capfd.readouterr() + + assert ( + "Please specify a path to your tests when invoking pytest using the {project} placeholder" + in captured.out + captured.err + ) def test_test_sources(tmp_path): From c41b47f7c2464ff7945b34e211ddc4b89f423a45 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 28 May 2025 20:07:38 +0100 Subject: [PATCH 1060/1105] Bump version: v3.0.0b3 --- README.md | 25 +++++++++++++------------ cibuildwheel/__init__.py | 2 +- docs/changelog.md | 15 ++++++++++++--- docs/faq.md | 6 +++--- examples/azure-pipelines-minimal.yml | 6 +++--- examples/circleci-minimal.yml | 6 +++--- examples/cirrus-ci-intel-mac.yml | 2 +- examples/cirrus-ci-minimal.yml | 2 +- examples/github-deploy.yml | 2 +- examples/github-minimal.yml | 2 +- examples/github-pipx.yml | 2 +- examples/github-with-qemu.yml | 2 +- examples/gitlab-minimal.yml | 6 +++--- examples/gitlab-with-qemu.yml | 2 +- examples/travis-ci-deploy.yml | 2 +- examples/travis-ci-minimal.yml | 2 +- examples/travis-ci-test-and-deploy.yml | 4 ++-- pyproject.toml | 2 +- 18 files changed, 50 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 8d260da70..574a422e2 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ jobs: - uses: actions/setup-python@v5 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==3.0.0b2 + run: python -m pip install cibuildwheel==3.0.0b3 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -223,8 +223,16 @@ 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. -Known issues: -- ⚠️ The CWD for test-command has changed in v3.0, but that is still [being debated](https://github.com/pypa/cibuildwheel/issues/2406), it might change before the final release. Please provide feedback on the aforementioned issue if you do (or don't!) encounter issues with this. +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. + +#### v3.0.0b3 + +_28 May 2025_ + +- 🛠 Reverts the test working dir (when test-sources isn't set) to a temporary dir, rather than the project. (#2420) +- 📚 Docs now primarily use the pyproject.toml name of options, rather than the environment variable name. (#2389) #### v3.0.0b2 @@ -245,7 +253,8 @@ _19 May 2025_ - ✨ 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, 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) - 🛠 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) @@ -260,14 +269,6 @@ _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) -- - --- diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index c9e418604..6ab976e35 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1 +1 @@ -__version__ = "3.0.0b2" +__version__ = "3.0.0b3" diff --git a/docs/changelog.md b/docs/changelog.md index 740f82b41..fce8d721a 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -10,8 +10,16 @@ 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. -Known issues: -- ⚠️ The CWD for test-command has changed in v3.0, but that is still [being debated](https://github.com/pypa/cibuildwheel/issues/2406), it might change before the final release. Please provide feedback on the aforementioned issue if you do (or don't!) encounter issues with this. +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. + +#### v3.0.0b3 + +_28 May 2025_ + +- 🛠 Reverts the test working dir (when test-sources isn't set) to a temporary dir, rather than the project. (#2420) +- 📚 Docs now primarily use the pyproject.toml name of options, rather than the environment variable name. (#2389) #### v3.0.0b2 @@ -32,7 +40,8 @@ _19 May 2025_ - ✨ 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, 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) - 🛠 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) diff --git a/docs/faq.md b/docs/faq.md index e132413b0..9a04e216c 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -60,7 +60,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: pypa/cibuildwheel@v3.0.0b2 +uses: pypa/cibuildwheel@v3.0.0b3 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. @@ -82,7 +82,7 @@ The second option, and the only one that supports other CI systems, is using a ` ```bash # requirements-cibw.txt -cibuildwheel==3.0.0b2 +cibuildwheel==3.0.0b3 ``` Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this: @@ -247,7 +247,7 @@ Solutions to this vary, but the simplest is to use pipx: # most runners have pipx preinstalled, but in case you don't python3 -m pip install pipx -pipx run cibuildwheel==3.0.0b2 --output-dir wheelhouse +pipx run cibuildwheel==3.0.0b3 --output-dir wheelhouse pipx run twine upload wheelhouse/*.whl ``` diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index de5fee7a1..fa805c94f 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -6,7 +6,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - pip3 install cibuildwheel==3.0.0b2 + pip3 install cibuildwheel==3.0.0b3 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -20,7 +20,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - python3 -m pip install cibuildwheel==3.0.0b2 + python3 -m pip install cibuildwheel==3.0.0b3 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -34,7 +34,7 @@ jobs: - bash: | set -o errexit python -m pip install --upgrade pip - pip install cibuildwheel==3.0.0b2 + pip install cibuildwheel==3.0.0b3 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index 45bd7ac90..aa27628a8 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -11,7 +11,7 @@ jobs: - run: name: Build the Linux wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0b2 + python3 -m pip install --user cibuildwheel==3.0.0b3 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -28,7 +28,7 @@ jobs: - run: name: Build the Linux aarch64 wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0b2 + python3 -m pip install --user cibuildwheel==3.0.0b3 python3 -m cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -44,7 +44,7 @@ jobs: name: Build the OS X wheels. command: | sudo softwareupdate --install-rosetta --agree-to-license # for python<=3.8 or x86_64/universal2 tests - pip3 install cibuildwheel==3.0.0b2 + pip3 install cibuildwheel==3.0.0b3 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ diff --git a/examples/cirrus-ci-intel-mac.yml b/examples/cirrus-ci-intel-mac.yml index ddbfac6ff..3dd47a778 100644 --- a/examples/cirrus-ci-intel-mac.yml +++ b/examples/cirrus-ci-intel-mac.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0b2 + - python -m pip install cibuildwheel==3.0.0b3 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index bc6a655aa..1688a1542 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0b2 + - python -m pip install cibuildwheel==3.0.0b3 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index da63c0922..69b9e3037 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b2 + uses: pypa/cibuildwheel@v3.0.0b3 env: CIBW_PLATFORM: ${{ matrix.platform }} CIBW_ARCHS: ${{ matrix.archs }} diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index 838d5b395..7b08021a4 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b2 + uses: pypa/cibuildwheel@v3.0.0b3 # env: # CIBW_SOME_OPTION: value # ... diff --git a/examples/github-pipx.yml b/examples/github-pipx.yml index 166c6162a..a9643590c 100644 --- a/examples/github-pipx.yml +++ b/examples/github-pipx.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - run: pipx run cibuildwheel==3.0.0b2 + run: pipx run cibuildwheel==3.0.0b3 - uses: actions/upload-artifact@v4 with: diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index 1db755101..32c6abdd2 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -21,7 +21,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b2 + uses: pypa/cibuildwheel@v3.0.0b3 env: # configure cibuildwheel on Linux to build native archs ('auto'), # and to split the remaining architectures between the x86_64 and diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index 420dce8cb..cdea6e172 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -12,7 +12,7 @@ linux: DOCKER_TLS_CERTDIR: "" script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==3.0.0b2 + - python -m pip install cibuildwheel==3.0.0b3 - cibuildwheel --output-dir wheelhouse artifacts: paths: @@ -23,7 +23,7 @@ windows: before_script: - choco install python -y --version 3.12.4 - choco install git.install -y - - py -m pip install cibuildwheel==3.0.0b2 + - py -m pip install cibuildwheel==3.0.0b3 script: - py -m cibuildwheel --output-dir wheelhouse --platform windows artifacts: @@ -35,7 +35,7 @@ windows: macos: image: macos-14-xcode-15 before_script: - - python3 -m pip install cibuildwheel==3.0.0b2 + - python3 -m pip install cibuildwheel==3.0.0b3 script: - python3 -m cibuildwheel --output-dir wheelhouse artifacts: diff --git a/examples/gitlab-with-qemu.yml b/examples/gitlab-with-qemu.yml index 937cd8f35..320a3788b 100644 --- a/examples/gitlab-with-qemu.yml +++ b/examples/gitlab-with-qemu.yml @@ -14,7 +14,7 @@ linux: - curl -sSL https://get.docker.com/ | sh # Warning: This is extremely slow, be careful with how many wheels you build - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - python -m pip install cibuildwheel==3.0.0b2 + - python -m pip install cibuildwheel==3.0.0b3 # Assuming your CI runner's default architecture is x86_64... - cibuildwheel --output-dir wheelhouse --platform linux --archs aarch64 artifacts: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index 976b55323..9210526c5 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -20,7 +20,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0b2 + - python3 -m pip install cibuildwheel==3.0.0b3 script: # build the wheels, put them into './dist' diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index d8018a40b..0645a1189 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -26,7 +26,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0b2 + - python3 -m pip install cibuildwheel==3.0.0b3 script: # build the wheels, put them into './wheelhouse' diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index 3b6c211e0..a0e90f1f8 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -52,7 +52,7 @@ jobs: - stage: deploy name: Build and deploy Linux wheels services: docker - install: python3 -m pip install cibuildwheel==3.0.0b2 twine + install: python3 -m pip install cibuildwheel==3.0.0b3 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl # Deploy on windows @@ -60,7 +60,7 @@ jobs: name: Build and deploy Windows wheels os: windows language: shell - install: python3 -m pip install cibuildwheel==3.0.0b2 twine + install: python3 -m pip install cibuildwheel==3.0.0b3 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl diff --git a/pyproject.toml b/pyproject.toml index f08fda1b0..5840e43a7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "cibuildwheel" -version = "3.0.0b2" +version = "3.0.0b3" description = "Build Python wheels on CI with minimal configuration." readme = "README.md" license = "BSD-2-Clause" From 7e099863cdbe9f0c241aa5ef52747f2db6b6f310 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 28 May 2025 20:38:53 +0100 Subject: [PATCH 1061/1105] docs: update options table in README and keep up-to-date with commit hook (#2427) * Update options table in README and keep up-to-date with commit hook * Separate multiple options with a newline * remove the old javascript version --- .pre-commit-config.yaml | 6 ++ README.md | 63 +++++++++++-------- bin/update_readme_options_table.py | 98 ++++++++++++++++++++++++++++++ docs/options.md | 34 ----------- 4 files changed, 140 insertions(+), 61 deletions(-) create mode 100755 bin/update_readme_options_table.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 22315221d..e8443a7f3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -70,6 +70,12 @@ repos: language: python entry: bin/update_readme_changelog.py files: ^docs/changelog.md$ + - id: update-readme-options-table + name: Update README options table + language: python + entry: bin/update_readme_options_table.py --force + files: ^docs/options.md$ + pass_filenames: false - repo: https://github.com/codespell-project/codespell rev: v2.4.1 diff --git a/README.md b/README.md index 574a422e2..d40d7af0a 100644 --- a/README.md +++ b/README.md @@ -124,35 +124,44 @@ The following diagram summarises the steps that cibuildwheel takes on each platf Explore an interactive version of this diagram [in the docs](https://cibuildwheel.pypa.io/en/stable/#how-it-works). -Options -------- + + | | Option | Description | -|---|--------|-------------| -| **Build selection** | [`CIBW_PLATFORM`](https://cibuildwheel.pypa.io/en/stable/options/#platform) | Override the auto-detected target platform | -| | [`CIBW_BUILD`](https://cibuildwheel.pypa.io/en/stable/options/#build-skip)
[`CIBW_SKIP`](https://cibuildwheel.pypa.io/en/stable/options/#build-skip) | Choose the Python versions to build | -| | [`CIBW_ARCHS`](https://cibuildwheel.pypa.io/en/stable/options/#archs) | Change the architectures built on your machine by default. | -| | [`CIBW_PROJECT_REQUIRES_PYTHON`](https://cibuildwheel.pypa.io/en/stable/options/#requires-python) | Manually set the Python compatibility of your project | -| | [`CIBW_PRERELEASE_PYTHONS`](https://cibuildwheel.pypa.io/en/stable/options/#prerelease-pythons) | Enable building with pre-release versions of Python if available | -| **Build customization** | [`CIBW_BUILD_FRONTEND`](https://cibuildwheel.pypa.io/en/stable/options/#build-frontend) | Set the tool to use to build, either "pip" (default for now) or "build" | -| | [`CIBW_ENVIRONMENT`](https://cibuildwheel.pypa.io/en/stable/options/#environment) | Set environment variables needed during the build | -| | [`CIBW_ENVIRONMENT_PASS_LINUX`](https://cibuildwheel.pypa.io/en/stable/options/#environment-pass) | Set environment variables on the host to pass-through to the container during the build. | -| | [`CIBW_BEFORE_ALL`](https://cibuildwheel.pypa.io/en/stable/options/#before-all) | Execute a shell command on the build system before any wheels are built. | -| | [`CIBW_BEFORE_BUILD`](https://cibuildwheel.pypa.io/en/stable/options/#before-build) | Execute a shell command preparing each wheel's build | -| | [`CIBW_XBUILD_TOOLS`](https://cibuildwheel.pypa.io/en/stable/options/#xbuild-tools) | Binaries on the path that should be included in an isolated cross-build environment. | -| | [`CIBW_REPAIR_WHEEL_COMMAND`](https://cibuildwheel.pypa.io/en/stable/options/#repair-wheel-command) | Execute a shell command to repair each built wheel | -| | [`CIBW_MANYLINUX_*_IMAGE`
`CIBW_MUSLLINUX_*_IMAGE`](https://cibuildwheel.pypa.io/en/stable/options/#linux-image) | Specify alternative manylinux / musllinux Docker images | -| | [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.pypa.io/en/stable/options/#container-engine) | Specify which container engine to use when building Linux wheels | -| | [`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 | -| **Other** | [`CIBW_BUILD_VERBOSITY`](https://cibuildwheel.pypa.io/en/stable/options/#build-verbosity) | Increase/decrease the output of pip wheel | - -These options can be specified in a pyproject.toml file, as well; see [configuration](https://cibuildwheel.pypa.io/en/stable/options/#configuration). +|---|---|---| +| **Build selection** | [`platform`](https://cibuildwheel.pypa.io/en/stable/options/#platform) | Override the auto-detected target platform | +| | [`build`
`skip`](https://cibuildwheel.pypa.io/en/stable/options/#build-skip) | Choose the Python versions to build | +| | [`archs`](https://cibuildwheel.pypa.io/en/stable/options/#archs) | Change the architectures built on your machine by default. | +| | [`project-requires-python`](https://cibuildwheel.pypa.io/en/stable/options/#requires-python) | Manually set the Python compatibility of your project | +| | [`enable`](https://cibuildwheel.pypa.io/en/stable/options/#enable) | Enable building with extra categories of selectors present. | +| | [`allow-empty`](https://cibuildwheel.pypa.io/en/stable/options/#allow-empty) | Suppress the error code if no wheels match the specified build identifiers | +| **Build customization** | [`build-frontend`](https://cibuildwheel.pypa.io/en/stable/options/#build-frontend) | Set the tool to use to build, either "build" (default), "build\[uv\]", or "pip" | +| | [`config-settings`](https://cibuildwheel.pypa.io/en/stable/options/#config-settings) | Specify config-settings for the build backend. | +| | [`environment`](https://cibuildwheel.pypa.io/en/stable/options/#environment) | Set environment variables | +| | [`environment-pass`](https://cibuildwheel.pypa.io/en/stable/options/#environment-pass) | Set environment variables on the host to pass-through to the container. | +| | [`before-all`](https://cibuildwheel.pypa.io/en/stable/options/#before-all) | Execute a shell command on the build system before any wheels are built. | +| | [`before-build`](https://cibuildwheel.pypa.io/en/stable/options/#before-build) | Execute a shell command preparing each wheel's build | +| | [`xbuild-tools`](https://cibuildwheel.pypa.io/en/stable/options/#xbuild-tools) | Binaries on the path that should be included in an isolated cross-build environment. | +| | [`repair-wheel-command`](https://cibuildwheel.pypa.io/en/stable/options/#repair-wheel-command) | Execute a shell command to repair each built wheel | +| | [`manylinux-*-image`
`musllinux-*-image`](https://cibuildwheel.pypa.io/en/stable/options/#linux-image) | Specify manylinux / musllinux container images | +| | [`container-engine`](https://cibuildwheel.pypa.io/en/stable/options/#container-engine) | Specify the container engine to use when building Linux wheels | +| | [`dependency-versions`](https://cibuildwheel.pypa.io/en/stable/options/#dependency-versions) | Control the versions of the tools cibuildwheel uses | +| | [`pyodide-version`](https://cibuildwheel.pypa.io/en/stable/options/#pyodide-version) | Specify the Pyodide version to use for `pyodide` platform builds | +| **Testing** | [`test-command`](https://cibuildwheel.pypa.io/en/stable/options/#test-command) | The command to test each built wheel | +| | [`before-test`](https://cibuildwheel.pypa.io/en/stable/options/#before-test) | Execute a shell command before testing each wheel | +| | [`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 | +| | [`test-requires`](https://cibuildwheel.pypa.io/en/stable/options/#test-requires) | Install Python dependencies before running the tests | +| | [`test-extras`](https://cibuildwheel.pypa.io/en/stable/options/#test-extras) | Install your wheel for testing using `extras_require` | +| | [`test-groups`](https://cibuildwheel.pypa.io/en/stable/options/#test-groups) | Specify test dependencies from your project's `dependency-groups` | +| | [`test-skip`](https://cibuildwheel.pypa.io/en/stable/options/#test-skip) | Skip running tests on some builds | +| | [`test-environment`](https://cibuildwheel.pypa.io/en/stable/options/#test-environment) | Set environment variables for the test environment | +| **Debugging** | [`debug-keep-container`](https://cibuildwheel.pypa.io/en/stable/options/#debug-keep-container) | Keep the container after running for debugging. | +| | [`debug-traceback`](https://cibuildwheel.pypa.io/en/stable/options/#debug-traceback) | Print full traceback when errors occur. | +| | [`build-verbosity`](https://cibuildwheel.pypa.io/en/stable/options/#build-verbosity) | Increase/decrease the output of the build | + + + +These options can be specified in a pyproject.toml file, or as environment variables, see [configuration docs](https://cibuildwheel.pypa.io/en/latest/configuration/). Working examples ---------------- diff --git a/bin/update_readme_options_table.py b/bin/update_readme_options_table.py new file mode 100755 index 000000000..f78cbeacc --- /dev/null +++ b/bin/update_readme_options_table.py @@ -0,0 +1,98 @@ +#!/usr/bin/env python3 + +import argparse +import dataclasses +import re +from pathlib import Path +from typing import Final + +DIR: Final[Path] = Path(__file__).parent.parent.resolve() +README: Final[Path] = DIR / "README.md" +OPTIONS_MD: Final[Path] = DIR / "docs" / "options.md" + +SECTION_HEADER_REGEX = re.compile(r"^## (?P.*?)$", re.MULTILINE) + +# https://regexr.com/8f1ff +OPTION_HEADER_REGEX = re.compile( + r"^### (?P.*?){.*#(?P\S+).*}\n+> ?(?P.*)$", re.MULTILINE +) + +README_OPTIONS_TABLE_SECTION = re.compile( + r"""(?<=\n).*(?=)""", + re.DOTALL, +) + + +@dataclasses.dataclass(kw_only=True) +class Option: + name: str + id: str + desc: str + section: str + + +def main() -> None: + parser = argparse.ArgumentParser( + description="Update the options table in the README from docs/options.md" + ) + parser.add_argument( + "--force", + action="http://github.com/store_true", + help="Updates the README inplace, rather than printing to stdout.", + ) + args = parser.parse_args() + + options_md = OPTIONS_MD.read_text(encoding="utf-8") + + sections = SECTION_HEADER_REGEX.split(options_md)[1:] + + options = [] + + for section_name, section_content in zip(sections[0::2], sections[1::2], strict=True): + for match in OPTION_HEADER_REGEX.finditer(section_content): + option = Option( + name=match.group("name").strip(), + id=match.group("id").strip(), + desc=match.group("desc").strip(), + section=section_name.strip(), + ) + options.append(option) + + table_md = "\n\n" + table_md += "| | Option | Description |\n" + table_md += "|---|---|---|\n" + last_section: str | None = None + + for option in options: + cells: list[str] = [] + + cells.append(f"**{option.section}**" if option.section != last_section else "") + last_section = option.section + + url = f"https://cibuildwheel.pypa.io/en/stable/options/#{option.id}" + name = option.name.replace(", ", "
") # Replace commas with line breaks + cells.append(f"[{name}]({url})") + + cells.append(option.desc) + + table_md += "| " + " | ".join(cells) + " |\n" + table_md += "\n" + + if not args.force: + print(table_md) + return + + readme_text = README.read_text(encoding="utf-8") + + if not re.search(README_OPTIONS_TABLE_SECTION, readme_text): + msg = "Options section not found in README" + raise ValueError(msg) + + readme_text = re.sub(README_OPTIONS_TABLE_SECTION, table_md, readme_text) + README.write_text(readme_text, encoding="utf-8") + + print("Updated README with options table.") + + +if __name__ == "__main__": + main() diff --git a/docs/options.md b/docs/options.md index 95a82e3db..4d7623353 100644 --- a/docs/options.md +++ b/docs/options.md @@ -1889,40 +1889,6 @@ Some options support placeholders, like `{project}`, `{package}` or `{wheel}`, t } } - // write the markdown table for the README - - var markdown = '' - - markdown += '| | Option | Description |\n' - markdown += '|---|--------|-------------|\n' - - var prevHeader = null - - for (var i = 0; i < headers.length; i += 1) { - var header = headers[i]; - var headerOptions = options[header]; - for (var j = 0; j < headerOptions.length; j += 1) { - var option = headerOptions[j]; - - if (j == 0) { - markdown += '| **'+header+'** ' - } else { - markdown += '| ' - } - - var optionNames = option.name.trim().split(', ') - var url = 'https://cibuildwheel.pypa.io/en/stable/options/#'+option.id; - var namesMarkdown = $.map(optionNames, function(n) { - return '[`'+n+'`]('+url+') ' - }).join('
') - - markdown += '| '+namesMarkdown+' ' - markdown += '| '+option.description.trim()+' ' - markdown += '|\n' - } - } - console.log('readme options markdown\n', markdown) - // add the option tags to each heading $('.rst-content h3') .each(function (i, el) { From 0e8f4f777d6bfb555a00ae0d2f679fd9d0611681 Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Wed, 28 May 2025 19:42:00 -0400 Subject: [PATCH 1062/1105] [Bot] Update dependencies (#2426) * Update dependencies * tests: ignore tag order Signed-off-by: Henry Schreiner * tests: use sorted platform tags Per PEP 425, compressed tag sets should be sorted. This was fixed in auditwheel 6.4.0 * tests: use sorted platform tags this shouldn't change that often, use static order to allow override. --------- Signed-off-by: Henry Schreiner Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner Co-authored-by: mayeut --- cibuildwheel/resources/build-platforms.toml | 24 ++++----- .../resources/constraints-pyodide312.txt | 2 +- .../resources/constraints-python310.txt | 2 +- .../resources/constraints-python39.txt | 2 +- .../resources/pinned_docker_images.cfg | 54 +++++++++---------- test/test_0_basic.py | 5 +- test/test_manylinuxXXXX_only.py | 2 +- test/utils.py | 8 +-- 8 files changed, 51 insertions(+), 48 deletions(-) diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index 10af09281..00c555794 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -165,12 +165,12 @@ python_configurations = [ { identifier = "cp313t-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, { identifier = "cp313t-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, { identifier = "cp313t-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, - { identifier = "cp314-macosx_x86_64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" }, - { identifier = "cp314-macosx_arm64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" }, - { identifier = "cp314-macosx_universal2", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" }, - { identifier = "cp314t-macosx_x86_64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" }, - { identifier = "cp314t-macosx_arm64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" }, - { identifier = "cp314t-macosx_universal2", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" }, + { identifier = "cp314-macosx_x86_64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" }, + { identifier = "cp314-macosx_arm64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" }, + { identifier = "cp314-macosx_universal2", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" }, + { identifier = "cp314t-macosx_x86_64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" }, + { identifier = "cp314t-macosx_arm64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" }, + { identifier = "cp314t-macosx_universal2", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" }, { 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" }, { identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.16-macos_x86_64.tar.bz2" }, @@ -199,18 +199,18 @@ python_configurations = [ { identifier = "cp313t-win32", version = "3.13.3", arch = "32" }, { identifier = "cp313-win_amd64", version = "3.13.3", arch = "64" }, { identifier = "cp313t-win_amd64", version = "3.13.3", arch = "64" }, - { identifier = "cp314-win32", version = "3.14.0-b1", arch = "32" }, - { identifier = "cp314t-win32", version = "3.14.0-b1", arch = "32" }, - { identifier = "cp314-win_amd64", version = "3.14.0-b1", arch = "64" }, - { identifier = "cp314t-win_amd64", version = "3.14.0-b1", arch = "64" }, + { identifier = "cp314-win32", version = "3.14.0-b2", arch = "32" }, + { identifier = "cp314t-win32", version = "3.14.0-b2", arch = "32" }, + { identifier = "cp314-win_amd64", version = "3.14.0-b2", arch = "64" }, + { identifier = "cp314t-win_amd64", version = "3.14.0-b2", 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.10", arch = "ARM64" }, { identifier = "cp313-win_arm64", version = "3.13.3", arch = "ARM64" }, { identifier = "cp313t-win_arm64", version = "3.13.3", arch = "ARM64" }, - { identifier = "cp314-win_arm64", version = "3.14.0-b1", arch = "ARM64" }, - { identifier = "cp314t-win_arm64", version = "3.14.0-b1", arch = "ARM64" }, + { identifier = "cp314-win_arm64", version = "3.14.0-b2", arch = "ARM64" }, + { identifier = "cp314t-win_arm64", version = "3.14.0-b2", arch = "ARM64" }, { 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" }, { identifier = "pp310-win_amd64", version = "3.10", arch = "64", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.19-win64.zip" }, diff --git a/cibuildwheel/resources/constraints-pyodide312.txt b/cibuildwheel/resources/constraints-pyodide312.txt index 5586115d0..8f4a6e5c7 100644 --- a/cibuildwheel/resources/constraints-pyodide312.txt +++ b/cibuildwheel/resources/constraints-pyodide312.txt @@ -89,7 +89,7 @@ shellingham==1.5.4 # via typer sniffio==1.3.1 # via anyio -typer==0.15.4 +typer==0.16.0 # via # auditwheel-emscripten # pyodide-build diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index 5883ddfe0..0a4aff319 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -30,5 +30,5 @@ typing-extensions==4.13.2 # via delocate virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in -zipp==3.21.0 +zipp==3.22.0 # via importlib-metadata diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index 5883ddfe0..0a4aff319 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -30,5 +30,5 @@ typing-extensions==4.13.2 # via delocate virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in -zipp==3.21.0 +zipp==3.22.0 # via importlib-metadata diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index b137183d2..83a71dce2 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,47 +1,47 @@ [x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.24-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.24-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.24-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.05.24-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.28-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.28-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.28-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.05.28-1 [i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.24-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.05.24-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.28-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.05.28-1 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.24-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.24-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.24-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.05.24-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.28-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.28-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.28-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.05.28-1 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.05.24-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.05.24-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.05.24-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.05.24-1 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.05.28-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.05.28-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.05.28-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.05.28-1 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.05.24-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.05.24-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.05.24-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.05.24-1 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.05.28-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.05.28-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.05.28-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.05.28-1 [pypy_x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.24-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.24-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.24-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.28-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.28-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.28-1 [pypy_i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.24-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.28-1 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.24-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.24-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.24-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.28-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.28-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.28-1 [armv7l] -manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.05.24-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.05.24-1 +manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.05.28-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.05.28-1 [riscv64] diff --git a/test/test_0_basic.py b/test/test_0_basic.py index c1a8dfcbf..2524d6286 100644 --- a/test/test_0_basic.py +++ b/test/test_0_basic.py @@ -1,5 +1,6 @@ import textwrap +import packaging.utils import pytest from cibuildwheel.logger import Logger @@ -37,7 +38,9 @@ def test(tmp_path, build_frontend_env, capfd): # check that the expected wheels are produced expected_wheels = utils.expected_wheels("spam", "0.1.0") - assert set(actual_wheels) == set(expected_wheels) + actual_wheels_normalized = {packaging.utils.parse_wheel_filename(w) for w in actual_wheels} + expected_wheels_normalized = {packaging.utils.parse_wheel_filename(w) for w in expected_wheels} + assert actual_wheels_normalized == expected_wheels_normalized enable_groups = utils.get_enable_groups() if EnableGroup.GraalPy not in enable_groups: diff --git a/test/test_manylinuxXXXX_only.py b/test/test_manylinuxXXXX_only.py index 5f0839711..483d40f99 100644 --- a/test/test_manylinuxXXXX_only.py +++ b/test/test_manylinuxXXXX_only.py @@ -95,7 +95,7 @@ def test(manylinux_image, tmp_path): actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env) platform_tag_map = { - "manylinux2014": ["manylinux_2_17", "manylinux2014"], + "manylinux2014": ["manylinux2014", "manylinux_2_17"], } expected_wheels = utils.expected_wheels( "spam", diff --git a/test/utils.py b/test/utils.py index 55b492a81..838e2179c 100644 --- a/test/utils.py +++ b/test/utils.py @@ -250,11 +250,11 @@ def _expected_wheels( if manylinux_versions is None: manylinux_versions = { - "armv7l": ["manylinux_2_17", "manylinux2014", "manylinux_2_31"], - "i686": ["manylinux_2_5", "manylinux1", "manylinux_2_17", "manylinux2014"], - "x86_64": ["manylinux_2_5", "manylinux1", "manylinux_2_28"], + "armv7l": ["manylinux2014", "manylinux_2_17", "manylinux_2_31"], + "i686": ["manylinux1", "manylinux2014", "manylinux_2_17", "manylinux_2_5"], + "x86_64": ["manylinux1", "manylinux_2_28", "manylinux_2_5"], "riscv64": ["manylinux_2_31", "manylinux_2_35"], - }.get(machine_arch, ["manylinux_2_17", "manylinux2014", "manylinux_2_28"]) + }.get(machine_arch, ["manylinux2014", "manylinux_2_17", "manylinux_2_28"]) if musllinux_versions is None: musllinux_versions = ["musllinux_1_2"] From 2d6c328457b11668770e3074919da8689c5afa7d Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 28 May 2025 19:43:19 -0400 Subject: [PATCH 1063/1105] fix: drop PYTHONSAFEPATH (#2429) Signed-off-by: Henry Schreiner --- cibuildwheel/platforms/linux.py | 1 - cibuildwheel/platforms/macos.py | 3 --- cibuildwheel/platforms/pyodide.py | 2 -- cibuildwheel/platforms/windows.py | 3 --- docs/options.md | 14 ++++---------- test/test_testing.py | 10 ++-------- 6 files changed, 6 insertions(+), 27 deletions(-) diff --git a/cibuildwheel/platforms/linux.py b/cibuildwheel/platforms/linux.py index 31f02cc85..00cd85b2f 100644 --- a/cibuildwheel/platforms/linux.py +++ b/cibuildwheel/platforms/linux.py @@ -361,7 +361,6 @@ def build_in_container( virtualenv_env = env.copy() virtualenv_env["PATH"] = f"{venv_dir / 'bin'}:{virtualenv_env['PATH']}" virtualenv_env["VIRTUAL_ENV"] = str(venv_dir) - virtualenv_env["PYTHONSAFEPATH"] = "1" virtualenv_env = build_options.test_environment.as_dictionary( prev_environment=virtualenv_env ) diff --git a/cibuildwheel/platforms/macos.py b/cibuildwheel/platforms/macos.py index 9dae02e5f..3b4534d2a 100644 --- a/cibuildwheel/platforms/macos.py +++ b/cibuildwheel/platforms/macos.py @@ -648,9 +648,6 @@ def build(options: Options, tmp_path: Path) -> None: virtualenv_env["MACOSX_DEPLOYMENT_TARGET"] = get_test_macosx_deployment_target() - # see https://github.com/pypa/cibuildwheel/issues/2358 for discussion - virtualenv_env["PYTHONSAFEPATH"] = "1" - virtualenv_env = build_options.test_environment.as_dictionary( prev_environment=virtualenv_env ) diff --git a/cibuildwheel/platforms/pyodide.py b/cibuildwheel/platforms/pyodide.py index fdabc3aa0..920920923 100644 --- a/cibuildwheel/platforms/pyodide.py +++ b/cibuildwheel/platforms/pyodide.py @@ -484,8 +484,6 @@ def build(options: Options, tmp_path: Path) -> None: ) virtualenv_env["VIRTUAL_ENV"] = str(venv_dir) - virtualenv_env["PYTHONSAFEPATH"] = "1" - virtualenv_env = build_options.test_environment.as_dictionary( prev_environment=virtualenv_env ) diff --git a/cibuildwheel/platforms/windows.py b/cibuildwheel/platforms/windows.py index 17375fad4..cce744d5f 100644 --- a/cibuildwheel/platforms/windows.py +++ b/cibuildwheel/platforms/windows.py @@ -553,9 +553,6 @@ def build(options: Options, tmp_path: Path) -> None: pip_version=pip_version, ) - # see https://github.com/pypa/cibuildwheel/issues/2358 for discussion - virtualenv_env["PYTHONSAFEPATH"] = "1" - virtualenv_env = build_options.test_environment.as_dictionary( prev_environment=virtualenv_env ) diff --git a/docs/options.md b/docs/options.md index 4d7623353..fcebb386e 100644 --- a/docs/options.md +++ b/docs/options.md @@ -1604,12 +1604,6 @@ A space-separated list of environment variables to set in the test environment. The syntax is the same as for [`environment`](#environment). -cibuildwheel sets the variable -[`PYTHONSAFEPATH`](https://docs.python.org/3/using/cmdline.html#envvar-PYTHONSAFEPATH) -to avoid picking up in-tree dependencies when running the tests - we want to -test the installed wheel, not the in-tree version. However, this can be -overridden by setting `PYTHONSAFEPATH` to an empty string. - Platform-specific environment variables are also available:
`CIBW_TEST_ENVIRONMENT_MACOS` | `CIBW_TEST_ENVIRONMENT_WINDOWS` | `CIBW_TEST_ENVIRONMENT_LINUX` | `CIBW_TEST_ENVIRONMENT_IOS` | `CIBW_TEST_ENVIRONMENT_PYODIDE` @@ -1622,8 +1616,8 @@ Platform-specific environment variables are also available:
# Set the environment variable MY_ENV_VAR to "my_value" in the test environment test-environment = { MY_ENV_VAR="my_value" } - # Unset PYTHONSAFEPATH in the test environment - test-environment = { PYTHONSAFEPATH="" } + # Set PYTHONSAFEPATH in the test environment + test-environment = { PYTHONSAFEPATH="1" } ``` !!! tab examples "Environment variables" @@ -1632,8 +1626,8 @@ Platform-specific environment variables are also available:
# Set the environment variable MY_ENV_VAR to "my_value" in the test environment CIBW_TEST_ENVIRONMENT: MY_ENV_VAR=my_value - # Unset PYTHONSAFEPATH in the test environment - CIBW_TEST_ENVIRONMENT: PYTHONSAFEPATH= + # Set PYTHONSAFEPATH in the test environment + CIBW_TEST_ENVIRONMENT: PYTHONSAFEPATH=1 ``` diff --git a/test/test_testing.py b/test/test_testing.py index f12e7b5d5..92de0e87e 100644 --- a/test/test_testing.py +++ b/test/test_testing.py @@ -66,12 +66,6 @@ def test_uname(self): bits = struct.calcsize("P") * 8 if bits == 32: self.assertIn(platform.machine(), ["i686", "armv7l","armv8l", "wasm32"]) - - def test_pythonsafepath(self): - # check that the PYTHONSAFEPATH environment variable is set - value = os.environ.get("PYTHONSAFEPATH") - self.assertIsNotNone(value) - self.assertNotEqual(value, "") ''' @@ -256,8 +250,8 @@ def test_test_environment(tmp_path): actual_wheels = utils.cibuildwheel_run( project_dir, add_env={ - "CIBW_TEST_ENVIRONMENT": "MYVAR=somevalue PYTHONSAFEPATH=", - "CIBW_TEST_COMMAND": "python -c \"import os; assert os.environ.get('MYVAR') == 'somevalue'; assert os.environ.get('PYTHONSAFEPATH') == ''\"", + "CIBW_TEST_ENVIRONMENT": "MYVAR=somevalue PYTHONSAFEPATH=1", + "CIBW_TEST_COMMAND": "python -c \"import os; assert os.environ.get('MYVAR') == 'somevalue'; assert os.environ.get('PYTHONSAFEPATH') == '1'\"", }, ) # also check that we got the right wheels From b9f1942e8d3957b623780e4a621a23a03364557b Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 28 May 2025 23:36:16 -0400 Subject: [PATCH 1064/1105] chore: use cog for quick README updates (#2428) * chore: use cog for quick README updates Signed-off-by: Henry Schreiner * refactor: rename scripts Signed-off-by: Henry Schreiner --------- Signed-off-by: Henry Schreiner --- .pre-commit-config.yaml | 17 +++---- README.md | 15 +++--- bin/readme_changelog.py | 23 +++++++++ ...tions_table.py => readme_options_table.py} | 38 ++------------- bin/update_readme_changelog.py | 48 ------------------- 5 files changed, 41 insertions(+), 100 deletions(-) create mode 100755 bin/readme_changelog.py rename bin/{update_readme_options_table.py => readme_options_table.py} (60%) delete mode 100755 bin/update_readme_changelog.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e8443a7f3..7831eae69 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -62,20 +62,15 @@ repos: name: Disallow improper capitalization language: pygrep entry: PyBind|Numpy|Cmake|Github|PyTest - types: - - markdown + types: [markdown] exclude: ^docs/working-examples\.md$ # Autogenerated - - id: update-readme-changelog - name: Update README changelog + - id: cog + name: Cog the README language: python - entry: bin/update_readme_changelog.py - files: ^docs/changelog.md$ - - id: update-readme-options-table - name: Update README options table - language: python - entry: bin/update_readme_options_table.py --force - files: ^docs/options.md$ pass_filenames: false + entry: cog -c -P -r -I ./bin README.md + files: '^(README\.md|docs/changelog\.md|docs/options\.md|bin/readme.*)$' + additional_dependencies: [cogapp] - repo: https://github.com/codespell-project/codespell rev: v2.4.1 diff --git a/README.md b/README.md index d40d7af0a..8a8f9c544 100644 --- a/README.md +++ b/README.md @@ -124,8 +124,10 @@ The following diagram summarises the steps that cibuildwheel takes on each platf Explore an interactive version of this diagram [in the docs](https://cibuildwheel.pypa.io/en/stable/#how-it-works). - - + + + + | | Option | Description | |---|---|---| @@ -159,7 +161,8 @@ The following diagram summarises the steps that cibuildwheel takes on each platf | | [`debug-traceback`](https://cibuildwheel.pypa.io/en/stable/options/#debug-traceback) | Print full traceback when errors occur. | | | [`build-verbosity`](https://cibuildwheel.pypa.io/en/stable/options/#build-verbosity) | Increase/decrease the output of the build | - + + These options can be specified in a pyproject.toml file, or as environment variables, see [configuration docs](https://cibuildwheel.pypa.io/en/latest/configuration/). @@ -222,9 +225,7 @@ This is similar to static linking, so it might have some license implications. C Changelog ========= - - - + ### v3.0.0 @@ -278,7 +279,7 @@ _26 April 2025_ - 🛠 Dependency updates, including Python 3.13.3 (#2371) - + --- diff --git a/bin/readme_changelog.py b/bin/readme_changelog.py new file mode 100755 index 000000000..29c30293e --- /dev/null +++ b/bin/readme_changelog.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python3 + +import re +from pathlib import Path + +PROJECT_ROOT = Path(__file__).parent / ".." +CHANGELOG_FILE = PROJECT_ROOT / "docs" / "changelog.md" + +# https://regexr.com/622ds +FIRST_5_CHANGELOG_ENTRIES_REGEX = re.compile(r"""(^###.*?(?=###)){5}""", re.DOTALL | re.MULTILINE) + + +def mini_changelog() -> str: + changelog_text = CHANGELOG_FILE.read_text() + + mini_changelog_match = FIRST_5_CHANGELOG_ENTRIES_REGEX.search(changelog_text) + assert mini_changelog_match, "Failed to find the first few changelog entries" + + return f"\n{mini_changelog_match.group(0).strip()}\n" + + +if __name__ == "__main__": + print(mini_changelog()) diff --git a/bin/update_readme_options_table.py b/bin/readme_options_table.py similarity index 60% rename from bin/update_readme_options_table.py rename to bin/readme_options_table.py index f78cbeacc..203d6bf5d 100755 --- a/bin/update_readme_options_table.py +++ b/bin/readme_options_table.py @@ -1,13 +1,11 @@ #!/usr/bin/env python3 -import argparse import dataclasses import re from pathlib import Path from typing import Final DIR: Final[Path] = Path(__file__).parent.parent.resolve() -README: Final[Path] = DIR / "README.md" OPTIONS_MD: Final[Path] = DIR / "docs" / "options.md" SECTION_HEADER_REGEX = re.compile(r"^## (?P.*?)$", re.MULTILINE) @@ -17,11 +15,6 @@ r"^### (?P.*?){.*#(?P\S+).*}\n+> ?(?P.*)$", re.MULTILINE ) -README_OPTIONS_TABLE_SECTION = re.compile( - r"""(?<=\n).*(?=)""", - re.DOTALL, -) - @dataclasses.dataclass(kw_only=True) class Option: @@ -31,17 +24,7 @@ class Option: section: str -def main() -> None: - parser = argparse.ArgumentParser( - description="Update the options table in the README from docs/options.md" - ) - parser.add_argument( - "--force", - action="http://github.com/store_true", - help="Updates the README inplace, rather than printing to stdout.", - ) - args = parser.parse_args() - +def get_table() -> str: options_md = OPTIONS_MD.read_text(encoding="utf-8") sections = SECTION_HEADER_REGEX.split(options_md)[1:] @@ -58,7 +41,7 @@ def main() -> None: ) options.append(option) - table_md = "\n\n" + table_md = "\n\n\n" table_md += "| | Option | Description |\n" table_md += "|---|---|---|\n" last_section: str | None = None @@ -78,21 +61,8 @@ def main() -> None: table_md += "| " + " | ".join(cells) + " |\n" table_md += "\n" - if not args.force: - print(table_md) - return - - readme_text = README.read_text(encoding="utf-8") - - if not re.search(README_OPTIONS_TABLE_SECTION, readme_text): - msg = "Options section not found in README" - raise ValueError(msg) - - readme_text = re.sub(README_OPTIONS_TABLE_SECTION, table_md, readme_text) - README.write_text(readme_text, encoding="utf-8") - - print("Updated README with options table.") + return table_md if __name__ == "__main__": - main() + print(get_table()) diff --git a/bin/update_readme_changelog.py b/bin/update_readme_changelog.py deleted file mode 100755 index 024a23373..000000000 --- a/bin/update_readme_changelog.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env python3 - - -import re -import sys -from pathlib import Path - -PROJECT_ROOT = Path(__file__).parent / ".." -CHANGELOG_FILE = PROJECT_ROOT / "docs" / "changelog.md" -README_FILE = PROJECT_ROOT / "README.md" - -# https://regexr.com/622ds -FIRST_5_CHANGELOG_ENTRIES_REGEX = re.compile(r"""(^###.*?(?=###)){5}""", re.DOTALL | re.MULTILINE) - -# https://regexr.com/622e5 -README_CHANGELOG_SECTION = re.compile( - r"""(?<=\n).*(?=)""", - re.DOTALL, -) - - -def main() -> None: - changelog_text = CHANGELOG_FILE.read_text() - readme_text = README_FILE.read_text() - - mini_changelog_match = FIRST_5_CHANGELOG_ENTRIES_REGEX.search(changelog_text) - assert mini_changelog_match, "Failed to find the first few changelog entries" - - mini_changelog = "\n".join( - [ - "", - "", - "", - mini_changelog_match.group(0).strip(), - "", - "", - ] - ) - - if not re.search(README_CHANGELOG_SECTION, readme_text): - sys.exit("Changelog section not found in README") - - readme_text = re.sub(README_CHANGELOG_SECTION, mini_changelog, readme_text) - README_FILE.write_text(readme_text) - - -if __name__ == "__main__": - main() From cf078b0954f3fd08b8445a7bf2c3fb83ab3bb971 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 29 May 2025 00:27:20 -0400 Subject: [PATCH 1065/1105] Bump version: v3.0.0b4 --- README.md | 18 ++++++++++-------- cibuildwheel/__init__.py | 2 +- docs/changelog.md | 8 ++++++++ docs/faq.md | 6 +++--- examples/azure-pipelines-minimal.yml | 6 +++--- examples/circleci-minimal.yml | 6 +++--- examples/cirrus-ci-intel-mac.yml | 2 +- examples/cirrus-ci-minimal.yml | 2 +- examples/github-deploy.yml | 2 +- examples/github-minimal.yml | 2 +- examples/github-pipx.yml | 2 +- examples/github-with-qemu.yml | 2 +- examples/gitlab-minimal.yml | 6 +++--- examples/gitlab-with-qemu.yml | 2 +- examples/travis-ci-deploy.yml | 2 +- examples/travis-ci-minimal.yml | 2 +- examples/travis-ci-test-and-deploy.yml | 4 ++-- pyproject.toml | 2 +- 18 files changed, 43 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 8a8f9c544..ecce87666 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ jobs: - uses: actions/setup-python@v5 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==3.0.0b3 + run: python -m pip install cibuildwheel==3.0.0b4 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -239,6 +239,14 @@ If you've used previous versions of the beta: #### v3.0.0b3 +_29 May 2025_ + +- 🛠 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) + +#### v3.0.0b3 + _28 May 2025_ - 🛠 Reverts the test working dir (when test-sources isn't set) to a temporary dir, rather than the project. (#2420) @@ -273,13 +281,7 @@ _19 May 2025_ - ⚠️ 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_ - -- 🛠 Dependency updates, including Python 3.13.3 (#2371) - - + --- diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index 6ab976e35..e5b84fbcd 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1 +1 @@ -__version__ = "3.0.0b3" +__version__ = "3.0.0b4" diff --git a/docs/changelog.md b/docs/changelog.md index fce8d721a..7341793ca 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -16,6 +16,14 @@ If you've used previous versions of the beta: #### v3.0.0b3 +_29 May 2025_ + +- 🛠 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) + +#### v3.0.0b3 + _28 May 2025_ - 🛠 Reverts the test working dir (when test-sources isn't set) to a temporary dir, rather than the project. (#2420) diff --git a/docs/faq.md b/docs/faq.md index 9a04e216c..4db883017 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -60,7 +60,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: pypa/cibuildwheel@v3.0.0b3 +uses: pypa/cibuildwheel@v3.0.0b4 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. @@ -82,7 +82,7 @@ The second option, and the only one that supports other CI systems, is using a ` ```bash # requirements-cibw.txt -cibuildwheel==3.0.0b3 +cibuildwheel==3.0.0b4 ``` Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this: @@ -247,7 +247,7 @@ Solutions to this vary, but the simplest is to use pipx: # most runners have pipx preinstalled, but in case you don't python3 -m pip install pipx -pipx run cibuildwheel==3.0.0b3 --output-dir wheelhouse +pipx run cibuildwheel==3.0.0b4 --output-dir wheelhouse pipx run twine upload wheelhouse/*.whl ``` diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index fa805c94f..786925848 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -6,7 +6,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - pip3 install cibuildwheel==3.0.0b3 + pip3 install cibuildwheel==3.0.0b4 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -20,7 +20,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - python3 -m pip install cibuildwheel==3.0.0b3 + python3 -m pip install cibuildwheel==3.0.0b4 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -34,7 +34,7 @@ jobs: - bash: | set -o errexit python -m pip install --upgrade pip - pip install cibuildwheel==3.0.0b3 + pip install cibuildwheel==3.0.0b4 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index aa27628a8..46d7ca97f 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -11,7 +11,7 @@ jobs: - run: name: Build the Linux wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0b3 + python3 -m pip install --user cibuildwheel==3.0.0b4 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -28,7 +28,7 @@ jobs: - run: name: Build the Linux aarch64 wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0b3 + python3 -m pip install --user cibuildwheel==3.0.0b4 python3 -m cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -44,7 +44,7 @@ jobs: name: Build the OS X wheels. command: | sudo softwareupdate --install-rosetta --agree-to-license # for python<=3.8 or x86_64/universal2 tests - pip3 install cibuildwheel==3.0.0b3 + pip3 install cibuildwheel==3.0.0b4 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ diff --git a/examples/cirrus-ci-intel-mac.yml b/examples/cirrus-ci-intel-mac.yml index 3dd47a778..df5221d1d 100644 --- a/examples/cirrus-ci-intel-mac.yml +++ b/examples/cirrus-ci-intel-mac.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0b3 + - python -m pip install cibuildwheel==3.0.0b4 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index 1688a1542..4b476a5c5 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0b3 + - python -m pip install cibuildwheel==3.0.0b4 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index 69b9e3037..54d5160de 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b3 + uses: pypa/cibuildwheel@v3.0.0b4 env: CIBW_PLATFORM: ${{ matrix.platform }} CIBW_ARCHS: ${{ matrix.archs }} diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index 7b08021a4..ddbb1fc26 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b3 + uses: pypa/cibuildwheel@v3.0.0b4 # env: # CIBW_SOME_OPTION: value # ... diff --git a/examples/github-pipx.yml b/examples/github-pipx.yml index a9643590c..6f8c4e855 100644 --- a/examples/github-pipx.yml +++ b/examples/github-pipx.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - run: pipx run cibuildwheel==3.0.0b3 + run: pipx run cibuildwheel==3.0.0b4 - uses: actions/upload-artifact@v4 with: diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index 32c6abdd2..e1308d701 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -21,7 +21,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b3 + uses: pypa/cibuildwheel@v3.0.0b4 env: # configure cibuildwheel on Linux to build native archs ('auto'), # and to split the remaining architectures between the x86_64 and diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index cdea6e172..030237dda 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -12,7 +12,7 @@ linux: DOCKER_TLS_CERTDIR: "" script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==3.0.0b3 + - python -m pip install cibuildwheel==3.0.0b4 - cibuildwheel --output-dir wheelhouse artifacts: paths: @@ -23,7 +23,7 @@ windows: before_script: - choco install python -y --version 3.12.4 - choco install git.install -y - - py -m pip install cibuildwheel==3.0.0b3 + - py -m pip install cibuildwheel==3.0.0b4 script: - py -m cibuildwheel --output-dir wheelhouse --platform windows artifacts: @@ -35,7 +35,7 @@ windows: macos: image: macos-14-xcode-15 before_script: - - python3 -m pip install cibuildwheel==3.0.0b3 + - python3 -m pip install cibuildwheel==3.0.0b4 script: - python3 -m cibuildwheel --output-dir wheelhouse artifacts: diff --git a/examples/gitlab-with-qemu.yml b/examples/gitlab-with-qemu.yml index 320a3788b..48e968046 100644 --- a/examples/gitlab-with-qemu.yml +++ b/examples/gitlab-with-qemu.yml @@ -14,7 +14,7 @@ linux: - curl -sSL https://get.docker.com/ | sh # Warning: This is extremely slow, be careful with how many wheels you build - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - python -m pip install cibuildwheel==3.0.0b3 + - python -m pip install cibuildwheel==3.0.0b4 # Assuming your CI runner's default architecture is x86_64... - cibuildwheel --output-dir wheelhouse --platform linux --archs aarch64 artifacts: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index 9210526c5..6d382c7ea 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -20,7 +20,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0b3 + - python3 -m pip install cibuildwheel==3.0.0b4 script: # build the wheels, put them into './dist' diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index 0645a1189..164751168 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -26,7 +26,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0b3 + - python3 -m pip install cibuildwheel==3.0.0b4 script: # build the wheels, put them into './wheelhouse' diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index a0e90f1f8..2498adef5 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -52,7 +52,7 @@ jobs: - stage: deploy name: Build and deploy Linux wheels services: docker - install: python3 -m pip install cibuildwheel==3.0.0b3 twine + install: python3 -m pip install cibuildwheel==3.0.0b4 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl # Deploy on windows @@ -60,7 +60,7 @@ jobs: name: Build and deploy Windows wheels os: windows language: shell - install: python3 -m pip install cibuildwheel==3.0.0b3 twine + install: python3 -m pip install cibuildwheel==3.0.0b4 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl diff --git a/pyproject.toml b/pyproject.toml index 5840e43a7..b52371de8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "cibuildwheel" -version = "3.0.0b3" +version = "3.0.0b4" description = "Build Python wheels on CI with minimal configuration." readme = "README.md" license = "BSD-2-Clause" From e8a7a374eef98a6486cb95d8977f9d2cbd76d869 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 29 May 2025 00:33:43 -0400 Subject: [PATCH 1066/1105] docs: typo b3 -> b4 --- docs/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.md b/docs/changelog.md index 7341793ca..7552e9069 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -14,7 +14,7 @@ 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. -#### v3.0.0b3 +#### v3.0.0b4 _29 May 2025_ From 6f2d68febffc08fc79573c57c6d8f0c28baccf5f Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Thu, 29 May 2025 12:24:39 +0100 Subject: [PATCH 1067/1105] Add missing changelog entries --- README.md | 15 ++++++++++++--- docs/changelog.md | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ecce87666..be390f213 100644 --- a/README.md +++ b/README.md @@ -233,6 +233,10 @@ 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. + + 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. @@ -274,10 +278,15 @@ _19 May 2025_ - ~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) -- 🛠 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) +- ✨ 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) -- ⚠️ 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 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) diff --git a/docs/changelog.md b/docs/changelog.md index 7552e9069..d267bd3af 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -10,6 +10,10 @@ 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. + + 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. @@ -51,10 +55,15 @@ _19 May 2025_ - ~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) -- 🛠 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) +- ✨ 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) -- ⚠️ 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 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) From c5a3ced8c8150302ceb8aa284acce6ed5a5fe225 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 29 May 2025 10:37:55 -0400 Subject: [PATCH 1068/1105] docs: rerender README Signed-off-by: Henry Schreiner --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index be390f213..b6e689472 100644 --- a/README.md +++ b/README.md @@ -241,7 +241,7 @@ 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. -#### v3.0.0b3 +#### v3.0.0b4 _29 May 2025_ @@ -290,7 +290,7 @@ _19 May 2025_ - ⚠️ 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) - + --- From 733573feb32f2626f99bcf3fd62bd23bf776923f Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Thu, 29 May 2025 15:52:46 +0100 Subject: [PATCH 1069/1105] Debug Cirrus CI testing (#2414) * Skip Cirrus CI iOS testing * Remove support tick in readme * Debugging cirrus windows failure * Use a separate file to avoid error messages from vsdevcmd getting into the output * cirrus: TEMP target just the test i care about * Revert "cirrus: TEMP target just the test i care about" This reverts commit 7ed4417970930ab9e0e1cb1f17497d406310d6ff. * Remove debug code * Fix windows issues with multiline -c Python commands --- README.md | 2 +- cibuildwheel/platforms/windows.py | 53 +++++++++++++++-------------- test/test_ios.py | 55 +++++++++++++------------------ 3 files changed, 50 insertions(+), 60 deletions(-) diff --git a/README.md b/README.md index b6e689472..151820ea1 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ Usage | Travis CI | ✅ | | ✅ | ✅ | | | | | CircleCI | ✅ | ✅ | | ✅ | ✅ | | ✅³ | | Gitlab CI | ✅ | ✅ | ✅ | ✅¹ | ✅ | | ✅³ | -| Cirrus CI | ✅ | ✅ | ✅ | ✅ | ✅ | | ✅³ | +| Cirrus CI | ✅ | ✅ | ✅ | ✅ | ✅ | | | ¹ [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.
² [Uses cross-compilation](https://cibuildwheel.pypa.io/en/stable/faq/#windows-arm64). It is not possible to test `arm64` on this CI platform.
diff --git a/cibuildwheel/platforms/windows.py b/cibuildwheel/platforms/windows.py index cce744d5f..521695b60 100644 --- a/cibuildwheel/platforms/windows.py +++ b/cibuildwheel/platforms/windows.py @@ -336,37 +336,36 @@ def setup_python( # variables. Adapted from # https://github.com/microsoft/vswhere/wiki/Start-Developer-Command-Prompt # Remove when https://github.com/oracle/graalpython/issues/492 is fixed. - vcpath = subprocess.check_output( - [ - Path(os.environ["PROGRAMFILES(X86)"]) - / "Microsoft Visual Studio" - / "Installer" - / "vswhere.exe", - "-products", - "*", - "-latest", - "-property", - "installationPath", - ], - text=True, + vcpath = call( + Path(os.environ["PROGRAMFILES(X86)"]) + / "Microsoft Visual Studio" + / "Installer" + / "vswhere.exe", + "-products", + "*", + "-latest", + "-property", + "installationPath", + capture_stdout=True, ).strip() log.notice(f"Discovering Visual Studio for GraalPy at {vcpath}") - vcvars = subprocess.check_output( - [ - f"{vcpath}\\Common7\\Tools\\vsdevcmd.bat", - "-no_logo", - "-arch=amd64", - "-host_arch=amd64", - "&&", - "python", - "-c", - "import os, json, sys; json.dump(dict(os.environ), sys.stdout);", - ], - shell=True, - text=True, + vcvars_file = tmp / "vcvars.json" + call( + f"{vcpath}\\Common7\\Tools\\vsdevcmd.bat", + "-no_logo", + "-arch=amd64", + "-host_arch=amd64", + "&&", + "python", + "-c", + # this command needs to be one line for Windows reasons + "import sys, json, pathlib, os; pathlib.Path(sys.argv[1]).write_text(json.dumps(dict(os.environ)))", + vcvars_file, env=env, ) - env.update(json.loads(vcvars)) + with open(vcvars_file, encoding="utf-8") as f: + vcvars = json.load(f) + env.update(vcvars) return base_python, env diff --git a/test/test_ios.py b/test/test_ios.py index 9ee588b26..3d1674585 100644 --- a/test/test_ios.py +++ b/test/test_ios.py @@ -8,6 +8,8 @@ import pytest +from cibuildwheel.ci import CIProvider, detect_ci_provider + from . import test_projects, utils basic_project_files = { @@ -23,6 +25,19 @@ def test_platform(self): } +def skip_if_ios_testing_not_supported() -> None: + """Skip the test if iOS testing is not supported on this machine.""" + if utils.get_platform() != "macos": + pytest.skip("this test can only run on macOS") + if utils.get_xcode_version() < (13, 0): + pytest.skip("this test only works with Xcode 13.0 or greater") + if detect_ci_provider() == CIProvider.cirrus_ci: + pytest.skip( + "iOS testing not currently supported on Cirrus CI due to a failure " + "to start the simulator." + ) + + # iOS tests shouldn't be run in parallel, because they're dependent on calling # Xcode, and starting a simulator. These are both multi-threaded operations, and # it's easy to overload the CI machine if there are multiple test processes @@ -39,10 +54,7 @@ def test_platform(self): ], ) def test_ios_platforms(tmp_path, build_config, monkeypatch, capfd): - if utils.get_platform() != "macos": - pytest.skip("this test can only run on macOS") - if utils.get_xcode_version() < (13, 0): - pytest.skip("this test only works with Xcode 13.0 or greater") + skip_if_ios_testing_not_supported() # Create a temporary "bin" directory, symlink a tool that we know eixsts # (/usr/bin/true) into that location under a name that should be unique, @@ -94,10 +106,7 @@ def test_ios_platforms(tmp_path, build_config, monkeypatch, capfd): @pytest.mark.serial def test_no_test_sources(tmp_path, capfd): """Build will provide a helpful error if pytest is run and test-sources is not defined.""" - if utils.get_platform() != "macos": - pytest.skip("this test can only run on macOS") - if utils.get_xcode_version() < (13, 0): - pytest.skip("this test only works with Xcode 13.0 or greater") + skip_if_ios_testing_not_supported() project_dir = tmp_path / "project" basic_project = test_projects.new_c_project() @@ -126,10 +135,7 @@ def test_no_test_sources(tmp_path, capfd): def test_ios_testing_with_placeholder(tmp_path, capfd): """Build will run tests with the {project} placeholder.""" - if utils.get_platform() != "macos": - pytest.skip("this test can only run on macOS") - if utils.get_xcode_version() < (13, 0): - pytest.skip("this test only works with Xcode 13.0 or greater") + skip_if_ios_testing_not_supported() project_dir = tmp_path / "project" basic_project = test_projects.new_c_project() @@ -155,10 +161,7 @@ def test_ios_testing_with_placeholder(tmp_path, capfd): def test_missing_xbuild_tool(tmp_path, capfd): """Build will fail if xbuild-tools references a non-existent tool.""" - if utils.get_platform() != "macos": - pytest.skip("this test can only run on macOS") - if utils.get_xcode_version() < (13, 0): - pytest.skip("this test only works with Xcode 13.0 or greater") + skip_if_ios_testing_not_supported() project_dir = tmp_path / "project" basic_project = test_projects.new_c_project() @@ -183,10 +186,7 @@ def test_missing_xbuild_tool(tmp_path, capfd): def test_no_xbuild_tool_definition(tmp_path, capfd): """Build will succeed with a warning if there is no xbuild-tools definition.""" - if utils.get_platform() != "macos": - pytest.skip("this test can only run on macOS") - if utils.get_xcode_version() < (13, 0): - pytest.skip("this test only works with Xcode 13.0 or greater") + skip_if_ios_testing_not_supported() project_dir = tmp_path / "project" basic_project = test_projects.new_c_project() @@ -220,10 +220,7 @@ def test_no_xbuild_tool_definition(tmp_path, capfd): def test_empty_xbuild_tool_definition(tmp_path, capfd): """Build will succeed with no warning if there is an empty xbuild-tools definition.""" - if utils.get_platform() != "macos": - pytest.skip("this test can only run on macOS") - if utils.get_xcode_version() < (13, 0): - pytest.skip("this test only works with Xcode 13.0 or greater") + skip_if_ios_testing_not_supported() project_dir = tmp_path / "project" basic_project = test_projects.new_c_project() @@ -255,10 +252,7 @@ def test_empty_xbuild_tool_definition(tmp_path, capfd): @pytest.mark.serial def test_ios_test_command_without_python_dash_m(tmp_path, capfd): """pytest should be able to run without python -m, but it should warn.""" - if utils.get_platform() != "macos": - pytest.skip("this test can only run on macOS") - if utils.get_xcode_version() < (13, 0): - pytest.skip("this test only works with Xcode 13.0 or greater") + skip_if_ios_testing_not_supported() project_dir = tmp_path / "project" @@ -296,10 +290,7 @@ def test_spam(): def test_ios_test_command_invalid(tmp_path, capfd): """Test command should raise an error if it's clearly invalid.""" - if utils.get_platform() != "macos": - pytest.skip("this test can only run on macOS") - if utils.get_xcode_version() < (13, 0): - pytest.skip("this test only works with Xcode 13.0 or greater") + skip_if_ios_testing_not_supported() project_dir = tmp_path / "project" basic_project = test_projects.new_c_project() From 3431adedba905aa473dcb104f124232e2bef741e Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 29 May 2025 19:44:38 -0400 Subject: [PATCH 1070/1105] fix: use standard schema line (#2433) This was a workaround for a bug in validate-pyproject, but that bug was fixed some time ago, so we can use the standard line here now. Signed-off-by: Henry Schreiner --- bin/generate_schema.py | 3 +-- cibuildwheel/resources/cibuildwheel.schema.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/generate_schema.py b/bin/generate_schema.py index 2c51597fd..6b98ce8ef 100755 --- a/bin/generate_schema.py +++ b/bin/generate_schema.py @@ -21,7 +21,7 @@ args = parser.parse_args() starter = """ -$schema: http://json-schema.org/draft-07/schema +$schema: http://json-schema.org/draft-07/schema# $id: https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/resources/cibuildwheel.schema.json $defs: inherit: @@ -365,7 +365,6 @@ def as_object(d: dict[str, Any]) -> dict[str, Any]: if args.schemastore: schema["$id"] = "https://json.schemastore.org/partial-cibuildwheel.json" - schema["$schema"] = "http://json-schema.org/draft-07/schema#" schema["description"] = ( "cibuildwheel's toml file, generated with ./bin/generate_schema.py --schemastore from cibuildwheel." ) diff --git a/cibuildwheel/resources/cibuildwheel.schema.json b/cibuildwheel/resources/cibuildwheel.schema.json index a66b0aa77..92113e3d7 100644 --- a/cibuildwheel/resources/cibuildwheel.schema.json +++ b/cibuildwheel/resources/cibuildwheel.schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/draft-07/schema", + "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/resources/cibuildwheel.schema.json", "$defs": { "inherit": { From f8168e2a892fe83dfcfea5f00d2516de61ff0ca3 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 29 May 2025 19:54:00 -0400 Subject: [PATCH 1071/1105] docs: found more to convert to toml (#2430) * docs: found more to convert to toml Signed-off-by: Henry Schreiner * Apply suggestions from code review Co-authored-by: Matthieu Darbois --------- Signed-off-by: Henry Schreiner Co-authored-by: Matthieu Darbois --- README.md | 2 +- docs/contributing.md | 2 +- docs/faq.md | 18 +++++++++--------- docs/platforms.md | 24 ++++++++++++------------ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 151820ea1..2b2587cc3 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ While cibuildwheel itself requires a recent Python version to run (we support th ¹ PyPy & GraalPy are only supported for manylinux wheels.
² Windows arm64 support is experimental.
-³ Free-threaded mode requires opt-in using [`CIBW_ENABLE`](https://cibuildwheel.pypa.io/en/stable/options/#enable).
+³ Free-threaded mode requires opt-in using [`enable`](https://cibuildwheel.pypa.io/en/stable/options/#enable).
⁴ Experimental, not yet supported on PyPI, but can be used directly in web deployment. Use `--platform pyodide` to build.
⁵ manylinux armv7l support is experimental. As there are no RHEL based image for this architecture, it's using an Ubuntu based image instead.
diff --git a/docs/contributing.md b/docs/contributing.md index 40ebaa8b6..31c879a79 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -16,7 +16,7 @@ Everyone contributing to the cibuildwheel project is expected to follow the [PSF - `cibuildwheel` should wrap the complexity of wheel building. - The user interface to `cibuildwheel` is the build script (e.g. `.travis.yml`). Feature additions should not increase the complexity of this script. -- Options should be environment variables (these lend themselves better to YML config files). They should be prefixed with `CIBW_`. +- Options should be environment variables (these lend themselves better to YAML config files). They should be prefixed with `CIBW_`. - Options should be generalised to all platforms. If platform-specific options are required, they should be namespaced e.g. `CIBW_TEST_COMMAND_MACOS` Other notes: diff --git a/docs/faq.md b/docs/faq.md index 4db883017..5c92c02a3 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -33,7 +33,7 @@ The CPython Limited API is a subset of the Python C Extension API that's declare To create a package that builds ABI3 wheels, you'll need to configure your build backend to compile libraries correctly create wheels with the right tags. [Check this repo](https://github.com/joerick/python-abi3-package-sample) for an example of how to do this with setuptools. -You could also consider running [abi3audit](https://github.com/trailofbits/abi3audit) against the produced wheels in order to check for abi3 violations or inconsistencies. You can run it alongside the default in your [CIBW_REPAIR_WHEEL_COMMAND](options.md#repair-wheel-command). +You could also consider running [abi3audit](https://github.com/trailofbits/abi3audit) against the produced wheels in order to check for abi3 violations or inconsistencies. You can run it alongside the default in your [repair-wheel-command](options.md#repair-wheel-command). ### Packages with optional C extensions {: #optional-extensions} @@ -108,7 +108,7 @@ package 'sdist' will also benefit. #### Missing build dependencies {: #cibw-options-alternatives-deps} -If your build needs Python dependencies, rather than using `CIBW_BEFORE_BUILD`, it's best to add these to the +If your build needs Python dependencies, rather than using `before-build`, it's best to add these to the [`build-system.requires`](https://www.python.org/dev/peps/pep-0518/#build-system-table) section of your pyproject.toml. For example, if your project requires Cython to build, your pyproject.toml might include a section like this: @@ -129,7 +129,7 @@ You might need to run some other commands before building, like running a script that performs codegen or downloading some data that's not stored in your source tree. -Rather than using `CIBW_BEFORE_ALL` or `CIBW_BEFORE_BUILD`, you could incorporate +Rather than using `before-all` or `before-build`, you could incorporate these steps into your package's build process. For example, if you're using setuptools, you can add steps to your package's `setup.py` using a structure like this: @@ -177,16 +177,16 @@ Sometimes a build will fail due to a missing dependency. **If the build is missing a Python package**, you should [add it to pyproject.toml](#cibw-options-alternatives-deps). -**If you need a build tool** (e.g. cmake, automake, ninja), you can install it through a package manager like apt/yum, brew or choco, using the [`CIBW_BEFORE_ALL`](options.md#before-all) option. +**If you need a build tool** (e.g. cmake, automake, ninja), you can install it through a package manager like apt/yum, brew or choco, using the [`before-all`](options.md#before-all) option. -**If your build is linking into a native library dependency**, you can build/install that in [`CIBW_BEFORE_ALL`](options.md#before-all). However, on Linux, Mac (and Windows if you're using [delvewheel]), the library that you install will be bundled into the wheel in the [repair step]. So take care to ensure that +**If your build is linking into a native library dependency**, you can build/install that in [`before-all`](options.md#before-all). However, on Linux, Mac (and Windows if you're using [delvewheel]), the library that you install will be bundled into the wheel in the [repair step]. So take care to ensure that - the bundled library doesn't accidentally increase the minimum system requirements (such as the minimum macOS version) - the bundled library matches the architecture of the wheel you're building when cross-compiling This is particularly an issue on macOS, where de facto package manager Homebrew will install libraries that are compiled for the specific version of macOS that the build machine is running, rendering the wheels useless for any previous version. And brew will not install the right arch for cross compilation of Apple Silicon wheels. -For these reasons, it's strongly recommended to not use brew for native library dependencies. Instead, we recommend compiling the library yourself. If you compile in the [`CIBW_BEFORE_ALL`](options.md#before-all) step, cibuildwheel will have already set the appropriate `MACOSX_DEPLOYMENT_TARGET` env var, so the library will target the correct version of macOS. +For these reasons, it's strongly recommended to not use brew for native library dependencies. Instead, we recommend compiling the library yourself. If you compile in the [`before-all`](options.md#before-all) step, cibuildwheel will have already set the appropriate `MACOSX_DEPLOYMENT_TARGET` env var, so the library will target the correct version of macOS. !!! tip For build steps, Homebrew is still a great resource - you can [look up the build formula](https://formulae.brew.sh/) and use that as a starting point. @@ -253,9 +253,9 @@ pipx run twine upload wheelhouse/*.whl ### macOS: Passing DYLD_LIBRARY_PATH to delocate -macOS has built-in [System Integrity protections](https://developer.apple.com/library/archive/documentation/Security/Conceptual/System_Integrity_Protection_Guide/RuntimeProtections/RuntimeProtections.html) which limits the use of `DYLD_LIBRARY_PATH` and `LD_LIBRARY_PATH` so that it does not automatically pass to children processes. This means if you set `DYLD_LIBRARY_PATH` before running cibuildwheel, or even set it in `CIBW_ENVIRONMENT`, it will be stripped out of the environment before delocate is called. +macOS has built-in [System Integrity protections](https://developer.apple.com/library/archive/documentation/Security/Conceptual/System_Integrity_Protection_Guide/RuntimeProtections/RuntimeProtections.html) which limits the use of `DYLD_LIBRARY_PATH` and `LD_LIBRARY_PATH` so that it does not automatically pass to children processes. This means if you set `DYLD_LIBRARY_PATH` before running cibuildwheel, or even set it in `environment`, it will be stripped out of the environment before delocate is called. -To work around this, use a different environment variable such as `REPAIR_LIBRARY_PATH` to store the library path, and set `DYLD_LIBRARY_PATH` in [`CIBW_REPAIR_WHEEL_COMMAND_MACOS`](https://cibuildwheel.pypa.io/en/stable/options/#repair-wheel-command), like this: +To work around this, use a different environment variable such as `REPAIR_LIBRARY_PATH` to store the library path, and set `DYLD_LIBRARY_PATH` in [`macos.repair-wheel-command`](https://cibuildwheel.pypa.io/en/stable/options/#repair-wheel-command), like this: !!! tab examples "Environment variables" @@ -307,7 +307,7 @@ Then cibuildwheel will detect that it's installed and use it instead. However, y ### macOS: Library dependencies do not satisfy target MacOS Since delocate 0.11.0 there is added verification that the library binary dependencies match the target macOS version. This is to prevent the situation where a wheel platform tag is lower than the actual minimum macOS version required by the library. To resolve this error you need to build the library to the same macOS version as the target wheel (for example using `MACOSX_DEPLOYMENT_TARGET` environment variable). -Alternatively, you could set `MACOSX_DEPLOYMENT_TARGET` in `CIBW_ENVIRONMENT` to correctly label the wheel as incompatible with older macOS versions. +Alternatively, you could set `MACOSX_DEPLOYMENT_TARGET` in `environment` to correctly label the wheel as incompatible with older macOS versions. This error may happen when you install a library using a package manager like Homebrew, which compiles the library for the macOS version of the build machine. This is not suitable for wheels, as the library will only work on the same macOS version as the build machine. You should compile the library yourself, or use a precompiled binary that matches the target macOS version. diff --git a/docs/platforms.md b/docs/platforms.md index ca9c0f90c..d57b1b864 100644 --- a/docs/platforms.md +++ b/docs/platforms.md @@ -25,11 +25,11 @@ Linux wheels are built in [`manylinux`/`musllinux` containers](https://github.co - Programs and libraries are not installed on the CI runner host, but rather should be installed inside the container - using `yum` for `manylinux2014`, `apt-get` for `manylinux_2_31`, `dnf` for `manylinux_2_28` and `apk` for `musllinux_1_1` or `musllinux_1_2`, or manually. The same goes for environment variables that are potentially needed to customize the wheel building. - `cibuildwheel` supports this by providing the [`CIBW_ENVIRONMENT`](options.md#environment) and [`CIBW_BEFORE_ALL`](options.md#before-all) options to setup the build environment inside the running container. + `cibuildwheel` supports this by providing the [`environment`](options.md#environment) and [`before-all`](options.md#before-all) options to setup the build environment inside the running container. - The project directory is copied into the container as `/project`, the output directory for the wheels to be copied out is `/output`. In general, this is handled transparently by `cibuildwheel`. For a more finegrained level of control however, the root of the host file system is mounted as `/host`, allowing for example to access shared files, caches, etc. on the host file system. Note that `/host` is not available on CircleCI and GitLab CI due to their Docker policies. -- Alternative Docker images can be specified with the `CIBW_MANYLINUX_*_IMAGE`/`CIBW_MUSLLINUX_*_IMAGE` options to allow for a custom, preconfigured build environment for the Linux builds. See [options](options.md#linux-image) for more details. +- Alternative Docker images can be specified with the `manylinux-*-image`/`musllinux-*-image` options to allow for a custom, preconfigured build environment for the Linux builds. See [options](options.md#linux-image) for more details. ## macOS {: #macos} @@ -80,7 +80,7 @@ If you set the value lower, cibuildwheel will cap it to the lowest supported val `cibuildwheel` supports both native builds and cross-compiling between `arm64` (Apple Silicon) and `x86_64` (Intel) architectures, including the cross-compatible `universal2` format. By default, macOS builds will build a single architecture wheel, using the build machine's architecture. -If you need to support both x86_64 and Apple Silicon, you can use the `CIBW_ARCHS` environment variable to specify the architectures you want to build, or the value `universal2` to build a multi-architecture wheel. cibuildwheel _will_ test x86_64 wheels (or the x86_64 slice of a `universal2` wheel) when running on Apple Silicon hardware using Rosetta 2 emulation, but it is *not* possible to test Apple Silicon wheels on x86_64 hardware. +If you need to support both `x86_64` and Apple Silicon, you can use the [`macos.archs`](options.md#archs) setting to specify the architectures you want to build, or the value `universal2` to build a multi-architecture wheel. cibuildwheel _will_ test `x86_64` wheels (or the `x86_64` slice of a `universal2` wheel) when running on Apple Silicon hardware using Rosetta 2 emulation, but it is *not* possible to test Apple Silicon wheels on `x86_64` hardware. #### Overview of Mac architectures @@ -129,8 +129,8 @@ If your CI provider doesn't offer arm64 runners yet, or you want to create `univ Regarding testing, -- On an arm64 runner, it is possible to test x86_64 wheels and both parts of a universal2 wheel using Rosetta 2 emulation. -- On an x86_64 runner, arm64 code can be compiled but it can't be tested. `cibuildwheel` will raise a warning to notify you of this - these warnings can be silenced by skipping testing on these platforms: `CIBW_TEST_SKIP: "*_arm64 *_universal2:arm64"`. +- On an arm64 runner, it is possible to test `x86_64` wheels and both parts of a `universal2` wheel using Rosetta 2 emulation. +- On an `x86_64` runner, arm64 code can be compiled but it can't be tested. `cibuildwheel` will raise a warning to notify you of this - these warnings can be silenced by skipping testing on these platforms: `test-skip = ["*_arm64", "*_universal2:arm64"]`. !!! note If your project uses **Poetry** as a build backend, cross-compiling on macOS [does not currently work](https://github.com/python-poetry/poetry/issues/7107). In some cases arm64 wheels can be built but their tags will be incorrect, with the platform tag showing `x86_64` instead of `arm64`. @@ -150,11 +150,11 @@ In order to speed-up builds, cibuildwheel will cache the tools it needs to be re ### Windows ARM64 builds {: #windows-arm64} -`cibuildwheel` supports cross-compiling `ARM64` wheels on all Windows runners, but a native ARM64 runner is required for testing. On non-native runners, tests for ARM64 wheels will be automatically skipped with a warning. Add `"*-win_arm64"` to your `CIBW_TEST_SKIP` setting to suppress the warning. +`cibuildwheel` supports cross-compiling `ARM64` wheels on all Windows runners, but a native `ARM64` runner is required for testing. On non-native runners, tests for `ARM64` wheels will be automatically skipped with a warning. Add `"*-win_arm64"` to your `test-skip` setting to suppress the warning. Cross-compilation on Windows relies on a supported build backend. Supported backends use an environment variable to specify their target platform (the one they are compiling native modules for, as opposed to the one they are running on), which is set in [cibuildwheel's windows.py](https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/platforms/windows.py) before building. Currently, `setuptools>=65.4.1` and `setuptools_rust` are the only supported backends. -By default, `ARM64` is not enabled when running on non-ARM64 runners. Use [`CIBW_ARCHS`](options.md#archs) to select it. +By default, `ARM64` is not enabled when running on non-`ARM64` runners. Use [`CIBW_ARCHS`](options.md#archs) to select it. ## Pyodide/WebAssembly {: #pyodide} @@ -170,7 +170,7 @@ You must target pyodide with `--platform pyodide` (or use `--only` on the identi ### Choosing a Pyodide version {: #pyodide-choosing-a-version} -It is also possible to target a specific Pyodide version by setting the `CIBW_PYODIDE_VERSION` option to the desired version. Users are responsible for setting an appropriate Pyodide version according to the `pyodide-build` version. A list is available in Pyodide's [cross-build environments metadata file](https://github.com/pyodide/pyodide/blob/main/pyodide-cross-build-environments.json), which can be viewed more easily by installing `pyodide-build` from PyPI and using `pyodide xbuildenv search --all` to see a compatibility table. +It is also possible to target a specific Pyodide version by setting the `pyodide-version` option to the desired version. Users are responsible for setting an appropriate Pyodide version according to the `pyodide-build` version. A list is available in Pyodide's [cross-build environments metadata file](https://github.com/pyodide/pyodide/blob/main/pyodide-cross-build-environments.json), which can be viewed more easily by installing `pyodide-build` from PyPI and using `pyodide xbuildenv search --all` to see a compatibility table. ### Running tests @@ -196,7 +196,7 @@ By default, cibuildwheel will build wheels for all three of these targets. If you need to specify different compilation flags or other properties on a per-ABI or per-CPU basis, you can use [configuration overrides](configuration.md#overrides) with a `select` clause that targets the specific ABI or architecture. For example, consider the following example: -``` +```toml [tool.cibuildwheel.ios] test-sources = ["tests"] test-requires = ["pytest"] @@ -233,12 +233,12 @@ iOS builds support both the `pip` and `build` build frontends. In principle, sup The environment used to run builds does not inherit the full user environment - in particular, `PATH` is deliberately re-written. This is because UNIX C tooling doesn't do a great job differentiating between "macOS ARM64" and "iOS ARM64" binaries. If (for example) Homebrew is on the path when compilation commands are invoked, it's easy for a macOS version of a library to be linked into the iOS binary, rendering it unusable on iOS. To prevent this, iOS builds always force `PATH` to a "known minimal" path, that includes only the bare system utilities, and the iOS compiler toolchain. -If your project requires additional tools to build (such as `cmake`, `ninja`, or `rustc`), those tools must be explicitly declared as cross-build tools using [`CIBW_XBUILD_TOOLS`](options.md#xbuild-tools). *Any* tool used by the build process must be included in the `CIBW_XBUILD_TOOLS` list, not just tools that cibuildwheel will invoke directly. For example, if your build script invokes `cmake`, and the `cmake` script invokes `magick` to perform some image transformations, both `cmake` and `magick` must be included in your cross-build tools list. +If your project requires additional tools to build (such as `cmake`, `ninja`, or `rustc`), those tools must be explicitly declared as cross-build tools using [`xbuild-tools`](options.md#xbuild-tools). *Any* tool used by the build process must be included in the `xbuild-tools` list, not just tools that cibuildwheel will invoke directly. For example, if your build script invokes `cmake`, and the `cmake` script invokes `magick` to perform some image transformations, both `cmake` and `magick` must be included in your cross-build tools list. ### Tests If tests have been configured, the test suite will be executed on the simulator matching the architecture of the build machine - that is, if you're building on an ARM64 macOS machine, the ARM64 wheel will be tested on an ARM64 simulator. It is not possible to use cibuildwheel to test wheels on other simulators, or on physical devices. -The iOS test environment can't support running shell scripts, so the [`CIBW_TEST_COMMAND`](options.md#test-command) value must be specified as if it were a command line being passed to `python -m ...`. In addition, the project must use [`CIBW_TEST_SOURCES`](options.md#test-sources) to specify the minimum subset of files that should be copied to the test environment. This is because the test must be run "on device", and the simulator device will not have access to the local project directory. +The iOS test environment can't support running shell scripts, so the [`test-command`](options.md#test-command) value must be specified as if it were a command line being passed to `python -m ...`. In addition, the project must use [`test-sources`](options.md#test-sources) to specify the minimum subset of files that should be copied to the test environment. This is because the test must be run "on device", and the simulator device will not have access to the local project directory. -The test process uses the same testbed used by CPython itself to run the CPython test suite. It is an Xcode project that has been configured to have a single Xcode "XCUnit" test - the result of which reports the success or failure of running `python -m `. +The test process uses the same testbed used by CPython itself to run the CPython test suite. It is an Xcode project that has been configured to have a single Xcode "XCUnit" test - the result of which reports the success or failure of running `python -m `. From ea08120e25fc635d7b655d2fc1d48e507f7245e6 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 30 May 2025 09:53:20 -0400 Subject: [PATCH 1072/1105] feat: support multiple commands on iOS (#2432) * feat: support multiple commands on iOS Signed-off-by: Henry Schreiner * Move split_command into a util module * (unrelated) fix test docstring * Implement short-circuit behaviour on test-command --------- Signed-off-by: Henry Schreiner Co-authored-by: Joe Rickerby --- cibuildwheel/platforms/ios.py | 100 ++++++++++++++++------------------ cibuildwheel/util/cmd.py | 17 +++++- test/test_ios.py | 40 +++++++++++++- 3 files changed, 102 insertions(+), 55 deletions(-) diff --git a/cibuildwheel/platforms/ios.py b/cibuildwheel/platforms/ios.py index 660af67c1..19ef04186 100644 --- a/cibuildwheel/platforms/ios.py +++ b/cibuildwheel/platforms/ios.py @@ -25,7 +25,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, @@ -618,62 +618,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) diff --git a/cibuildwheel/util/cmd.py b/cibuildwheel/util/cmd.py index fcf725819..a528480e7 100644 --- a/cibuildwheel/util/cmd.py +++ b/cibuildwheel/util/cmd.py @@ -4,7 +4,7 @@ import subprocess import sys import typing -from collections.abc import Mapping +from collections.abc import Iterator, Mapping from typing import Final, Literal from ..errors import FatalError @@ -81,3 +81,18 @@ def shell( command = " ".join(commands) print(f"+ {command}") subprocess.run(command, env=env, cwd=cwd, shell=True, check=True) + + +def split_command(lst: list[str]) -> Iterator[list[str]]: + """ + Split a shell-style command, as returned by shlex.split, into a sequence + of commands, separated by '&&'. + """ + items = list[str]() + for item in lst: + if item == "&&": + yield items + items = [] + else: + items.append(item) + yield items diff --git a/test/test_ios.py b/test/test_ios.py index 3d1674585..b2d7e892a 100644 --- a/test/test_ios.py +++ b/test/test_ios.py @@ -86,7 +86,7 @@ def test_ios_platforms(tmp_path, build_config, monkeypatch, capfd): "CIBW_BUILD": "cp313-*", "CIBW_XBUILD_TOOLS": "does-exist", "CIBW_TEST_SOURCES": "tests", - "CIBW_TEST_COMMAND": "python -m unittest discover tests test_platform.py", + "CIBW_TEST_COMMAND": "python -m this && python -m unittest discover tests test_platform.py", "CIBW_BUILD_VERBOSITY": "1", **build_config, }, @@ -102,6 +102,9 @@ def test_ios_platforms(tmp_path, build_config, monkeypatch, capfd): captured = capfd.readouterr() assert "'does-exist' will be included in the cross-build environment" in captured.out + # Make sure the first command ran + assert "Zen of Python" in captured.out + @pytest.mark.serial def test_no_test_sources(tmp_path, capfd): @@ -134,7 +137,10 @@ def test_no_test_sources(tmp_path, capfd): def test_ios_testing_with_placeholder(tmp_path, capfd): - """Build will run tests with the {project} placeholder.""" + """ + Tests with the {project} placeholder are not supported on iOS, because the test command + is run in the simulator. + """ skip_if_ios_testing_not_supported() project_dir = tmp_path / "project" @@ -159,6 +165,36 @@ def test_ios_testing_with_placeholder(tmp_path, capfd): assert "iOS tests cannot use placeholders" in captured.out + captured.err +@pytest.mark.serial +def test_ios_test_command_short_circuit(tmp_path, capfd): + skip_if_ios_testing_not_supported() + + project_dir = tmp_path / "project" + basic_project = test_projects.new_c_project() + basic_project.files.update(basic_project_files) + basic_project.generate(project_dir) + + with pytest.raises(subprocess.CalledProcessError): + # `python -m not_a_module` will fail, so `python -m this` should not be run. + utils.cibuildwheel_run( + project_dir, + add_env={ + "CIBW_PLATFORM": "ios", + "CIBW_BUILD": "cp313-*", + "CIBW_XBUILD_TOOLS": "", + "CIBW_TEST_SOURCES": "tests", + "CIBW_TEST_COMMAND": "python -m not_a_module && python -m this", + "CIBW_BUILD_VERBOSITY": "1", + }, + ) + + captured = capfd.readouterr() + + assert "No module named not_a_module" in captured.out + captured.err + # assert that `python -m this` was not run + assert "Zen of Python" not in captured.out + captured.err + + def test_missing_xbuild_tool(tmp_path, capfd): """Build will fail if xbuild-tools references a non-existent tool.""" skip_if_ios_testing_not_supported() From 2125d7117ef94c79a8df9e7be388c3d210a2eba0 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 31 May 2025 23:36:02 -0400 Subject: [PATCH 1073/1105] fix: test-sources should use project dir (#2437) * fix: test-sources should use project dir Signed-off-by: Henry Schreiner * docs: fix docstring Signed-off-by: Henry Schreiner --------- Signed-off-by: Henry Schreiner --- cibuildwheel/platforms/ios.py | 2 +- cibuildwheel/platforms/linux.py | 2 +- cibuildwheel/platforms/macos.py | 2 +- cibuildwheel/platforms/pyodide.py | 2 +- cibuildwheel/platforms/windows.py | 2 +- cibuildwheel/util/file.py | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cibuildwheel/platforms/ios.py b/cibuildwheel/platforms/ios.py index 19ef04186..1a3d2d274 100644 --- a/cibuildwheel/platforms/ios.py +++ b/cibuildwheel/platforms/ios.py @@ -565,7 +565,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: diff --git a/cibuildwheel/platforms/linux.py b/cibuildwheel/platforms/linux.py index 00cd85b2f..82a695e69 100644 --- a/cibuildwheel/platforms/linux.py +++ b/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, ) diff --git a/cibuildwheel/platforms/macos.py b/cibuildwheel/platforms/macos.py index 3b4534d2a..99ca915b8 100644 --- a/cibuildwheel/platforms/macos.py +++ b/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: diff --git a/cibuildwheel/platforms/pyodide.py b/cibuildwheel/platforms/pyodide.py index 920920923..4e545260f 100644 --- a/cibuildwheel/platforms/pyodide.py +++ b/cibuildwheel/platforms/pyodide.py @@ -527,7 +527,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(), test_cwd, ) else: diff --git a/cibuildwheel/platforms/windows.py b/cibuildwheel/platforms/windows.py index 521695b60..c57a53de0 100644 --- a/cibuildwheel/platforms/windows.py +++ b/cibuildwheel/platforms/windows.py @@ -590,7 +590,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(), test_cwd, ) else: diff --git a/cibuildwheel/util/file.py b/cibuildwheel/util/file.py index e38da01eb..c0fdc2c19 100644 --- a/cibuildwheel/util/file.py +++ b/cibuildwheel/util/file.py @@ -111,21 +111,21 @@ def copy_into_local(src: Path, dst: PurePath) -> None: def copy_test_sources( test_sources: list[str], - package_dir: Path, + project_dir: Path, test_dir: PurePath, copy_into: Callable[[Path, PurePath], None] = copy_into_local, ) -> None: """Copy the list of test sources from the package to the test directory. - :param test_sources: A list of test paths, relative to the package_dir. - :param package_dir: The root of the package directory. + :param test_sources: A list of test paths, relative to the project_dir. + :param project_dir: The root of the project. :param test_dir: The folder where test sources should be placed. - :param copy_info: The copy function to use. By default, does a local + :param copy_into: The copy function to use. By default, does a local filesystem copy; but an OCIContainer.copy_info method (or equivalent) can be provided. """ for test_path in test_sources: - source = package_dir.resolve() / test_path + source = project_dir.resolve() / test_path if not source.exists(): msg = f"Test source {test_path} does not exist." From 2346c5f6e05f3be051cc823d2547a3ee1fd83ed5 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Sun, 1 Jun 2025 06:28:20 +0100 Subject: [PATCH 1074/1105] Fix changelog formatting bug --- docs/changelog.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/changelog.md b/docs/changelog.md index d267bd3af..5a0c1777d 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -79,7 +79,6 @@ _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 From c90accef518b1dd0253bf43b639ce21f765d6794 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sun, 1 Jun 2025 01:34:20 -0400 Subject: [PATCH 1075/1105] docs: color output for docs (#2407) * docs: color output for docs Signed-off-by: Henry Schreiner * fix: use asdf (python-build) * docs: try to fix colors Signed-off-by: Henry Schreiner * Update .pre-commit-config.yaml * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Signed-off-by: Henry Schreiner Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 3 ++- .readthedocs.yml | 6 +++--- docs/main.py | 16 +++++++++++++++- docs/options.md | 2 -- noxfile.py | 2 +- pyproject.toml | 1 + 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7831eae69..e86f06134 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -87,7 +87,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 diff --git a/.readthedocs.yml b/.readthedocs.yml index 60724f36e..a2dc26bb7 100644 --- a/.readthedocs.yml +++ b/.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 diff --git a/docs/main.py b/docs/main.py index 15d42cbb1..11556dec0 100644 --- a/docs/main.py +++ b/docs/main.py @@ -1,8 +1,12 @@ import os +import re import subprocess import sysconfig from typing import Any +import rich.console +import rich.text + def define_env(env: Any) -> None: "Hook function for mkdocs-macros" @@ -12,5 +16,15 @@ def subprocess_run(*args: str) -> str: "Run a subprocess and return the stdout" env = os.environ.copy() scripts = sysconfig.get_path("scripts") + env.pop("NO_COLOR", None) env["PATH"] = f"{scripts}{os.pathsep}{env.get('PATH', '')}" - return subprocess.run(args, check=True, capture_output=True, text=True, env=env).stdout + env["PYTHON_COLORS"] = "1" + output = subprocess.run(args, check=True, capture_output=True, text=True, env=env).stdout + rich_text = rich.text.Text.from_ansi(output) + console = rich.console.Console(record=True, force_terminal=True) + console.print(rich_text) + page = console.export_html(inline_styles=True) + result = re.search(r"(.*?)", page, re.DOTALL | re.IGNORECASE) + assert result + txt = result.group(1).strip() + return txt.replace("code ", 'code class="nohighlight" ') diff --git a/docs/options.md b/docs/options.md index fcebb386e..3a9abf552 100644 --- a/docs/options.md +++ b/docs/options.md @@ -1714,9 +1714,7 @@ Platform-specific environment variables are also available:
### Options -```text « subprocess_run("cibuildwheel", "--help") » -``` ### Return codes diff --git a/noxfile.py b/noxfile.py index a31c147f6..d475c60e3 100755 --- a/noxfile.py +++ b/noxfile.py @@ -173,7 +173,7 @@ def bump_version(session: nox.Session) -> None: session.install_and_run_script("bin/bump_version.py") -@nox.session(default=False, python="3.12") +@nox.session(default=False) def docs(session: nox.Session) -> None: """ Build the docs. Will serve unless --non-interactive diff --git a/pyproject.toml b/pyproject.toml index b52371de8..4f3721c62 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,6 +76,7 @@ docs = [ "mkdocs-macros-plugin", "mkdocs==1.6.1", "pymdown-extensions", + "rich", ] test = [ "build", From e6b4e2d355ca1db112930e1d498b6bfec0281575 Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Mon, 2 Jun 2025 11:37:35 -0400 Subject: [PATCH 1076/1105] [Bot] Update dependencies (#2439) Update dependencies Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> --- README.md | 4 +- .../resources/constraints-pyodide312.txt | 2 +- .../resources/pinned_docker_images.cfg | 42 +- .../python-build-standalone-releases.json | 434 +++++++++--------- docs/working-examples.md | 8 +- 5 files changed, 245 insertions(+), 245 deletions(-) diff --git a/README.md b/README.md index 2b2587cc3..56b098665 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/cibuildwheel/resources/constraints-pyodide312.txt b/cibuildwheel/resources/constraints-pyodide312.txt index 8f4a6e5c7..0fdd13116 100644 --- a/cibuildwheel/resources/constraints-pyodide312.txt +++ b/cibuildwheel/resources/constraints-pyodide312.txt @@ -81,7 +81,7 @@ rich==14.0.0 # pyodide-build # pyodide-cli # typer -ruamel-yaml==0.18.11 +ruamel-yaml==0.18.12 # via pyodide-build ruamel-yaml-clib==0.2.12 # via ruamel-yaml diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 83a71dce2..3ba9d5b39 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,47 +1,47 @@ [x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.28-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.31-1 manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.28-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.28-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.05.28-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.31-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.05.31-1 [i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.28-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.05.28-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.31-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.05.31-1 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.28-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.31-1 manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.28-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.28-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.05.28-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.31-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.05.31-1 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.05.28-1 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.05.31-1 manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.05.28-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.05.28-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.05.28-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.05.31-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.05.31-1 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.05.28-1 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.05.31-1 manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.05.28-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.05.28-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.05.28-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.05.31-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.05.31-1 [pypy_x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.28-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.31-1 manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.28-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.28-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.31-1 [pypy_i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.28-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.31-1 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.28-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.31-1 manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.28-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.28-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.31-1 [armv7l] -manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.05.28-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.05.28-1 +manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.05.31-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.05.31-1 [riscv64] diff --git a/cibuildwheel/resources/python-build-standalone-releases.json b/cibuildwheel/resources/python-build-standalone-releases.json index bcbc196b7..82f072fc2 100644 --- a/cibuildwheel/resources/python-build-standalone-releases.json +++ b/cibuildwheel/resources/python-build-standalone-releases.json @@ -1,439 +1,439 @@ { "releases": [ { - "tag": "20250517", + "tag": "20250529", "assets": [ { - "name": "cpython-3.10.17+20250517-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.10.17%2B20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.17+20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.11.12%2B20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.12+20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.12.10%2B20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.3+20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.13.3%2B20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.10+20250529-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.14.0a7%2B20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0a7+20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250517/cpython-3.9.22%2B20250517-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.22+20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz" } ] } diff --git a/docs/working-examples.md b/docs/working-examples.md index 40631cddb..0eba8f54f 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -10,8 +10,8 @@ title: Working examples |-----------------------------------|----|----|:------| | [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 | @@ -71,8 +71,8 @@ title: Working examples | [mosec][] | ![github icon][] | ![linux icon][] ![apple icon][] | A machine learning model serving framework powered by Rust | | [Picologging][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A high-performance logging library for Python. | | [pybind11 cmake_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system | -| [markupsafe][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. | | [Rtree][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS | +| [markupsafe][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. | | [KDEpy][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Kernel Density Estimation in Python | | [dd-trace-py][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub | | [tgcalls][] | ![github icon][] | ![apple icon][] ![windows icon][] | Python `pybind11` binding to Telegram's WebRTC library with third party dependencies like `OpenSSL`, `MozJPEG`, `FFmpeg`, etc. | @@ -120,8 +120,8 @@ title: Working examples [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 @@ -181,8 +181,8 @@ title: Working examples [mosec]: https://github.com/mosecorg/mosec [Picologging]: https://github.com/microsoft/picologging [pybind11 cmake_example]: https://github.com/pybind/cmake_example -[markupsafe]: https://github.com/pallets/markupsafe [Rtree]: https://github.com/Toblerity/rtree +[markupsafe]: https://github.com/pallets/markupsafe [KDEpy]: https://github.com/tommyod/KDEpy [dd-trace-py]: https://github.com/DataDog/dd-trace-py [tgcalls]: https://github.com/MarshalX/tgcalls From 4aaa823c8e73cbcc3a1a797e9d7058e39230dd3b Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Tue, 3 Jun 2025 04:35:59 +0100 Subject: [PATCH 1077/1105] feat: add pyodide 0.28 and pyodide-prerelease (#2431) * Add pyodide 0.28.0a3 * Add docs and tests for 0.28 This reverts commit 2e7d716a9ecfbdac159eed798ebf1b0170e6858d. * fix: add selector for pyodide-prerelease, and add graalpy to schema Signed-off-by: Henry Schreiner --------- Signed-off-by: Henry Schreiner Co-authored-by: Henry Schreiner --- bin/generate_schema.py | 4 +++- cibuildwheel/resources/build-platforms.toml | 1 + .../resources/cibuildwheel.schema.json | 6 ++++-- cibuildwheel/selector.py | 9 +++++++-- docs/options.md | 13 +++++++----- docs/platforms.md | 4 +++- test/test_pyodide.py | 5 ++++- test/utils.py | 2 ++ unit_test/build_selector_test.py | 20 +++++++++++++++++++ 9 files changed, 52 insertions(+), 12 deletions(-) diff --git a/bin/generate_schema.py b/bin/generate_schema.py index 6b98ce8ef..3ea67f378 100755 --- a/bin/generate_schema.py +++ b/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. diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index 00c555794..0102ff5e7 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -221,6 +221,7 @@ python_configurations = [ [pyodide] python_configurations = [ { identifier = "cp312-pyodide_wasm32", version = "3.12", default_pyodide_version = "0.27.6", node_version = "v22" }, + { identifier = "cp313-pyodide_wasm32", version = "3.13", default_pyodide_version = "0.28.0a3", node_version = "v22" }, ] [ios] diff --git a/cibuildwheel/resources/cibuildwheel.schema.json b/cibuildwheel/resources/cibuildwheel.schema.json index 92113e3d7..7d6aaf10d 100644 --- a/cibuildwheel/resources/cibuildwheel.schema.json +++ b/cibuildwheel/resources/cibuildwheel.schema.json @@ -13,11 +13,13 @@ }, "enable": { "enum": [ + "cpython-experimental-riscv64", "cpython-freethreading", "cpython-prerelease", + "graalpy", + "pyodide-prerelease", "pypy", - "pypy-eol", - "cpython-experimental-riscv64" + "pypy-eol" ] }, "description": "A Python version or flavor to enable." diff --git a/cibuildwheel/selector.py b/cibuildwheel/selector.py index 42f4104be..256e4fb04 100644 --- a/cibuildwheel/selector.py +++ b/cibuildwheel/selector.py @@ -29,12 +29,13 @@ class EnableGroup(StrEnum): Groups of build selectors that are not enabled by default. """ + CPythonExperimentalRiscV64 = "cpython-experimental-riscv64" CPythonFreeThreading = "cpython-freethreading" CPythonPrerelease = "cpython-prerelease" + GraalPy = "graalpy" PyPy = "pypy" PyPyEoL = "pypy-eol" - CPythonExperimentalRiscV64 = "cpython-experimental-riscv64" - GraalPy = "graalpy" + PyodidePrerelease = "pyodide-prerelease" @classmethod def all_groups(cls) -> frozenset["EnableGroup"]: @@ -98,6 +99,10 @@ def __call__(self, build_id: str) -> bool: return False if EnableGroup.GraalPy not in self.enable and fnmatch(build_id, "gp*"): return False + if EnableGroup.PyodidePrerelease not in self.enable and fnmatch( + build_id, "cp313-pyodide_*" + ): + return False should_build = selector_matches(self.build_config, build_id) should_skip = selector_matches(self.skip_config, build_id) diff --git a/docs/options.md b/docs/options.md index 3a9abf552..67439176f 100644 --- a/docs/options.md +++ b/docs/options.md @@ -58,7 +58,7 @@ When setting the options, you can use shell-style globbing syntax, as per [fnmat | Python 3.10 | cp310-macosx_x86_64
cp310-macosx_universal2
cp310-macosx_arm64 | cp310-win_amd64
cp310-win32
cp310-win_arm64 | cp310-manylinux_x86_64
cp310-manylinux_i686
cp310-musllinux_x86_64
cp310-musllinux_i686 | cp310-manylinux_aarch64
cp310-manylinux_ppc64le
cp310-manylinux_s390x
cp310-manylinux_armv7l
cp310-manylinux_riscv64
cp310-musllinux_aarch64
cp310-musllinux_ppc64le
cp310-musllinux_s390x
cp310-musllinux_armv7l
cp310-musllinux_riscv64 | | | | Python 3.11 | cp311-macosx_x86_64
cp311-macosx_universal2
cp311-macosx_arm64 | cp311-win_amd64
cp311-win32
cp311-win_arm64 | cp311-manylinux_x86_64
cp311-manylinux_i686
cp311-musllinux_x86_64
cp311-musllinux_i686 | cp311-manylinux_aarch64
cp311-manylinux_ppc64le
cp311-manylinux_s390x
cp311-manylinux_armv7l
cp311-manylinux_riscv64
cp311-musllinux_aarch64
cp311-musllinux_ppc64le
cp311-musllinux_s390x
cp311-musllinux_armv7l
cp311-musllinux_riscv64 | | | | Python 3.12 | cp312-macosx_x86_64
cp312-macosx_universal2
cp312-macosx_arm64 | cp312-win_amd64
cp312-win32
cp312-win_arm64 | cp312-manylinux_x86_64
cp312-manylinux_i686
cp312-musllinux_x86_64
cp312-musllinux_i686 | cp312-manylinux_aarch64
cp312-manylinux_ppc64le
cp312-manylinux_s390x
cp312-manylinux_armv7l
cp312-manylinux_riscv64
cp312-musllinux_aarch64
cp312-musllinux_ppc64le
cp312-musllinux_s390x
cp312-musllinux_armv7l
cp312-musllinux_riscv64 | | cp312-pyodide_wasm32 | -| Python 3.13 | cp313-macosx_x86_64
cp313-macosx_universal2
cp313-macosx_arm64 | cp313-win_amd64
cp313-win32
cp313-win_arm64 | cp313-manylinux_x86_64
cp313-manylinux_i686
cp313-musllinux_x86_64
cp313-musllinux_i686 | cp313-manylinux_aarch64
cp313-manylinux_ppc64le
cp313-manylinux_s390x
cp313-manylinux_armv7l
cp313-manylinux_riscv64
cp313-musllinux_aarch64
cp313-musllinux_ppc64le
cp313-musllinux_s390x
cp313-musllinux_armv7l
cp313-musllinux_riscv64 | cp313-ios_arm64_iphoneos
cp313-ios_arm64_iphonesimulator
cp313-ios_x86_64_iphonesimulator | | +| Python 3.13 | cp313-macosx_x86_64
cp313-macosx_universal2
cp313-macosx_arm64 | cp313-win_amd64
cp313-win32
cp313-win_arm64 | cp313-manylinux_x86_64
cp313-manylinux_i686
cp313-musllinux_x86_64
cp313-musllinux_i686 | cp313-manylinux_aarch64
cp313-manylinux_ppc64le
cp313-manylinux_s390x
cp313-manylinux_armv7l
cp313-manylinux_riscv64
cp313-musllinux_aarch64
cp313-musllinux_ppc64le
cp313-musllinux_s390x
cp313-musllinux_armv7l
cp313-musllinux_riscv64 | cp313-ios_arm64_iphoneos
cp313-ios_arm64_iphonesimulator
cp313-ios_x86_64_iphonesimulator | cp313-pyodide_wasm32 | | Python 3.14 | cp314-macosx_x86_64
cp314-macosx_universal2
cp314-macosx_arm64 | cp314-win_amd64
cp314-win32
cp314-win_arm64 | cp314-manylinux_x86_64
cp314-manylinux_i686
cp314-musllinux_x86_64
cp314-musllinux_i686 | cp314-manylinux_aarch64
cp314-manylinux_ppc64le
cp314-manylinux_s390x
cp314-manylinux_armv7l
cp314-manylinux_riscv64
cp314-musllinux_aarch64
cp314-musllinux_ppc64le
cp314-musllinux_s390x
cp314-musllinux_armv7l
cp314-musllinux_riscv64 | | | | PyPy3.8 v7.3 | pp38-macosx_x86_64
pp38-macosx_arm64 | pp38-win_amd64 | pp38-manylinux_x86_64
pp38-manylinux_i686 | pp38-manylinux_aarch64 | | | | PyPy3.9 v7.3 | pp39-macosx_x86_64
pp39-macosx_arm64 | pp39-win_amd64 | pp39-manylinux_x86_64
pp39-manylinux_i686 | pp39-manylinux_aarch64 | | | @@ -334,15 +334,18 @@ values are: are disabled by default as they can't be uploaded to PyPI and a PEP will most likely be required before this can happen. - `graalpy`: Enable GraalPy. +- `pyodide-prerelease`: Pyodide versions that haven't released yet, if one is + available. Safe if you are shipping a site with an early build, not for + general distribution. - `all`: Enable all of the above. !!! caution `cpython-prerelease` is provided for testing purposes only. It is not recommended to distribute wheels built with beta releases, such as - uploading to PyPI. Please _do not_ upload these wheels to PyPI, as they are - not guaranteed to work with the final Python release. Once Python is ABI - stable and enters the release candidate phase, that version of Python will - become available without this flag. + uploading to PyPI. Please _do not_ upload these wheels to PyPI (except for + pre-releases), as they are not guaranteed to work with the final Python + release. Once Python is ABI stable and enters the release candidate phase, + that version of Python will become available without this flag. !!! note Free threading is experimental: [What’s New In Python 3.13](https://docs.python.org/3.13/whatsnew/3.13.html#free-threaded-cpython) diff --git a/docs/platforms.md b/docs/platforms.md index d57b1b864..438ba7607 100644 --- a/docs/platforms.md +++ b/docs/platforms.md @@ -170,7 +170,9 @@ You must target pyodide with `--platform pyodide` (or use `--only` on the identi ### Choosing a Pyodide version {: #pyodide-choosing-a-version} -It is also possible to target a specific Pyodide version by setting the `pyodide-version` option to the desired version. Users are responsible for setting an appropriate Pyodide version according to the `pyodide-build` version. A list is available in Pyodide's [cross-build environments metadata file](https://github.com/pyodide/pyodide/blob/main/pyodide-cross-build-environments.json), which can be viewed more easily by installing `pyodide-build` from PyPI and using `pyodide xbuildenv search --all` to see a compatibility table. +It is also possible to target a specific Pyodide version by setting the [`pyodide-version`](options.md#pyodide-version) option to the desired version. Users are responsible for setting an appropriate Pyodide version according to the `pyodide-build` version. A list is available in Pyodide's [cross-build environments metadata file](https://github.com/pyodide/pyodide/blob/main/pyodide-cross-build-environments.json), which can be viewed more easily by installing `pyodide-build` from PyPI and using `pyodide xbuildenv search --all` to see a compatibility table. + +If there are pre-releases available for a newer Python version, the `pyodide-prerelease` [`enable`](options.md#enable) can be used to include pre-release versions. ### Running tests diff --git a/test/test_pyodide.py b/test/test_pyodide.py index 39bc2be32..9240e8266 100644 --- a/test/test_pyodide.py +++ b/test/test_pyodide.py @@ -58,7 +58,7 @@ def test_pyodide_build(tmp_path, use_pyproject_toml): basic_project.generate(project_dir) # check for node in 1 case only to reduce CI load - add_env = {} + add_env = {"CIBW_ENABLE": "pyodide-prerelease"} if use_pyproject_toml: add_env["CIBW_TEST_COMMAND"] = f"python {{project}}/check_node.py {CIBW_CACHE_PATH}" @@ -72,6 +72,7 @@ def test_pyodide_build(tmp_path, use_pyproject_toml): # check that the expected wheels are produced expected_wheels = [ "spam-0.1.0-cp312-cp312-pyodide_2024_0_wasm32.whl", + "spam-0.1.0-cp313-cp313-pyodide_2025_0_wasm32.whl", ] print("actual_wheels", actual_wheels) @@ -130,11 +131,13 @@ def test_filter(): add_env={ "CIBW_TEST_REQUIRES": "pytest", "CIBW_TEST_COMMAND": "python -m pytest {project}", + "CIBW_ENABLE": "pyodide-prerelease", }, ) # check that the expected wheels are produced expected_wheels = [ "spam-0.1.0-cp312-cp312-pyodide_2024_0_wasm32.whl", + "spam-0.1.0-cp313-cp313-pyodide_2025_0_wasm32.whl", ] print("actual_wheels", actual_wheels) print("expected_wheels", expected_wheels) diff --git a/test/utils.py b/test/utils.py index 838e2179c..71071abe0 100644 --- a/test/utils.py +++ b/test/utils.py @@ -261,6 +261,8 @@ def _expected_wheels( if platform == "pyodide" and python_abi_tags is None: python_abi_tags = ["cp312-cp312"] + if EnableGroup.PyodidePrerelease in enable_groups: + python_abi_tags.append("cp313-cp313") elif platform == "ios" and python_abi_tags is None: python_abi_tags = ["cp313-cp313"] elif python_abi_tags is None: diff --git a/unit_test/build_selector_test.py b/unit_test/build_selector_test.py index 1c87c4264..0b29b3887 100644 --- a/unit_test/build_selector_test.py +++ b/unit_test/build_selector_test.py @@ -89,6 +89,26 @@ def test_build_filter_pypy_all(): assert build_selector("pp39-manylinux_x86_64") +def test_build_filter_pyodide_prerelease(): + build_selector = BuildSelector( + build_config="*", + skip_config="", + enable=frozenset([EnableGroup.PyodidePrerelease]), + ) + assert build_selector("cp312-pyodide_wasm32") + assert build_selector("cp313-pyodide_wasm32") + + +def test_build_filter_pyodide(): + build_selector = BuildSelector( + build_config="*", + skip_config="", + enable=frozenset(), + ) + assert build_selector("cp312-pyodide_wasm32") + assert not build_selector("cp313-pyodide_wasm32") + + def test_skip(): build_selector = BuildSelector( build_config="*", From 03a2ba0bec4a240bf13197b3779b7750dd37118a Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 3 Jun 2025 11:36:14 +0800 Subject: [PATCH 1078/1105] docs: correct documentation suggesting iOS builds all platforms by default. (#2441) --- docs/platforms.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/platforms.md b/docs/platforms.md index 438ba7607..84a8cb502 100644 --- a/docs/platforms.md +++ b/docs/platforms.md @@ -194,7 +194,7 @@ iOS is effectively 2 platforms - physical devices, and simulators. While the API * `arm64_iphonesimulator` (for iOS simulators running on Apple Silicon macOS machines); and * `x64_64_iphonesimulator` (for iOS simulators running on Intel macOS machines). -By default, cibuildwheel will build wheels for all three of these targets. +By default, cibuildwheel will build all wheels for the CPU architecture of the build machine. You can build all wheels for all architectures by specifying `--archs all`. If you need to specify different compilation flags or other properties on a per-ABI or per-CPU basis, you can use [configuration overrides](configuration.md#overrides) with a `select` clause that targets the specific ABI or architecture. For example, consider the following example: From 4aa7d7e9c1abf879714fcac113f39d1b6d7e0de1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Jun 2025 23:36:28 -0400 Subject: [PATCH 1079/1105] [pre-commit.ci] pre-commit autoupdate (#2440) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.11 → v0.11.12](https://github.com/astral-sh/ruff-pre-commit/compare/v0.11.11...v0.11.12) - [github.com/pre-commit/mirrors-mypy: v1.15.0 → v1.16.0](https://github.com/pre-commit/mirrors-mypy/compare/v1.15.0...v1.16.0) * chore: update some things for checks Signed-off-by: Henry Schreiner * chore: fully use PEP 639 licensing Signed-off-by: Henry Schreiner --------- Signed-off-by: Henry Schreiner Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner --- .pre-commit-config.yaml | 4 ++-- bin/projects.py | 1 + pyproject.toml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e86f06134..896ae38ec 100644 --- a/.pre-commit-config.yaml +++ b/.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/ diff --git a/bin/projects.py b/bin/projects.py index 029ef6679..47a1dcb4f 100755 --- a/bin/projects.py +++ b/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") diff --git a/pyproject.toml b/pyproject.toml index 4f3721c62..de326f087 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,6 +8,7 @@ version = "3.0.0b4" description = "Build Python wheels on CI with minimal configuration." readme = "README.md" license = "BSD-2-Clause" +license-files = ["LICENSE"] requires-python = ">=3.11" authors = [ { name = "Joe Rickerby", email = "joerick@mac.com" }, @@ -25,7 +26,6 @@ keywords = [ classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", - "License :: OSI Approved :: BSD License", "Natural Language :: English", "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", @@ -102,7 +102,7 @@ addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"] junit_family = "xunit2" xfail_strict = true filterwarnings = ["error"] -log_cli_level = "info" +log_cli_level = "INFO" markers = [ "serial: tests that must *not* be run in parallel (deselect with '-m \"not serial\"')", ] From ef60c822df87f3a361002ad2b182cf4adc25da4c Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 3 Jun 2025 02:36:02 -0400 Subject: [PATCH 1080/1105] ci: fix gitlab Windows with --allow-downgrade Signed-off-by: Henry Schreiner --- .gitlab-ci.yml | 2 +- examples/gitlab-minimal.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ee98dd54..723400c62 100644 --- a/.gitlab-ci.yml +++ b/.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: diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index 030237dda..cefecd2d6 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -21,7 +21,7 @@ linux: windows: image: mcr.microsoft.com/windows/servercore:1809 before_script: - - choco install python -y --version 3.12.4 + - choco install python -y --allow-downgrade --version 3.12.4 - choco install git.install -y - py -m pip install cibuildwheel==3.0.0b4 script: From a76b6fc3389d0e1f98cb11e56df7e0f5f0ddcccb Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 3 Jun 2025 02:49:08 -0400 Subject: [PATCH 1081/1105] Bump version: v3.0.0b5 --- README.md | 45 +++++++++----------------- cibuildwheel/__init__.py | 2 +- docs/changelog.md | 14 +++++++- docs/faq.md | 6 ++-- examples/azure-pipelines-minimal.yml | 6 ++-- examples/circleci-minimal.yml | 6 ++-- examples/cirrus-ci-intel-mac.yml | 2 +- examples/cirrus-ci-minimal.yml | 2 +- examples/github-deploy.yml | 2 +- examples/github-minimal.yml | 2 +- examples/github-pipx.yml | 2 +- examples/github-with-qemu.yml | 2 +- examples/gitlab-minimal.yml | 6 ++-- examples/gitlab-with-qemu.yml | 2 +- examples/travis-ci-deploy.yml | 2 +- examples/travis-ci-minimal.yml | 2 +- examples/travis-ci-test-and-deploy.yml | 4 +-- pyproject.toml | 2 +- 18 files changed, 53 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index 56b098665..63044dedc 100644 --- a/README.md +++ b/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 @@ -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) - - + --- diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index e5b84fbcd..b6aac9a7f 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1 +1 @@ -__version__ = "3.0.0b4" +__version__ = "3.0.0b5" diff --git a/docs/changelog.md b/docs/changelog.md index 5a0c1777d..5032069cf 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -17,12 +17,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) diff --git a/docs/faq.md b/docs/faq.md index 5c92c02a3..55cd467cb 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -60,7 +60,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: pypa/cibuildwheel@v3.0.0b4 +uses: pypa/cibuildwheel@v3.0.0b5 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. @@ -82,7 +82,7 @@ The second option, and the only one that supports other CI systems, is using a ` ```bash # requirements-cibw.txt -cibuildwheel==3.0.0b4 +cibuildwheel==3.0.0b5 ``` Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this: @@ -247,7 +247,7 @@ Solutions to this vary, but the simplest is to use pipx: # most runners have pipx preinstalled, but in case you don't python3 -m pip install pipx -pipx run cibuildwheel==3.0.0b4 --output-dir wheelhouse +pipx run cibuildwheel==3.0.0b5 --output-dir wheelhouse pipx run twine upload wheelhouse/*.whl ``` diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index 786925848..3279da865 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -6,7 +6,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - pip3 install cibuildwheel==3.0.0b4 + pip3 install cibuildwheel==3.0.0b5 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -20,7 +20,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - python3 -m pip install cibuildwheel==3.0.0b4 + python3 -m pip install cibuildwheel==3.0.0b5 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -34,7 +34,7 @@ jobs: - bash: | set -o errexit python -m pip install --upgrade pip - pip install cibuildwheel==3.0.0b4 + pip install cibuildwheel==3.0.0b5 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index 46d7ca97f..d538b6244 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -11,7 +11,7 @@ jobs: - run: name: Build the Linux wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0b4 + python3 -m pip install --user cibuildwheel==3.0.0b5 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -28,7 +28,7 @@ jobs: - run: name: Build the Linux aarch64 wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0b4 + python3 -m pip install --user cibuildwheel==3.0.0b5 python3 -m cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -44,7 +44,7 @@ jobs: name: Build the OS X wheels. command: | sudo softwareupdate --install-rosetta --agree-to-license # for python<=3.8 or x86_64/universal2 tests - pip3 install cibuildwheel==3.0.0b4 + pip3 install cibuildwheel==3.0.0b5 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ diff --git a/examples/cirrus-ci-intel-mac.yml b/examples/cirrus-ci-intel-mac.yml index df5221d1d..4fae49cb0 100644 --- a/examples/cirrus-ci-intel-mac.yml +++ b/examples/cirrus-ci-intel-mac.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0b4 + - python -m pip install cibuildwheel==3.0.0b5 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index 4b476a5c5..74b2ccd5b 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0b4 + - python -m pip install cibuildwheel==3.0.0b5 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index 54d5160de..1e14c5196 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b4 + uses: pypa/cibuildwheel@v3.0.0b5 env: CIBW_PLATFORM: ${{ matrix.platform }} CIBW_ARCHS: ${{ matrix.archs }} diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index ddbb1fc26..f8e278105 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b4 + uses: pypa/cibuildwheel@v3.0.0b5 # env: # CIBW_SOME_OPTION: value # ... diff --git a/examples/github-pipx.yml b/examples/github-pipx.yml index 6f8c4e855..cd42ab514 100644 --- a/examples/github-pipx.yml +++ b/examples/github-pipx.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - run: pipx run cibuildwheel==3.0.0b4 + run: pipx run cibuildwheel==3.0.0b5 - uses: actions/upload-artifact@v4 with: diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index e1308d701..df679b068 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -21,7 +21,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b4 + uses: pypa/cibuildwheel@v3.0.0b5 env: # configure cibuildwheel on Linux to build native archs ('auto'), # and to split the remaining architectures between the x86_64 and diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index cefecd2d6..b05096ace 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -12,7 +12,7 @@ linux: DOCKER_TLS_CERTDIR: "" script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==3.0.0b4 + - python -m pip install cibuildwheel==3.0.0b5 - cibuildwheel --output-dir wheelhouse artifacts: paths: @@ -23,7 +23,7 @@ windows: before_script: - choco install python -y --allow-downgrade --version 3.12.4 - choco install git.install -y - - py -m pip install cibuildwheel==3.0.0b4 + - py -m pip install cibuildwheel==3.0.0b5 script: - py -m cibuildwheel --output-dir wheelhouse --platform windows artifacts: @@ -35,7 +35,7 @@ windows: macos: image: macos-14-xcode-15 before_script: - - python3 -m pip install cibuildwheel==3.0.0b4 + - python3 -m pip install cibuildwheel==3.0.0b5 script: - python3 -m cibuildwheel --output-dir wheelhouse artifacts: diff --git a/examples/gitlab-with-qemu.yml b/examples/gitlab-with-qemu.yml index 48e968046..3f0a64d49 100644 --- a/examples/gitlab-with-qemu.yml +++ b/examples/gitlab-with-qemu.yml @@ -14,7 +14,7 @@ linux: - curl -sSL https://get.docker.com/ | sh # Warning: This is extremely slow, be careful with how many wheels you build - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - python -m pip install cibuildwheel==3.0.0b4 + - python -m pip install cibuildwheel==3.0.0b5 # Assuming your CI runner's default architecture is x86_64... - cibuildwheel --output-dir wheelhouse --platform linux --archs aarch64 artifacts: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index 6d382c7ea..ddb4a3ea2 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -20,7 +20,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0b4 + - python3 -m pip install cibuildwheel==3.0.0b5 script: # build the wheels, put them into './dist' diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index 164751168..950454a3f 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -26,7 +26,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0b4 + - python3 -m pip install cibuildwheel==3.0.0b5 script: # build the wheels, put them into './wheelhouse' diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index 2498adef5..ceb711ab2 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -52,7 +52,7 @@ jobs: - stage: deploy name: Build and deploy Linux wheels services: docker - install: python3 -m pip install cibuildwheel==3.0.0b4 twine + install: python3 -m pip install cibuildwheel==3.0.0b5 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl # Deploy on windows @@ -60,7 +60,7 @@ jobs: name: Build and deploy Windows wheels os: windows language: shell - install: python3 -m pip install cibuildwheel==3.0.0b4 twine + install: python3 -m pip install cibuildwheel==3.0.0b5 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl diff --git a/pyproject.toml b/pyproject.toml index de326f087..e6b31ad7e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "cibuildwheel" -version = "3.0.0b4" +version = "3.0.0b5" description = "Build Python wheels on CI with minimal configuration." readme = "README.md" license = "BSD-2-Clause" From 4e8d0757df94536205a0759b683aa9e30e26cfc5 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 3 Jun 2025 17:34:22 -0400 Subject: [PATCH 1082/1105] chore: touch up release script (#2442) Signed-off-by: Henry Schreiner --- .pre-commit-config.yaml | 1 - bin/bump_version.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 896ae38ec..187531216 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -35,7 +35,6 @@ repos: - pygithub - pytest - rich - - tomli - tomli_w - types-certifi - types-click diff --git a/bin/bump_version.py b/bin/bump_version.py index 452dfa066..af2d7ae32 100755 --- a/bin/bump_version.py +++ b/bin/bump_version.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # /// script -# dependencies = ["click", "packaging", "tomli; python_version<'3.11'"] +# dependencies = ["click", "packaging"] # /// @@ -129,8 +129,8 @@ def bump_version() -> None: contents = contents.replace(find, replace) path.write_text(contents, encoding="utf8") - print("Files updated. If you want to update the changelog as part of this") - print("commit, do that now.") + print("Files updated. If you want to update docs/changelog.md as part of") + print("this commit, do that now.") print() while input('Type "done" to continue: ').strip().lower() != "done": From b5c33b7a092835ea3343750cbec3bf09d421a045 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 4 Jun 2025 22:20:54 +0000 Subject: [PATCH 1083/1105] Docs fixes (#2446) --- docs/options.md | 1 + docs/theme_overrides/js/theme.js | 15 +++++++++++++++ mkdocs.yml | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/docs/options.md b/docs/options.md index 67439176f..bf239856f 100644 --- a/docs/options.md +++ b/docs/options.md @@ -1791,6 +1791,7 @@ Some options support placeholders, like `{project}`, `{package}` or `{wheel}`, t padding-left: 10px; padding-right: 10px; line-height: normal; + overflow: visible; } .rst-content h3 .badges code.cmd-line:before, .rst-content h3 .badges code.toml:before, .rst-content h3 .badges code.env-var:before { content: ' '; diff --git a/docs/theme_overrides/js/theme.js b/docs/theme_overrides/js/theme.js index 4ccbe61de..f87c9f266 100644 --- a/docs/theme_overrides/js/theme.js +++ b/docs/theme_overrides/js/theme.js @@ -126,6 +126,21 @@ function ThemeNav () { }); link.prepend(expand); }); + + // EDIT by joerick + // + // workaround a bug with the site in safari. safari navigates to the + // anchor before the above code has run, specifically wrap with + // .wy-table-responsive activates css rules that change the size of + // tables, making anchor points move around. + console.log('Document ready, checking for anchor in URL'); + const anchorEl = document.querySelector(window.location.hash); + anchorEl.getBoundingClientRect(); // Force layout to ensure scrollIntoView works correctly + if (anchorEl) { + console.log('Anchor element:', anchorEl); + anchorEl.scrollIntoView({ behavior: 'instant', block: 'start' }); + } + // end edit by joerick }; nav.reset = function () { diff --git a/mkdocs.yml b/mkdocs.yml index b434ca1a1..2f38025b5 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -27,9 +27,9 @@ nav: - faq.md - cpp_standards.md - Reference: - - platforms.md - - configuration.md - options.md + - configuration.md + - platforms.md - working-examples.md - About: - contributing.md From 7601bfcb45be4fcda3c61d8ec571442a0631004f Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Wed, 4 Jun 2025 18:21:09 -0400 Subject: [PATCH 1084/1105] [Bot] Update dependencies (#2443) --- cibuildwheel/resources/build-platforms.toml | 30 ++--- .../resources/constraints-pyodide312.txt | 4 +- .../resources/constraints-pyodide313.txt | 116 ++++++++++++++++++ .../resources/constraints-python310.txt | 2 +- .../resources/constraints-python311.txt | 2 +- .../resources/constraints-python312.txt | 2 +- .../resources/constraints-python313.txt | 2 +- .../resources/constraints-python314.txt | 2 +- .../resources/constraints-python39.txt | 2 +- cibuildwheel/resources/constraints.txt | 2 +- .../resources/pinned_docker_images.cfg | 54 ++++---- .../python-build-standalone-releases.json | 32 ++--- docs/working-examples.md | 4 +- 13 files changed, 185 insertions(+), 69 deletions(-) create mode 100644 cibuildwheel/resources/constraints-pyodide313.txt diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index 0102ff5e7..e018fe4d5 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -159,12 +159,12 @@ python_configurations = [ { identifier = "cp312-macosx_x86_64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.10/python-3.12.10-macos11.pkg" }, { identifier = "cp312-macosx_arm64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.10/python-3.12.10-macos11.pkg" }, { identifier = "cp312-macosx_universal2", version = "3.12", url = "https://www.python.org/ftp/python/3.12.10/python-3.12.10-macos11.pkg" }, - { identifier = "cp313-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, - { identifier = "cp313-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, - { identifier = "cp313-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, - { identifier = "cp313t-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, - { identifier = "cp313t-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, - { identifier = "cp313t-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" }, + { identifier = "cp313-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.4/python-3.13.4-macos11.pkg" }, + { identifier = "cp313-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.4/python-3.13.4-macos11.pkg" }, + { identifier = "cp313-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.4/python-3.13.4-macos11.pkg" }, + { identifier = "cp313t-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.4/python-3.13.4-macos11.pkg" }, + { identifier = "cp313t-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.4/python-3.13.4-macos11.pkg" }, + { identifier = "cp313t-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.4/python-3.13.4-macos11.pkg" }, { identifier = "cp314-macosx_x86_64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" }, { identifier = "cp314-macosx_arm64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" }, { identifier = "cp314-macosx_universal2", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" }, @@ -195,10 +195,10 @@ python_configurations = [ { identifier = "cp311-win_amd64", version = "3.11.9", arch = "64" }, { identifier = "cp312-win32", version = "3.12.10", arch = "32" }, { identifier = "cp312-win_amd64", version = "3.12.10", arch = "64" }, - { identifier = "cp313-win32", version = "3.13.3", arch = "32" }, - { identifier = "cp313t-win32", version = "3.13.3", arch = "32" }, - { identifier = "cp313-win_amd64", version = "3.13.3", arch = "64" }, - { identifier = "cp313t-win_amd64", version = "3.13.3", arch = "64" }, + { identifier = "cp313-win32", version = "3.13.4", arch = "32" }, + { identifier = "cp313t-win32", version = "3.13.4", arch = "32" }, + { identifier = "cp313-win_amd64", version = "3.13.4", arch = "64" }, + { identifier = "cp313t-win_amd64", version = "3.13.4", arch = "64" }, { identifier = "cp314-win32", version = "3.14.0-b2", arch = "32" }, { identifier = "cp314t-win32", version = "3.14.0-b2", arch = "32" }, { identifier = "cp314-win_amd64", version = "3.14.0-b2", arch = "64" }, @@ -207,8 +207,8 @@ python_configurations = [ { 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.10", arch = "ARM64" }, - { identifier = "cp313-win_arm64", version = "3.13.3", arch = "ARM64" }, - { identifier = "cp313t-win_arm64", version = "3.13.3", arch = "ARM64" }, + { identifier = "cp313-win_arm64", version = "3.13.4", arch = "ARM64" }, + { identifier = "cp313t-win_arm64", version = "3.13.4", arch = "ARM64" }, { identifier = "cp314-win_arm64", version = "3.14.0-b2", arch = "ARM64" }, { identifier = "cp314t-win_arm64", version = "3.14.0-b2", arch = "ARM64" }, { identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.11-win64.zip" }, @@ -226,7 +226,7 @@ python_configurations = [ [ios] python_configurations = [ - { identifier = "cp313-ios_arm64_iphoneos", version = "3.13", url = "https://github.com/beeware/Python-Apple-support/releases/download/3.13-b6/Python-3.13-iOS-support.b6.tar.gz" }, - { identifier = "cp313-ios_x86_64_iphonesimulator", version = "3.13", url = "https://github.com/beeware/Python-Apple-support/releases/download/3.13-b6/Python-3.13-iOS-support.b6.tar.gz" }, - { identifier = "cp313-ios_arm64_iphonesimulator", version = "3.13", url = "https://github.com/beeware/Python-Apple-support/releases/download/3.13-b6/Python-3.13-iOS-support.b6.tar.gz" }, + { identifier = "cp313-ios_arm64_iphoneos", version = "3.13", url = "https://github.com/beeware/Python-Apple-support/releases/download/3.13-b8/Python-3.13-iOS-support.b8.tar.gz" }, + { identifier = "cp313-ios_x86_64_iphonesimulator", version = "3.13", url = "https://github.com/beeware/Python-Apple-support/releases/download/3.13-b8/Python-3.13-iOS-support.b8.tar.gz" }, + { identifier = "cp313-ios_arm64_iphonesimulator", version = "3.13", url = "https://github.com/beeware/Python-Apple-support/releases/download/3.13-b8/Python-3.13-iOS-support.b8.tar.gz" }, ] diff --git a/cibuildwheel/resources/constraints-pyodide312.txt b/cibuildwheel/resources/constraints-pyodide312.txt index 0fdd13116..959e3c756 100644 --- a/cibuildwheel/resources/constraints-pyodide312.txt +++ b/cibuildwheel/resources/constraints-pyodide312.txt @@ -62,7 +62,7 @@ pydantic-core==2.33.2 # via pydantic pygments==2.19.1 # via rich -pyodide-build==0.30.4 +pyodide-build==0.30.5 # via -r .nox/update_constraints/tmp/constraints-pyodide.in pyodide-cli==0.3.0 # via @@ -94,7 +94,7 @@ typer==0.16.0 # auditwheel-emscripten # pyodide-build # pyodide-cli -typing-extensions==4.13.2 +typing-extensions==4.14.0 # via # anyio # pydantic diff --git a/cibuildwheel/resources/constraints-pyodide313.txt b/cibuildwheel/resources/constraints-pyodide313.txt new file mode 100644 index 000000000..10d9b1641 --- /dev/null +++ b/cibuildwheel/resources/constraints-pyodide313.txt @@ -0,0 +1,116 @@ +# This file was autogenerated by uv via the following command: +# nox -s update_constraints +annotated-types==0.7.0 + # via pydantic +anyio==4.9.0 + # via httpx +auditwheel-emscripten==0.1.0 + # via pyodide-build +build==1.2.2.post1 + # via + # -r .nox/update_constraints/tmp/constraints-pyodide.in + # pyodide-build +certifi==2025.4.26 + # via + # httpcore + # httpx + # requests +charset-normalizer==3.4.2 + # via requests +click==8.1.8 + # via + # -r .nox/update_constraints/tmp/constraints-pyodide.in + # typer +distlib==0.3.9 + # via virtualenv +filelock==3.18.0 + # via virtualenv +h11==0.16.0 + # via httpcore +httpcore==1.0.9 + # via httpx +httpx==0.28.1 + # via unearth +idna==3.10 + # via + # anyio + # httpx + # requests +leb128==1.0.8 + # via auditwheel-emscripten +markdown-it-py==3.0.0 + # via rich +mdurl==0.1.2 + # via markdown-it-py +packaging==25.0 + # via + # auditwheel-emscripten + # build + # pyodide-build + # unearth +pip==25.1.1 + # via -r .nox/update_constraints/tmp/constraints-pyodide.in +platformdirs==4.3.8 + # via + # pyodide-build + # virtualenv +pydantic==2.11.5 + # via + # pyodide-build + # pyodide-lock +pydantic-core==2.33.2 + # via pydantic +pygments==2.19.1 + # via rich +pyodide-build==0.30.5 + # via -r .nox/update_constraints/tmp/constraints-pyodide.in +pyodide-cli==0.3.0 + # via + # auditwheel-emscripten + # pyodide-build +pyodide-lock==0.1.0a7 + # via pyodide-build +pyproject-hooks==1.2.0 + # via build +requests==2.32.3 + # via pyodide-build +resolvelib==1.1.0 + # via pyodide-build +rich==14.0.0 + # via + # pyodide-build + # pyodide-cli + # typer +ruamel-yaml==0.18.12 + # via pyodide-build +ruamel-yaml-clib==0.2.12 + # via ruamel-yaml +shellingham==1.5.4 + # via typer +sniffio==1.3.1 + # via anyio +typer==0.16.0 + # via + # auditwheel-emscripten + # pyodide-build + # pyodide-cli +typing-extensions==4.14.0 + # via + # pydantic + # pydantic-core + # typer + # typing-inspection +typing-inspection==0.4.1 + # via pydantic +unearth==0.17.5 + # via pyodide-build +urllib3==2.4.0 + # via requests +virtualenv==20.31.2 + # via + # build + # pyodide-build +wheel==0.45.1 + # via + # auditwheel-emscripten + # pyodide-build diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index 0a4aff319..4a4a7ebac 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -26,7 +26,7 @@ pyproject-hooks==1.2.0 # via build tomli==2.2.1 # via build -typing-extensions==4.13.2 +typing-extensions==4.14.0 # via delocate virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python311.txt b/cibuildwheel/resources/constraints-python311.txt index 0cff478d6..4f0b01819 100644 --- a/cibuildwheel/resources/constraints-python311.txt +++ b/cibuildwheel/resources/constraints-python311.txt @@ -22,7 +22,7 @@ platformdirs==4.3.8 # via virtualenv pyproject-hooks==1.2.0 # via build -typing-extensions==4.13.2 +typing-extensions==4.14.0 # via delocate virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python312.txt b/cibuildwheel/resources/constraints-python312.txt index 0cff478d6..4f0b01819 100644 --- a/cibuildwheel/resources/constraints-python312.txt +++ b/cibuildwheel/resources/constraints-python312.txt @@ -22,7 +22,7 @@ platformdirs==4.3.8 # via virtualenv pyproject-hooks==1.2.0 # via build -typing-extensions==4.13.2 +typing-extensions==4.14.0 # via delocate virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python313.txt b/cibuildwheel/resources/constraints-python313.txt index 0cff478d6..4f0b01819 100644 --- a/cibuildwheel/resources/constraints-python313.txt +++ b/cibuildwheel/resources/constraints-python313.txt @@ -22,7 +22,7 @@ platformdirs==4.3.8 # via virtualenv pyproject-hooks==1.2.0 # via build -typing-extensions==4.13.2 +typing-extensions==4.14.0 # via delocate virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python314.txt b/cibuildwheel/resources/constraints-python314.txt index 0cff478d6..4f0b01819 100644 --- a/cibuildwheel/resources/constraints-python314.txt +++ b/cibuildwheel/resources/constraints-python314.txt @@ -22,7 +22,7 @@ platformdirs==4.3.8 # via virtualenv pyproject-hooks==1.2.0 # via build -typing-extensions==4.13.2 +typing-extensions==4.14.0 # via delocate virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index 0a4aff319..4a4a7ebac 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -26,7 +26,7 @@ pyproject-hooks==1.2.0 # via build tomli==2.2.1 # via build -typing-extensions==4.13.2 +typing-extensions==4.14.0 # via delocate virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index 0cff478d6..4f0b01819 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -22,7 +22,7 @@ platformdirs==4.3.8 # via virtualenv pyproject-hooks==1.2.0 # via build -typing-extensions==4.13.2 +typing-extensions==4.14.0 # via delocate virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 3ba9d5b39..158f7a581 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,47 +1,47 @@ [x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.31-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.28-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.31-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.05.31-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.06.04-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.06.04-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.06.04-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.06.04-1 [i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.31-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.05.31-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.06.04-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.06.04-1 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.31-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.28-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.31-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.05.31-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.06.04-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.06.04-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.06.04-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.06.04-1 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.05.31-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.05.28-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.05.31-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.05.31-1 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.06.04-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.06.04-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.06.04-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.06.04-1 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.05.31-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.05.28-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.05.31-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.05.31-1 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.06.04-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.06.04-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.06.04-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.06.04-1 [pypy_x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.31-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.28-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.31-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.06.04-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.06.04-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.06.04-1 [pypy_i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.31-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.06.04-1 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.31-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.28-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.31-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.06.04-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.06.04-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.06.04-1 [armv7l] -manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.05.31-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.05.31-1 +manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.06.04-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.06.04-1 [riscv64] diff --git a/cibuildwheel/resources/python-build-standalone-releases.json b/cibuildwheel/resources/python-build-standalone-releases.json index 82f072fc2..da67af223 100644 --- a/cibuildwheel/resources/python-build-standalone-releases.json +++ b/cibuildwheel/resources/python-build-standalone-releases.json @@ -3,14 +3,14 @@ { "tag": "20250529", "assets": [ - { - "name": "cpython-3.10.17+20250529-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-aarch64-unknown-linux-gnu-install_only.tar.gz" - }, { "name": "cpython-3.10.17+20250529-aarch64-apple-darwin-install_only.tar.gz", "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-aarch64-apple-darwin-install_only.tar.gz" }, + { + "name": "cpython-3.10.17+20250529-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-aarch64-unknown-linux-gnu-install_only.tar.gz" + }, { "name": "cpython-3.10.17+20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz", "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz" @@ -167,10 +167,22 @@ "name": "cpython-3.12.10+20250529-i686-pc-windows-msvc-install_only.tar.gz", "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-i686-pc-windows-msvc-install_only.tar.gz" }, + { + "name": "cpython-3.12.10+20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz" + }, { "name": "cpython-3.12.10+20250529-riscv64-unknown-linux-gnu-install_only.tar.gz", "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-riscv64-unknown-linux-gnu-install_only.tar.gz" }, + { + "name": "cpython-3.12.10+20250529-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-s390x-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.12.10+20250529-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64-apple-darwin-install_only.tar.gz" + }, { "name": "cpython-3.12.10+20250529-x86_64-pc-windows-msvc-install_only.tar.gz", "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64-pc-windows-msvc-install_only.tar.gz" @@ -335,18 +347,10 @@ "name": "cpython-3.14.0a7+20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz", "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, - { - "name": "cpython-3.12.10+20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz" - }, { "name": "cpython-3.14.0a7+20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, - { - "name": "cpython-3.12.10+20250529-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-s390x-unknown-linux-gnu-install_only.tar.gz" - }, { "name": "cpython-3.14.0a7+20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz", "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz" @@ -355,10 +359,6 @@ "name": "cpython-3.14.0a7+20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, - { - "name": "cpython-3.12.10+20250529-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64-apple-darwin-install_only.tar.gz" - }, { "name": "cpython-3.14.0a7+20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz", "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz" diff --git a/docs/working-examples.md b/docs/working-examples.md index 0eba8f54f..7277db74d 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -99,8 +99,8 @@ title: Working examples | [boost-histogram][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. | | [Imagecodecs (fork)][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. | | [Python-WebRTC][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | a Python extension that provides bindings to WebRTC M92 | -| [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 | | [fathon][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms | +| [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 | | [Arbor][] | ![github icon][] | ![apple icon][] ![linux icon][] | Arbor is a multi-compartment neuron simulation library; compatible with next-generation accelerators; best-practices applied to research software; focused on community-driven development. Includes a [small script](https://github.com/arbor-sim/arbor/blob/master/scripts/patchwheel.py) patching `rpath` in bundled libraries. | | [clang-format][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. | | [polaroid][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. | @@ -209,8 +209,8 @@ title: Working examples [boost-histogram]: https://github.com/scikit-hep/boost-histogram [Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build [Python-WebRTC]: https://github.com/MarshalX/python-webrtc -[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example [fathon]: https://github.com/stfbnc/fathon +[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example [Arbor]: https://github.com/arbor-sim/arbor [clang-format]: https://github.com/ssciwr/clang-format-wheel [polaroid]: https://github.com/daggy1234/polaroid From 31f536bdf347750243cca094ffc12035161d2108 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Thu, 5 Jun 2025 11:39:19 +0000 Subject: [PATCH 1085/1105] Bump version: v3.0.0rc1 --- README.md | 17 ++++++++--------- cibuildwheel/__init__.py | 2 +- docs/changelog.md | 6 ++++++ docs/faq.md | 6 +++--- examples/azure-pipelines-minimal.yml | 6 +++--- examples/circleci-minimal.yml | 6 +++--- examples/cirrus-ci-intel-mac.yml | 2 +- examples/cirrus-ci-minimal.yml | 2 +- examples/github-deploy.yml | 2 +- examples/github-minimal.yml | 2 +- examples/github-pipx.yml | 2 +- examples/github-with-qemu.yml | 2 +- examples/gitlab-minimal.yml | 6 +++--- examples/gitlab-with-qemu.yml | 2 +- examples/travis-ci-deploy.yml | 2 +- examples/travis-ci-minimal.yml | 2 +- examples/travis-ci-test-and-deploy.yml | 4 ++-- pyproject.toml | 2 +- 18 files changed, 39 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 63044dedc..142a90d00 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ jobs: - uses: actions/setup-python@v5 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==3.0.0b5 + run: python -m pip install cibuildwheel==3.0.0rc1 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -242,6 +242,12 @@ If you've used previous versions of the beta: - ⚠️ 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.0rc1 + +_5 June 2025_ + +- 🛠 Updates to dependencies including CPython 3.13.4, pyodide-build and iOS support package. (#2443) + #### v3.0.0b5 _3 June 2025_ @@ -268,14 +274,7 @@ _28 May 2025_ - 🛠 Reverts the test working dir (when test-sources isn't set) to a temporary dir, rather than the project. (#2420) - 📚 Docs now primarily use the pyproject.toml name of options, rather than the environment variable name. (#2389) -#### v3.0.0b2 - -_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) - - + --- diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index b6aac9a7f..451cd1fa2 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1 +1 @@ -__version__ = "3.0.0b5" +__version__ = "3.0.0rc1" diff --git a/docs/changelog.md b/docs/changelog.md index 5032069cf..2a17e5d57 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -19,6 +19,12 @@ If you've used previous versions of the beta: - ⚠️ 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.0rc1 + +_5 June 2025_ + +- 🛠 Updates to dependencies including CPython 3.13.4, pyodide-build and iOS support package. (#2443) + #### v3.0.0b5 _3 June 2025_ diff --git a/docs/faq.md b/docs/faq.md index 55cd467cb..75a4480ca 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -60,7 +60,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: pypa/cibuildwheel@v3.0.0b5 +uses: pypa/cibuildwheel@v3.0.0rc1 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. @@ -82,7 +82,7 @@ The second option, and the only one that supports other CI systems, is using a ` ```bash # requirements-cibw.txt -cibuildwheel==3.0.0b5 +cibuildwheel==3.0.0rc1 ``` Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this: @@ -247,7 +247,7 @@ Solutions to this vary, but the simplest is to use pipx: # most runners have pipx preinstalled, but in case you don't python3 -m pip install pipx -pipx run cibuildwheel==3.0.0b5 --output-dir wheelhouse +pipx run cibuildwheel==3.0.0rc1 --output-dir wheelhouse pipx run twine upload wheelhouse/*.whl ``` diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index 3279da865..e7ce192d6 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -6,7 +6,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - pip3 install cibuildwheel==3.0.0b5 + pip3 install cibuildwheel==3.0.0rc1 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -20,7 +20,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - python3 -m pip install cibuildwheel==3.0.0b5 + python3 -m pip install cibuildwheel==3.0.0rc1 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -34,7 +34,7 @@ jobs: - bash: | set -o errexit python -m pip install --upgrade pip - pip install cibuildwheel==3.0.0b5 + pip install cibuildwheel==3.0.0rc1 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index d538b6244..c281732e0 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -11,7 +11,7 @@ jobs: - run: name: Build the Linux wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0b5 + python3 -m pip install --user cibuildwheel==3.0.0rc1 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -28,7 +28,7 @@ jobs: - run: name: Build the Linux aarch64 wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0b5 + python3 -m pip install --user cibuildwheel==3.0.0rc1 python3 -m cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -44,7 +44,7 @@ jobs: name: Build the OS X wheels. command: | sudo softwareupdate --install-rosetta --agree-to-license # for python<=3.8 or x86_64/universal2 tests - pip3 install cibuildwheel==3.0.0b5 + pip3 install cibuildwheel==3.0.0rc1 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ diff --git a/examples/cirrus-ci-intel-mac.yml b/examples/cirrus-ci-intel-mac.yml index 4fae49cb0..b3e0a98c1 100644 --- a/examples/cirrus-ci-intel-mac.yml +++ b/examples/cirrus-ci-intel-mac.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0b5 + - python -m pip install cibuildwheel==3.0.0rc1 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index 74b2ccd5b..09ec6af36 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0b5 + - python -m pip install cibuildwheel==3.0.0rc1 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index 1e14c5196..6af80f3d6 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b5 + uses: pypa/cibuildwheel@v3.0.0rc1 env: CIBW_PLATFORM: ${{ matrix.platform }} CIBW_ARCHS: ${{ matrix.archs }} diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index f8e278105..576e07f7c 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b5 + uses: pypa/cibuildwheel@v3.0.0rc1 # env: # CIBW_SOME_OPTION: value # ... diff --git a/examples/github-pipx.yml b/examples/github-pipx.yml index cd42ab514..f8d932b44 100644 --- a/examples/github-pipx.yml +++ b/examples/github-pipx.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - run: pipx run cibuildwheel==3.0.0b5 + run: pipx run cibuildwheel==3.0.0rc1 - uses: actions/upload-artifact@v4 with: diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index df679b068..ea6e84237 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -21,7 +21,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0b5 + uses: pypa/cibuildwheel@v3.0.0rc1 env: # configure cibuildwheel on Linux to build native archs ('auto'), # and to split the remaining architectures between the x86_64 and diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index b05096ace..de2e547a6 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -12,7 +12,7 @@ linux: DOCKER_TLS_CERTDIR: "" script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==3.0.0b5 + - python -m pip install cibuildwheel==3.0.0rc1 - cibuildwheel --output-dir wheelhouse artifacts: paths: @@ -23,7 +23,7 @@ windows: before_script: - choco install python -y --allow-downgrade --version 3.12.4 - choco install git.install -y - - py -m pip install cibuildwheel==3.0.0b5 + - py -m pip install cibuildwheel==3.0.0rc1 script: - py -m cibuildwheel --output-dir wheelhouse --platform windows artifacts: @@ -35,7 +35,7 @@ windows: macos: image: macos-14-xcode-15 before_script: - - python3 -m pip install cibuildwheel==3.0.0b5 + - python3 -m pip install cibuildwheel==3.0.0rc1 script: - python3 -m cibuildwheel --output-dir wheelhouse artifacts: diff --git a/examples/gitlab-with-qemu.yml b/examples/gitlab-with-qemu.yml index 3f0a64d49..b53937e5a 100644 --- a/examples/gitlab-with-qemu.yml +++ b/examples/gitlab-with-qemu.yml @@ -14,7 +14,7 @@ linux: - curl -sSL https://get.docker.com/ | sh # Warning: This is extremely slow, be careful with how many wheels you build - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - python -m pip install cibuildwheel==3.0.0b5 + - python -m pip install cibuildwheel==3.0.0rc1 # Assuming your CI runner's default architecture is x86_64... - cibuildwheel --output-dir wheelhouse --platform linux --archs aarch64 artifacts: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index ddb4a3ea2..eca854347 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -20,7 +20,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0b5 + - python3 -m pip install cibuildwheel==3.0.0rc1 script: # build the wheels, put them into './dist' diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index 950454a3f..bc861bb55 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -26,7 +26,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0b5 + - python3 -m pip install cibuildwheel==3.0.0rc1 script: # build the wheels, put them into './wheelhouse' diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index ceb711ab2..810746e94 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -52,7 +52,7 @@ jobs: - stage: deploy name: Build and deploy Linux wheels services: docker - install: python3 -m pip install cibuildwheel==3.0.0b5 twine + install: python3 -m pip install cibuildwheel==3.0.0rc1 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl # Deploy on windows @@ -60,7 +60,7 @@ jobs: name: Build and deploy Windows wheels os: windows language: shell - install: python3 -m pip install cibuildwheel==3.0.0b5 twine + install: python3 -m pip install cibuildwheel==3.0.0rc1 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl diff --git a/pyproject.toml b/pyproject.toml index e6b31ad7e..a0df356fa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "cibuildwheel" -version = "3.0.0b5" +version = "3.0.0rc1" description = "Build Python wheels on CI with minimal configuration." readme = "README.md" license = "BSD-2-Clause" From 70c6aba90165dc247b95d228d2498b5b1ed18250 Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Fri, 6 Jun 2025 00:00:58 -0400 Subject: [PATCH 1086/1105] [Bot] Update dependencies (#2449) Update dependencies Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> --- cibuildwheel/resources/build-platforms.toml | 8 +- .../python-build-standalone-releases.json | 434 +++++++++--------- 2 files changed, 221 insertions(+), 221 deletions(-) diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index e018fe4d5..1b28c4dcd 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -220,13 +220,13 @@ python_configurations = [ [pyodide] python_configurations = [ - { identifier = "cp312-pyodide_wasm32", version = "3.12", default_pyodide_version = "0.27.6", node_version = "v22" }, + { identifier = "cp312-pyodide_wasm32", version = "3.12", default_pyodide_version = "0.27.7", node_version = "v22" }, { identifier = "cp313-pyodide_wasm32", version = "3.13", default_pyodide_version = "0.28.0a3", node_version = "v22" }, ] [ios] python_configurations = [ - { identifier = "cp313-ios_arm64_iphoneos", version = "3.13", url = "https://github.com/beeware/Python-Apple-support/releases/download/3.13-b8/Python-3.13-iOS-support.b8.tar.gz" }, - { identifier = "cp313-ios_x86_64_iphonesimulator", version = "3.13", url = "https://github.com/beeware/Python-Apple-support/releases/download/3.13-b8/Python-3.13-iOS-support.b8.tar.gz" }, - { identifier = "cp313-ios_arm64_iphonesimulator", version = "3.13", url = "https://github.com/beeware/Python-Apple-support/releases/download/3.13-b8/Python-3.13-iOS-support.b8.tar.gz" }, + { identifier = "cp313-ios_arm64_iphoneos", version = "3.13", url = "https://github.com/beeware/Python-Apple-support/releases/download/3.13-b9/Python-3.13-iOS-support.b9.tar.gz" }, + { identifier = "cp313-ios_x86_64_iphonesimulator", version = "3.13", url = "https://github.com/beeware/Python-Apple-support/releases/download/3.13-b9/Python-3.13-iOS-support.b9.tar.gz" }, + { identifier = "cp313-ios_arm64_iphonesimulator", version = "3.13", url = "https://github.com/beeware/Python-Apple-support/releases/download/3.13-b9/Python-3.13-iOS-support.b9.tar.gz" }, ] diff --git a/cibuildwheel/resources/python-build-standalone-releases.json b/cibuildwheel/resources/python-build-standalone-releases.json index da67af223..89acf8404 100644 --- a/cibuildwheel/resources/python-build-standalone-releases.json +++ b/cibuildwheel/resources/python-build-standalone-releases.json @@ -1,439 +1,439 @@ { "releases": [ { - "tag": "20250529", + "tag": "20250604", "assets": [ { - "name": "cpython-3.10.17+20250529-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.17+20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.10.17%2B20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.12+20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.11.12%2B20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.10+20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.12.10%2B20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.3+20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.13.3%2B20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0a7+20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.14.0a7%2B20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.22+20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250529/cpython-3.9.22%2B20250529-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" } ] } From 2edf5784998b7b1ab70445baced23069e839541e Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 6 Jun 2025 00:05:23 -0400 Subject: [PATCH 1087/1105] Bump version: v3.0.0rc2 --- README.md | 17 ++++++++--------- cibuildwheel/__init__.py | 2 +- docs/changelog.md | 6 ++++++ docs/faq.md | 6 +++--- examples/azure-pipelines-minimal.yml | 6 +++--- examples/circleci-minimal.yml | 6 +++--- examples/cirrus-ci-intel-mac.yml | 2 +- examples/cirrus-ci-minimal.yml | 2 +- examples/github-deploy.yml | 2 +- examples/github-minimal.yml | 2 +- examples/github-pipx.yml | 2 +- examples/github-with-qemu.yml | 2 +- examples/gitlab-minimal.yml | 6 +++--- examples/gitlab-with-qemu.yml | 2 +- examples/travis-ci-deploy.yml | 2 +- examples/travis-ci-minimal.yml | 2 +- examples/travis-ci-test-and-deploy.yml | 4 ++-- pyproject.toml | 2 +- 18 files changed, 39 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 142a90d00..7a1f49880 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ jobs: - uses: actions/setup-python@v5 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==3.0.0rc1 + run: python -m pip install cibuildwheel==3.0.0rc2 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -242,6 +242,12 @@ If you've used previous versions of the beta: - ⚠️ 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.0rc2 + +_6 June 2025_ + +- 🛠 Updates to dependencies including Pyodide, python-build-standalone, and iOS support package. (#2449) + #### v3.0.0rc1 _5 June 2025_ @@ -267,14 +273,7 @@ _29 May 2025_ - 🛠 Remove the addition of `PYTHONSAFEPATH` to `test-environment`. (#2429) - 📚 README table now matches docs and auto-updates. (#2427, #2428) -#### v3.0.0b3 - -_28 May 2025_ - -- 🛠 Reverts the test working dir (when test-sources isn't set) to a temporary dir, rather than the project. (#2420) -- 📚 Docs now primarily use the pyproject.toml name of options, rather than the environment variable name. (#2389) - - + --- diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index 451cd1fa2..f7bbf541c 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1 +1 @@ -__version__ = "3.0.0rc1" +__version__ = "3.0.0rc2" diff --git a/docs/changelog.md b/docs/changelog.md index 2a17e5d57..a6e09fb7c 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -19,6 +19,12 @@ If you've used previous versions of the beta: - ⚠️ 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.0rc2 + +_6 June 2025_ + +- 🛠 Updates to dependencies including Pyodide, python-build-standalone, and iOS support package. (#2449) + #### v3.0.0rc1 _5 June 2025_ diff --git a/docs/faq.md b/docs/faq.md index 75a4480ca..c76a90d72 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -60,7 +60,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: pypa/cibuildwheel@v3.0.0rc1 +uses: pypa/cibuildwheel@v3.0.0rc2 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. @@ -82,7 +82,7 @@ The second option, and the only one that supports other CI systems, is using a ` ```bash # requirements-cibw.txt -cibuildwheel==3.0.0rc1 +cibuildwheel==3.0.0rc2 ``` Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this: @@ -247,7 +247,7 @@ Solutions to this vary, but the simplest is to use pipx: # most runners have pipx preinstalled, but in case you don't python3 -m pip install pipx -pipx run cibuildwheel==3.0.0rc1 --output-dir wheelhouse +pipx run cibuildwheel==3.0.0rc2 --output-dir wheelhouse pipx run twine upload wheelhouse/*.whl ``` diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index e7ce192d6..707b857e9 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -6,7 +6,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - pip3 install cibuildwheel==3.0.0rc1 + pip3 install cibuildwheel==3.0.0rc2 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -20,7 +20,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - python3 -m pip install cibuildwheel==3.0.0rc1 + python3 -m pip install cibuildwheel==3.0.0rc2 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -34,7 +34,7 @@ jobs: - bash: | set -o errexit python -m pip install --upgrade pip - pip install cibuildwheel==3.0.0rc1 + pip install cibuildwheel==3.0.0rc2 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index c281732e0..118d90c32 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -11,7 +11,7 @@ jobs: - run: name: Build the Linux wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0rc1 + python3 -m pip install --user cibuildwheel==3.0.0rc2 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -28,7 +28,7 @@ jobs: - run: name: Build the Linux aarch64 wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0rc1 + python3 -m pip install --user cibuildwheel==3.0.0rc2 python3 -m cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -44,7 +44,7 @@ jobs: name: Build the OS X wheels. command: | sudo softwareupdate --install-rosetta --agree-to-license # for python<=3.8 or x86_64/universal2 tests - pip3 install cibuildwheel==3.0.0rc1 + pip3 install cibuildwheel==3.0.0rc2 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ diff --git a/examples/cirrus-ci-intel-mac.yml b/examples/cirrus-ci-intel-mac.yml index b3e0a98c1..13ed72c64 100644 --- a/examples/cirrus-ci-intel-mac.yml +++ b/examples/cirrus-ci-intel-mac.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0rc1 + - python -m pip install cibuildwheel==3.0.0rc2 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index 09ec6af36..f07686e6a 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0rc1 + - python -m pip install cibuildwheel==3.0.0rc2 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index 6af80f3d6..161289440 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0rc1 + uses: pypa/cibuildwheel@v3.0.0rc2 env: CIBW_PLATFORM: ${{ matrix.platform }} CIBW_ARCHS: ${{ matrix.archs }} diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index 576e07f7c..8f1feb444 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0rc1 + uses: pypa/cibuildwheel@v3.0.0rc2 # env: # CIBW_SOME_OPTION: value # ... diff --git a/examples/github-pipx.yml b/examples/github-pipx.yml index f8d932b44..c5a555230 100644 --- a/examples/github-pipx.yml +++ b/examples/github-pipx.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - run: pipx run cibuildwheel==3.0.0rc1 + run: pipx run cibuildwheel==3.0.0rc2 - uses: actions/upload-artifact@v4 with: diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index ea6e84237..28cfdefdc 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -21,7 +21,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0rc1 + uses: pypa/cibuildwheel@v3.0.0rc2 env: # configure cibuildwheel on Linux to build native archs ('auto'), # and to split the remaining architectures between the x86_64 and diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index de2e547a6..7ba813afb 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -12,7 +12,7 @@ linux: DOCKER_TLS_CERTDIR: "" script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==3.0.0rc1 + - python -m pip install cibuildwheel==3.0.0rc2 - cibuildwheel --output-dir wheelhouse artifacts: paths: @@ -23,7 +23,7 @@ windows: before_script: - choco install python -y --allow-downgrade --version 3.12.4 - choco install git.install -y - - py -m pip install cibuildwheel==3.0.0rc1 + - py -m pip install cibuildwheel==3.0.0rc2 script: - py -m cibuildwheel --output-dir wheelhouse --platform windows artifacts: @@ -35,7 +35,7 @@ windows: macos: image: macos-14-xcode-15 before_script: - - python3 -m pip install cibuildwheel==3.0.0rc1 + - python3 -m pip install cibuildwheel==3.0.0rc2 script: - python3 -m cibuildwheel --output-dir wheelhouse artifacts: diff --git a/examples/gitlab-with-qemu.yml b/examples/gitlab-with-qemu.yml index b53937e5a..7265aef61 100644 --- a/examples/gitlab-with-qemu.yml +++ b/examples/gitlab-with-qemu.yml @@ -14,7 +14,7 @@ linux: - curl -sSL https://get.docker.com/ | sh # Warning: This is extremely slow, be careful with how many wheels you build - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - python -m pip install cibuildwheel==3.0.0rc1 + - python -m pip install cibuildwheel==3.0.0rc2 # Assuming your CI runner's default architecture is x86_64... - cibuildwheel --output-dir wheelhouse --platform linux --archs aarch64 artifacts: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index eca854347..c105fd3c4 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -20,7 +20,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0rc1 + - python3 -m pip install cibuildwheel==3.0.0rc2 script: # build the wheels, put them into './dist' diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index bc861bb55..4498bc6cf 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -26,7 +26,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0rc1 + - python3 -m pip install cibuildwheel==3.0.0rc2 script: # build the wheels, put them into './wheelhouse' diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index 810746e94..7fb5c392a 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -52,7 +52,7 @@ jobs: - stage: deploy name: Build and deploy Linux wheels services: docker - install: python3 -m pip install cibuildwheel==3.0.0rc1 twine + install: python3 -m pip install cibuildwheel==3.0.0rc2 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl # Deploy on windows @@ -60,7 +60,7 @@ jobs: name: Build and deploy Windows wheels os: windows language: shell - install: python3 -m pip install cibuildwheel==3.0.0rc1 twine + install: python3 -m pip install cibuildwheel==3.0.0rc2 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl diff --git a/pyproject.toml b/pyproject.toml index a0df356fa..2a01f6a4e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "cibuildwheel" -version = "3.0.0rc1" +version = "3.0.0rc2" description = "Build Python wheels on CI with minimal configuration." readme = "README.md" license = "BSD-2-Clause" From 38dab4b641824b4d652209380802ae125b645d5b Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 6 Jun 2025 09:57:58 -0400 Subject: [PATCH 1088/1105] docs: warning about pyodide-version (#2450) --- docs/options.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/options.md b/docs/options.md index bf239856f..c91b0b8eb 100644 --- a/docs/options.md +++ b/docs/options.md @@ -1253,6 +1253,12 @@ The available Pyodide versions are determined by the version of `pyodide-build` !!! tip You can set the version of `pyodide-build` using the [`dependency-versions`](#dependency-versions) option. +!!! warning + This option is considered experimental, and might be converted to a more general mechanism in a future minor cibuildwheel release. + +!!! warning + Make sure to scope it to one specific pyodide identifier with overrides if using the `pyodide-prerelease` enable. + #### Examples !!! tab examples "pyproject.toml" From 0b6c7d0aff6bd2ab65be084efe697aa213d92ea5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Jun 2025 19:37:40 +0100 Subject: [PATCH 1089/1105] [pre-commit.ci] pre-commit autoupdate (#2457) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.12 → v0.11.13](https://github.com/astral-sh/ruff-pre-commit/compare/v0.11.12...v0.11.13) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 187531216..196a01dc3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.12 + rev: v0.11.13 hooks: - id: ruff args: ["--fix", "--show-fixes"] From 0fe82c588261ffd3c042a2d2e6826718b43d2767 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 9 Jun 2025 18:32:32 -0400 Subject: [PATCH 1090/1105] chore: order python-standalone releases for stability (#2456) Signed-off-by: Henry Schreiner --- bin/update_python_build_standalone.py | 20 +- .../python-build-standalone-releases.json | 432 +++++++++--------- 2 files changed, 226 insertions(+), 226 deletions(-) diff --git a/bin/update_python_build_standalone.py b/bin/update_python_build_standalone.py index 516920144..b9ac37265 100755 --- a/bin/update_python_build_standalone.py +++ b/bin/update_python_build_standalone.py @@ -25,25 +25,25 @@ def main() -> None: f"repos/astral-sh/python-build-standalone/releases/tags/{latest_tag}" )["assets"] - assets: list[PythonBuildStandaloneAsset] = [] + assets = [ + PythonBuildStandaloneAsset(name=ga["name"], url=ga["browser_download_url"]) + for ga in github_assets + if ga["name"].endswith("install_only.tar.gz") + ] - for github_asset in github_assets: - name = github_asset["name"] - if not name.endswith("install_only.tar.gz"): - continue - url = github_asset["browser_download_url"] - assets.append({"name": name, "url": url}) + # Try to keep output order stable + assets = sorted(assets, key=lambda x: x["name"]) # Write the assets to the JSON file. One day, we might need to support # multiple releases, but for now, we only support the latest one - json_file_contents: PythonBuildStandaloneReleaseData = { - "releases": [ + json_file_contents = PythonBuildStandaloneReleaseData( + releases=[ { "tag": latest_tag, "assets": assets, } ] - } + ) with PYTHON_BUILD_STANDALONE_RELEASES.open("w", encoding="utf-8") as f: json.dump(json_file_contents, f, indent=2) diff --git a/cibuildwheel/resources/python-build-standalone-releases.json b/cibuildwheel/resources/python-build-standalone-releases.json index 89acf8404..2a680516c 100644 --- a/cibuildwheel/resources/python-build-standalone-releases.json +++ b/cibuildwheel/resources/python-build-standalone-releases.json @@ -4,436 +4,436 @@ "tag": "20250604", "assets": [ { - "name": "cpython-3.10.18+20250604-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-aarch64-apple-darwin-install_only.tar.gz" - }, - { - "name": "cpython-3.10.18+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { "name": "cpython-3.13.4+20250604-aarch64-apple-darwin-install_only.tar.gz", "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.10.18+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-aarch64-apple-darwin-install_only.tar.gz" } ] } From 487154abbb81eef6669b826d5f71c6173f7ee56f Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 9 Jun 2025 23:15:34 -0400 Subject: [PATCH 1091/1105] ci: update example too --- examples/cirrus-ci-minimal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index f07686e6a..cea88e78b 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -54,7 +54,7 @@ windows_x86_task: install_pre_requirements_script: - choco install -y --no-progress python3 --version 3.12.4 - refreshenv - - echo PATH=%PATH% >> "%CIRRUS_ENV%" + - set /p=PATH=%PATH%>> "%CIRRUS_ENV%" <<: *BUILD_AND_STORE_WHEELS macos_arm64_task: From adc58e93d17d805f1b5db4f6fe552509256d0a49 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Mon, 9 Jun 2025 23:39:56 -0400 Subject: [PATCH 1092/1105] Revert "ci: update example too" This reverts commit 487154abbb81eef6669b826d5f71c6173f7ee56f. --- examples/cirrus-ci-minimal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index cea88e78b..f07686e6a 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -54,7 +54,7 @@ windows_x86_task: install_pre_requirements_script: - choco install -y --no-progress python3 --version 3.12.4 - refreshenv - - set /p=PATH=%PATH%>> "%CIRRUS_ENV%" + - echo PATH=%PATH% >> "%CIRRUS_ENV%" <<: *BUILD_AND_STORE_WHEELS macos_arm64_task: From dcecda6962ea9dd93b87b53191758cc10dd91446 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 10 Jun 2025 01:54:45 -0400 Subject: [PATCH 1093/1105] chore: handle update of cog to 3.5 (#2459) chore: handle update of cog Signed-off-by: Henry Schreiner --- .pre-commit-config.yaml | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 196a01dc3..94bf4a707 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -69,7 +69,7 @@ repos: pass_filenames: false entry: cog -c -P -r -I ./bin README.md files: '^(README\.md|docs/changelog\.md|docs/options\.md|bin/readme.*)$' - additional_dependencies: [cogapp] + additional_dependencies: [cogapp>=3.5] - repo: https://github.com/codespell-project/codespell rev: v2.4.1 diff --git a/README.md b/README.md index 7a1f49880..67881d506 100644 --- a/README.md +++ b/README.md @@ -162,7 +162,7 @@ The following diagram summarises the steps that cibuildwheel takes on each platf | | [`build-verbosity`](https://cibuildwheel.pypa.io/en/stable/options/#build-verbosity) | Increase/decrease the output of the build | - + These options can be specified in a pyproject.toml file, or as environment variables, see [configuration docs](https://cibuildwheel.pypa.io/en/latest/configuration/). @@ -273,7 +273,7 @@ _29 May 2025_ - 🛠 Remove the addition of `PYTHONSAFEPATH` to `test-environment`. (#2429) - 📚 README table now matches docs and auto-updates. (#2427, #2428) - + --- From c6368be701a99f8315656f925236dbcec5b9b9c2 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Tue, 10 Jun 2025 21:48:53 +0100 Subject: [PATCH 1094/1105] Move to the `OS-latest` image tags on Azure Pipelines (#2461) --- azure-pipelines.yml | 6 +++--- examples/azure-pipelines-minimal.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ddc9f18fa..b19c516ed 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ pr: jobs: - job: linux_311 timeoutInMinutes: 180 - pool: {vmImage: 'Ubuntu-22.04'} + pool: {vmImage: 'ubuntu-latest'} steps: - task: UsePythonVersion@0 inputs: @@ -25,7 +25,7 @@ jobs: python ./bin/run_tests.py - job: macos_311 - pool: {vmImage: 'macOS-13'} + pool: {vmImage: 'macOS-latest'} timeoutInMinutes: 120 steps: - task: UsePythonVersion@0 @@ -43,7 +43,7 @@ jobs: python ./bin/run_tests.py - job: windows_311 - pool: {vmImage: 'windows-2019'} + pool: {vmImage: 'windows-latest'} timeoutInMinutes: 180 steps: - task: UsePythonVersion@0 diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index 707b857e9..003842976 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -1,6 +1,6 @@ jobs: - job: linux - pool: {vmImage: 'Ubuntu-20.04'} + pool: {vmImage: 'ubuntu-latest'} steps: - task: UsePythonVersion@0 - bash: | @@ -14,7 +14,7 @@ jobs: inputs: {pathtoPublish: 'wheelhouse'} - job: macos - pool: {vmImage: 'macOS-13'} + pool: {vmImage: 'macOS-latest'} steps: - task: UsePythonVersion@0 - bash: | @@ -28,7 +28,7 @@ jobs: inputs: {pathtoPublish: wheelhouse} - job: windows - pool: {vmImage: 'windows-2019'} + pool: {vmImage: 'windows-latest'} steps: - task: UsePythonVersion@0 - bash: | From 3fa7bd1e72c565f4efc61363db6b2f14dbdbb198 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 10 Jun 2025 17:57:25 -0400 Subject: [PATCH 1095/1105] ci: fix cirrus and reduce rebuilds (#2460) * ci: fix Cirrus CI on Windows Signed-off-by: Henry Schreiner * ci: skip unrelated changes more often Signed-off-by: Henry Schreiner --------- Signed-off-by: Henry Schreiner --- .cirrus.yml | 11 +++++++---- .github/workflows/test.yml | 13 ++++++++++++- azure-pipelines.yml | 13 ++++++++++++- examples/cirrus-ci-minimal.yml | 6 +++++- test/test_ssl.py | 4 ++++ 5 files changed, 40 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1250dacb7..02cc023bb 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,9 +1,9 @@ -only_if: changesInclude('.cirrus.yml') || ($CIRRUS_BRANCH == "main" && !changesIncludeOnly('docs/*', '.pre-commit-config.yaml')) || $CIRRUS_BRANCH =~ 'cirrus.*' +only_if: changesInclude('.cirrus.yml') || ($CIRRUS_BRANCH == "main" && !changesIncludeOnly('.github/*', 'bin/*', 'docs/*', '.circleci/*', '.travis.yml', '.pre-commit-config.yaml', '.readthedocs.yml', 'azure-pipelines.yml', 'README.md', 'mkdocs.yml', 'noxfile.py')) || $CIRRUS_BRANCH =~ 'cirrus.*' run_tests: &RUN_TESTS install_cibuildwheel_script: - - python -m pip install dependency-groups - - python -m dependency_groups test | xargs python -m pip install -e. + - python -m pip install -U pip + - python -m pip install -e. --group test run_cibuildwheel_tests_script: - python ./bin/run_tests.py @@ -55,9 +55,12 @@ windows_x86_task: memory: 8G install_pre_requirements_script: + - certutil -generateSSTFromWU roots.sst + - certutil -addstore -f root roots.sst + - del roots.sst - choco install -y --no-progress python3 --version 3.12.4 - refreshenv - - echo PATH=%PATH% >> "%CIRRUS_ENV%" + - powershell -Command "$cleanPath = $env:PATH -replace ';+$', ''; Add-Content -Path $env:CIRRUS_ENV -Value ('PATH=' + $cleanPath)" <<: *RUN_TESTS macos_arm64_task: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 684c76cf4..edc55f027 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,8 +12,19 @@ on: - reopened - labeled paths-ignore: - - 'docs/**' + - .ci* + - bin/* + - docs/** + - examples/azure-pipelines-* + - examples/ci* + - examples/travis-ci-* - .pre-commit-config.yaml + - .readthedocs.yml + - .travis.yml + - README.md + - azure-pipelines.yml + - mkdocs.yml + - noxfile.py workflow_dispatch: # allow manual runs on branches without a PR diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b19c516ed..5c244ac7e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,8 +1,19 @@ pr: paths: exclude: - - docs/* + - .github/** + - bin/* + - docs/** + - examples/github-* + - examples/ci* + - examples/travis-ci-* + - .ci* - .pre-commit-config.yaml + - .readthedocs.yml + - .travis.yml + - README.md + - mkdocs.yml + - noxfile.py jobs: - job: linux_311 diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index f07686e6a..d5a934c95 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -52,9 +52,13 @@ windows_x86_task: memory: 4G install_pre_requirements_script: + - certutil -generateSSTFromWU roots.sst + - certutil -addstore -f root roots.sst + - del roots.sst - choco install -y --no-progress python3 --version 3.12.4 - refreshenv - - echo PATH=%PATH% >> "%CIRRUS_ENV%" + - powershell -Command "$cleanPath = $env:PATH -replace ';+$', ''; Add-Content -Path $env:CIRRUS_ENV -Value ('PATH=' + $cleanPath)" + <<: *BUILD_AND_STORE_WHEELS macos_arm64_task: diff --git a/test/test_ssl.py b/test/test_ssl.py index e4ff24e91..0ea958ba3 100644 --- a/test/test_ssl.py +++ b/test/test_ssl.py @@ -1,3 +1,4 @@ +import socket import textwrap from . import test_projects, utils @@ -24,6 +25,9 @@ def test(tmp_path): project_dir = tmp_path / "project" project_with_ssl_tests.generate(project_dir) + # warm up connection + socket.getaddrinfo("tls-v1-2.badssl.com", 443) + actual_wheels = utils.cibuildwheel_run(project_dir) expected_wheels = utils.expected_wheels("spam", "0.1.0") From e188d9e26007031c475bb5293b90c5f386ecb439 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 10 Jun 2025 17:57:41 -0400 Subject: [PATCH 1096/1105] feat: remove 32-bit linux from auto arch, fix auto32 on linux aarch64 (#2458) * feat: remove 32-bit linux from auto arch, fix auto32 on linux aarch64 Signed-off-by: Henry Schreiner * Apply suggestions from code review Co-authored-by: Joe Rickerby * Update cibuildwheel/architecture.py --------- Signed-off-by: Henry Schreiner Co-authored-by: Joe Rickerby --- cibuildwheel/architecture.py | 92 +++++++++++++--------- docs/options.md | 39 +++++++-- test/utils.py | 3 +- unit_test/architecture_test.py | 25 +++++- unit_test/main_tests/main_platform_test.py | 2 +- unit_test/option_prepare_test.py | 2 + unit_test/options_test.py | 1 + 7 files changed, 112 insertions(+), 52 deletions(-) diff --git a/cibuildwheel/architecture.py b/cibuildwheel/architecture.py index 0ac2f1a1a..69c164b27 100644 --- a/cibuildwheel/architecture.py +++ b/cibuildwheel/architecture.py @@ -75,24 +75,24 @@ class Architecture(StrEnum): def parse_config(config: str, platform: PlatformName) -> "set[Architecture]": result = set() for arch_str in re.split(r"[\s,]+", config): - if arch_str == "auto": - result |= Architecture.auto_archs(platform=platform) - elif arch_str == "native": - native_arch = Architecture.native_arch(platform=platform) - if native_arch: - result.add(native_arch) - elif arch_str == "all": - result |= Architecture.all_archs(platform=platform) - elif arch_str == "auto64": - result |= Architecture.bitness_archs(platform=platform, bitness="64") - elif arch_str == "auto32": - result |= Architecture.bitness_archs(platform=platform, bitness="32") - else: - try: - result.add(Architecture(arch_str)) - except ValueError as e: - msg = f"Invalid architecture '{arch_str}'" - raise errors.ConfigurationError(msg) from e + match arch_str: + case "auto": + result |= Architecture.auto_archs(platform=platform) + case "native": + if native_arch := Architecture.native_arch(platform=platform): + result.add(native_arch) + case "all": + result |= Architecture.all_archs(platform=platform) + case "auto64": + result |= Architecture.bitness_archs(platform=platform, bitness="64") + case "auto32": + result |= Architecture.bitness_archs(platform=platform, bitness="32") + case _: + try: + result.add(Architecture(arch_str)) + except ValueError as e: + msg = f"Invalid architecture '{arch_str}'" + raise errors.ConfigurationError(msg) from e return result @staticmethod @@ -142,19 +142,12 @@ def auto_archs(platform: PlatformName) -> "set[Architecture]": return set() # can't build anything on this platform result = {native_arch} - if platform == "linux": - if Architecture.x86_64 in result: - # x86_64 machines can run i686 containers - result.add(Architecture.i686) - elif Architecture.aarch64 in result and _check_aarch32_el0(): - result.add(Architecture.armv7l) - - elif platform == "windows" and Architecture.AMD64 in result: - result.add(Architecture.x86) - - elif platform == "ios" and native_arch == Architecture.arm64_iphonesimulator: - # Also build the device wheel if we're on ARM64. - result.add(Architecture.arm64_iphoneos) + match platform: + case "windows" if Architecture.AMD64 in result: + result.add(Architecture.x86) + case "ios" if native_arch == Architecture.arm64_iphonesimulator: + # Also build the device wheel if we're on ARM64. + result.add(Architecture.arm64_iphoneos) return result @@ -183,14 +176,35 @@ def all_archs(platform: PlatformName) -> "set[Architecture]": @staticmethod def bitness_archs(platform: PlatformName, bitness: Literal["64", "32"]) -> "set[Architecture]": - archs_32 = {Architecture.i686, Architecture.x86, Architecture.armv7l} - auto_archs = Architecture.auto_archs(platform) - - if bitness == "64": - return auto_archs - archs_32 - if bitness == "32": - return auto_archs & archs_32 - typing.assert_never(bitness) + # This map maps 64-bit architectures to their 32-bit equivalents. + archs_map = { + Architecture.x86_64: Architecture.i686, + Architecture.AMD64: Architecture.x86, + Architecture.aarch64: Architecture.armv7l, + } + native_arch = Architecture.native_arch(platform) + + if native_arch is None: + return set() # can't build anything on this platform + + if native_arch == Architecture.wasm32: + return {native_arch} if bitness == "32" else set() + + match bitness: + case "64": + return {native_arch} if native_arch not in archs_map.values() else set() + case "32": + if native_arch in archs_map.values(): + return {native_arch} + elif native_arch in archs_map and platform in {"linux", "windows"}: + if native_arch == Architecture.aarch64 and not _check_aarch32_el0(): + # If we're on aarch64, skip if we cannot build armv7l wheels. + return set() + return {archs_map[native_arch]} + else: + return set() + case _: + typing.assert_never(bitness) def allowed_architectures_check( diff --git a/docs/options.md b/docs/options.md index c91b0b8eb..bd99997cc 100644 --- a/docs/options.md +++ b/docs/options.md @@ -191,10 +191,10 @@ Options: - Windows: `AMD64` `x86` `ARM64` - Pyodide: `wasm32` - iOS: `arm64_iphoneos` `arm64_iphonesimulator` `x86_64_iphonesimulator` -- `auto`: The default archs for your machine - see the table below. - - `auto64`: Just the 64-bit auto archs - - `auto32`: Just the 32-bit auto archs -- `native`: the native arch of the build machine - Matches [`platform.machine()`](https://docs.python.org/3/library/platform.html#platform.machine). +- `auto`: The recommended archs for your machine - see the table below. +- `auto64`: The 64-bit arch(s) supported by your machine (includes device and simulator for iOS) +- `auto32`: The 32-bit arch supported by your machine +- `native`: the native arch of the build machine - matches [`platform.machine()`](https://docs.python.org/3/library/platform.html#platform.machine). - `all` : expands to all the architectures supported on this OS. You may want to use [`build`](#build-skip) with this option to target specific architectures via build selectors. @@ -205,16 +205,34 @@ Default: `auto` | Runner | `native` | `auto` | `auto64` | `auto32` | |---|---|---|---|---| -| Linux / Intel | `x86_64` | `x86_64` `i686` | `x86_64` | `i686` | -| Windows / Intel | `AMD64` | `AMD64` `x86` | `AMD64` | `x86` | +| Linux / Intel 64-bit | `x86_64` | `x86_64` | `x86_64` | `i686` | +| Linux / Intel 32-bit | `i686` | `i686` | | `i686` | +| Linux / Arm 64-bit | `aarch64` | `aarch64` | `aarch64` | `armv7l`¹ | +| Linux / Arm 32-bit | `armv7l` | `armv7l` | | `armv7l` | +| Windows / Intel 64-bit | `AMD64` | `AMD64` `x86` | `AMD64` | `x86` | +| Windows / Intel 32-bit | `x86` | `x86` | | `x86` | | Windows / ARM64 | `ARM64` | `ARM64` | `ARM64` | | | macOS / Intel | `x86_64` | `x86_64` | `x86_64` | | | macOS / Apple Silicon | `arm64` | `arm64` | `arm64` | | | iOS on macOS / Intel | `x86_64_iphonesimulator` | `x86_64_iphonesimulator` | `x86_64_iphonesimulator` | | | iOS on macOS / Apple Silicon | `arm64_iphonesimulator` | `arm64_iphoneos` `arm64_iphonesimulator` | `arm64_iphoneos` `arm64_iphonesimulator` | +¹: This will only be included if the runner supports it. + If not listed above, `auto` is the same as `native`. +!!! warning + The `auto` option only includes 32-bit architectures if they are + commonly built. `cibuildwheel` 3.0 removed 32-bit Linux builds from `auto`, + and a future release may remove 32-bit Windows builds from `auto` as well. + If you know you need them, please include `auto32`. Note that modern + manylinux image do not support 32-bit builds. If you want to avoid 32-bit + Windows builds today, feel free to use `auto64`. + +!!! note + Pyodide currently ignores the architecture setting, as it always builds for + `wasm32`. + [setup-qemu-action]: https://github.com/docker/setup-qemu-action [binfmt]: https://hub.docker.com/r/tonistiigi/binfmt @@ -238,6 +256,10 @@ This option can also be set using the [command-line option](#command-line) # On an Linux Intel runner with qemu installed, build Intel and ARM wheels [tool.cibuildwheel.linux] archs = ["auto", "aarch64"] + + # Build all 32-bit and 64-bit wheels natively buildable on the image + [tool.cibuildwheel] + archs = ["auto64", "auto32"] ``` !!! tab examples "Environment variables" @@ -250,12 +272,13 @@ This option can also be set using the [command-line option](#command-line) # On an Linux Intel runner with qemu installed, build Intel and ARM wheels CIBW_ARCHS_LINUX: "auto aarch64" + + # Build all 32-bit and 64-bit wheels natively buildable on the image + CIBW_ARCHS: "auto64 auto32" ``` Separate multiple archs with a space. - - It is generally recommended to use the environment variable or command-line option for Linux, as selecting archs often depends on your specific runner having qemu installed. diff --git a/test/utils.py b/test/utils.py index 71071abe0..782934bdf 100644 --- a/test/utils.py +++ b/test/utils.py @@ -175,6 +175,7 @@ def expected_wheels( include_universal2: bool = False, single_python: bool = False, single_arch: bool = False, + full_auto: bool = False, ) -> list[str]: """ Returns the expected wheels from a run of cibuildwheel. @@ -194,7 +195,7 @@ def expected_wheels( architectures = [machine_arch] if not single_arch: - if platform == "linux": + if platform == "linux" and full_auto: if machine_arch == "x86_64": architectures.append("i686") elif ( diff --git a/unit_test/architecture_test.py b/unit_test/architecture_test.py index 934b2655d..98efe91d8 100644 --- a/unit_test/architecture_test.py +++ b/unit_test/architecture_test.py @@ -34,8 +34,8 @@ def test_arch_auto(platform_machine): arch_set = Architecture.auto_archs("linux") expected = { "32": {Architecture.i686}, - "64": {Architecture.x86_64, Architecture.i686}, - "arm": {Architecture.aarch64, Architecture.armv7l}, + "64": {Architecture.x86_64}, + "arm": {Architecture.aarch64}, } assert arch_set == expected[machine_name] @@ -94,5 +94,24 @@ def test_arch_auto_no_aarch32(monkeypatch): arch_set = Architecture.parse_config("auto64", "linux") assert arch_set == {Architecture.aarch64} + monkeypatch.setattr(cibuildwheel.architecture, "_check_aarch32_el0", lambda: True) + arch_set = Architecture.parse_config("auto32", "linux") + assert arch_set == {Architecture.armv7l} + + monkeypatch.setattr(cibuildwheel.architecture, "_check_aarch32_el0", lambda: False) arch_set = Architecture.parse_config("auto32", "linux") - assert len(arch_set) == 0 + assert arch_set == set() + + +def test_arch_native_on_ios(monkeypatch): + monkeypatch.setattr(sys, "platform", "darwin") + monkeypatch.setattr(platform_module, "machine", lambda: "arm64") + arch_set = Architecture.parse_config("native", platform="ios") + assert arch_set == {Architecture.arm64_iphonesimulator} + + +def test_arch_auto_on_ios(monkeypatch): + monkeypatch.setattr(sys, "platform", "darwin") + monkeypatch.setattr(platform_module, "machine", lambda: "arm64") + arch_set = Architecture.parse_config("auto", platform="ios") + assert arch_set == {Architecture.arm64_iphonesimulator, Architecture.arm64_iphoneos} diff --git a/unit_test/main_tests/main_platform_test.py b/unit_test/main_tests/main_platform_test.py index 084207368..620f86e4e 100644 --- a/unit_test/main_tests/main_platform_test.py +++ b/unit_test/main_tests/main_platform_test.py @@ -79,7 +79,7 @@ def test_archs_default(platform, intercepted_build_args): options = intercepted_build_args.args[0] if platform == "linux": - assert options.globals.architectures == {Architecture.x86_64, Architecture.i686} + assert options.globals.architectures == {Architecture.x86_64} elif platform == "windows": assert options.globals.architectures == {Architecture.AMD64, Architecture.x86} else: diff --git a/unit_test/option_prepare_test.py b/unit_test/option_prepare_test.py index 34f26eee6..d2a1a0826 100644 --- a/unit_test/option_prepare_test.py +++ b/unit_test/option_prepare_test.py @@ -51,6 +51,7 @@ def ignore_context_call(*args, **kwargs): @pytest.mark.usefixtures("mock_build_container", "fake_package_dir") def test_build_default_launches(monkeypatch): monkeypatch.setattr(sys, "argv", [*sys.argv, "--platform=linux"]) + monkeypatch.setenv("CIBW_ARCHS", "auto64 auto32") monkeypatch.delenv("CIBW_ENABLE", raising=False) main() @@ -105,6 +106,7 @@ def test_build_with_override_launches(monkeypatch, tmp_path): manylinux-x86_64-image = "manylinux_2_28" musllinux-x86_64-image = "musllinux_1_2" enable = ["pypy", "pypy-eol", "graalpy", "cpython-freethreading"] +archs = ["auto64", "auto32"] # Before Python 3.10, use manylinux2014 [[tool.cibuildwheel.overrides]] diff --git a/unit_test/options_test.py b/unit_test/options_test.py index 9e5a1f089..8bf7e5691 100644 --- a/unit_test/options_test.py +++ b/unit_test/options_test.py @@ -25,6 +25,7 @@ [tool.cibuildwheel] build = ["cp38-*", "cp313-*"] skip = ["*musllinux*"] +archs = ["auto64", "auto32"] environment = {FOO="BAR"} test-command = "pyproject" From aa9fe2a24edd67db40cbd394e4621a479e9e69f1 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Tue, 10 Jun 2025 18:28:34 -0400 Subject: [PATCH 1097/1105] ci: use uv python for docs (binary b1) (#2462) Signed-off-by: Henry Schreiner --- .readthedocs.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index a2dc26bb7..70d3153a3 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -5,9 +5,7 @@ version: 2 build: 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 - - NO_COLOR=1 uv run --no-dev --group docs mkdocs build --strict --site-dir $READTHEDOCS_OUTPUT/html + - NO_COLOR=1 uv run --python 3.14 --managed-python --no-dev --group docs mkdocs build --strict --site-dir $READTHEDOCS_OUTPUT/html From 1b9a56e01487f7fd9146e622505ea22d4d35e954 Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Tue, 10 Jun 2025 21:06:51 -0400 Subject: [PATCH 1098/1105] [Bot] Update dependencies (#2455) --- .../resources/constraints-pyodide312.txt | 4 +- .../resources/constraints-pyodide313.txt | 4 +- .../resources/constraints-python310.txt | 2 +- .../resources/constraints-python39.txt | 2 +- .../resources/pinned_docker_images.cfg | 54 +-- .../python-build-standalone-releases.json | 432 +++++++++--------- docs/working-examples.md | 12 +- 7 files changed, 255 insertions(+), 255 deletions(-) diff --git a/cibuildwheel/resources/constraints-pyodide312.txt b/cibuildwheel/resources/constraints-pyodide312.txt index 959e3c756..b41080b7b 100644 --- a/cibuildwheel/resources/constraints-pyodide312.txt +++ b/cibuildwheel/resources/constraints-pyodide312.txt @@ -72,7 +72,7 @@ pyodide-lock==0.1.0a7 # via pyodide-build pyproject-hooks==1.2.0 # via build -requests==2.32.3 +requests==2.32.4 # via pyodide-build resolvelib==1.1.0 # via pyodide-build @@ -81,7 +81,7 @@ rich==14.0.0 # pyodide-build # pyodide-cli # typer -ruamel-yaml==0.18.12 +ruamel-yaml==0.18.14 # via pyodide-build ruamel-yaml-clib==0.2.12 # via ruamel-yaml diff --git a/cibuildwheel/resources/constraints-pyodide313.txt b/cibuildwheel/resources/constraints-pyodide313.txt index 10d9b1641..b3a5ffd68 100644 --- a/cibuildwheel/resources/constraints-pyodide313.txt +++ b/cibuildwheel/resources/constraints-pyodide313.txt @@ -72,7 +72,7 @@ pyodide-lock==0.1.0a7 # via pyodide-build pyproject-hooks==1.2.0 # via build -requests==2.32.3 +requests==2.32.4 # via pyodide-build resolvelib==1.1.0 # via pyodide-build @@ -81,7 +81,7 @@ rich==14.0.0 # pyodide-build # pyodide-cli # typer -ruamel-yaml==0.18.12 +ruamel-yaml==0.18.14 # via pyodide-build ruamel-yaml-clib==0.2.12 # via ruamel-yaml diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index 4a4a7ebac..ee7e66578 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -30,5 +30,5 @@ typing-extensions==4.14.0 # via delocate virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in -zipp==3.22.0 +zipp==3.23.0 # via importlib-metadata diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index 4a4a7ebac..ee7e66578 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -30,5 +30,5 @@ typing-extensions==4.14.0 # via delocate virtualenv==20.31.2 # via -r cibuildwheel/resources/constraints.in -zipp==3.22.0 +zipp==3.23.0 # via importlib-metadata diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 158f7a581..479ffca70 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,47 +1,47 @@ [x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.06.04-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.06.04-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.06.04-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.06.04-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.06.08-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.06.08-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.06.08-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.06.08-1 [i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.06.04-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.06.04-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.06.08-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.06.08-1 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.06.04-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.06.04-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.06.04-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.06.04-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.06.08-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.06.08-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.06.08-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.06.08-1 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.06.04-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.06.04-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.06.04-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.06.04-1 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.06.08-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.06.08-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.06.08-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.06.08-1 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.06.04-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.06.04-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.06.04-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.06.04-1 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.06.08-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.06.08-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.06.08-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.06.08-1 [pypy_x86_64] -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.06.04-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.06.04-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.06.04-1 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.06.08-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.06.08-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.06.08-1 [pypy_i686] -manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.06.04-1 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.06.08-1 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.06.04-1 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.06.04-1 -manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.06.04-1 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.06.08-1 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.06.08-1 +manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.06.08-1 [armv7l] -manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.06.04-1 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.06.04-1 +manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.06.08-1 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.06.08-1 [riscv64] diff --git a/cibuildwheel/resources/python-build-standalone-releases.json b/cibuildwheel/resources/python-build-standalone-releases.json index 2a680516c..2597c29ba 100644 --- a/cibuildwheel/resources/python-build-standalone-releases.json +++ b/cibuildwheel/resources/python-build-standalone-releases.json @@ -4,436 +4,436 @@ "tag": "20250604", "assets": [ { - "name": "cpython-3.9.23+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" - }, - { - "name": "cpython-3.9.23+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.9.23+20250604-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.10.18+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.14.0b1+20250604-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.11.13+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.13.4+20250604-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.12.11+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { "name": "cpython-3.12.11+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.12.11+20250604-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.12.11%2B20250604-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.13.4+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.13.4%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.11.13+20250604-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.11.13%2B20250604-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.14.0b1+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.14.0b1%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-aarch64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-aarch64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-i686-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-x86_64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-x86_64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64-apple-darwin-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-apple-darwin-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-s390x-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-s390x-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64-pc-windows-msvc-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-pc-windows-msvc-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-riscv64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-riscv64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-ppc64le-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-i686-pc-windows-msvc-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-i686-pc-windows-msvc-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v2-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-armv7-unknown-linux-gnueabihf-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v2-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-armv7-unknown-linux-gnueabi-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v3-unknown-linux-gnu-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-aarch64-unknown-linux-gnu-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-aarch64-unknown-linux-gnu-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v3-unknown-linux-musl-install_only.tar.gz" }, { - "name": "cpython-3.10.18+20250604-aarch64-apple-darwin-install_only.tar.gz", - "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.10.18%2B20250604-aarch64-apple-darwin-install_only.tar.gz" + "name": "cpython-3.9.23+20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v4-unknown-linux-gnu-install_only.tar.gz" + }, + { + "name": "cpython-3.9.23+20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz", + "url": "https://github.com/astral-sh/python-build-standalone/releases/download/20250604/cpython-3.9.23%2B20250604-x86_64_v4-unknown-linux-musl-install_only.tar.gz" } ] } diff --git a/docs/working-examples.md b/docs/working-examples.md index 7277db74d..146ef39d8 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -71,8 +71,8 @@ title: Working examples | [mosec][] | ![github icon][] | ![linux icon][] ![apple icon][] | A machine learning model serving framework powered by Rust | | [Picologging][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A high-performance logging library for Python. | | [pybind11 cmake_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system | -| [Rtree][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS | | [markupsafe][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. | +| [Rtree][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS | | [KDEpy][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Kernel Density Estimation in Python | | [dd-trace-py][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub | | [tgcalls][] | ![github icon][] | ![apple icon][] ![windows icon][] | Python `pybind11` binding to Telegram's WebRTC library with third party dependencies like `OpenSSL`, `MozJPEG`, `FFmpeg`, etc. | @@ -81,8 +81,8 @@ title: Working examples | [sourmash][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. | | [abess][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A fast best-subset selection library. It uses cibuildwheel to build a large project with C++ extensions. | | [python-snappy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for the snappy google library | -| [jq.py][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq | | [cyvcf2][] | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing | +| [jq.py][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq | | [matrixprofile][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. | | [Tokenizer][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support | | [iminuit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 | @@ -94,8 +94,8 @@ title: Working examples | [iDynTree][] | ![github icon][] | ![linux icon][] | Uses manylinux_2_24 | | [streaming-form-data][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Streaming parser for multipart/form-data written in Cython | | [power-grid-model][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python/C++ library for distribution power system analysis | -| [bx-python][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | A library that includes Cython extensions. | | [pybase64][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python | +| [bx-python][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | A library that includes Cython extensions. | | [boost-histogram][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. | | [Imagecodecs (fork)][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. | | [Python-WebRTC][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | a Python extension that provides bindings to WebRTC M92 | @@ -181,8 +181,8 @@ title: Working examples [mosec]: https://github.com/mosecorg/mosec [Picologging]: https://github.com/microsoft/picologging [pybind11 cmake_example]: https://github.com/pybind/cmake_example -[Rtree]: https://github.com/Toblerity/rtree [markupsafe]: https://github.com/pallets/markupsafe +[Rtree]: https://github.com/Toblerity/rtree [KDEpy]: https://github.com/tommyod/KDEpy [dd-trace-py]: https://github.com/DataDog/dd-trace-py [tgcalls]: https://github.com/MarshalX/tgcalls @@ -191,8 +191,8 @@ title: Working examples [sourmash]: https://github.com/sourmash-bio/sourmash [abess]: https://github.com/abess-team/abess [python-snappy]: https://github.com/intake/python-snappy -[jq.py]: https://github.com/mwilliamson/jq.py [cyvcf2]: https://github.com/brentp/cyvcf2 +[jq.py]: https://github.com/mwilliamson/jq.py [matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile [Tokenizer]: https://github.com/OpenNMT/Tokenizer [iminuit]: https://github.com/scikit-hep/iminuit @@ -204,8 +204,8 @@ title: Working examples [iDynTree]: https://github.com/robotology/idyntree [streaming-form-data]: https://github.com/siddhantgoel/streaming-form-data [power-grid-model]: https://github.com/PowerGridModel/power-grid-model -[bx-python]: https://github.com/bxlab/bx-python [pybase64]: https://github.com/mayeut/pybase64 +[bx-python]: https://github.com/bxlab/bx-python [boost-histogram]: https://github.com/scikit-hep/boost-histogram [Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build [Python-WebRTC]: https://github.com/MarshalX/python-webrtc From 3c5ff0988806752c5a6502c845f9edc2d98095d6 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 11 Jun 2025 00:57:01 -0400 Subject: [PATCH 1099/1105] Bump version: v3.0.0rc3 --- README.md | 21 +++++++++++---------- cibuildwheel/__init__.py | 2 +- docs/changelog.md | 9 +++++++++ docs/faq.md | 6 +++--- examples/azure-pipelines-minimal.yml | 6 +++--- examples/circleci-minimal.yml | 6 +++--- examples/cirrus-ci-intel-mac.yml | 2 +- examples/cirrus-ci-minimal.yml | 2 +- examples/github-deploy.yml | 2 +- examples/github-minimal.yml | 2 +- examples/github-pipx.yml | 2 +- examples/github-with-qemu.yml | 2 +- examples/gitlab-minimal.yml | 6 +++--- examples/gitlab-with-qemu.yml | 2 +- examples/travis-ci-deploy.yml | 2 +- examples/travis-ci-minimal.yml | 2 +- examples/travis-ci-test-and-deploy.yml | 4 ++-- pyproject.toml | 2 +- 18 files changed, 45 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 67881d506..c96e24121 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ jobs: - uses: actions/setup-python@v5 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==3.0.0rc2 + run: python -m pip install cibuildwheel==3.0.0rc3 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -241,6 +241,15 @@ 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). +- ⚠️ 32-bit linux builds were removed from `"auto"` (the default), now require `"auto32"` or explicit archs, as modern manylinux images (including our new default) do not support them. + + +#### v3.0.0rc3 + +_11 June 2025_ + +- 🛠 32-bit linux builds removed from `"auto"`, requires explicit `"auto32"`. (#2458) +- 📚 Warn that `pyodide-version` is experimental. (#2450) #### v3.0.0rc2 @@ -265,15 +274,7 @@ _3 June 2025_ - 🛠 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) -- 🛠 Remove the addition of `PYTHONSAFEPATH` to `test-environment`. (#2429) -- 📚 README table now matches docs and auto-updates. (#2427, #2428) - - + --- diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index f7bbf541c..0b609eb38 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1 +1 @@ -__version__ = "3.0.0rc2" +__version__ = "3.0.0rc3" diff --git a/docs/changelog.md b/docs/changelog.md index a6e09fb7c..da2883a75 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -18,6 +18,15 @@ 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). +- ⚠️ 32-bit linux builds were removed from `"auto"` (the default), now require `"auto32"` or explicit archs, as modern manylinux images (including our new default) do not support them. + + +#### v3.0.0rc3 + +_11 June 2025_ + +- 🛠 32-bit linux builds removed from `"auto"`, requires explicit `"auto32"`. (#2458) +- 📚 Warn that `pyodide-version` is experimental. (#2450) #### v3.0.0rc2 diff --git a/docs/faq.md b/docs/faq.md index c76a90d72..1f78958c1 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -60,7 +60,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: pypa/cibuildwheel@v3.0.0rc2 +uses: pypa/cibuildwheel@v3.0.0rc3 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. @@ -82,7 +82,7 @@ The second option, and the only one that supports other CI systems, is using a ` ```bash # requirements-cibw.txt -cibuildwheel==3.0.0rc2 +cibuildwheel==3.0.0rc3 ``` Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this: @@ -247,7 +247,7 @@ Solutions to this vary, but the simplest is to use pipx: # most runners have pipx preinstalled, but in case you don't python3 -m pip install pipx -pipx run cibuildwheel==3.0.0rc2 --output-dir wheelhouse +pipx run cibuildwheel==3.0.0rc3 --output-dir wheelhouse pipx run twine upload wheelhouse/*.whl ``` diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index 003842976..13a25dd53 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -6,7 +6,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - pip3 install cibuildwheel==3.0.0rc2 + pip3 install cibuildwheel==3.0.0rc3 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -20,7 +20,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - python3 -m pip install cibuildwheel==3.0.0rc2 + python3 -m pip install cibuildwheel==3.0.0rc3 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -34,7 +34,7 @@ jobs: - bash: | set -o errexit python -m pip install --upgrade pip - pip install cibuildwheel==3.0.0rc2 + pip install cibuildwheel==3.0.0rc3 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index 118d90c32..53a877858 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -11,7 +11,7 @@ jobs: - run: name: Build the Linux wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0rc2 + python3 -m pip install --user cibuildwheel==3.0.0rc3 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -28,7 +28,7 @@ jobs: - run: name: Build the Linux aarch64 wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0rc2 + python3 -m pip install --user cibuildwheel==3.0.0rc3 python3 -m cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -44,7 +44,7 @@ jobs: name: Build the OS X wheels. command: | sudo softwareupdate --install-rosetta --agree-to-license # for python<=3.8 or x86_64/universal2 tests - pip3 install cibuildwheel==3.0.0rc2 + pip3 install cibuildwheel==3.0.0rc3 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ diff --git a/examples/cirrus-ci-intel-mac.yml b/examples/cirrus-ci-intel-mac.yml index 13ed72c64..4150459ad 100644 --- a/examples/cirrus-ci-intel-mac.yml +++ b/examples/cirrus-ci-intel-mac.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0rc2 + - python -m pip install cibuildwheel==3.0.0rc3 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index d5a934c95..4a006d7c0 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0rc2 + - python -m pip install cibuildwheel==3.0.0rc3 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index 161289440..b06ee841a 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0rc2 + uses: pypa/cibuildwheel@v3.0.0rc3 env: CIBW_PLATFORM: ${{ matrix.platform }} CIBW_ARCHS: ${{ matrix.archs }} diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index 8f1feb444..b495817ca 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0rc2 + uses: pypa/cibuildwheel@v3.0.0rc3 # env: # CIBW_SOME_OPTION: value # ... diff --git a/examples/github-pipx.yml b/examples/github-pipx.yml index c5a555230..b63f311e4 100644 --- a/examples/github-pipx.yml +++ b/examples/github-pipx.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - run: pipx run cibuildwheel==3.0.0rc2 + run: pipx run cibuildwheel==3.0.0rc3 - uses: actions/upload-artifact@v4 with: diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index 28cfdefdc..3c4271954 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -21,7 +21,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0rc2 + uses: pypa/cibuildwheel@v3.0.0rc3 env: # configure cibuildwheel on Linux to build native archs ('auto'), # and to split the remaining architectures between the x86_64 and diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index 7ba813afb..5c5f02221 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -12,7 +12,7 @@ linux: DOCKER_TLS_CERTDIR: "" script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==3.0.0rc2 + - python -m pip install cibuildwheel==3.0.0rc3 - cibuildwheel --output-dir wheelhouse artifacts: paths: @@ -23,7 +23,7 @@ windows: before_script: - choco install python -y --allow-downgrade --version 3.12.4 - choco install git.install -y - - py -m pip install cibuildwheel==3.0.0rc2 + - py -m pip install cibuildwheel==3.0.0rc3 script: - py -m cibuildwheel --output-dir wheelhouse --platform windows artifacts: @@ -35,7 +35,7 @@ windows: macos: image: macos-14-xcode-15 before_script: - - python3 -m pip install cibuildwheel==3.0.0rc2 + - python3 -m pip install cibuildwheel==3.0.0rc3 script: - python3 -m cibuildwheel --output-dir wheelhouse artifacts: diff --git a/examples/gitlab-with-qemu.yml b/examples/gitlab-with-qemu.yml index 7265aef61..c0b3713d5 100644 --- a/examples/gitlab-with-qemu.yml +++ b/examples/gitlab-with-qemu.yml @@ -14,7 +14,7 @@ linux: - curl -sSL https://get.docker.com/ | sh # Warning: This is extremely slow, be careful with how many wheels you build - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - python -m pip install cibuildwheel==3.0.0rc2 + - python -m pip install cibuildwheel==3.0.0rc3 # Assuming your CI runner's default architecture is x86_64... - cibuildwheel --output-dir wheelhouse --platform linux --archs aarch64 artifacts: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index c105fd3c4..a60dccead 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -20,7 +20,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0rc2 + - python3 -m pip install cibuildwheel==3.0.0rc3 script: # build the wheels, put them into './dist' diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index 4498bc6cf..02a56dac9 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -26,7 +26,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0rc2 + - python3 -m pip install cibuildwheel==3.0.0rc3 script: # build the wheels, put them into './wheelhouse' diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index 7fb5c392a..86c9ca915 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -52,7 +52,7 @@ jobs: - stage: deploy name: Build and deploy Linux wheels services: docker - install: python3 -m pip install cibuildwheel==3.0.0rc2 twine + install: python3 -m pip install cibuildwheel==3.0.0rc3 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl # Deploy on windows @@ -60,7 +60,7 @@ jobs: name: Build and deploy Windows wheels os: windows language: shell - install: python3 -m pip install cibuildwheel==3.0.0rc2 twine + install: python3 -m pip install cibuildwheel==3.0.0rc3 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl diff --git a/pyproject.toml b/pyproject.toml index 2a01f6a4e..00353b23b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "cibuildwheel" -version = "3.0.0rc2" +version = "3.0.0rc3" description = "Build Python wheels on CI with minimal configuration." readme = "README.md" license = "BSD-2-Clause" From 6f5e480fec0d367f9230ee0be4bcb56136eeec43 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 11 Jun 2025 03:56:12 -0400 Subject: [PATCH 1100/1105] chore: use pip's groups in CI (#2463) Signed-off-by: Henry Schreiner --- .circleci/prepare.sh | 4 ++-- .gitlab-ci.yml | 12 ++++++------ .travis.yml | 4 ++-- azure-pipelines.yml | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.circleci/prepare.sh b/.circleci/prepare.sh index 86ab4cbea..6023be5ce 100644 --- a/.circleci/prepare.sh +++ b/.circleci/prepare.sh @@ -10,7 +10,7 @@ fi $PYTHON --version $PYTHON -m venv venv -venv/bin/python -m pip install -U pip dependency-groups -venv/bin/python -m dependency_groups test | xargs venv/bin/python -m pip install -e. +venv/bin/python -m pip install -U pip +venv/bin/python -m pip install -e. --group test venv/bin/python -m pip freeze venv/bin/python --version diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 723400c62..a5a7cf483 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,8 +20,8 @@ linux: script: - curl -sSL https://get.docker.com/ | sh - docker run --rm --privileged docker.io/tonistiigi/binfmt:latest --install all - - python -m pip install dependency-groups - - python -m dependency_groups test | xargs python -m pip install -e. pytest-custom-exit-code + - python -m pip install -U pip + - python -m pip install -e. pytest-custom-exit-code --group test - python ./bin/run_tests.py windows: @@ -35,8 +35,8 @@ windows: variables: CIBW_ENABLE: "all" script: - - py -m pip install dependency-groups - - py -m pip install -e. pytest-custom-exit-code $(py -m dependency_groups test) + - py -m pip install -U pip + - py -m pip install -e. pytest-custom-exit-code --group test - py bin\run_tests.py tags: - saas-windows-medium-amd64 @@ -50,8 +50,8 @@ macos: variables: CIBW_ENABLE: "all" script: - - python3 -m pip install dependency-groups - - python3 -m dependency_groups test | xargs python3 -m pip install -e. pytest-custom-exit-code + - python3 -m pip install -U pip + - python3 -m pip install -e. pytest-custom-exit-code --group test - python3 ./bin/run_tests.py tags: - saas-macos-medium-m1 diff --git a/.travis.yml b/.travis.yml index d2082cc1f..7b3160a18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,8 +64,8 @@ jobs: install: - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then docker run --rm --privileged docker.io/tonistiigi/binfmt:latest --install all; fi -- $PYTHON -m pip install -U pip dependency-groups -- $PYTHON -m dependency_groups test | xargs $PYTHON -m pip install -e. +- $PYTHON -m pip install -U pip +- $PYTHON -m pip install -e. --group test script: | # travis_wait disable the output while waiting diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5c244ac7e..23d6928e0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,8 +25,8 @@ jobs: versionSpec: '3.11' - bash: | docker run --rm --privileged docker.io/tonistiigi/binfmt:latest --install all - python -m pip install dependency-groups - python -m dependency_groups test | xargs python -m pip install -e. + python -m pip install -U pip + python -m pip install -e. --group test if [ "$(Build.SourceBranch)" = "refs/heads/main" ]; then echo "INFO: Exporting CIBW_ENABLE=all for main branch test run." export CIBW_ENABLE=all @@ -43,8 +43,8 @@ jobs: inputs: versionSpec: '3.11' - bash: | - python -m pip install dependency-groups - python -m dependency_groups test | xargs python -m pip install -e. + python -m pip install -U pip + python -m pip install -e. --group test if [ "$(Build.SourceBranch)" = "refs/heads/main" ]; then echo "INFO: Exporting CIBW_ENABLE=all for main branch test run." export CIBW_ENABLE=all @@ -61,8 +61,8 @@ jobs: inputs: versionSpec: '3.11' - bash: | - python -m pip install dependency-groups - python -m dependency_groups test | xargs python -m pip install -e. + python -m pip install -U pip + python -m pip install -e. --group test if [ "$(Build.SourceBranch)" = "refs/heads/main" ]; then echo "INFO: Exporting CIBW_ENABLE=all for main branch test run." export CIBW_ENABLE=all From ff86a6457781e53a6edbb60d3c2677c64be4f282 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 11 Jun 2025 03:57:24 -0400 Subject: [PATCH 1101/1105] docs: add tips for numpy (#2465) * docs: add tips for numpy Signed-off-by: Henry Schreiner * docs: update example for numpy 2.3.0 Signed-off-by: Henry Schreiner * Update docs/faq.md --------- Signed-off-by: Henry Schreiner --- docs/faq.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/docs/faq.md b/docs/faq.md index 1f78958c1..c3a3512bd 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -49,6 +49,56 @@ myextension = Extension( ) ``` +### Building with NumPy + +If using NumPy, there are a couple of things that can help. + +First, if you require the `numpy` package at build-time (some binding tools, like `pybind11` and `nanobind`, do not), then the backward compatibility for your `build-backend.build-requires` is a little complicated for Python <3.9: + +* NumPy <1.25: You must build with the oldest version of NumPy you want to support at runtime. +* NumPy 1.25 and 1.26: Anything you build will be compatible with 1.19+ by default, and you can set the minimum target to, for example, 1.22 with `#define NPY_TARGET_VERSION NPY_1_22_API_VERSION`. +* NumPy 2.x: You must build with NumPy 2 to support NumPy 2; otherwise the same as 1.25+. + +So the rule is: + +* Python <3.8: Use the oldest supported NumPy (via helper `oldest-supported-numpy` if you want) +* Python 3.9+: Use latest supported NumPy (2+). + +Second, there might be platforms you want to ship for that NumPy (or some other scientific Python libraries) are not shipping yet for. This is often true for beta candidates of new Python releases, for example. To work with this, you can use the Scientific Python Nightly wheels. Here's an example, depending on what frontend you use: + +!!! tab "pip based" + For frontends like `build` (the default) and `pip`: + + ```toml + [tool.cibuildwheel] + environment.PIP_ONLY_BINARY = "numpy" + environment.PIP_PREFER_BINARY = "1" + + [[tool.cibuildwheel.overrides]] + select = ["cp314*"] + inherit.environment = "append" + environment.PIP_EXTRA_INDEX_URL = "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/" + environment.PIP_PRERELEASE = "allow" + ``` + +!!! tab "uv based" + For frontends like `build[uv]`: + + ```toml + [tool.cibuildwheel] + environment.UV_ONLY_BINARY = "numpy" + environment.UV_PREFER_BINARY = "1" + + [[tool.cibuildwheel.overrides]] + select = ["cp314*"] + inherit.environment = "append" + environment.UV_INDEX = "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/" + environment.UV_INDEX_STRATEGY = "unsafe-best-match" + environment.UV_PRERELEASE = "allow" + ``` + +(Note the `*_ONLY_BINARY` variable also supports `":all:"`, and you don't need both that and `*_PREFER_BINARY`, you can use either one, depending on if you want a missing wheel to be a failure or an attempt to build in CI.) + ### Automatic updates using Dependabot {: #automatic-updates} Selecting a moving target (like the latest release) is generally a bad idea in CI. If something breaks, you can't tell whether it was your code or an upstream update that caused the breakage, and in a worst-case scenario, it could occur during a release. From a73177515a438c947d6e6e7a7356dfe67991d740 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 11 Jun 2025 08:57:43 +0100 Subject: [PATCH 1102/1105] Docs: mobile layout fix (#2466) * Remove console warning * Fix table overflow issue on mobile --- docs/extra.css | 2 +- docs/theme_overrides/js/theme.js | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/extra.css b/docs/extra.css index ecd99f667..770508a63 100644 --- a/docs/extra.css +++ b/docs/extra.css @@ -59,7 +59,7 @@ h1, h2, h3, h4, h5, h6 { left: -3.236em; max-width: calc(100cqw); width: fit-content; - min-width: calc(100% + 3.236em + 3.236em); + min-width: min(calc(100% + 3.236em + 3.236em), 100cqw); } .rst-content .section .wy-table-responsive .docutils { padding-left: 3.236em; diff --git a/docs/theme_overrides/js/theme.js b/docs/theme_overrides/js/theme.js index f87c9f266..05689756c 100644 --- a/docs/theme_overrides/js/theme.js +++ b/docs/theme_overrides/js/theme.js @@ -134,11 +134,13 @@ function ThemeNav () { // .wy-table-responsive activates css rules that change the size of // tables, making anchor points move around. console.log('Document ready, checking for anchor in URL'); - const anchorEl = document.querySelector(window.location.hash); - anchorEl.getBoundingClientRect(); // Force layout to ensure scrollIntoView works correctly - if (anchorEl) { - console.log('Anchor element:', anchorEl); - anchorEl.scrollIntoView({ behavior: 'instant', block: 'start' }); + if (window.location.hash) { + const anchorEl = document.querySelector(window.location.hash); + anchorEl.getBoundingClientRect(); // Force layout to ensure scrollIntoView works correctly + if (anchorEl) { + console.log('Anchor element:', anchorEl); + anchorEl.scrollIntoView({ behavior: 'instant', block: 'start' }); + } } // end edit by joerick }; From 5f22145df44122af0f5a201f93cf0207171beca7 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Wed, 11 Jun 2025 14:02:58 +0100 Subject: [PATCH 1103/1105] Bump version: v3.0.0 --- README.md | 86 ++++++++++++------- cibuildwheel/__init__.py | 2 +- docs/changelog.md | 114 ++++++------------------- docs/faq.md | 6 +- examples/azure-pipelines-minimal.yml | 6 +- examples/circleci-minimal.yml | 6 +- examples/cirrus-ci-intel-mac.yml | 2 +- examples/cirrus-ci-minimal.yml | 2 +- examples/github-deploy.yml | 2 +- examples/github-minimal.yml | 2 +- examples/github-pipx.yml | 2 +- examples/github-with-qemu.yml | 2 +- examples/gitlab-minimal.yml | 6 +- examples/gitlab-with-qemu.yml | 2 +- examples/travis-ci-deploy.yml | 2 +- examples/travis-ci-minimal.yml | 2 +- examples/travis-ci-test-and-deploy.yml | 4 +- pyproject.toml | 2 +- 18 files changed, 106 insertions(+), 144 deletions(-) diff --git a/README.md b/README.md index c96e24121..e15eaf6af 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ jobs: - uses: actions/setup-python@v5 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==3.0.0rc3 + run: python -m pip install cibuildwheel==3.0.0 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -229,52 +229,72 @@ 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. - - - -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). -- ⚠️ 32-bit linux builds were removed from `"auto"` (the default), now require `"auto32"` or explicit archs, as modern manylinux images (including our new default) do not support them. +_11 June 2025_ +See @henryiii's [release post](https://iscinumpy.dev/post/cibuildwheel-3-0-0/) for more info on new features! + +- 🌟 Adds the ability to [build wheels for iOS](https://cibuildwheel.pypa.io/en/stable/platforms/#ios)! Set the [`platform` option](https://cibuildwheel.pypa.io/en/stable/options/#platform) to `ios` on a Mac with the iOS toolchain to try it out! (#2286, #2363, #2432) +- 🌟 Adds support for the GraalPy interpreter! Enable for your project using the [`enable` option](https://cibuildwheel.pypa.io/en/stable/options/#enable). (#1538, #2411, #2414) +- ✨ Adds CPython 3.14 support, under the [`enable` option](https://cibuildwheel.pypa.io/en/stable/options/#enable) `cpython-prerelease`. This version of cibuildwheel uses 3.14.0b2. (#2390) + + _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/stable/options/#test-sources), and changes the working directory for tests. (#2062, #2284, #2437) + + - If this option is set, cibuildwheel will copy the files and folders specified in `test-sources` into the temporary directory we run from. This is required for iOS builds, but also useful for other platforms, as it allows you to avoid placeholders. + - 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. (#2420) + +- ✨ Adds [`dependency-versions`](https://cibuildwheel.pypa.io/en/stable/options/#dependency-versions) inline syntax (#2122) +- ✨ Improves support for Pyodide builds and adds the experimental [`pyodide-version`](https://cibuildwheel.pypa.io/en/stable/options/#pyodide-version) option, which allows you to specify the version of Pyodide to use for builds. (#2002) +- ✨ Add `pyodide-prerelease` [enable](https://cibuildwheel.pypa.io/en/stable/options/#enable) option, with an early build of 0.28 (Python 3.13). (#2431) +- ✨ Adds the [`test-environment`](https://cibuildwheel.pypa.io/en/stable/options/#test-environment) option, which allows you to set environment variables for the test command. (#2388) +- ✨ Adds the [`xbuild-tools`](https://cibuildwheel.pypa.io/en/stable/options/#xbuild-tools) option, which allows you to specify tools safe for cross-compilation. Currently only used on iOS; will be useful for Android in the future. (#2317) +- 🛠 The default [manylinux image](https://cibuildwheel.pypa.io/en/stable/options/#linux-image) has changed from `manylinux2014` to `manylinux_2_28`. (#2330) +- 🛠 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) +- 🛠 Invokes `build` rather than `pip wheel` to build wheels by default. You can control this via the [`build-frontend`](https://cibuildwheel.pypa.io/en/stable/options/#build-frontend) option. You might notice that you can see your build log output now! (#2321) +- 🛠 Build verbosity settings have been reworked to have consistent meanings between build backends when non-zero. (#2339) +- 🛠 Removed the `CIBW_PRERELEASE_PYTHONS` and `CIBW_FREE_THREADED_SUPPORT` options - these have been folded into the [`enable`](https://cibuildwheel.pypa.io/en/stable/options/#enable) option instead. (#2095) +- 🛠 Build environments no longer have setuptools and wheel preinstalled. (#2329) +- 🛠 Use the standard Schema line for the integrated JSONSchema. (#2433) +- ⚠️ 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) +- ⚠️ 32-bit Linux wheels no longer built by default - the [arch](https://cibuildwheel.pypa.io/en/stable/options/#archs) was removed from `"auto"`. It now requires explicit `"auto32"`. Note that modern manylinux images (like the new default, `manylinux_2_28`) do not have 32-bit versions. (#2458) +- ⚠️ 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/stable/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) +- 📚 Use Python 3.14 color output in docs CLI output. (#2407) +- 📚 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) -#### v3.0.0rc3 +### v2.23.3 -_11 June 2025_ +_26 April 2025_ -- 🛠 32-bit linux builds removed from `"auto"`, requires explicit `"auto32"`. (#2458) -- 📚 Warn that `pyodide-version` is experimental. (#2450) +- 🛠 Dependency updates, including Python 3.13.3 (#2371) -#### v3.0.0rc2 +### v2.23.2 -_6 June 2025_ +_24 March 2025_ -- 🛠 Updates to dependencies including Pyodide, python-build-standalone, and iOS support package. (#2449) +- 🐛 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) -#### v3.0.0rc1 +### v2.23.1 -_5 June 2025_ +_15 March 2025_ -- 🛠 Updates to dependencies including CPython 3.13.4, pyodide-build and iOS support package. (#2443) +- ⚠️ 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) -#### v3.0.0b5 +### v2.23.0 -_3 June 2025_ +_1 March 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) +- ✨ 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) - + --- diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index 0b609eb38..528787cfc 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1 +1 @@ -__version__ = "3.0.0rc3" +__version__ = "3.0.0" diff --git a/docs/changelog.md b/docs/changelog.md index da2883a75..06356a4f6 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -6,99 +6,41 @@ title: 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. - - - -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). -- ⚠️ 32-bit linux builds were removed from `"auto"` (the default), now require `"auto32"` or explicit archs, as modern manylinux images (including our new default) do not support them. - - -#### v3.0.0rc3 - _11 June 2025_ -- 🛠 32-bit linux builds removed from `"auto"`, requires explicit `"auto32"`. (#2458) -- 📚 Warn that `pyodide-version` is experimental. (#2450) - -#### v3.0.0rc2 - -_6 June 2025_ - -- 🛠 Updates to dependencies including Pyodide, python-build-standalone, and iOS support package. (#2449) - -#### v3.0.0rc1 - -_5 June 2025_ - -- 🛠 Updates to dependencies including CPython 3.13.4, pyodide-build and iOS support package. (#2443) - -#### 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 +See @henryiii's [release post](https://iscinumpy.dev/post/cibuildwheel-3-0-0/) for more info on new features! -_29 May 2025_ - -- 🛠 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) - -#### v3.0.0b3 - -_28 May 2025_ - -- 🛠 Reverts the test working dir (when test-sources isn't set) to a temporary dir, rather than the project. (#2420) -- 📚 Docs now primarily use the pyproject.toml name of options, rather than the environment variable name. (#2389) - -#### v3.0.0b2 - -_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. +- 🌟 Adds the ability to [build wheels for iOS](https://cibuildwheel.pypa.io/en/stable/platforms/#ios)! Set the [`platform` option](https://cibuildwheel.pypa.io/en/stable/options/#platform) to `ios` on a Mac with the iOS toolchain to try it out! (#2286, #2363, #2432) +- 🌟 Adds support for the GraalPy interpreter! Enable for your project using the [`enable` option](https://cibuildwheel.pypa.io/en/stable/options/#enable). (#1538, #2411, #2414) +- ✨ Adds CPython 3.14 support, under the [`enable` option](https://cibuildwheel.pypa.io/en/stable/options/#enable) `cpython-prerelease`. This version of cibuildwheel uses 3.14.0b2. (#2390) _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) +- ✨ Adds the [test-sources option](https://cibuildwheel.pypa.io/en/stable/options/#test-sources), and changes the working directory for tests. (#2062, #2284, #2437) + + - If this option is set, cibuildwheel will copy the files and folders specified in `test-sources` into the temporary directory we run from. This is required for iOS builds, but also useful for other platforms, as it allows you to avoid placeholders. + - 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. (#2420) + +- ✨ Adds [`dependency-versions`](https://cibuildwheel.pypa.io/en/stable/options/#dependency-versions) inline syntax (#2122) +- ✨ Improves support for Pyodide builds and adds the experimental [`pyodide-version`](https://cibuildwheel.pypa.io/en/stable/options/#pyodide-version) option, which allows you to specify the version of Pyodide to use for builds. (#2002) +- ✨ Add `pyodide-prerelease` [enable](https://cibuildwheel.pypa.io/en/stable/options/#enable) option, with an early build of 0.28 (Python 3.13). (#2431) +- ✨ Adds the [`test-environment`](https://cibuildwheel.pypa.io/en/stable/options/#test-environment) option, which allows you to set environment variables for the test command. (#2388) +- ✨ Adds the [`xbuild-tools`](https://cibuildwheel.pypa.io/en/stable/options/#xbuild-tools) option, which allows you to specify tools safe for cross-compilation. Currently only used on iOS; will be useful for Android in the future. (#2317) +- 🛠 The default [manylinux image](https://cibuildwheel.pypa.io/en/stable/options/#linux-image) has changed from `manylinux2014` to `manylinux_2_28`. (#2330) +- 🛠 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) +- 🛠 Invokes `build` rather than `pip wheel` to build wheels by default. You can control this via the [`build-frontend`](https://cibuildwheel.pypa.io/en/stable/options/#build-frontend) option. You might notice that you can see your build log output now! (#2321) +- 🛠 Build verbosity settings have been reworked to have consistent meanings between build backends when non-zero. (#2339) +- 🛠 Removed the `CIBW_PRERELEASE_PYTHONS` and `CIBW_FREE_THREADED_SUPPORT` options - these have been folded into the [`enable`](https://cibuildwheel.pypa.io/en/stable/options/#enable) option instead. (#2095) - 🛠 Build environments no longer have setuptools and wheel preinstalled. (#2329) +- 🛠 Use the standard Schema line for the integrated JSONSchema. (#2433) - ⚠️ 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) +- ⚠️ 32-bit Linux wheels no longer built by default - the [arch](https://cibuildwheel.pypa.io/en/stable/options/#archs) was removed from `"auto"`. It now requires explicit `"auto32"`. Note that modern manylinux images (like the new default, `manylinux_2_28`) do not have 32-bit versions. (#2458) +- ⚠️ 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/stable/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) +- 📚 A reorganisation of the docs, and numerous updates. (#2280) +- 📚 Use Python 3.14 color output in docs CLI output. (#2407) +- 📚 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 @@ -574,7 +516,7 @@ _14 December 2021_ _26 November 2021_ - 📈 cibuildwheel now defaults to manylinux2014 image for linux builds, rather than manylinux2010. If you want to stick with manylinux2010, it's simple to set this using [the image options](https://cibuildwheel.pypa.io/en/stable/options/#linux-image). (#926) -- ✨ You can now pass environment variables from the host machine into the Docker container during a Linux build. Check out [the docs for `CIBW_ENVIRONMENT_PASS_LINUX `](https://cibuildwheel.pypa.io/en/latest/options/#environment-pass) for the details. (#914) +- ✨ You can now pass environment variables from the host machine into the Docker container during a Linux build. Check out [the docs for `CIBW_ENVIRONMENT_PASS_LINUX `](https://cibuildwheel.pypa.io/en/stable/options/#environment-pass) for the details. (#914) - ✨ Added support for building PyPy 3.8 wheels. (#881) - ✨ Added support for building Windows arm64 CPython wheels on a Windows arm64 runner. We can't test this in CI yet, so for now, this is experimental. (#920) - 📚 Improved the deployment documentation (#911) @@ -605,7 +547,7 @@ _22 October 2021_ - 🌟 TOML option overrides! This provides much greater flexibility in configuration via pyproject.toml. (#854) - You can now set build options for any subset of your builds using a match pattern. So, for example, you can customise CPython 3.8 builds with an override on `cp38-*` or musllinux builds by selecting `*musllinux*`. Check out [the docs](https://cibuildwheel.pypa.io/en/latest/options/#overrides) for more info on the specifics. + You can now set build options for any subset of your builds using a match pattern. So, for example, you can customise CPython 3.8 builds with an override on `cp38-*` or musllinux builds by selecting `*musllinux*`. Check out [the docs](https://cibuildwheel.pypa.io/en/stable/options/#overrides) for more info on the specifics. - 🛠 Added support for building PyPy wheels on macOS 11 CI runners. (#875) diff --git a/docs/faq.md b/docs/faq.md index c3a3512bd..25d9da73b 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -110,7 +110,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: pypa/cibuildwheel@v3.0.0rc3 +uses: pypa/cibuildwheel@v3.0.0 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. @@ -132,7 +132,7 @@ The second option, and the only one that supports other CI systems, is using a ` ```bash # requirements-cibw.txt -cibuildwheel==3.0.0rc3 +cibuildwheel==3.0.0 ``` Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this: @@ -297,7 +297,7 @@ Solutions to this vary, but the simplest is to use pipx: # most runners have pipx preinstalled, but in case you don't python3 -m pip install pipx -pipx run cibuildwheel==3.0.0rc3 --output-dir wheelhouse +pipx run cibuildwheel==3.0.0 --output-dir wheelhouse pipx run twine upload wheelhouse/*.whl ``` diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index 13a25dd53..e73864f8e 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -6,7 +6,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - pip3 install cibuildwheel==3.0.0rc3 + pip3 install cibuildwheel==3.0.0 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -20,7 +20,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - python3 -m pip install cibuildwheel==3.0.0rc3 + python3 -m pip install cibuildwheel==3.0.0 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -34,7 +34,7 @@ jobs: - bash: | set -o errexit python -m pip install --upgrade pip - pip install cibuildwheel==3.0.0rc3 + pip install cibuildwheel==3.0.0 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index 53a877858..816a58135 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -11,7 +11,7 @@ jobs: - run: name: Build the Linux wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0rc3 + python3 -m pip install --user cibuildwheel==3.0.0 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -28,7 +28,7 @@ jobs: - run: name: Build the Linux aarch64 wheels. command: | - python3 -m pip install --user cibuildwheel==3.0.0rc3 + python3 -m pip install --user cibuildwheel==3.0.0 python3 -m cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -44,7 +44,7 @@ jobs: name: Build the OS X wheels. command: | sudo softwareupdate --install-rosetta --agree-to-license # for python<=3.8 or x86_64/universal2 tests - pip3 install cibuildwheel==3.0.0rc3 + pip3 install cibuildwheel==3.0.0 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ diff --git a/examples/cirrus-ci-intel-mac.yml b/examples/cirrus-ci-intel-mac.yml index 4150459ad..d59ecdad1 100644 --- a/examples/cirrus-ci-intel-mac.yml +++ b/examples/cirrus-ci-intel-mac.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0rc3 + - python -m pip install cibuildwheel==3.0.0 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index 4a006d7c0..0f552a15a 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==3.0.0rc3 + - python -m pip install cibuildwheel==3.0.0 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index b06ee841a..02dcf4b96 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0rc3 + uses: pypa/cibuildwheel@v3.0.0 env: CIBW_PLATFORM: ${{ matrix.platform }} CIBW_ARCHS: ${{ matrix.archs }} diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index b495817ca..607b66f61 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0rc3 + uses: pypa/cibuildwheel@v3.0.0 # env: # CIBW_SOME_OPTION: value # ... diff --git a/examples/github-pipx.yml b/examples/github-pipx.yml index b63f311e4..c20128d85 100644 --- a/examples/github-pipx.yml +++ b/examples/github-pipx.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - run: pipx run cibuildwheel==3.0.0rc3 + run: pipx run cibuildwheel==3.0.0 - uses: actions/upload-artifact@v4 with: diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index 3c4271954..4008a4f21 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -21,7 +21,7 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v3.0.0rc3 + uses: pypa/cibuildwheel@v3.0.0 env: # configure cibuildwheel on Linux to build native archs ('auto'), # and to split the remaining architectures between the x86_64 and diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index 5c5f02221..1a8e054a3 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -12,7 +12,7 @@ linux: DOCKER_TLS_CERTDIR: "" script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==3.0.0rc3 + - python -m pip install cibuildwheel==3.0.0 - cibuildwheel --output-dir wheelhouse artifacts: paths: @@ -23,7 +23,7 @@ windows: before_script: - choco install python -y --allow-downgrade --version 3.12.4 - choco install git.install -y - - py -m pip install cibuildwheel==3.0.0rc3 + - py -m pip install cibuildwheel==3.0.0 script: - py -m cibuildwheel --output-dir wheelhouse --platform windows artifacts: @@ -35,7 +35,7 @@ windows: macos: image: macos-14-xcode-15 before_script: - - python3 -m pip install cibuildwheel==3.0.0rc3 + - python3 -m pip install cibuildwheel==3.0.0 script: - python3 -m cibuildwheel --output-dir wheelhouse artifacts: diff --git a/examples/gitlab-with-qemu.yml b/examples/gitlab-with-qemu.yml index c0b3713d5..db86bb583 100644 --- a/examples/gitlab-with-qemu.yml +++ b/examples/gitlab-with-qemu.yml @@ -14,7 +14,7 @@ linux: - curl -sSL https://get.docker.com/ | sh # Warning: This is extremely slow, be careful with how many wheels you build - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - python -m pip install cibuildwheel==3.0.0rc3 + - python -m pip install cibuildwheel==3.0.0 # Assuming your CI runner's default architecture is x86_64... - cibuildwheel --output-dir wheelhouse --platform linux --archs aarch64 artifacts: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index a60dccead..fbf762793 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -20,7 +20,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0rc3 + - python3 -m pip install cibuildwheel==3.0.0 script: # build the wheels, put them into './dist' diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index 02a56dac9..796253f35 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -26,7 +26,7 @@ jobs: - ln -s /c/Python312/python.exe /c/Python312/python3.exe install: - - python3 -m pip install cibuildwheel==3.0.0rc3 + - python3 -m pip install cibuildwheel==3.0.0 script: # build the wheels, put them into './wheelhouse' diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index 86c9ca915..fc0dffa59 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -52,7 +52,7 @@ jobs: - stage: deploy name: Build and deploy Linux wheels services: docker - install: python3 -m pip install cibuildwheel==3.0.0rc3 twine + install: python3 -m pip install cibuildwheel==3.0.0 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl # Deploy on windows @@ -60,7 +60,7 @@ jobs: name: Build and deploy Windows wheels os: windows language: shell - install: python3 -m pip install cibuildwheel==3.0.0rc3 twine + install: python3 -m pip install cibuildwheel==3.0.0 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl diff --git a/pyproject.toml b/pyproject.toml index 00353b23b..0b1ef884d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "cibuildwheel" -version = "3.0.0rc3" +version = "3.0.0" description = "Build Python wheels on CI with minimal configuration." readme = "README.md" license = "BSD-2-Clause" From 9c53c4ee46b86d79d75082a32fcfcd035bc7bbb7 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 14 Jun 2025 08:58:57 -0400 Subject: [PATCH 1104/1105] chore: minor tweaks to generate schema script (#2467) chore: minor tweeks to generate schema script Signed-off-by: Henry Schreiner --- bin/generate_schema.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/generate_schema.py b/bin/generate_schema.py index 3ea67f378..cc4e8730f 100755 --- a/bin/generate_schema.py +++ b/bin/generate_schema.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env -S uv run -q # /// script # dependencies = ["pyyaml"] @@ -368,7 +368,7 @@ def as_object(d: dict[str, Any]) -> dict[str, Any]: if args.schemastore: schema["$id"] = "https://json.schemastore.org/partial-cibuildwheel.json" schema["description"] = ( - "cibuildwheel's toml file, generated with ./bin/generate_schema.py --schemastore from cibuildwheel." + "cibuildwheel's settings. Generated with ./bin/generate_schema.py --schemastore from cibuildwheel." ) print(json.dumps(schema, indent=2)) From 588dee0e0c7780ab3264dfd3fab3a197f50306d3 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sat, 14 Jun 2025 09:58:07 -0400 Subject: [PATCH 1105/1105] docs: include Windows ARM in examples (#2468) docs: include Windows ARM --- README.md | 2 +- examples/github-deploy.yml | 11 ++++------- examples/github-minimal.yml | 2 +- examples/github-pipx.yml | 2 +- examples/github-with-qemu.yml | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index e15eaf6af..0abcf8f9e 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-13, macos-latest] + os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-13, macos-latest] steps: - uses: actions/checkout@v4 diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index 02dcf4b96..596ac716c 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -16,23 +16,21 @@ jobs: runs-on: ${{ matrix.runs-on }} strategy: matrix: - os: [ linux-intel, linux-arm, windows, macOS-intel, macOS-arm, iOS, pyodide ] include: - - archs: auto - platform: auto - os: linux-intel runs-on: ubuntu-latest - os: linux-arm runs-on: ubuntu-24.04-arm - - os: windows + - os: windows-intel runs-on: windows-latest + - os: windows-arm + runs-on: windows-11-arm - os: macos-intel # macos-13 was the last x86_64 runner runs-on: macos-13 - os: macos-arm # macos-14+ (including latest) are ARM64 runners runs-on: macos-latest - archs: auto,universal2 - os: ios runs-on: macos-latest platform: ios @@ -46,8 +44,7 @@ jobs: - name: Build wheels uses: pypa/cibuildwheel@v3.0.0 env: - CIBW_PLATFORM: ${{ matrix.platform }} - CIBW_ARCHS: ${{ matrix.archs }} + CIBW_PLATFORM: ${{ matrix.platform || 'auto' }} # Can also be configured directly, using `with:` # with: # package-dir: . diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index 607b66f61..4bc1fd5b8 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: # macos-13 is an intel runner, macos-14 is apple silicon - os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-13, macos-14] + os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-13, macos-14] steps: - uses: actions/checkout@v4 diff --git a/examples/github-pipx.yml b/examples/github-pipx.yml index c20128d85..258b562e2 100644 --- a/examples/github-pipx.yml +++ b/examples/github-pipx.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: # macos-13 is an intel runner, macos-14 is apple silicon - os: [ubuntu-latest, windows-latest, macos-13, macos-14] + os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-13, macos-14] steps: - uses: actions/checkout@v4 diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index 4008a4f21..7b376bc15 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: # macos-13 is an intel runner, macos-14 is apple silicon - os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-13, macos-14] + os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-13, macos-14] steps: - uses: actions/checkout@v4