fixup pytests

Author: davidhewitt

pytests/noxfile.py

@@ -9,16 +9,16 @@
 def test(session: nox.Session):
     session.env["MATURIN_PEP517_ARGS"] = "--profile=dev"
     session.run_always("python", "-m", "pip", "install", "-v", ".[dev]")
-    try:
-        session.install("--only-binary=numpy", "numpy>=1.16")
-    except CommandFailed:
-        # No binary wheel for numpy available on this platform
-        pass
-    try:
-        session.install("--only-binary=gevent", "gevent>=22.10.2")
-    except CommandFailed:
-        # No binary wheel for numpy available on this platform
-        pass
+
+    def try_install_binary(package: str, constraint: str):
+        try:
+            session.install(f"--only-binary={package}", f"{package}{constraint}")
+        except CommandFailed:
+            # No binary wheel available on this platform
+            pass
+
+    try_install_binary("numpy", ">=1.16")
+    try_install_binary("gevent", ">=22.10.2")
     ignored_paths = []
     if sys.version_info < (3, 10):
         # Match syntax is only available in Python >= 3.10

pytests/tests/test_misc.py

@@ -5,6 +5,11 @@
 import pyo3_pytests.misc
 import pytest
 
+if sys.version_info >= (3, 13):
+    subinterpreters = pytest.importorskip("subinterpreters")
+else:
+    subinterpreters = pytest.importorskip("_xxsubinterpreters")
+
 
 def test_issue_219():
     # Should not deadlock
@@ -31,23 +36,19 @@ def test_multiple_imports_same_interpreter_ok():
     reason="PyPy and GraalPy do not support subinterpreters",
 )
 def test_import_in_subinterpreter_forbidden():
-    import _xxsubinterpreters
-
     if sys.version_info < (3, 12):
         expected_error = "PyO3 modules do not yet support subinterpreters, see https://github.com/PyO3/pyo3/issues/576"
     else:
         expected_error = "module pyo3_pytests.pyo3_pytests does not support loading in subinterpreters"
 
-    sub_interpreter = _xxsubinterpreters.create()
+    sub_interpreter = subinterpreters.create()
     with pytest.raises(
-        _xxsubinterpreters.RunFailedError,
+        subinterpreters.RunFailedError,
         match=expected_error,
     ):
-        _xxsubinterpreters.run_string(
-            sub_interpreter, "import pyo3_pytests.pyo3_pytests"
-        )
+        subinterpreters.run_string(sub_interpreter, "import pyo3_pytests.pyo3_pytests")
 
-    _xxsubinterpreters.destroy(sub_interpreter)
+    subinterpreters.destroy(sub_interpreter)
 
 
 def test_type_full_name_includes_module():