Remove unittest reliance on optional dependencies

docs/src/whatsnew/latest.rst

@@ -144,6 +144,10 @@ This document explains the changes made to Iris for this release
    Cube/Coord summary to use ``str`` representation instead of ``repr``.
    (:pull:`6966`, :issue:`6692`)
 
+#. `@ESadek-MO` and `@pp-mo`_ removed unit test reliance on all optional dependencies
+   except for mo_pack.
+   (:issue:`6832`, :pull:`6976`)
+
 .. comment
     Whatsnew author names (@github name) in alphabetical order. Note that,
     core dev names are automatically included by the common_links.inc:

lib/iris/tests/_shared_utils.py

@@ -979,12 +979,6 @@ class MyGeoTiffTests(test.IrisTest):
 )
 
 
-skip_stratify = pytest.mark.skipif(
-    not STRATIFY_AVAILABLE,
-    reason='Test(s) require "python-stratify", which is not available.',
-)
-
-
 def no_warnings(func):
     """Provides a decorator to ensure that there are no warnings raised
     within the test, otherwise the test will fail.

lib/iris/tests/integration/_shapefiles/__init__.py

@@ -0,0 +1,5 @@
+# Copyright Iris contributors
+#
+# This file is part of Iris and is released under the BSD license.
+# See LICENSE in the root of the repository for full licensing details.
+"""Integration tests for the :mod:`iris._shapefiles` package."""

lib/iris/tests/unit/_shapefiles/test_create_shape_mask.py → lib/iris/tests/integration/_shapefiles/test_create_shape_mask.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Iris and is released under the BSD license.
 # See LICENSE in the root of the repository for full licensing details.
-"""Unit tests for :func:`iris._shapefiles.create_shape_mask`."""
+"""Integration tests for :func:`iris._shapefiles.create_shape_mask`."""
 
 import numpy as np
 from pyproj import CRS

lib/iris/tests/unit/_shapefiles/test_get_weighted_mask.py → lib/iris/tests/integration/_shapefiles/test_get_weighted_mask.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Iris and is released under the BSD license.
 # See LICENSE in the root of the repository for full licensing details.
-"""Unit tests for :func:`iris._shapefiles._get_weighted_mask`."""
+"""Integration tests for :func:`iris._shapefiles._get_weighted_mask`."""
 
 import numpy as np
 import pytest

lib/iris/tests/unit/_shapefiles/test_is_geometry_valid.py → lib/iris/tests/integration/_shapefiles/test_is_geometry_valid.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Iris and is released under the BSD license.
 # See LICENSE in the root of the repository for full licensing details.
-"""Unit tests for :func:`iris._shapefiles.is_geometry_valid`."""
+"""Integration tests for :func:`iris._shapefiles.is_geometry_valid`."""
 
 from pyproj import CRS
 import pytest

lib/iris/tests/unit/_shapefiles/test_make_raster_cube_transform.py → lib/iris/tests/integration/_shapefiles/test_make_raster_cube_transform.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Iris and is released under the BSD license.
 # See LICENSE in the root of the repository for full licensing details.
-"""Unit tests for :func:`iris._shapefiles._make_raster_cube_transform`."""
+"""Integration tests for :func:`iris._shapefiles._make_raster_cube_transform`."""
 
 from affine import Affine
 import numpy as np

lib/iris/tests/unit/_shapefiles/test_transform_geometry.py → lib/iris/tests/integration/_shapefiles/test_transform_geometry.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Iris and is released under the BSD license.
 # See LICENSE in the root of the repository for full licensing details.
-"""Unit tests for :func:`iris._shapefiles._transform_geometry`."""
+"""Integration tests for :func:`iris._shapefiles._transform_geometry`."""
 
 import numpy as np
 import pyproj

lib/iris/tests/unit/pandas/__init__.py → lib/iris/tests/integration/experimental/regrid/__init__.py

@@ -2,4 +2,4 @@
 #
 # This file is part of Iris and is released under the BSD license.
 # See LICENSE in the root of the repository for full licensing details.
-"""Unit tests for the :mod:`iris.pandas` module."""
+"""Regridding code is tested in this package."""

lib/iris/tests/integration/experimental/stratify/__init__.py

@@ -0,0 +1,5 @@
+# Copyright Iris contributors
+#
+# This file is part of Iris and is released under the BSD license.
+# See LICENSE in the root of the repository for full licensing details.
+"""Integration tests for the :mod:`iris.experimental.stratify` package."""

lib/iris/tests/integration/experimental/stratify/test_relevel.py

@@ -0,0 +1,98 @@
+# Copyright Iris contributors
+#
+# This file is part of Iris and is released under the BSD license.
+# See LICENSE in the root of the repository for full licensing details.
+"""Integration tests for the :func:`iris.experimental.stratify.relevel` function."""
+
+from functools import partial
+
+import numpy as np
+import pytest
+import stratify
+
+from iris.coords import AuxCoord, DimCoord
+from iris.experimental.stratify import relevel
+from iris.tests import _shared_utils
+import iris.tests.stock as stock
+
+
+class Test:
+    @pytest.fixture(autouse=True)
+    def _setup(self):
+        cube = stock.simple_3d()[:, :1, :1]
+        #: The data from which to get the levels.
+        self.src_levels = cube.copy()
+        #: The data to interpolate.
+        self.cube = cube.copy()
+        self.cube.rename("foobar")
+        self.cube *= 10
+        self.coord = self.src_levels.coord("wibble")
+        self.axes = (self.coord, self.coord.name(), None, 0)
+
+    def test_standard_input(self):
+        for axis in self.axes:
+            result = relevel(self.cube, self.src_levels, [-1, 0, 5.5], axis=axis)
+            _shared_utils.assert_array_equal(
+                result.data.flatten(), np.array([np.nan, 0, 55])
+            )
+            expected = DimCoord([-1, 0, 5.5], units=1, long_name="thingness")
+            assert expected == result.coord("thingness")
+
+    def test_non_monotonic(self):
+        for axis in self.axes:
+            result = relevel(self.cube, self.src_levels, [2, 3, 2], axis=axis)
+            _shared_utils.assert_array_equal(
+                result.data.flatten(), np.array([20, 30, np.nan])
+            )
+            expected = AuxCoord([2, 3, 2], units=1, long_name="thingness")
+            assert result.coord("thingness") == expected
+
+    def test_static_level(self):
+        for axis in self.axes:
+            result = relevel(self.cube, self.src_levels, [2, 2], axis=axis)
+            _shared_utils.assert_array_equal(result.data.flatten(), np.array([20, 20]))
+
+    def test_coord_input(self):
+        source = AuxCoord(self.src_levels.data)
+        metadata = self.src_levels.metadata._asdict()
+        metadata["coord_system"] = None
+        metadata["climatological"] = None
+        source.metadata = metadata
+
+        for axis in self.axes:
+            result = relevel(self.cube, source, [0, 12, 13], axis=axis)
+            assert result.shape == (3, 1, 1)
+            _shared_utils.assert_array_equal(result.data.flatten(), [0, 120, np.nan])
+
+    def test_custom_interpolator(self):
+        interpolator = partial(stratify.interpolate, interpolation="nearest")
+
+        for axis in self.axes:
+            result = relevel(
+                self.cube,
+                self.src_levels,
+                [-1, 0, 6.5],
+                axis=axis,
+                interpolator=interpolator,
+            )
+            _shared_utils.assert_array_equal(
+                result.data.flatten(), np.array([np.nan, 0, 120])
+            )
+
+    def test_multi_dim_target_levels(self, request):
+        interpolator = partial(
+            stratify.interpolate,
+            interpolation="linear",
+            extrapolation="linear",
+        )
+
+        for axis in self.axes:
+            result = relevel(
+                self.cube,
+                self.src_levels,
+                self.src_levels.data,
+                axis=axis,
+                interpolator=interpolator,
+            )
+            _shared_utils.assert_array_equal(result.data.flatten(), np.array([0, 120]))
+            _shared_utils.assert_CML(request, result)

lib/iris/tests/unit/pandas/test_pandas.py → lib/iris/tests/integration/test_pandas.py

@@ -23,17 +23,10 @@
 # Importing pandas has the side-effect of messing with the formatters
 # used by matplotlib for handling dates.
 default_units_registry = copy.copy(matplotlib.units.registry)
-try:
-    import pandas as pd
-except ImportError:
-    # Disable all these tests if pandas is not installed.
-    pd = None
+import pandas as pd
+
 matplotlib.units.registry = default_units_registry
 
-skip_pandas = pytest.mark.skipif(
-    pd is None,
-    reason='Test(s) require "pandas", which is not available.',
-)
 
 if pd is not None:
     from iris.coords import AncillaryVariable, AuxCoord, CellMeasure, DimCoord
@@ -48,7 +41,6 @@ def activate_pandas_ndim():
     iris.FUTURE.pandas_ndim = False
 
 
-@skip_pandas
 @pytest.mark.filterwarnings(
     "ignore:.*as_series has been deprecated.*:iris._deprecation.IrisDeprecation"
 )
@@ -131,7 +123,6 @@ def test_copy_masked_true(self):
         assert cube.data[0] == 0
 
 
-@skip_pandas
 @pytest.mark.filterwarnings(
     "ignore:You are using legacy 2-dimensional behaviour.*:FutureWarning"
 )
@@ -261,7 +252,6 @@ def test_copy_masked_true(self):
         assert cube.data[0, 0] == 0
 
 
-@skip_pandas
 class TestAsDataFrameNDim:
     """Test conversion of n-dimensional cubes to Pandas using as_data_frame()."""
 
@@ -565,7 +555,6 @@ def test_instance_error(self):
             _ = iris.pandas.as_data_frame(list())
 
 
-@skip_pandas
 @pytest.mark.filterwarnings(
     "ignore:.*as_cube has been deprecated.*:iris._deprecation.IrisDeprecation"
 )
@@ -647,7 +636,6 @@ def test_implicit_copy_true(self):
         assert series[5] == 0
 
 
-@skip_pandas
 @pytest.mark.filterwarnings(
     "ignore:.*as_cube has been deprecated.*:iris._deprecation.IrisDeprecation"
 )
@@ -750,7 +738,6 @@ def test_implicit_copy_true(self):
         assert data_frame.iloc[0, 0] == 0
 
 
-@skip_pandas
 class TestFutureAndDeprecation:
     def test_as_cube_deprecation_warning(self):
         data_frame = pd.DataFrame([[0, 1, 2, 3, 4], [5, 6, 7, 8, 9]])
@@ -819,7 +806,6 @@ def test_explicit_copy_false_error(self, test_function, test_input):
             _ = test_function(test_input, copy=False)
 
 
-@skip_pandas
 class TestPandasAsCubes:
     @staticmethod
     def _create_pandas(index_levels=0, is_series=False):

lib/iris/tests/integration/util/__init__.py

@@ -0,0 +1,5 @@
+# Copyright Iris contributors
+#
+# This file is part of Iris and is released under the BSD license.
+# See LICENSE in the root of the repository for full licensing details.
+"""Integration tests for the :mod:`iris.util` module."""

lib/iris/tests/unit/util/test_mask_cube_from_shapefile.py → lib/iris/tests/integration/util/test_mask_cube_from_shapefile.py

@@ -2,7 +2,7 @@
 #
 # This file is part of Iris and is released under the BSD license.
 # See LICENSE in the root of the repository for full licensing details.
-"""Unit tests for :func:`iris.util.mask_cube_from_shapefile`."""
+"""Integration tests for :func:`iris.util.mask_cube_from_shapefile`."""
 
 import numpy as np
 import pytest

lib/iris/tests/test_constraints.py

@@ -305,12 +305,21 @@ def load_match(self, files, constraints):
         return cubes
 
 
+@pytest.fixture
+def _skip_sample_data_path():
+    try:
+        fname = iris.sample_data_path("atlantic_profiles.nc")
+        cubes = iris.load(fname)
+    except ImportError:
+        cubes = iris.cube.CubeList([stock.simple_pp(), stock.simple_3d()])
+    return cubes
+
+
 @_shared_utils.skip_data
 class TestCubeExtract__names(ConstraintMixin):
     @pytest.fixture(autouse=True)
-    def _setup(self, _setup_mixin):
-        fname = iris.sample_data_path("atlantic_profiles.nc")
-        self.cubes = iris.load(fname)
+    def _setup(self, _setup_mixin, _skip_sample_data_path):
+        self.cubes = _skip_sample_data_path
         cube = iris.load_cube(self.theta_path)
         # Expected names...
         self.standard_name = "air_potential_temperature"
@@ -365,9 +374,8 @@ def test_unknown(self):
 @_shared_utils.skip_data
 class TestCubeExtract__name_constraint(ConstraintMixin):
     @pytest.fixture(autouse=True)
-    def _setup(self, _setup_mixin):
-        fname = iris.sample_data_path("atlantic_profiles.nc")
-        self.cubes = iris.load(fname)
+    def _setup(self, _setup_mixin, _skip_sample_data_path):
+        self.cubes = _skip_sample_data_path
         cube = iris.load_cube(self.theta_path)
         # Expected names...
         self.standard_name = "air_potential_temperature"

lib/iris/tests/unit/experimental/geovista/test_cube_to_polydata.py

@@ -6,7 +6,6 @@
 
 from typing import ClassVar
 
-from geovista import Transform
 import numpy as np
 import pytest
 
@@ -67,8 +66,8 @@ def cube_with_crs(self, default_cs, cube):
 
     @pytest.fixture
     def mocked_operation(self, mocker):
-        mocking = mocker.Mock()
-        setattr(Transform, self.MOCKED_OPERATION, mocking)
+        target = f"geovista.Transform.{self.MOCKED_OPERATION}"
+        mocking = mocker.patch(target, mocker.Mock())
         return mocking
 
     @staticmethod

lib/iris/tests/unit/experimental/geovista/test_extract_unstructured_region.py

@@ -4,7 +4,6 @@
 # See LICENSE in the root of the repository for full licensing details.
 """Unit tests for the `iris.experimental.geovista.extract_unstructured_region` function."""
 
-from geovista.common import VTK_CELL_IDS, VTK_POINT_IDS
 import numpy as np
 import pytest
 
@@ -13,6 +12,9 @@
 from iris.tests.stock import sample_2d_latlons
 from iris.tests.stock.mesh import sample_mesh_cube
 
+VTK_CELL_IDS = "vtkOriginalCellIds"
+VTK_POINT_IDS = "vtkOriginalPointIds"
+
 
 class TestRegionExtraction:
     @pytest.fixture