Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: pypy 3.8 & pip 21.3 #881

Merged
merged 2 commits into from Nov 11, 2021
Merged

feat: pypy 3.8 & pip 21.3 #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f19f4b
Update dependencies
henryiii Nov 10, 2021
060251e
fix: support pypy 3.8 and 7.3.7
henryiii Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 15 additions & 10 deletions cibuildwheel/resources/build-platforms.toml
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@ python_configurations = [
{ identifier = "cp39-manylinux_i686", version = "3.9", path_str = "/opt/python/cp39-cp39" },
{ 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 = "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 @@ -27,7 +28,9 @@ python_configurations = [
{ identifier = "cp39-manylinux_s390x", version = "3.9", path_str = "/opt/python/cp39-cp39" },
{ 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 = "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 = "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 @@ -62,13 +65,14 @@ python_configurations = [
{ identifier = "cp38-macosx_x86_64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" },
{ identifier = "cp38-macosx_arm64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" },
{ identifier = "cp38-macosx_universal2", version = "3.8", url = "https://www.python.org/ftp/python/3.8.10/python-3.8.10-macosx10.9.pkg" },
{ identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.7/python-3.9.7-macos11.pkg" },
{ identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.7/python-3.9.7-macos11.pkg" },
{ identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.7/python-3.9.7-macos11.pkg" },
{ identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0-macos11.pkg" },
{ identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0-macos11.pkg" },
{ identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0-macos11.pkg" },
{ identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5-osx64.tar.bz2" },
{ identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.8/python-3.9.8-macos11.pkg" },
{ identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.8/python-3.9.8-macos11.pkg" },
{ identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.8/python-3.9.8-macos11.pkg" },
{ identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0post2-macos11.pkg" },
{ identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0post2-macos11.pkg" },
{ identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.0/python-3.10.0post2-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.7-osx64.tar.bz2" },
]

[windows]
Expand All @@ -79,9 +83,10 @@ python_configurations = [
{ identifier = "cp37-win_amd64", version = "3.7.9", arch = "64" },
{ identifier = "cp38-win32", version = "3.8.10", arch = "32" },
{ identifier = "cp38-win_amd64", version = "3.8.10", arch = "64" },
{ identifier = "cp39-win32", version = "3.9.7", arch = "32" },
{ identifier = "cp39-win_amd64", version = "3.9.7", arch = "64" },
{ identifier = "cp39-win32", version = "3.9.8", arch = "32" },
{ identifier = "cp39-win_amd64", version = "3.9.8", arch = "64" },
{ identifier = "cp310-win32", version = "3.10.0", arch = "32" },
{ identifier = "cp310-win_amd64", version = "3.10.0", arch = "64" },
{ identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5-win64.zip" },
{ 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.7-win64.zip" },
]
14 changes: 7 additions & 7 deletions cibuildwheel/resources/constraints-python36.txt
View file
Open in desktop
Expand Up @@ -4,19 +4,19 @@
#
# bin/update_dependencies.py
#
backports.entry-points-selectable==1.1.0
backports.entry-points-selectable==1.1.1
# via virtualenv
delocate==0.10.0
# via -r cibuildwheel/resources/constraints.in
distlib==0.3.3
# via virtualenv
filelock==3.3.0
filelock==3.3.2
# via virtualenv
importlib-metadata==4.8.1
importlib-metadata==4.8.2
# via
# backports.entry-points-selectable
# virtualenv
importlib-resources==5.2.2
importlib-resources==5.4.0
# via virtualenv
platformdirs==2.4.0
# via virtualenv
Expand All @@ -26,7 +26,7 @@ typing-extensions==3.10.0.2
# via
# delocate
# importlib-metadata
virtualenv==20.8.1
virtualenv==20.10.0
# via -r cibuildwheel/resources/constraints.in
wheel==0.37.0
# via
Expand All @@ -38,7 +38,7 @@ zipp==3.6.0
# importlib-resources

# The following packages are considered to be unsafe in a requirements file:
pip==21.2.4
pip==21.3.1
# via -r cibuildwheel/resources/constraints.in
setuptools==58.2.0
setuptools==58.5.3
# via -r cibuildwheel/resources/constraints.in
12 changes: 6 additions & 6 deletions cibuildwheel/resources/constraints-python37.txt
View file
Open in desktop
Expand Up @@ -4,15 +4,15 @@
#
# bin/update_dependencies.py
#
backports.entry-points-selectable==1.1.0
backports.entry-points-selectable==1.1.1
# via virtualenv
delocate==0.10.0
# via -r cibuildwheel/resources/constraints.in
distlib==0.3.3
# via virtualenv
filelock==3.3.0
filelock==3.3.2
# via virtualenv
importlib-metadata==4.8.1
importlib-metadata==4.8.2
# via
# backports.entry-points-selectable
# virtualenv
Expand All @@ -24,7 +24,7 @@ typing-extensions==3.10.0.2
# via
# delocate
# importlib-metadata
virtualenv==20.8.1
virtualenv==20.10.0
# via -r cibuildwheel/resources/constraints.in
wheel==0.37.0
# via
Expand All @@ -34,7 +34,7 @@ zipp==3.6.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
pip==21.2.4
pip==21.3.1
# via -r cibuildwheel/resources/constraints.in
setuptools==58.2.0
setuptools==58.5.3
# via -r cibuildwheel/resources/constraints.in
10 changes: 5 additions & 5 deletions cibuildwheel/resources/constraints-python38.txt
View file
Open in desktop
Expand Up @@ -4,29 +4,29 @@
#
# bin/update_dependencies.py
#
backports.entry-points-selectable==1.1.0
backports.entry-points-selectable==1.1.1
# via virtualenv
delocate==0.10.0
# via -r cibuildwheel/resources/constraints.in
distlib==0.3.3
# via virtualenv
filelock==3.3.0
filelock==3.3.2
# via virtualenv
platformdirs==2.4.0
# via virtualenv
six==1.16.0
# via virtualenv
typing-extensions==3.10.0.2
# via delocate
virtualenv==20.8.1
virtualenv==20.10.0
# via -r cibuildwheel/resources/constraints.in
wheel==0.37.0
# via
# -r cibuildwheel/resources/constraints.in
# delocate

# The following packages are considered to be unsafe in a requirements file:
pip==21.2.4
pip==21.3.1
# via -r cibuildwheel/resources/constraints.in
setuptools==58.2.0
setuptools==58.5.3
# via -r cibuildwheel/resources/constraints.in
10 changes: 5 additions & 5 deletions cibuildwheel/resources/constraints-python39.txt
View file
Open in desktop
Expand Up @@ -4,29 +4,29 @@
#
# bin/update_dependencies.py
#
backports.entry-points-selectable==1.1.0
backports.entry-points-selectable==1.1.1
# via virtualenv
delocate==0.10.0
# via -r cibuildwheel/resources/constraints.in
distlib==0.3.3
# via virtualenv
filelock==3.3.0
filelock==3.3.2
# via virtualenv
platformdirs==2.4.0
# via virtualenv
six==1.16.0
# via virtualenv
typing-extensions==3.10.0.2
# via delocate
virtualenv==20.8.1
virtualenv==20.10.0
# via -r cibuildwheel/resources/constraints.in
wheel==0.37.0
# via
# -r cibuildwheel/resources/constraints.in
# delocate

# The following packages are considered to be unsafe in a requirements file:
pip==21.2.4
pip==21.3.1
# via -r cibuildwheel/resources/constraints.in
setuptools==58.2.0
setuptools==58.5.3
# via -r cibuildwheel/resources/constraints.in
10 changes: 5 additions & 5 deletions cibuildwheel/resources/constraints.txt
View file
Open in desktop
Expand Up @@ -4,29 +4,29 @@
#
# bin/update_dependencies.py
#
backports.entry-points-selectable==1.1.0
backports.entry-points-selectable==1.1.1
# via virtualenv
delocate==0.10.0
# via -r cibuildwheel/resources/constraints.in
distlib==0.3.3
# via virtualenv
filelock==3.3.0
filelock==3.3.2
# via virtualenv
platformdirs==2.4.0
# via virtualenv
six==1.16.0
# via virtualenv
typing-extensions==3.10.0.2
# via delocate
virtualenv==20.8.1
virtualenv==20.10.0
# via -r cibuildwheel/resources/constraints.in
wheel==0.37.0
# via
# -r cibuildwheel/resources/constraints.in
# delocate

# The following packages are considered to be unsafe in a requirements file:
pip==21.2.4
pip==21.3.1
# via -r cibuildwheel/resources/constraints.in
setuptools==58.2.0
setuptools==58.5.3
# via -r cibuildwheel/resources/constraints.in
54 changes: 27 additions & 27 deletions cibuildwheel/resources/pinned_docker_images.cfg
View file
Open in desktop
@@ -1,43 +1,43 @@
[x86_64]
manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-10-10-fee0ae1
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-10-10-790306f
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-10-10-790306f
manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-10-10-790306f
musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2021-10-10-790306f
manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-11-07-f38ff36
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-11-07-28723f3
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-11-07-28723f3
manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-11-07-28723f3
musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2021-11-07-28723f3

[i686]
manylinux1 = quay.io/pypa/manylinux1_i686:2021-10-10-fee0ae1
manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-10-10-790306f
manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-10-10-790306f
manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-10-10-790306f
musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2021-10-10-790306f
manylinux1 = quay.io/pypa/manylinux1_i686:2021-11-07-f38ff36
manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-11-07-28723f3
manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-11-07-28723f3
manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-11-07-28723f3
musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2021-11-07-28723f3

[pypy_x86_64]
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-10-10-790306f
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-10-10-790306f
manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-10-10-790306f
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-11-07-28723f3
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-11-07-28723f3
manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-11-07-28723f3

[pypy_i686]
manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-10-10-790306f
manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-10-10-790306f
manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-10-10-790306f
manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-11-07-28723f3
manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-11-07-28723f3
manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-11-07-28723f3

[aarch64]
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-10-10-790306f
manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-10-10-790306f
musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2021-10-10-790306f
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-11-07-28723f3
manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-11-07-28723f3
musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2021-11-07-28723f3

[ppc64le]
manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-10-10-790306f
manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2021-10-10-790306f
musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2021-10-10-790306f
manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-11-07-28723f3
manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2021-11-07-28723f3
musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2021-11-07-28723f3

[s390x]
manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-10-10-790306f
manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2021-10-10-790306f
musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2021-10-10-790306f
manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-11-07-28723f3
manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2021-11-07-28723f3
musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2021-11-07-28723f3

[pypy_aarch64]
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-10-10-790306f
manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-10-10-790306f
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-11-07-28723f3
manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-11-07-28723f3

1 change: 0 additions & 1 deletion cibuildwheel/windows.py
View file
Open in desktop
Expand Up @@ -112,7 +112,6 @@ def install_pypy(version: str, arch: str, url: str) -> Path:
download(url, pypy_zip)
# Extract to the parent directory because the zip file still contains a directory
extract_zip(pypy_zip, installation_path.parent)
(installation_path / "python.exe").symlink_to(installation_path / "pypy3.exe")
return installation_path


Expand Down
3 changes: 2 additions & 1 deletion docs/options.md
View file
Open in desktop
Expand Up @@ -208,7 +208,8 @@ When setting the options, you can use shell-style globbing syntax, as per [fnmat
| 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-musllinux_aarch64<br/>cp38-musllinux_ppc64le<br/>cp38-musllinux_s390x |
| Python 3.9 | cp39-macosx_x86_64<br/>cp39-macosx_universal2<br/>cp39-macosx_arm64 | cp39-win_amd64<br/>cp39-win32 | 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-musllinux_aarch64<br/>cp39-musllinux_ppc64le<br/>cp39-musllinux_s390x |
| Python 3.10 | cp310-macosx_x86_64<br/>cp310-macosx_universal2<br/>cp310-macosx_arm64 | cp310-win_amd64<br/>cp310-win32 | 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 | |
| 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 |

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