Update rainforests tests to run only when required modules are present

improver_tests/acceptance/test_apply_rainforests_calibration.py

@@ -11,10 +11,6 @@
 
 from . import acceptance as acc
 
-lightgbm = pytest.importorskip("lightgbm")
-tl2cgen = pytest.importorskip("tl2cgen")
-treelite = pytest.importorskip("treelite")
-
 pytestmark = [pytest.mark.acc, acc.skip_if_kgo_missing]
 CLI = acc.cli_name_with_dashes(__file__)
 run_cli = acc.run_cli(CLI)
@@ -38,6 +34,16 @@ def patch_available_packages(self, model_key, monkeypatch):
                 raise NotImplementedError("Unknown value for model_key")
         yield
 
+    @pytest.fixture(autouse=True)
+    def skip_test_on_missing_import(self, model_key):
+        match model_key:
+            case "lightgbm_model":
+                pytest.importorskip("lightgbm")
+            case "treelite_model":
+                pytest.importorskip("tl2cgen")
+                pytest.importorskip("treelite")
+        yield
+
     @pytest.fixture
     def create_model_config(self):
         """Load model-config json containing relative paths, and create a duplicate version

improver_tests/acceptance/test_apply_samos_coefficients.py

@@ -18,6 +18,7 @@
 def test_normal_gam_coordinates(tmp_path):
     """Test diagnostic with assumed normal distribution and GAM feature
     provided as coordinates on the input cube."""
+    pytest.importorskip("pygam")
     kgo_dir = acc.kgo_root() / "apply-samos-coefficients"
     kgo_path = kgo_dir / "kgo_coord.nc"
 
@@ -50,6 +51,7 @@ def test_normal_gam_cubes(tmp_path):
     Test apply-samos-coefficients for diagnostic with assumed
     normal distribution and additional features provided as cubes.
     """
+    pytest.importorskip("pygam")
     kgo_dir = acc.kgo_root() / "apply-samos-coefficients"
     kgo_path = kgo_dir / "kgo_cubes_additional_cubes.nc"
 
@@ -85,6 +87,7 @@ def test_normal_sites(tmp_path):
     Test apply-samos-coefficients for diagnostic with assumed
     normal distribution at sites.
     """
+    pytest.importorskip("pygam")
     kgo_dir = acc.kgo_root() / "apply-samos-coefficients"
     kgo_path = kgo_dir / "kgo_sites.nc"
 
@@ -113,6 +116,7 @@ def test_normal_sites(tmp_path):
 
 def test_no_coefficients(tmp_path):
     """Test apply-samos-coefficients when no coefficients provided"""
+    pytest.importorskip("pygam")
     kgo_dir = acc.kgo_root() / "apply-samos-coefficients/"
     kgo_path = kgo_dir / "kgo_with_comment.nc"
 

improver_tests/acceptance/test_stochastic_noise.py

@@ -17,6 +17,7 @@
 
 def test_basic(tmp_path):
     """Test basic stochastic noise addition."""
+    pytest.importorskip("pysteps")
     kgo_dir = acc.kgo_root() / "stochastic_noise"
     kgo_path = kgo_dir / "unscaled/kgo.nc"
     dependence_template_path = kgo_dir / "input.nc"
@@ -39,6 +40,7 @@ def test_basic(tmp_path):
 
 
 def test_scale_non_positive_noise(tmp_path):
+    pytest.importorskip("pysteps")
     """Test stochastic noise addition with scale_non_positive_noise=True"""
     kgo_dir = acc.kgo_root() / "stochastic_noise"
     kgo_path = kgo_dir / "scaled/kgo.nc"

improver_tests/acceptance/test_wet_bulb_freezing_level.py

@@ -15,6 +15,7 @@
 
 def test_basic(tmp_path):
     """Test basic wet bulb freezing level calculation"""
+    pytest.importorskip("stratify")
     kgo_dir = acc.kgo_root() / "wet-bulb-freezing-level"
     kgo_path = kgo_dir / "kgo.nc"
     output_path = tmp_path / "output.nc"