Merge remote-tracking branch 'origin/main' into ci-label-flags

Author: joerick

.github/workflows/test.yml

@@ -55,7 +55,7 @@ jobs:
         python-version: ${{ matrix.python_version }}
         allow-prereleases: true
 
-    - uses: astral-sh/setup-uv@v5
+    - uses: astral-sh/setup-uv@v6
 
     - uses: joerick/[email protected]
     - name: Set CIBW_ENABLE
@@ -99,7 +99,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: ./
@@ -154,7 +154,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
@@ -177,7 +177,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
 
@@ -198,7 +198,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

.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.7
   hooks:
   - id: ruff
     args: ["--fix", "--show-fixes"]
@@ -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

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 |
 
-<sup>¹ PyPy is only supported for manylinux wheels.</sup><br>
+<sup>¹ PyPy & GraalPy are only supported for manylinux wheels.</sup><br>
 <sup>² Windows arm64 support is experimental.</sup><br>
 <sup>³ Free-threaded mode requires opt-in using [`CIBW_ENABLE`](https://cibuildwheel.pypa.io/en/stable/options/#enable).</sup><br>
 <sup>⁴ Experimental, not yet supported on PyPI, but can be used directly in web deployment. Use `--platform pyodide` to build.</sup><br>
 <sup>⁵ manylinux armv7l support is experimental. As there are no RHEL based image for this architecture, it's using an Ubuntu based image instead.</sup><br>
 
-- 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
@@ -97,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
@@ -218,6 +219,12 @@ Changelog
 
 <!-- this section was generated by bin/update_readme_changelog.py -- do not edit manually -->
 
+### v2.23.3
+
+_26 April 2025_
+
+- 🛠 Dependency updates, including Python 3.13.3 (#2371)
+
 ### v2.23.2
 
 _24 March 2025_
@@ -259,14 +266,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)
-
 <!-- END bin/update_readme_changelog.py -->
 
 ---

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
@@ -26,6 +26,7 @@ jobs:
 
 - job: macos_311
   pool: {vmImage: 'macOS-13'}
+  timeoutInMinutes: 120
   steps:
     - task: UsePythonVersion@0
       inputs:

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

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)

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"):

cibuildwheel/__init__.py

@@ -1 +1 @@
-__version__ = "2.23.2"
+__version__ = "2.23.3"

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},

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",
@@ -241,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)

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"
 
 

cibuildwheel/options.py

@@ -35,6 +35,7 @@
     "ppc64le",
     "s390x",
     "armv7l",
+    "riscv64",
     "pypy_aarch64",
     "pypy_i686",
 )
@@ -46,6 +47,7 @@
     "ppc64le",
     "s390x",
     "armv7l",
+    "riscv64",
 )
 
 

cibuildwheel/platforms/linux.py

@@ -28,6 +28,7 @@
     Architecture.ppc64le: OCIPlatform.PPC64LE,
     Architecture.s390x: OCIPlatform.S390X,
     Architecture.armv7l: OCIPlatform.ARMV7,
+    Architecture.riscv64: OCIPlatform.RISCV64,
 }