Add GraalPy 25 and remove workarounds for that version. (#2597)

test/test_abi_variants.py

@@ -41,7 +41,7 @@ def test_abi3(tmp_path):
         add_env={
             # free_threaded, GraalPy, and PyPy do not have a Py_LIMITED_API equivalent, just build one of those
             # also limit the number of builds for test performance reasons
-            "CIBW_BUILD": "cp39-* cp310-* pp310-* gp311_242-* cp312-* cp313t-*",
+            "CIBW_BUILD": "cp39-* cp310-* pp310-* gp312_250-* cp312-* cp313t-*",
             "CIBW_ENABLE": "all",
         },
     )
@@ -64,7 +64,7 @@ def test_abi3(tmp_path):
                 "cp310-abi3",  # <-- ABI3, works with 3.10 and 3.12
                 "cp313-cp313t",
                 "pp310-pypy310_pp73",
-                "graalpy311-graalpy242_311_native",
+                "graalpy312-graalpy250_312_native",
             ],
         )
 

test/test_dependency_versions.py

@@ -140,11 +140,11 @@ def test_dependency_constraints(method, tmp_path, build_frontend_env_nouv):
         and method == "file"
         and build_frontend_env_nouv["CIBW_BUILD_FRONTEND"] == "build"
     ):
-        # GraalPy fails to discover its standard library when a venv is created
+        # GraalPy 24 fails to discover its standard library when a venv is created
         # from a virtualenv seeded executable. See
         # https://github.com/oracle/graalpython/issues/491 and remove this once
-        # fixed upstream.
-        build_frontend_env_nouv["CIBW_SKIP"] = "gp*"
+        # GraalPy 24 is dropped
+        build_frontend_env_nouv["CIBW_SKIP"] = "gp311*"
 
     for package_name, version in tool_versions.items():
         env_name = f"EXPECTED_{package_name.upper()}_VERSION"
@@ -172,6 +172,6 @@ def test_dependency_constraints(method, tmp_path, build_frontend_env_nouv):
     ):
         # See reference to https://github.com/oracle/graalpython/issues/491
         # above
-        expected_wheels = [w for w in expected_wheels if "graalpy" not in w]
+        expected_wheels = [w for w in expected_wheels if "graalpy311" not in w]
 
     assert set(actual_wheels) == set(expected_wheels)

test/utils.py

@@ -308,6 +308,7 @@ def _expected_wheels(
         if EnableGroup.GraalPy in enable_groups:
             python_abi_tags += [
                 "graalpy311-graalpy242_311_native",
+                "graalpy312-graalpy250_312_native",
             ]
 
     if machine_arch == "ARM64" and platform == "windows":
@@ -367,6 +368,11 @@ def _expected_wheels(
                     min_macosx = macosx_deployment_target
                 else:
                     min_macosx = _floor_macosx(macosx_deployment_target, "10.13")
+            elif python_abi_tag.startswith("graalpy"):
+                if python_abi_tag.startswith("graalpy311"):
+                    min_macosx = macosx_deployment_target
+                else:
+                    min_macosx = _floor_macosx(macosx_deployment_target, "10.13")
             else:
                 min_macosx = macosx_deployment_target