Skip to content

Commit 58b2dc3

Browse files
mayeutmayeut
authored
Merge pull request #671 from YannickJadoul/pypy-7.3.5
Update PyPy to 7.3.5 and use PyPA's manylinux images with PyPy
2 parents d29f37b + d846654 commit 58b2dc3

File tree

12 files changed

+74
-37
lines changed

12 files changed

+74
-37
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ What does it do?
2828
| CPython 3.7 | ✅ | | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
2929
| CPython 3.8 | ✅ | | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
3030
| CPython 3.9 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
31-
| PyPy 3.7 v7.3 | ✅ | | ✅ | | ✅ | | | | |
31+
| PyPy 3.7 v7.3 | ✅ | | ✅ | | ✅ | ✅ | ✅ | | |
3232

3333
- Builds manylinux, macOS 10.9+, and Windows wheels for CPython and PyPy
3434
- Works on GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, and GitLab CI
@@ -110,7 +110,7 @@ Options
110110
| | [`CIBW_BEFORE_ALL`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-all) | Execute a shell command on the build system before any wheels are built. |
111111
| | [`CIBW_BEFORE_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-build) | Execute a shell command preparing each wheel's build |
112112
| | [`CIBW_REPAIR_WHEEL_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#repair-wheel-command) | Execute a shell command to repair each (non-pure Python) built wheel |
113-
| | [`CIBW_MANYLINUX_X86_64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) <br> [`CIBW_MANYLINUX_I686_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) <br> [`CIBW_MANYLINUX_PYPY_X86_64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) <br> [`CIBW_MANYLINUX_AARCH64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) <br> [`CIBW_MANYLINUX_PPC64LE_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) <br> [`CIBW_MANYLINUX_S390X_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) | Specify alternative manylinux docker images |
113+
| | [`CIBW_MANYLINUX_X86_64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) <br> [`CIBW_MANYLINUX_I686_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) <br> [`CIBW_MANYLINUX_PYPY_X86_64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) <br> [`CIBW_MANYLINUX_AARCH64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) <br> [`CIBW_MANYLINUX_PPC64LE_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) <br> [`CIBW_MANYLINUX_S390X_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) <br> [`CIBW_MANYLINUX_PYPY_AARCH64_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) <br> [`CIBW_MANYLINUX_PYPY_I686_IMAGE`](https://cibuildwheel.readthedocs.io/en/stable/options/#manylinux-image) | Specify alternative manylinux docker images |
114114
| | [`CIBW_DEPENDENCY_VERSIONS`](https://cibuildwheel.readthedocs.io/en/stable/options/#dependency-versions) | Specify how cibuildwheel controls the versions of the tools it uses |
115115
| **Testing** | [`CIBW_TEST_COMMAND`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-command) | Execute a shell command to test each built wheel |
116116
| | [`CIBW_BEFORE_TEST`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-test) | Execute a shell command before testing each wheel |

‎bin/update_docker.py‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,26 @@ class Image(NamedTuple):
2424
# 2010 images
2525
Image("manylinux2010", "x86_64", "quay.io/pypa/manylinux2010_x86_64", None),
2626
Image("manylinux2010", "i686", "quay.io/pypa/manylinux2010_i686", None),
27-
Image("manylinux2010", "pypy_x86_64", "pypywheels/manylinux2010-pypy_x86_64", None),
27+
Image("manylinux2010", "pypy_x86_64", "quay.io/pypa/manylinux2010_x86_64", None),
28+
Image("manylinux2010", "pypy_i686", "quay.io/pypa/manylinux2010_i686", None),
2829
# 2014 images
2930
Image("manylinux2014", "x86_64", "quay.io/pypa/manylinux2014_x86_64", None),
3031
Image("manylinux2014", "i686", "quay.io/pypa/manylinux2014_i686", None),
3132
Image("manylinux2014", "aarch64", "quay.io/pypa/manylinux2014_aarch64", None),
3233
Image("manylinux2014", "ppc64le", "quay.io/pypa/manylinux2014_ppc64le", None),
3334
Image("manylinux2014", "s390x", "quay.io/pypa/manylinux2014_s390x", None),
35+
Image("manylinux2014", "pypy_x86_64", "quay.io/pypa/manylinux2014_x86_64", None),
36+
Image("manylinux2014", "pypy_i686", "quay.io/pypa/manylinux2014_i686", None),
37+
Image("manylinux2014", "pypy_aarch64", "quay.io/pypa/manylinux2014_aarch64", None),
3438
# 2_24 images
3539
Image("manylinux_2_24", "x86_64", "quay.io/pypa/manylinux_2_24_x86_64", None),
3640
Image("manylinux_2_24", "i686", "quay.io/pypa/manylinux_2_24_i686", None),
3741
Image("manylinux_2_24", "aarch64", "quay.io/pypa/manylinux_2_24_aarch64", None),
3842
Image("manylinux_2_24", "ppc64le", "quay.io/pypa/manylinux_2_24_ppc64le", None),
3943
Image("manylinux_2_24", "s390x", "quay.io/pypa/manylinux_2_24_s390x", None),
44+
Image("manylinux_2_24", "pypy_x86_64", "quay.io/pypa/manylinux_2_24_x86_64", None),
45+
Image("manylinux_2_24", "pypy_i686", "quay.io/pypa/manylinux_2_24_i686", None),
46+
Image("manylinux_2_24", "pypy_aarch64", "quay.io/pypa/manylinux_2_24_aarch64", None),
4047
]
4148

4249
config = configparser.ConfigParser()

‎cibuildwheel/__main__.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,16 @@ def main() -> None:
285285

286286
manylinux_images = {}
287287

288-
for build_platform in ["x86_64", "i686", "pypy_x86_64", "aarch64", "ppc64le", "s390x"]:
288+
for build_platform in [
289+
"x86_64",
290+
"i686",
291+
"pypy_x86_64",
292+
"aarch64",
293+
"ppc64le",
294+
"s390x",
295+
"pypy_aarch64",
296+
"pypy_i686",
297+
]:
289298
pinned_images = all_pinned_docker_images[build_platform]
290299

291300
config_name = f"CIBW_MANYLINUX_{build_platform.upper()}_IMAGE"

‎cibuildwheel/linux.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ def build(options: BuildOptions) -> None:
6969
("cp", "manylinux_ppc64le", options.manylinux_images["ppc64le"]),
7070
("cp", "manylinux_s390x", options.manylinux_images["s390x"]),
7171
("pp", "manylinux_x86_64", options.manylinux_images["pypy_x86_64"]),
72+
("pp", "manylinux_aarch64", options.manylinux_images["pypy_aarch64"]),
73+
("pp", "manylinux_i686", options.manylinux_images["pypy_i686"]),
7274
]
7375

7476
cwd = Path.cwd()

‎cibuildwheel/resources/build-platforms.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ python_configurations = [
2121
{ identifier = "cp37-manylinux_s390x", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
2222
{ identifier = "cp38-manylinux_s390x", version = "3.8", path_str = "/opt/python/cp38-cp38" },
2323
{ identifier = "cp39-manylinux_s390x", version = "3.9", path_str = "/opt/python/cp39-cp39" },
24+
{ identifier = "pp37-manylinux_aarch64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
25+
{ identifier = "pp37-manylinux_i686", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
2426
]
2527

2628
[macos]
@@ -31,7 +33,7 @@ python_configurations = [
3133
{ identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.5/python-3.9.5-macos11.pkg" },
3234
{ identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.5/python-3.9.5-macos11.pkg" },
3335
{ identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.5/python-3.9.5-macos11.pkg" },
34-
{ identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.4-osx64.tar.bz2" },
36+
{ identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5-osx64.tar.bz2" },
3537
]
3638

3739
[windows]
@@ -44,5 +46,5 @@ python_configurations = [
4446
{ identifier = "cp38-win_amd64", version = "3.8.10", arch = "64" },
4547
{ identifier = "cp39-win32", version = "3.9.5", arch = "32" },
4648
{ identifier = "cp39-win_amd64", version = "3.9.5", arch = "64" },
47-
{ identifier = "pp37-win32", version = "3.7", arch = "32", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.3-win32.zip" },
49+
{ identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.5-win64.zip" },
4850
]

‎cibuildwheel/resources/pinned_docker_images.cfg‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,38 @@
11
[x86_64]
2-
manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-05-16-740a2ec
3-
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-05-16-606ba6c
4-
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-05-16-606ba6c
5-
manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-05-16-606ba6c
2+
manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-05-24-df68af6
3+
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-05-24-84874a2
4+
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-05-24-84874a2
5+
manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-05-24-84874a2
66

77
[i686]
8-
manylinux1 = quay.io/pypa/manylinux1_i686:2021-05-16-740a2ec
9-
manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-05-16-606ba6c
10-
manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-05-16-606ba6c
11-
manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-05-16-606ba6c
8+
manylinux1 = quay.io/pypa/manylinux1_i686:2021-05-24-df68af6
9+
manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-05-24-84874a2
10+
manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-05-24-84874a2
11+
manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-05-24-84874a2
1212

1313
[pypy_x86_64]
14-
manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2021-05-08-8650a6d
14+
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-05-24-84874a2
15+
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-05-24-84874a2
16+
manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2021-05-24-84874a2
17+
18+
[pypy_i686]
19+
manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-05-24-84874a2
20+
manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-05-24-84874a2
21+
manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2021-05-24-84874a2
1522

1623
[aarch64]
17-
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-05-16-606ba6c
18-
manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-05-16-606ba6c
24+
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-05-24-84874a2
25+
manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-05-24-84874a2
1926

2027
[ppc64le]
21-
manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-05-16-606ba6c
22-
manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2021-05-16-606ba6c
28+
manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-05-24-84874a2
29+
manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2021-05-24-84874a2
2330

2431
[s390x]
25-
manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-05-16-606ba6c
26-
manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2021-05-16-606ba6c
32+
manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-05-24-84874a2
33+
manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2021-05-24-84874a2
34+
35+
[pypy_aarch64]
36+
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-05-24-84874a2
37+
manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2021-05-24-84874a2
2738

‎cibuildwheel/windows.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def install_cpython(version: str, arch: str, nuget: Path) -> Path:
9595

9696

9797
def install_pypy(version: str, arch: str, url: str) -> Path:
98-
assert arch == "32"
98+
assert arch == "64" and "win64" in url
9999
# Inside the PyPy zip file is a directory with the same name
100100
zip_filename = url.rsplit("/", 1)[-1]
101101
extension = ".zip"

‎docs/options.md‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ When setting the options, you can use shell-style globbing syntax, as per [fnmat
124124
| Python 3.7 | cp37-macosx_x86_64 | cp37-win_amd64<br/>cp37-win32 | cp37-manylinux_x86_64<br/>cp37-manylinux_i686 | cp37-manylinux_aarch64<br/>cp37-manylinux_ppc64le<br/>cp37-manylinux_s390x |
125125
| Python 3.8 | cp38-macosx_x86_64 | cp38-win_amd64<br/>cp38-win32 | cp38-manylinux_x86_64<br/>cp38-manylinux_i686 | cp38-manylinux_aarch64<br/>cp38-manylinux_ppc64le<br/>cp38-manylinux_s390x |
126126
| 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 | cp39-manylinux_aarch64<br/>cp39-manylinux_ppc64le<br/>cp39-manylinux_s390x |
127-
| PyPy3.7 v7.3 | pp37-macosx_x86_64 | pp37-win32 | pp37-manylinux_x86_64 | |
127+
| PyPy3.7 v7.3 | pp37-macosx_x86_64 | pp37-win_amd64 | pp37-manylinux_x86_64 | |
128128

129129

130130
The list of supported and currently selected build identifiers can also be retrieved by passing the `--print-build-identifiers` flag to cibuildwheel.
@@ -478,10 +478,12 @@ The available options are:
478478
- `CIBW_MANYLINUX_AARCH64_IMAGE`
479479
- `CIBW_MANYLINUX_PPC64LE_IMAGE`
480480
- `CIBW_MANYLINUX_S390X_IMAGE`
481+
- `CIBW_MANYLINUX_PYPY_AARCH64_IMAGE`
482+
- `CIBW_MANYLINUX_PYPY_I686_IMAGE`
481483

482-
Set an alternative Docker image to be used for building [manylinux](https://github.com/pypa/manylinux) wheels. cibuildwheel will then pull these instead of the default images, [`quay.io/pypa/manylinux2010_x86_64`](https://quay.io/pypa/manylinux2010_x86_64), [`quay.io/pypa/manylinux2010_i686`](https://quay.io/pypa/manylinux2010_i686), [`pypywheels/manylinux2010-pypy_x86_64`](https://hub.docker.com/r/pypywheels/manylinux2010-pypy_x86_64), [`quay.io/pypa/manylinux2014_aarch64`](https://quay.io/pypa/manylinux2014_aarch64), [`quay.io/pypa/manylinux2014_ppc64le`](https://quay.io/pypa/manylinux2014_ppc64le), and [`quay.io/pypa/manylinux2014_s390x`](https://quay.io/pypa/manylinux2010_s390x).
484+
Set an alternative Docker image to be used for building [manylinux](https://github.com/pypa/manylinux) wheels. cibuildwheel will then pull these instead of the default images, [`quay.io/pypa/manylinux2010_x86_64`](https://quay.io/pypa/manylinux2010_x86_64), [`quay.io/pypa/manylinux2010_i686`](https://quay.io/pypa/manylinux2010_i686), [`quay.io/pypa/manylinux2010_x86_64`](https://quay.io/pypa/manylinux2010_x86_64), [`quay.io/pypa/manylinux2014_aarch64`](https://quay.io/pypa/manylinux2014_aarch64), [`quay.io/pypa/manylinux2014_ppc64le`](https://quay.io/pypa/manylinux2014_ppc64le), and [`quay.io/pypa/manylinux2014_s390x`](https://quay.io/pypa/manylinux2010_s390x).
483485

484-
The value of this option can either be set to `manylinux1`, `manylinux2010`, `manylinux2014` or `manylinux_2_24` to use a pinned version of the [official manylinux images](https://github.com/pypa/manylinux) and [PyPy manylinux images](https://github.com/pypy/manylinux). Alternatively, set these options to any other valid Docker image name. For PyPy, only the official `manylinux2010` image is currently available. For architectures other
486+
The value of this option can either be set to `manylinux1`, `manylinux2010`, `manylinux2014` or `manylinux_2_24` to use a pinned version of the [official manylinux images](https://github.com/pypa/manylinux). Alternatively, set these options to any other valid Docker image name. For PyPy, the `manylinux1` image is not available. For architectures other
485487
than x86 (x86\_64 and i686) `manylinux2014` or `manylinux_2_24` must be used, because the first version of the manylinux specification that supports additional architectures is `manylinux2014`.
486488

487489

@@ -501,12 +503,15 @@ CIBW_SKIP: pp*
501503
# build using the manylinux2014 image
502504
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
503505
CIBW_MANYLINUX_I686_IMAGE: manylinux2014
504-
CIBW_SKIP: cp27-manylinux*
506+
CIBW_MANYLINUX_PYPY_X86_64_IMAGE: manylinux2014
507+
CIBW_MANYLINUX_PYPY_I686_IMAGE: manylinux2014
505508
506509
# build using the latest manylinux2010 release, instead of the cibuildwheel
507510
# pinned version
508511
CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux2010_x86_64:latest
509512
CIBW_MANYLINUX_I686_IMAGE: quay.io/pypa/manylinux2010_i686:latest
513+
CIBW_MANYLINUX_PYPY_X86_64_IMAGE: quay.io/pypa/manylinux2010_x86_64:latest
514+
CIBW_MANYLINUX_PYPY_I686_IMAGE: quay.io/pypa/manylinux2010_i686:latest
510515
511516
# build using a different image from the docker registry
512517
CIBW_MANYLINUX_X86_64_IMAGE: dockcross/manylinux-x64

‎test/test_manylinuxXXXX_only.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,11 @@ def test(manylinux_image, tmp_path):
6464
"CIBW_MANYLINUX_AARCH64_IMAGE": manylinux_image,
6565
"CIBW_MANYLINUX_PPC64LE_IMAGE": manylinux_image,
6666
"CIBW_MANYLINUX_S390X_IMAGE": manylinux_image,
67+
"CIBW_MANYLINUX_PYPY_AARCH64_IMAGE": manylinux_image,
68+
"CIBW_MANYLINUX_PYPY_I686_IMAGE": manylinux_image,
6769
}
68-
if manylinux_image in {"manylinux1", "manylinux2014", "manylinux_2_24"}:
70+
if manylinux_image in {"manylinux1"}:
6971
# We don't have a manylinux1 image for PyPy
70-
# We don't have a manylinux2014 / manylinux_2_24 image for PyPy (yet?)
7172
add_env["CIBW_SKIP"] = "pp*"
7273

7374
actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
@@ -80,6 +81,6 @@ def test(manylinux_image, tmp_path):
8081
expected_wheels = utils.expected_wheels(
8182
"spam", "0.1.0", manylinux_versions=platform_tag_map.get(manylinux_image, [manylinux_image])
8283
)
83-
if manylinux_image in {"manylinux1", "manylinux2014", "manylinux_2_24"}:
84+
if manylinux_image in {"manylinux1"}:
8485
expected_wheels = [w for w in expected_wheels if "-pp" not in w]
8586
assert set(actual_wheels) == set(expected_wheels)

‎test/utils.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def expected_wheels(
120120

121121
python_abi_tags = ["cp36-cp36m", "cp37-cp37m", "cp38-cp38", "cp39-cp39"]
122122

123-
if machine_arch in ["x86_64", "AMD64", "x86"]:
123+
if machine_arch in ["x86_64", "AMD64", "x86", "aarch64"]:
124124
python_abi_tags += ["pp37-pypy37_pp73"]
125125

126126
if platform == "macos" and get_macos_version() >= (10, 16):
@@ -140,7 +140,7 @@ def expected_wheels(
140140
if platform == "linux":
141141
architectures = [machine_arch]
142142

143-
if machine_arch == "x86_64" and python_abi_tag.startswith("cp"):
143+
if machine_arch == "x86_64":
144144
architectures.append("i686")
145145

146146
platform_tags = [
@@ -157,7 +157,7 @@ def expected_wheels(
157157
if python_abi_tag.startswith("cp"):
158158
platform_tags = ["win32", "win_amd64"]
159159
else:
160-
platform_tags = ["win32"]
160+
platform_tags = ["win_amd64"]
161161

162162
elif platform == "macos":
163163
if python_abi_tag == "cp39-cp39" and machine_arch == "arm64":

0 commit comments

Comments
 (0)