Merge pull request #671 from YannickJadoul/pypy-7.3.5

Update PyPy to 7.3.5 and use PyPA's manylinux images with PyPy

test/test_manylinuxXXXX_only.py

@@ -64,10 +64,11 @@ def test(manylinux_image, tmp_path):
         "CIBW_MANYLINUX_AARCH64_IMAGE": manylinux_image,
         "CIBW_MANYLINUX_PPC64LE_IMAGE": manylinux_image,
         "CIBW_MANYLINUX_S390X_IMAGE": manylinux_image,
+        "CIBW_MANYLINUX_PYPY_AARCH64_IMAGE": manylinux_image,
+        "CIBW_MANYLINUX_PYPY_I686_IMAGE": manylinux_image,
     }
-    if manylinux_image in {"manylinux1", "manylinux2014", "manylinux_2_24"}:
+    if manylinux_image in {"manylinux1"}:
         # We don't have a manylinux1 image for PyPy
-        # We don't have a manylinux2014 / manylinux_2_24 image for PyPy (yet?)
         add_env["CIBW_SKIP"] = "pp*"
 
     actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
@@ -80,6 +81,6 @@ def test(manylinux_image, tmp_path):
     expected_wheels = utils.expected_wheels(
         "spam", "0.1.0", manylinux_versions=platform_tag_map.get(manylinux_image, [manylinux_image])
     )
-    if manylinux_image in {"manylinux1", "manylinux2014", "manylinux_2_24"}:
+    if manylinux_image in {"manylinux1"}:
         expected_wheels = [w for w in expected_wheels if "-pp" not in w]
     assert set(actual_wheels) == set(expected_wheels)

test/utils.py

@@ -120,7 +120,7 @@ def expected_wheels(
 
     python_abi_tags = ["cp36-cp36m", "cp37-cp37m", "cp38-cp38", "cp39-cp39"]
 
-    if machine_arch in ["x86_64", "AMD64", "x86"]:
+    if machine_arch in ["x86_64", "AMD64", "x86", "aarch64"]:
         python_abi_tags += ["pp37-pypy37_pp73"]
 
     if platform == "macos" and get_macos_version() >= (10, 16):
@@ -140,7 +140,7 @@ def expected_wheels(
         if platform == "linux":
             architectures = [machine_arch]
 
-            if machine_arch == "x86_64" and python_abi_tag.startswith("cp"):
+            if machine_arch == "x86_64":
                 architectures.append("i686")
 
             platform_tags = [
@@ -157,7 +157,7 @@ def expected_wheels(
             if python_abi_tag.startswith("cp"):
                 platform_tags = ["win32", "win_amd64"]
             else:
-                platform_tags = ["win32"]
+                platform_tags = ["win_amd64"]
 
         elif platform == "macos":
             if python_abi_tag == "cp39-cp39" and machine_arch == "arm64":