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

Merge pull request #671 from YannickJadoul/pypy-7.3.5

Browse Source 
Update PyPy to 7.3.5 and use PyPA's manylinux images with PyPy
This commit is contained in:
Matthieu Darbois
2021-05-25 18:04:18 +02:00
committed by GitHub
parent d29f37ba6c d84665491a
commit 58b2dc367c
12 changed files with 74 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/__main__.py
+10 -1
View File
@@ -285,7 +285,16 @@ def main() -> None:
manylinux_images = {}
for build_platform in ["x86_64", "i686", "pypy_x86_64", "aarch64", "ppc64le", "s390x"]:
for build_platform in [
"x86_64",
"i686",
"pypy_x86_64",
"aarch64",
"ppc64le",
"s390x",
"pypy_aarch64",
"pypy_i686",
]:
pinned_images = all_pinned_docker_images[build_platform]
config_name = f"CIBW_MANYLINUX_{build_platform.upper()}_IMAGE"
cibuildwheel/linux.py
+2
View File
@@ -69,6 +69,8 @@ def build(options: BuildOptions) -> None:
("cp", "manylinux_ppc64le", options.manylinux_images["ppc64le"]),
("cp", "manylinux_s390x", options.manylinux_images["s390x"]),
("pp", "manylinux_x86_64", options.manylinux_images["pypy_x86_64"]),
("pp", "manylinux_aarch64", options.manylinux_images["pypy_aarch64"]),
("pp", "manylinux_i686", options.manylinux_images["pypy_i686"]),
]
cwd = Path.cwd()
cibuildwheel/resources/build-platforms.toml
+4 -2
View File
@@ -21,6 +21,8 @@ python_configurations = [
{ identifier = "cp37-manylinux_s390x", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
{ 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 = "pp37-manylinux_aarch64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
{ identifier = "pp37-manylinux_i686", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
]
[macos]
@@ -31,7 +33,7 @@ python_configurations = [
{ identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.5/python-3.9.5-macos11.pkg" },
{ identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.5/python-3.9.5-macos11.pkg" },
{ identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.5/python-3.9.5-macos11.pkg" },
{ identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.4-osx64.tar.bz2" },
{ identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5-osx64.tar.bz2" },
]
[windows]
@@ -44,5 +46,5 @@ python_configurations = [
{ identifier = "cp38-win_amd64", version = "3.8.10", arch = "64" },
{ identifier = "cp39-win32", version = "3.9.5", arch = "32" },
{ identifier = "cp39-win_amd64", version = "3.9.5", arch = "64" },
{ identifier = "pp37-win32", version = "3.7", arch = "32", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.3-win32.zip" },
{ identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5-win64.zip" },
]
cibuildwheel/resources/pinned_docker_images.cfg
+26 -15
View File
@@ -1,27 +1,38 @@
[x86_64]
manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-05-16-740a2ec
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-05-16-606ba6c
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-05-16-606ba6c
manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-05-16-606ba6c
manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-05-24-df68af6
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-05-24-84874a2
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-05-24-84874a2
manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-05-24-84874a2
[i686]
manylinux1 = quay.io/pypa/manylinux1_i686:2021-05-16-740a2ec
manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-05-16-606ba6c
manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-05-16-606ba6c
manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-05-16-606ba6c
manylinux1 = quay.io/pypa/manylinux1_i686:2021-05-24-df68af6
manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-05-24-84874a2
manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-05-24-84874a2
manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-05-24-84874a2
[pypy_x86_64]
manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2021-05-08-8650a6d
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-05-24-84874a2
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-05-24-84874a2
manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-05-24-84874a2
[pypy_i686]
manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-05-24-84874a2
manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-05-24-84874a2
manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-05-24-84874a2
[aarch64]
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-05-16-606ba6c
manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-05-16-606ba6c
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-05-24-84874a2
manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-05-24-84874a2
[ppc64le]
manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-05-16-606ba6c
manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2021-05-16-606ba6c
manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-05-24-84874a2
manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2021-05-24-84874a2
[s390x]
manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-05-16-606ba6c
manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2021-05-16-606ba6c
manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-05-24-84874a2
manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2021-05-24-84874a2
[pypy_aarch64]
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-05-24-84874a2
manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-05-24-84874a2
cibuildwheel/windows.py
+1 -1
View File
@@ -95,7 +95,7 @@ def install_cpython(version: str, arch: str, nuget: Path) -> Path:
def install_pypy(version: str, arch: str, url: str) -> Path:
assert arch == "32"
assert arch == "64" and "win64" in url
# Inside the PyPy zip file is a directory with the same name
zip_filename = url.rsplit("/", 1)[-1]
extension = ".zip"