Move PyPy 3.10 to pypy-eol (#2521)

* Move PyPy 3.10 to pypy-eol

* Refactor PyPy selection

Author: hugovk

cibuildwheel/selector.py

@@ -89,9 +89,11 @@ def __call__(self, build_id: str) -> bool:
             return False
         if EnableGroup.CPythonPrerelease not in self.enable and fnmatch(build_id, "cp315*"):
             return False
-        if EnableGroup.PyPy not in self.enable and fnmatch(build_id, "pp31*"):
+        is_pypy_eol = fnmatch(build_id, "pp3?-*") or fnmatch(build_id, "pp310-*")
+        is_pypy = fnmatch(build_id, "pp*") and not is_pypy_eol
+        if EnableGroup.PyPy not in self.enable and is_pypy:
             return False
-        if EnableGroup.PyPyEoL not in self.enable and fnmatch(build_id, "pp3?-*"):
+        if EnableGroup.PyPyEoL not in self.enable and is_pypy_eol:
             return False
         if EnableGroup.GraalPy not in self.enable and fnmatch(build_id, "gp*"):
             return False

test/utils.py

@@ -287,10 +287,10 @@ def _expected_wheels(
             python_abi_tags += [
                 "pp38-pypy38_pp73",
                 "pp39-pypy39_pp73",
+                "pp310-pypy310_pp73",
             ]
         if EnableGroup.PyPy in enable_groups:
             python_abi_tags += [
-                "pp310-pypy310_pp73",
                 "pp311-pypy311_pp73",
             ]
 

unit_test/build_selector_test.py

@@ -16,7 +16,6 @@ def test_build():
     assert build_selector("cp312-manylinux_x86_64")
     assert build_selector("cp313-manylinux_x86_64")
     assert build_selector("cp314-manylinux_x86_64")
-    assert build_selector("pp310-manylinux_x86_64")
     assert build_selector("pp311-manylinux_x86_64")
     assert build_selector("cp36-manylinux_i686")
     assert build_selector("cp37-manylinux_i686")
@@ -62,8 +61,8 @@ def test_build_filter_pypy():
         skip_config="",
         enable=frozenset([EnableGroup.PyPy]),
     )
-    assert build_selector("pp310-manylinux_x86_64")
     assert build_selector("pp311-manylinux_x86_64")
+    assert not build_selector("pp310-manylinux_x86_64")
     assert not build_selector("pp38-manylinux_x86_64")
     assert not build_selector("pp39-manylinux_x86_64")
 
@@ -74,8 +73,8 @@ def test_build_filter_pypy_eol():
         skip_config="",
         enable=frozenset([EnableGroup.PyPyEoL]),
     )
-    assert not build_selector("pp310-manylinux_x86_64")
     assert not build_selector("pp311-manylinux_x86_64")
+    assert build_selector("pp310-manylinux_x86_64")
     assert build_selector("pp38-manylinux_x86_64")
     assert build_selector("pp39-manylinux_x86_64")