Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: initial support for riscv64 (#2366)

Browse Source 
* feat: initial support for riscv64

* use enable for riscv64

* Apply review suggestion

Co-authored-by: Joe Rickerby <joerick@mac.com>

* update documentation

---------

Co-authored-by: Joe Rickerby <joerick@mac.com>
This commit is contained in:
Matthieu Darbois
2025-04-28 12:05:03 -04:00
committed by GitHub
co-authored by Joe Rickerby
parent 0463d26066
commit 5f8d06ff55
18 changed files with 139 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/generate_schema.py
+7
View File
@@ -31,6 +31,7 @@ $defs:
- cpython-freethreading - cpython-freethreading
- cpython-prerelease - cpython-prerelease
- pypy - pypy
- cpython-experimental-riscv64
description: A Python version or flavor to enable. description: A Python version or flavor to enable.
additionalProperties: false additionalProperties: false
description: cibuildwheel's settings. description: cibuildwheel's settings.
@@ -157,6 +158,9 @@ properties:
manylinux-pypy_x86_64-image: manylinux-pypy_x86_64-image:
type: string type: string
description: Specify alternative manylinux / musllinux container images description: Specify alternative manylinux / musllinux container images
manylinux-riscv64-image:
type: string
description: Specify alternative manylinux / musllinux container images
manylinux-s390x-image: manylinux-s390x-image:
type: string type: string
description: Specify alternative manylinux / musllinux container images description: Specify alternative manylinux / musllinux container images
@@ -175,6 +179,9 @@ properties:
musllinux-ppc64le-image: musllinux-ppc64le-image:
type: string type: string
description: Specify alternative manylinux / musllinux container images description: Specify alternative manylinux / musllinux container images
musllinux-riscv64-image:
type: string
description: Specify alternative manylinux / musllinux container images
musllinux-s390x-image: musllinux-s390x-image:
type: string type: string
description: Specify alternative manylinux / musllinux container images description: Specify alternative manylinux / musllinux container images
bin/update_docker.py
+3
View File
@@ -116,5 +116,8 @@ for image in images:
suffix = f"_{platform.removeprefix('pypy_')}" suffix = f"_{platform.removeprefix('pypy_')}"
config[platform][image.manylinux_version] = f"{image.image_name}{suffix}:{tag_name}" 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: with open(RESOURCES / "pinned_docker_images.cfg", "w") as f:
config.write(f) config.write(f)
cibuildwheel/architecture.py
+2
View File
@@ -51,6 +51,7 @@ class Architecture(StrEnum):
ppc64le = auto() ppc64le = auto()
s390x = auto() s390x = auto()
armv7l = auto() armv7l = auto()
riscv64 = auto()
# mac archs # mac archs
universal2 = auto() universal2 = auto()
@@ -167,6 +168,7 @@ class Architecture(StrEnum):
Architecture.ppc64le, Architecture.ppc64le,
Architecture.s390x, Architecture.s390x,
Architecture.armv7l, Architecture.armv7l,
Architecture.riscv64,
}, },
"macos": {Architecture.x86_64, Architecture.arm64, Architecture.universal2}, "macos": {Architecture.x86_64, Architecture.arm64, Architecture.universal2},
"windows": {Architecture.x86, Architecture.AMD64, Architecture.ARM64}, "windows": {Architecture.x86, Architecture.AMD64, Architecture.ARM64},
cibuildwheel/logger.py
+2
View File
@@ -22,12 +22,14 @@ PLATFORM_IDENTIFIER_DESCRIPTIONS: Final[dict[str, str]] = {
"manylinux_ppc64le": "manylinux ppc64le", "manylinux_ppc64le": "manylinux ppc64le",
"manylinux_s390x": "manylinux s390x", "manylinux_s390x": "manylinux s390x",
"manylinux_armv7l": "manylinux armv7l", "manylinux_armv7l": "manylinux armv7l",
"manylinux_riscv64": "manylinux riscv64",
"musllinux_x86_64": "musllinux x86_64", "musllinux_x86_64": "musllinux x86_64",
"musllinux_i686": "musllinux i686", "musllinux_i686": "musllinux i686",
"musllinux_aarch64": "musllinux aarch64", "musllinux_aarch64": "musllinux aarch64",
"musllinux_ppc64le": "musllinux ppc64le", "musllinux_ppc64le": "musllinux ppc64le",
"musllinux_s390x": "musllinux s390x", "musllinux_s390x": "musllinux s390x",
"musllinux_armv7l": "musllinux armv7l", "musllinux_armv7l": "musllinux armv7l",
"musllinux_riscv64": "musllinux riscv64",
"win32": "Windows 32bit", "win32": "Windows 32bit",
"win_amd64": "Windows 64bit", "win_amd64": "Windows 64bit",
"win_arm64": "Windows on ARM 64bit", "win_arm64": "Windows on ARM 64bit",
cibuildwheel/oci_container.py
+1
View File
@@ -33,6 +33,7 @@ class OCIPlatform(Enum):
ARMV7 = "linux/arm/v7" ARMV7 = "linux/arm/v7"
ARM64 = "linux/arm64" ARM64 = "linux/arm64"
PPC64LE = "linux/ppc64le" PPC64LE = "linux/ppc64le"
RISCV64 = "linux/riscv64"
S390X = "linux/s390x" S390X = "linux/s390x"
cibuildwheel/options.py
+2
View File
@@ -35,6 +35,7 @@ MANYLINUX_ARCHS: Final[tuple[str, ...]] = (
"ppc64le", "ppc64le",
"s390x", "s390x",
"armv7l", "armv7l",
"riscv64",
"pypy_aarch64", "pypy_aarch64",
"pypy_i686", "pypy_i686",
) )
@@ -46,6 +47,7 @@ MUSLLINUX_ARCHS: Final[tuple[str, ...]] = (
"ppc64le", "ppc64le",
"s390x", "s390x",
"armv7l", "armv7l",
"riscv64",
) )
cibuildwheel/platforms/linux.py
+1
View File
@@ -28,6 +28,7 @@ ARCHITECTURE_OCI_PLATFORM_MAP = {
Architecture.ppc64le: OCIPlatform.PPC64LE, Architecture.ppc64le: OCIPlatform.PPC64LE,
Architecture.s390x: OCIPlatform.S390X, Architecture.s390x: OCIPlatform.S390X,
Architecture.armv7l: OCIPlatform.ARMV7, Architecture.armv7l: OCIPlatform.ARMV7,
Architecture.riscv64: OCIPlatform.RISCV64,
} }
cibuildwheel/resources/build-platforms.toml
+14
View File
@@ -46,6 +46,13 @@ python_configurations = [
{ identifier = "cp312-manylinux_armv7l", version = "3.12", path_str = "/opt/python/cp312-cp312" }, { 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 = "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 = "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 = "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 = "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 = "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 = "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 = "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 = "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] [macos]
cibuildwheel/resources/cibuildwheel.schema.json
+52 -8
View File
@@ -15,7 +15,8 @@
"enum": [ "enum": [
"cpython-freethreading", "cpython-freethreading",
"cpython-prerelease", "cpython-prerelease",
"pypy" "pypy",
"cpython-experimental-riscv64"
] ]
}, },
"description": "A Python version or flavor to enable." "description": "A Python version or flavor to enable."
@@ -357,6 +358,11 @@
"description": "Specify alternative manylinux / musllinux container images", "description": "Specify alternative manylinux / musllinux container images",
"title": "CIBW_MANYLINUX_PYPY_X86_64_IMAGE" "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": { "manylinux-s390x-image": {
"type": "string", "type": "string",
"description": "Specify alternative manylinux / musllinux container images", "description": "Specify alternative manylinux / musllinux container images",
@@ -387,6 +393,11 @@
"description": "Specify alternative manylinux / musllinux container images", "description": "Specify alternative manylinux / musllinux container images",
"title": "CIBW_MUSLLINUX_PPC64LE_IMAGE" "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": { "musllinux-s390x-image": {
"type": "string", "type": "string",
"description": "Specify alternative manylinux / musllinux container images", "description": "Specify alternative manylinux / musllinux container images",
@@ -566,6 +577,9 @@
"before-build": { "before-build": {
"$ref": "#/$defs/inherit" "$ref": "#/$defs/inherit"
}, },
"xbuild-tools": {
"$ref": "#/$defs/inherit"
},
"before-test": { "before-test": {
"$ref": "#/$defs/inherit" "$ref": "#/$defs/inherit"
}, },
@@ -581,9 +595,6 @@
"environment-pass": { "environment-pass": {
"$ref": "#/$defs/inherit" "$ref": "#/$defs/inherit"
}, },
"xbuild-tools": {
"$ref": "#/$defs/inherit"
},
"repair-wheel-command": { "repair-wheel-command": {
"$ref": "#/$defs/inherit" "$ref": "#/$defs/inherit"
}, },
@@ -652,6 +663,9 @@
"manylinux-pypy_x86_64-image": { "manylinux-pypy_x86_64-image": {
"$ref": "#/properties/manylinux-pypy_x86_64-image" "$ref": "#/properties/manylinux-pypy_x86_64-image"
}, },
"manylinux-riscv64-image": {
"$ref": "#/properties/manylinux-riscv64-image"
},
"manylinux-s390x-image": { "manylinux-s390x-image": {
"$ref": "#/properties/manylinux-s390x-image" "$ref": "#/properties/manylinux-s390x-image"
}, },
@@ -670,12 +684,18 @@
"musllinux-ppc64le-image": { "musllinux-ppc64le-image": {
"$ref": "#/properties/musllinux-ppc64le-image" "$ref": "#/properties/musllinux-ppc64le-image"
}, },
"musllinux-riscv64-image": {
"$ref": "#/properties/musllinux-riscv64-image"
},
"musllinux-s390x-image": { "musllinux-s390x-image": {
"$ref": "#/properties/musllinux-s390x-image" "$ref": "#/properties/musllinux-s390x-image"
}, },
"musllinux-x86_64-image": { "musllinux-x86_64-image": {
"$ref": "#/properties/musllinux-x86_64-image" "$ref": "#/properties/musllinux-x86_64-image"
}, },
"xbuild-tools": {
"$ref": "#/properties/xbuild-tools"
},
"repair-wheel-command": { "repair-wheel-command": {
"$ref": "#/properties/repair-wheel-command" "$ref": "#/properties/repair-wheel-command"
}, },
@@ -752,6 +772,9 @@
"manylinux-pypy_x86_64-image": { "manylinux-pypy_x86_64-image": {
"$ref": "#/properties/manylinux-pypy_x86_64-image" "$ref": "#/properties/manylinux-pypy_x86_64-image"
}, },
"manylinux-riscv64-image": {
"$ref": "#/properties/manylinux-riscv64-image"
},
"manylinux-s390x-image": { "manylinux-s390x-image": {
"$ref": "#/properties/manylinux-s390x-image" "$ref": "#/properties/manylinux-s390x-image"
}, },
@@ -770,12 +793,18 @@
"musllinux-ppc64le-image": { "musllinux-ppc64le-image": {
"$ref": "#/properties/musllinux-ppc64le-image" "$ref": "#/properties/musllinux-ppc64le-image"
}, },
"musllinux-riscv64-image": {
"$ref": "#/properties/musllinux-riscv64-image"
},
"musllinux-s390x-image": { "musllinux-s390x-image": {
"$ref": "#/properties/musllinux-s390x-image" "$ref": "#/properties/musllinux-s390x-image"
}, },
"musllinux-x86_64-image": { "musllinux-x86_64-image": {
"$ref": "#/properties/musllinux-x86_64-image" "$ref": "#/properties/musllinux-x86_64-image"
}, },
"xbuild-tools": {
"$ref": "#/properties/xbuild-tools"
},
"repair-wheel-command": { "repair-wheel-command": {
"description": "Execute a shell command to repair each built wheel.", "description": "Execute a shell command to repair each built wheel.",
"oneOf": [ "oneOf": [
@@ -840,6 +869,9 @@
"environment": { "environment": {
"$ref": "#/properties/environment" "$ref": "#/properties/environment"
}, },
"xbuild-tools": {
"$ref": "#/properties/xbuild-tools"
},
"repair-wheel-command": { "repair-wheel-command": {
"$ref": "#/properties/repair-wheel-command" "$ref": "#/properties/repair-wheel-command"
}, },
@@ -891,6 +923,9 @@
"environment": { "environment": {
"$ref": "#/properties/environment" "$ref": "#/properties/environment"
}, },
"xbuild-tools": {
"$ref": "#/properties/xbuild-tools"
},
"repair-wheel-command": { "repair-wheel-command": {
"description": "Execute a shell command to repair each built wheel.", "description": "Execute a shell command to repair each built wheel.",
"oneOf": [ "oneOf": [
@@ -955,6 +990,9 @@
"environment": { "environment": {
"$ref": "#/properties/environment" "$ref": "#/properties/environment"
}, },
"xbuild-tools": {
"$ref": "#/properties/xbuild-tools"
},
"repair-wheel-command": { "repair-wheel-command": {
"$ref": "#/properties/repair-wheel-command" "$ref": "#/properties/repair-wheel-command"
}, },
@@ -1006,22 +1044,28 @@
"environment": { "environment": {
"$ref": "#/properties/environment" "$ref": "#/properties/environment"
}, },
"repair-wheel-command": {
"$ref": "#/properties/repair-wheel-command"
},
"xbuild-tools": { "xbuild-tools": {
"$ref": "#/properties/xbuild-tools" "$ref": "#/properties/xbuild-tools"
}, },
"repair-wheel-command": {
"$ref": "#/properties/repair-wheel-command"
},
"test-command": { "test-command": {
"$ref": "#/properties/test-command" "$ref": "#/properties/test-command"
}, },
"test-extras": { "test-extras": {
"$ref": "#/properties/test-extras" "$ref": "#/properties/test-extras"
}, },
"test-sources": {
"$ref": "#/properties/test-sources"
},
"test-groups": {
"$ref": "#/properties/test-groups"
},
"test-requires": { "test-requires": {
"$ref": "#/properties/test-requires" "$ref": "#/properties/test-requires"
} }
} }
} }
} }
} }
cibuildwheel/resources/defaults.toml
+2
View File
@@ -33,6 +33,7 @@ manylinux-aarch64-image = "manylinux_2_28"
manylinux-ppc64le-image = "manylinux_2_28" manylinux-ppc64le-image = "manylinux_2_28"
manylinux-s390x-image = "manylinux_2_28" manylinux-s390x-image = "manylinux_2_28"
manylinux-armv7l-image = "manylinux_2_31" 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_x86_64-image = "manylinux_2_28"
manylinux-pypy_i686-image = "manylinux2014" manylinux-pypy_i686-image = "manylinux2014"
manylinux-pypy_aarch64-image = "manylinux_2_28" manylinux-pypy_aarch64-image = "manylinux_2_28"
@@ -43,6 +44,7 @@ musllinux-aarch64-image = "musllinux_1_2"
musllinux-ppc64le-image = "musllinux_1_2" musllinux-ppc64le-image = "musllinux_1_2"
musllinux-s390x-image = "musllinux_1_2" musllinux-s390x-image = "musllinux_1_2"
musllinux-armv7l-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] [tool.cibuildwheel.linux]
cibuildwheel/resources/pinned_docker_images.cfg
+2
View File
@@ -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 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 musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.04.19-1
[riscv64]
cibuildwheel/selector.py
+5
View File
@@ -32,6 +32,7 @@ class EnableGroup(StrEnum):
CPythonFreeThreading = "cpython-freethreading" CPythonFreeThreading = "cpython-freethreading"
CPythonPrerelease = "cpython-prerelease" CPythonPrerelease = "cpython-prerelease"
PyPy = "pypy" PyPy = "pypy"
CPythonExperimentalRiscV64 = "cpython-experimental-riscv64"
@classmethod @classmethod
def all_groups(cls) -> frozenset["EnableGroup"]: def all_groups(cls) -> frozenset["EnableGroup"]:
@@ -70,6 +71,10 @@ class BuildSelector:
return False 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, "pp*"):
return False 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_build = selector_matches(self.build_config, build_id)
should_skip = selector_matches(self.skip_config, build_id) should_skip = selector_matches(self.skip_config, build_id)
docs/options.md
+21 -13
View File
@@ -50,23 +50,24 @@ When setting the options, you can use shell-style globbing syntax, as per [fnmat
<div class="build-id-table-marker"></div> <div class="build-id-table-marker"></div>
| | macOS | Windows | Linux Intel | Linux Other | iOS | | | macOS | Windows | Linux Intel | Linux Other | iOS |
|---------------|------------------------------------------------------------------------|-----------------------------------------------------|-----------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------| |---------------|------------------------------------------------------------------------|-----------------------------------------------------|-----------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
| Python 3.8 | cp38-macosx_x86_64<br/>cp38-macosx_universal2<br/>cp38-macosx_arm64 | cp38-win_amd64<br/>cp38-win32 | cp38-manylinux_x86_64<br/>cp38-manylinux_i686<br/>cp38-musllinux_x86_64<br/>cp38-musllinux_i686 | cp38-manylinux_aarch64<br/>cp38-manylinux_ppc64le<br/>cp38-manylinux_s390x<br/>cp38-manylinux_armv7l<br/>cp38-musllinux_aarch64<br/>cp38-musllinux_ppc64le<br/>cp38-musllinux_s390x<br/>cp38-musllinux_armv7l | | | Python 3.8 | cp38-macosx_x86_64<br/>cp38-macosx_universal2<br/>cp38-macosx_arm64 | cp38-win_amd64<br/>cp38-win32 | cp38-manylinux_x86_64<br/>cp38-manylinux_i686<br/>cp38-musllinux_x86_64<br/>cp38-musllinux_i686 | cp38-manylinux_aarch64<br/>cp38-manylinux_ppc64le<br/>cp38-manylinux_s390x<br/>cp38-manylinux_armv7l<br/>cp38-manylinux_riscv64<br/>cp38-musllinux_aarch64<br/>cp38-musllinux_ppc64le<br/>cp38-musllinux_s390x<br/>cp38-musllinux_armv7l<br/>cp38-musllinux_riscv64 | |
| Python 3.9 | cp39-macosx_x86_64<br/>cp39-macosx_universal2<br/>cp39-macosx_arm64 | cp39-win_amd64<br/>cp39-win32<br/>cp39-win_arm64 | cp39-manylinux_x86_64<br/>cp39-manylinux_i686<br/>cp39-musllinux_x86_64<br/>cp39-musllinux_i686 | cp39-manylinux_aarch64<br/>cp39-manylinux_ppc64le<br/>cp39-manylinux_s390x<br/>cp39-manylinux_armv7l<br/>cp39-musllinux_aarch64<br/>cp39-musllinux_ppc64le<br/>cp39-musllinux_s390x<br/>cp39-musllinux_armv7l | | | Python 3.9 | cp39-macosx_x86_64<br/>cp39-macosx_universal2<br/>cp39-macosx_arm64 | cp39-win_amd64<br/>cp39-win32<br/>cp39-win_arm64 | cp39-manylinux_x86_64<br/>cp39-manylinux_i686<br/>cp39-musllinux_x86_64<br/>cp39-musllinux_i686 | cp39-manylinux_aarch64<br/>cp39-manylinux_ppc64le<br/>cp39-manylinux_s390x<br/>cp39-manylinux_armv7l<br/>cp39-manylinux_riscv64<br/>cp39-musllinux_aarch64<br/>cp39-musllinux_ppc64le<br/>cp39-musllinux_s390x<br/>cp39-musllinux_armv7l<br/>cp39-musllinux_riscv64 | |
| Python 3.10 | cp310-macosx_x86_64<br/>cp310-macosx_universal2<br/>cp310-macosx_arm64 | cp310-win_amd64<br/>cp310-win32<br/>cp310-win_arm64 | cp310-manylinux_x86_64<br/>cp310-manylinux_i686<br/>cp310-musllinux_x86_64<br/>cp310-musllinux_i686 | cp310-manylinux_aarch64<br/>cp310-manylinux_ppc64le<br/>cp310-manylinux_s390x<br/>cp310-manylinux_armv7l<br/>cp310-musllinux_aarch64<br/>cp310-musllinux_ppc64le<br/>cp310-musllinux_s390x<br/>cp310-musllinux_armv7l | | | Python 3.10 | cp310-macosx_x86_64<br/>cp310-macosx_universal2<br/>cp310-macosx_arm64 | cp310-win_amd64<br/>cp310-win32<br/>cp310-win_arm64 | cp310-manylinux_x86_64<br/>cp310-manylinux_i686<br/>cp310-musllinux_x86_64<br/>cp310-musllinux_i686 | cp310-manylinux_aarch64<br/>cp310-manylinux_ppc64le<br/>cp310-manylinux_s390x<br/>cp310-manylinux_armv7l<br/>cp310-manylinux_riscv64<br/>cp310-musllinux_aarch64<br/>cp310-musllinux_ppc64le<br/>cp310-musllinux_s390x<br/>cp310-musllinux_armv7l<br/>cp310-musllinux_riscv64 | |
| Python 3.11 | cp311-macosx_x86_64<br/>cp311-macosx_universal2<br/>cp311-macosx_arm64 | cp311-win_amd64<br/>cp311-win32<br/>cp311-win_arm64 | cp311-manylinux_x86_64<br/>cp311-manylinux_i686<br/>cp311-musllinux_x86_64<br/>cp311-musllinux_i686 | cp311-manylinux_aarch64<br/>cp311-manylinux_ppc64le<br/>cp311-manylinux_s390x<br/>cp311-manylinux_armv7l<br/>cp311-musllinux_aarch64<br/>cp311-musllinux_ppc64le<br/>cp311-musllinux_s390x<br/>cp311-musllinux_armv7l | | | Python 3.11 | cp311-macosx_x86_64<br/>cp311-macosx_universal2<br/>cp311-macosx_arm64 | cp311-win_amd64<br/>cp311-win32<br/>cp311-win_arm64 | cp311-manylinux_x86_64<br/>cp311-manylinux_i686<br/>cp311-musllinux_x86_64<br/>cp311-musllinux_i686 | cp311-manylinux_aarch64<br/>cp311-manylinux_ppc64le<br/>cp311-manylinux_s390x<br/>cp311-manylinux_armv7l<br/>cp311-manylinux_riscv64<br/>cp311-musllinux_aarch64<br/>cp311-musllinux_ppc64le<br/>cp311-musllinux_s390x<br/>cp311-musllinux_armv7l<br/>cp311-musllinux_riscv64 | |
| Python 3.12 | cp312-macosx_x86_64<br/>cp312-macosx_universal2<br/>cp312-macosx_arm64 | cp312-win_amd64<br/>cp312-win32<br/>cp312-win_arm64 | cp312-manylinux_x86_64<br/>cp312-manylinux_i686<br/>cp312-musllinux_x86_64<br/>cp312-musllinux_i686 | cp312-manylinux_aarch64<br/>cp312-manylinux_ppc64le<br/>cp312-manylinux_s390x<br/>cp312-musllinux_armv7l<br/>cp312-musllinux_ppc64le<br/>cp312-musllinux_s390x<br/>cp312-musllinux_armv7l | | | Python 3.12 | cp312-macosx_x86_64<br/>cp312-macosx_universal2<br/>cp312-macosx_arm64 | cp312-win_amd64<br/>cp312-win32<br/>cp312-win_arm64 | cp312-manylinux_x86_64<br/>cp312-manylinux_i686<br/>cp312-musllinux_x86_64<br/>cp312-musllinux_i686 | cp312-manylinux_aarch64<br/>cp312-manylinux_ppc64le<br/>cp312-manylinux_s390x<br/>cp312-manylinux_armv7l<br/>cp312-manylinux_riscv64<br/>cp312-musllinux_aarch64<br/>cp312-musllinux_ppc64le<br/>cp312-musllinux_s390x<br/>cp312-musllinux_armv7l<br/>cp312-musllinux_riscv64 | |
| Python 3.13 | cp313-macosx_x86_64<br/>cp313-macosx_universal2<br/>cp313-macosx_arm64 | cp313-win_amd64<br/>cp313-win32<br/>cp313-win_arm64 | cp313-manylinux_x86_64<br/>cp313-manylinux_i686<br/>cp313-musllinux_x86_64<br/>cp313-musllinux_i686 | cp313-manylinux_aarch64<br/>cp313-manylinux_ppc64le<br/>cp313-manylinux_s390x<br/>cp313-manylinux_armv7l<br/>cp313-musllinux_aarch64<br/>cp313-musllinux_ppc64le<br/>cp313-musllinux_s390x<br/>cp313-musllinux_armv7l | cp313-ios_arm64_iphoneos<br/>cp313-ios_arm64_iphonesimulator<br/>cp313-ios_x86_64_iphonesimulator | | Python 3.13 | cp313-macosx_x86_64<br/>cp313-macosx_universal2<br/>cp313-macosx_arm64 | cp313-win_amd64<br/>cp313-win32<br/>cp313-win_arm64 | cp313-manylinux_x86_64<br/>cp313-manylinux_i686<br/>cp313-musllinux_x86_64<br/>cp313-musllinux_i686 | cp313-manylinux_aarch64<br/>cp313-manylinux_ppc64le<br/>cp313-manylinux_s390x<br/>cp313-manylinux_armv7l<br/>cp313-manylinux_riscv64<br/>cp313-musllinux_aarch64<br/>cp313-musllinux_ppc64le<br/>cp313-musllinux_s390x<br/>cp313-musllinux_armv7l<br/>cp313-musllinux_riscv64 | cp313-ios_arm64_iphoneos<br/>cp313-ios_arm64_iphonesimulator<br/>cp313-ios_x86_64_iphonesimulator |
| PyPy3.8 v7.3 | pp38-macosx_x86_64<br/>pp38-macosx_arm64 | pp38-win_amd64 | pp38-manylinux_x86_64<br/>pp38-manylinux_i686 | pp38-manylinux_aarch64 | | | PyPy3.8 v7.3 | pp38-macosx_x86_64<br/>pp38-macosx_arm64 | pp38-win_amd64 | pp38-manylinux_x86_64<br/>pp38-manylinux_i686 | pp38-manylinux_aarch64 | |
| PyPy3.9 v7.3 | pp39-macosx_x86_64<br/>pp39-macosx_arm64 | pp39-win_amd64 | pp39-manylinux_x86_64<br/>pp39-manylinux_i686 | pp39-manylinux_aarch64 | | | PyPy3.9 v7.3 | pp39-macosx_x86_64<br/>pp39-macosx_arm64 | pp39-win_amd64 | pp39-manylinux_x86_64<br/>pp39-manylinux_i686 | pp39-manylinux_aarch64 | |
| PyPy3.10 v7.3 | pp310-macosx_x86_64<br/>pp310-macosx_arm64 | pp310-win_amd64 | pp310-manylinux_x86_64<br/>pp310-manylinux_i686 | pp310-manylinux_aarch64 | | | PyPy3.10 v7.3 | pp310-macosx_x86_64<br/>pp310-macosx_arm64 | pp310-win_amd64 | pp310-manylinux_x86_64<br/>pp310-manylinux_i686 | pp310-manylinux_aarch64 | |
| PyPy3.11 v7.3 | pp311-macosx_x86_64<br/>pp311-macosx_arm64 | pp311-win_amd64 | pp311-manylinux_x86_64<br/>pp311-manylinux_i686 | pp311-manylinux_aarch64 | | | PyPy3.11 v7.3 | pp311-macosx_x86_64<br/>pp311-macosx_arm64 | pp311-win_amd64 | pp311-manylinux_x86_64<br/>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 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). 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. 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`, For an experimental WebAssembly build with `--platform pyodide`,
`cp312-pyodide_wasm32` is the only platform identifier. `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: Options:
- Linux: `x86_64` `i686` `aarch64` `ppc64le` `s390x` `armv7l` - Linux: `x86_64` `i686` `aarch64` `ppc64le` `s390x` `armv7l` `riscv64`
- macOS: `x86_64` `arm64` `universal2` - macOS: `x86_64` `arm64` `universal2`
- Windows: `AMD64` `x86` `ARM64` - Windows: `AMD64` `x86` `ARM64`
- Pyodide: `wasm32` - Pyodide: `wasm32`
@@ -191,6 +192,8 @@ Options:
to use [CIBW_BUILD](#build-skip) with this option to target specific to use [CIBW_BUILD](#build-skip) with this option to target specific
architectures via build selectors. architectures via build selectors.
Linux riscv64 platform support is experimental and requires an explicit opt-in through [CIBW_ENABLE](#enable).
Default: `auto` Default: `auto`
| Runner | `native` | `auto` | `auto64` | `auto32` | | Runner | `native` | `auto` | `auto64` | `auto32` |
@@ -317,6 +320,9 @@ values are:
The build identifiers for those variants have a `t` suffix in their The build identifiers for those variants have a `t` suffix in their
`python_tag` (e.g. `cp313t-manylinux_x86_64`). `python_tag` (e.g. `cp313t-manylinux_x86_64`).
- `pypy`: Enable PyPy. - `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 !!! 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_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_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_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_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_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_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_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_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_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. Set the Docker image to be used for building [manylinux / musllinux](https://github.com/pypa/manylinux) wheels.
test/test_emulation.py
+10 -3
View File
@@ -34,14 +34,21 @@ def test(tmp_path, request):
"CIBW_TEST_REQUIRES": "pytest", "CIBW_TEST_REQUIRES": "pytest",
"CIBW_TEST_COMMAND": "pytest ./test", "CIBW_TEST_COMMAND": "pytest ./test",
"CIBW_ARCHS": archs, "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 # also check that we got the right wheels
expected_wheels = itertools.chain.from_iterable( expected_wheels = list(
utils.expected_wheels("spam", "0.1.0", machine_arch=arch, single_arch=True) itertools.chain.from_iterable(
for arch in archs.split(" ") 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) assert set(actual_wheels) == set(expected_wheels)
test/utils.py
+1
View File
@@ -227,6 +227,7 @@ def _expected_wheels(
"armv7l": ["manylinux_2_17", "manylinux2014", "manylinux_2_31"], "armv7l": ["manylinux_2_17", "manylinux2014", "manylinux_2_31"],
"i686": ["manylinux_2_5", "manylinux1", "manylinux_2_17", "manylinux2014"], "i686": ["manylinux_2_5", "manylinux1", "manylinux_2_17", "manylinux2014"],
"x86_64": ["manylinux_2_5", "manylinux1", "manylinux_2_28"], "x86_64": ["manylinux_2_5", "manylinux1", "manylinux_2_28"],
"riscv64": ["manylinux_2_31"],
}.get(machine_arch, ["manylinux_2_17", "manylinux2014", "manylinux_2_28"]) }.get(machine_arch, ["manylinux_2_17", "manylinux2014", "manylinux_2_28"])
if musllinux_versions is None: if musllinux_versions is None:
unit_test/build_selector_test.py
+9
View File
@@ -158,6 +158,15 @@ def test_build_free_threaded_python():
assert build_selector("cp313t-manylinux_x86_64") 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(): def test_testing_selector():
# local import to avoid pytest trying to collect this as a test class! # local import to avoid pytest trying to collect this as a test class!
from cibuildwheel.selector import TestSelector from cibuildwheel.selector import TestSelector
unit_test/main_tests/main_platform_test.py
+1
View File
@@ -179,6 +179,7 @@ def test_archs_platform_all(platform, intercepted_build_args, monkeypatch):
Architecture.ppc64le, Architecture.ppc64le,
Architecture.s390x, Architecture.s390x,
Architecture.armv7l, Architecture.armv7l,
Architecture.riscv64,
} }
elif platform == "windows": elif platform == "windows":
assert options.globals.architectures == { assert options.globals.architectures == {
unit_test/oci_container_test.py
+4 -2
View File
@@ -552,7 +552,7 @@ def test_local_image(
# both GHA & local macOS arm64 podman desktop are failing # both GHA & local macOS arm64 podman desktop are failing
pytest.xfail("podman fails with armv7l images") pytest.xfail("podman fails with armv7l images")
remote_image = "debian:12-slim" remote_image = "debian:trixie-slim"
platform_name = platform.value.replace("/", "_") platform_name = platform.value.replace("/", "_")
local_image = f"cibw_{container_engine.name}_{platform_name}_local:latest" local_image = f"cibw_{container_engine.name}_{platform_name}_local:latest"
dockerfile = tmp_path / "Dockerfile" dockerfile = tmp_path / "Dockerfile"
@@ -582,7 +582,7 @@ def test_multiarch_image(container_engine, platform):
# both GHA & local macOS arm64 podman desktop are failing # both GHA & local macOS arm64 podman desktop are failing
pytest.xfail("podman fails with armv7l images") pytest.xfail("podman fails with armv7l images")
with OCIContainer( with OCIContainer(
engine=container_engine, image="debian:12-slim", oci_platform=platform engine=container_engine, image="debian:trixie-slim", oci_platform=platform
) as container: ) as container:
output = container.call(["uname", "-m"], capture_output=True) output = container.call(["uname", "-m"], capture_output=True)
output_map_kernel = { output_map_kernel = {
@@ -591,6 +591,7 @@ def test_multiarch_image(container_engine, platform):
OCIPlatform.ARMV7: ("armv7l", "armv8l"), OCIPlatform.ARMV7: ("armv7l", "armv8l"),
OCIPlatform.ARM64: ("aarch64",), OCIPlatform.ARM64: ("aarch64",),
OCIPlatform.PPC64LE: ("ppc64le",), OCIPlatform.PPC64LE: ("ppc64le",),
OCIPlatform.RISCV64: ("riscv64",),
OCIPlatform.S390X: ("s390x",), OCIPlatform.S390X: ("s390x",),
} }
assert output.strip() in output_map_kernel[platform] assert output.strip() in output_map_kernel[platform]
@@ -601,6 +602,7 @@ def test_multiarch_image(container_engine, platform):
OCIPlatform.ARMV7: "armhf", OCIPlatform.ARMV7: "armhf",
OCIPlatform.ARM64: "arm64", OCIPlatform.ARM64: "arm64",
OCIPlatform.PPC64LE: "ppc64el", OCIPlatform.PPC64LE: "ppc64el",
OCIPlatform.RISCV64: "riscv64",
OCIPlatform.S390X: "s390x", OCIPlatform.S390X: "s390x",
} }
assert output_map_dpkg[platform] == output.strip() assert output_map_dpkg[platform] == output.strip()