Skip to content

Commit

Permalink
feature: Add PyPy 3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@mayeut
mayeut committed Feb 25, 2022
1 parent a0341ab commit 70780db
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 28 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Expand Up @@ -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 |

<sup>¹ PyPy is only supported for manylinux wheels.</sup><br>
<sup>² Windows arm64 support is experimental.</sup><br>
Expand Down
5 changes: 5 additions & 0 deletions cibuildwheel/resources/build-platforms.toml
View file
Expand Up @@ -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" },
Expand All @@ -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" },
Expand Down Expand Up @@ -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]
Expand All @@ -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" },
]
50 changes: 25 additions & 25 deletions cibuildwheel/resources/pinned_docker_images.cfg
View file
@@ -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

1 change: 1 addition & 0 deletions docs/options.md
View file
Expand Up @@ -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<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-musllinux_aarch64<br/>cp310-musllinux_ppc64le<br/>cp310-musllinux_s390x |
| PyPy3.7 v7.3 | pp37-macosx_x86_64 | pp37-win_amd64 | pp37-manylinux_x86_64<br/>pp37-manylinux_i686 | pp37-manylinux_aarch64 |
| PyPy3.8 v7.3 | pp38-macosx_x86_64 | pp38-win_amd64 | pp38-manylinux_x86_64<br/>pp38-manylinux_i686 | pp38-manylinux_aarch64 |
| PyPy3.9 v7.3 | pp39-macosx_x86_64 | pp39-win_amd64 | pp39-manylinux_x86_64<br/>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).
Expand Down
6 changes: 6 additions & 0 deletions test/test_manylinuxXXXX_only.py
View file
Expand Up @@ -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)

Expand All @@ -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)
2 changes: 1 addition & 1 deletion test/utils.py
View file
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions unit_test/option_prepare_test.py
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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 == ""

Expand 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]
Expand Down

0 comments on commit 70780db

Please sign in to comment.