TST: only partially skip image tests when pytest-mpl is missing

Author: neutrinoceros

tests/conftest.py

@@ -1,7 +1,6 @@
 import textwrap
 from importlib.util import find_spec
 
-import pytest
 from runtime_introspect import runtime_feature_set
 
 import gpgi
@@ -16,17 +15,11 @@ def pytest_configure(config):
         mpl.use("Agg")
     else:  # pragma: no cover
         config.addinivalue_line(
-            "markers", "mpl_image_compare: skip (missing requirement: pytest_mpl)"
+            "markers",
+            "mpl_image_compare: partial skip (missing requirement: pytest_mpl)",
         )
 
 
-def pytest_runtest_setup(item):
-    if HAVE_PYTEST_MPL:
-        return
-    if any(item.iter_markers(name="mpl_image_compare")):  # pragma: no cover
-        pytest.skip("missing requirement: pytest_mpl")
-
-
 def pytest_report_header(config, start_path) -> list[str]:
     fs = runtime_feature_set()
     diagnostics = fs.diagnostics(features=["free-threading", "JIT"])

tests/test_deposit.py

@@ -2,6 +2,7 @@
 from contextlib import nullcontext
 from copy import deepcopy
 from functools import partial
+from importlib.util import find_spec
 from threading import Lock
 
 import numpy as np
@@ -11,6 +12,8 @@
 import gpgi
 from gpgi._lib import _deposit_ngp_2D
 
+HAVE_PYTEST_MPL = find_spec("pytest_mpl") is not None
+
 
 @pytest.fixture()
 def sample_2D_dataset():
@@ -120,11 +123,13 @@ def fake_dep(*args, metadata=None, **kwargs):
 @pytest.mark.parametrize("method", ["ngp", "cic", "tsc"])
 @pytest.mark.mpl_image_compare
 def test_2D_deposit(sample_2D_dataset, method):
-    from matplotlib.figure import Figure
-
     ds = sample_2D_dataset
     particle_density = ds.deposit("mass", method=method)
 
+    if not HAVE_PYTEST_MPL:
+        pytest.skip(reason="pytest-mpl is not available")
+    from matplotlib.figure import Figure
+
     fig = Figure()
     ax = fig.add_subplot()
 
@@ -153,8 +158,6 @@ def test_2D_deposit(sample_2D_dataset, method):
 @pytest.mark.parametrize("grid_type", ["linear", "geometric"])
 @pytest.mark.mpl_image_compare
 def test_1D_deposit(method, grid_type):
-    from matplotlib.figure import Figure
-
     if grid_type == "linear":
         xedges = np.linspace(1, 2, 6)
     elif grid_type == "geometric":
@@ -178,6 +181,11 @@ def test_1D_deposit(method, grid_type):
     if method == "ngp":
         assert mass.sum() == ds.particles.count
 
+    if not HAVE_PYTEST_MPL:
+        pytest.skip(reason="pytest-mpl is not available")
+
+    from matplotlib.figure import Figure
+
     fig = Figure()
     ax = fig.add_subplot()
     ax.set(xlabel="x", ylabel="particle mass", title=f"Deposition method '{method}'")
@@ -243,8 +251,6 @@ def test_3D_deposit(method, dtype):
 
 @pytest.mark.mpl_image_compare
 def test_readme_example():
-    from matplotlib.figure import Figure
-
     nx = ny = 64
     nparticles = 600_000
 
@@ -271,6 +277,10 @@ def test_readme_example():
 
     particle_mass = ds.deposit("mass", method="nearest_grid_point")
 
+    if not HAVE_PYTEST_MPL:
+        pytest.skip(reason="pytest-mpl is not available")
+    from matplotlib.figure import Figure
+
     fig = Figure()
     ax = fig.add_subplot()
     ax.set(aspect=1, xlabel="x", ylabel="y")