From 977937568146646c565352a7393c0000f742e1df Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 11 Dec 2022 11:43:08 +0100 Subject: [PATCH] feat: add PyPy macOS arm64 --- .github/workflows/test.yml | 1 + README.md | 5 +++-- bin/update_pythons.py | 18 ++++++++++++------ cibuildwheel/resources/build-platforms.toml | 2 ++ docs/options.md | 4 ++-- test/utils.py | 9 ++++++++- 6 files changed, 28 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1e387efe1..ae9ae42e3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -73,6 +73,7 @@ jobs: output-dir: wheelhouse env: CIBW_ARCHS_MACOS: x86_64 universal2 arm64 + CIBW_SKIP: pp*-macosx_arm64 - uses: actions/upload-artifact@v3 with: diff --git a/README.md b/README.md index 446ece5cc..0a5e503de 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,13 @@ What does it do? | CPython 3.10 | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | | CPython 3.11 | ✅ | ✅ | ✅ | ✅ | ✅² | ✅ | ✅ | ✅ | ✅ | ✅ | | 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 3.8 v7.3 | ✅ | ✅⁴ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | +| PyPy 3.9 v7.3 | ✅ | ✅⁴ | ✅ | N/A | N/A | ✅¹ | ✅¹ | ✅¹ | N/A | N/A | ¹ PyPy is only supported for manylinux wheels.
² Windows arm64 support is experimental.
³ Alpine 3.14 and very briefly 3.15's default python3 [was not able to load](https://github.com/pypa/cibuildwheel/issues/934) musllinux wheels. This has been fixed; please upgrade the python package if using Alpine from before the fix.
+⁴ cross-compilation not supported with PyPy.
- Builds manylinux, musllinux, macOS 10.9+, and Windows wheels for CPython and PyPy - Works on GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, GitLab CI, and Cirrus CI diff --git a/bin/update_pythons.py b/bin/update_pythons.py index 0227c361b..160c1b7b8 100755 --- a/bin/update_pythons.py +++ b/bin/update_pythons.py @@ -159,8 +159,8 @@ def update_version_windows(self, spec: Specifier) -> ConfigWinCP: ) def update_version_macos(self, spec: Specifier) -> ConfigMacOS: - if self.arch != "64": - msg = "Other archs not supported yet on macOS" + if self.arch not in {"64", "ARM64"}: + msg = f"'{self.arch}' arch not supported yet on macOS" raise RuntimeError(msg) releases = [r for r in self.releases if spec.contains(r["python_version"])] @@ -172,12 +172,14 @@ def update_version_macos(self, spec: Specifier) -> ConfigMacOS: release = releases[-1] version = release["python_version"] - identifier = f"pp{version.major}{version.minor}-macosx_x86_64" + arch = "x86_64" if self.arch == "64" else self.arch.lower() + identifier = f"pp{version.major}{version.minor}-macosx_{arch}" + arch = "x64" if self.arch == "64" else self.arch.lower() (url,) = ( rf["download_url"] for rf in release["files"] - if "" in rf["platform"] == "darwin" and rf["arch"] == "x64" + if "" in rf["platform"] == "darwin" and rf["arch"] == arch ) return ConfigMacOS( @@ -251,6 +253,7 @@ def __init__(self) -> None: self.macos_cpython = CPythonVersions() self.macos_pypy = PyPyVersions("64") + self.macos_pypy_arm64 = PyPyVersions("ARM64") def update_config(self, config: dict[str, str]) -> None: identifier = config["identifier"] @@ -261,11 +264,14 @@ def update_config(self, config: dict[str, str]) -> None: config_update: AnyConfig | None = None # We need to use ** in update due to MyPy (probably a bug) - if "macos" in identifier: + if "macosx" in identifier: if identifier.startswith("cp"): config_update = self.macos_cpython.update_version_macos(identifier, version, spec) elif identifier.startswith("pp"): - config_update = self.macos_pypy.update_version_macos(spec) + if "macosx_x86_64" in identifier: + 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 "win32" in identifier: if identifier.startswith("cp"): config_update = self.windows_32.update_version_windows(spec) diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index b8008aaa4..09e0fd0cc 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -89,7 +89,9 @@ python_configurations = [ { identifier = "cp311-macosx_universal2", version = "3.11", url = "https://www.python.org/ftp/python/3.11.1/python-3.11.1-macos11.pkg" }, { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.9-osx64.tar.bz2" }, { identifier = "pp38-macosx_x86_64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.10-macos_x86_64.tar.bz2" }, + { identifier = "pp38-macosx_arm64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.10-macos_arm64.tar.bz2" }, { identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.10-macos_x86_64.tar.bz2" }, + { identifier = "pp39-macosx_arm64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.10-macos_arm64.tar.bz2" }, ] [windows] diff --git a/docs/options.md b/docs/options.md index f2a5c142d..02d5aafa7 100644 --- a/docs/options.md +++ b/docs/options.md @@ -227,8 +227,8 @@ 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 | | 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-musllinux_aarch64
cp311-musllinux_ppc64le
cp311-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 | +| 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 | 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/utils.py b/test/utils.py index 7d1135333..cd9477891 100644 --- a/test/utils.py +++ b/test/utils.py @@ -177,7 +177,14 @@ def expected_wheels( if platform == "macos" and machine_arch == "arm64": # arm64 macs are only supported by cp38+ - python_abi_tags = ["cp38-cp38", "cp39-cp39", "cp310-cp310", "cp311-cp311"] + python_abi_tags = [ + "cp38-cp38", + "cp39-cp39", + "cp310-cp310", + "cp311-cp311", + "pp38-pypy38_pp73", + "pp39-pypy39_pp73", + ] wheels = []