tests: update for GRAALPY 24.2 and better printout

Signed-off-by: Henry Schreiner <[email protected]>

Author: henryiii

tests/conftest.py

@@ -9,9 +9,11 @@
 import contextlib
 import difflib
 import gc
+import importlib.metadata
 import multiprocessing
 import re
 import sys
+import sysconfig
 import textwrap
 import traceback
 
@@ -210,16 +212,32 @@ def pytest_configure():
     pytest.gc_collect = gc_collect
 
 
-def pytest_report_header(config):
-    del config  # Unused.
+def pytest_report_header():
     assert pybind11_tests.compiler_info is not None, (
         "Please update pybind11_tests.cpp if this assert fails."
     )
-    return (
-        "C++ Info:"
-        f" {pybind11_tests.compiler_info}"
-        f" {pybind11_tests.cpp_std}"
-        f" {pybind11_tests.PYBIND11_INTERNALS_ID}"
-        f" PYBIND11_SIMPLE_GIL_MANAGEMENT={pybind11_tests.PYBIND11_SIMPLE_GIL_MANAGEMENT}"
-        f" PYBIND11_NUMPY_1_ONLY={pybind11_tests.PYBIND11_NUMPY_1_ONLY}"
-    )
+    interesting_packages = ("pybind11", "numpy", "scipy", "build")
+    valid = []
+    for package in sorted(interesting_packages):
+        with contextlib.suppress(ModuleNotFoundError):
+            valid.append(f"{package}=={importlib.metadata.version(package)}")
+    reqs = " ".join(valid)
+
+    cpp_info = [
+        "C++ Info:",
+        f"{pybind11_tests.compiler_info}",
+        f"{pybind11_tests.cpp_std}",
+        f"{pybind11_tests.PYBIND11_INTERNALS_ID}",
+        f"PYBIND11_SIMPLE_GIL_MANAGEMENT={pybind11_tests.PYBIND11_SIMPLE_GIL_MANAGEMENT}",
+        f"PYBIND11_NUMPY_1_ONLY={pybind11_tests.PYBIND11_NUMPY_1_ONLY}",
+    ]
+    if hasattr(pybind11_tests, "GRAALPY_VERSION_NUM"):
+        cpp_info.append(f"GRAALPY_VERSION_NUM=0x{pybind11_tests.GRAALPY_VERSION_NUM:x}")
+    lines = [
+        f"installed packages of interest: {reqs}",
+        " ".join(cpp_info),
+    ]
+    if sysconfig.get_config_var("Py_GIL_DISABLED"):
+        lines.append("free-threaded Python build")
+
+    return lines

tests/pybind11_tests.cpp

@@ -104,6 +104,11 @@ PYBIND11_MODULE(pybind11_tests, m, py::mod_gil_not_used()) {
         false;
 #endif
 
+// Note that this is missing before GraalPy 24.2
+#if defined(GRAALPY_VERSION_NUM)
+    m.attr("GRAALPY_VERSION_NUM") = GRAALPY_VERSION_NUM;
+#endif
+
     bind_ConstructorStats(m);
 
 #if defined(PYBIND11_DETAILED_ERROR_MESSAGES)

tests/test_enum.py

@@ -5,11 +5,14 @@
 
 import pytest
 
-import env  # noqa: F401
+import env
+import pybind11_tests
 from pybind11_tests import enums as m
 
+GRAALPY_24_2 = env.GRAALPY and getattr(pybind11_tests, "GRAALPY_VERSION_NUM", 0) >= 0x180200
 
-@pytest.mark.xfail("env.GRAALPY", reason="TODO should get fixed on GraalPy side")
+
+@pytest.mark.xfail(env.GRAALPY and not GRAALPY_24_2, reason="Fixed in GraalPy 24.2")
 def test_unscoped_enum():
     assert str(m.UnscopedEnum.EOne) == "UnscopedEnum.EOne"
     assert str(m.UnscopedEnum.ETwo) == "UnscopedEnum.ETwo"
@@ -197,7 +200,7 @@ def test_implicit_conversion():
     assert repr(x) == "{<EMode.EFirstMode: 1>: 3, <EMode.ESecondMode: 2>: 4}"
 
 
-@pytest.mark.xfail("env.GRAALPY", reason="TODO should get fixed on GraalPy side")
+@pytest.mark.xfail(env.GRAALPY and not GRAALPY_24_2, reason="Fixed in GraalPy 24.2")
 def test_binary_operators():
     assert int(m.Flags.Read) == 4
     assert int(m.Flags.Write) == 2

tests/test_operator_overloading.py

@@ -3,9 +3,12 @@
 import pytest
 
 import env
+import pybind11_tests
 from pybind11_tests import ConstructorStats
 from pybind11_tests import operators as m
 
+GRAALPY_24_2 = env.GRAALPY and getattr(pybind11_tests, "GRAALPY_VERSION_NUM", 0) >= 0x180200
+
 
 @pytest.mark.xfail("env.GRAALPY", reason="TODO should get fixed on GraalPy side")
 def test_operator_overloading():
@@ -88,7 +91,7 @@ def test_operator_overloading():
     assert cstats.move_assignments == 0
 
 
-@pytest.mark.xfail("env.GRAALPY", reason="TODO should get fixed on GraalPy side")
+@pytest.mark.xfail(env.GRAALPY and not GRAALPY_24_2, reason="Fixed in GraalPy 24.2")
 def test_operators_notimplemented():
     """#393: need to return NotSupported to ensure correct arithmetic operator behavior"""