precommit fixes

lib/iris/tests/_shared_utils.py

@@ -19,7 +19,7 @@
 import re
 import shutil
 import subprocess
-from typing import AnyStr
+from typing import Optional
 import warnings
 import xml.dom.minidom
 import zlib
@@ -380,7 +380,7 @@ def sort_key(line):
 
     dimension_lines = slice(lines.index("dimensions:") + 1, lines.index("variables:"))
     lines[dimension_lines] = sorted(lines[dimension_lines], key=sort_key)
-    cdl = "\n".join(lines) + "\n"
+    cdl = "\n".join(lines) + "\n"  # type: ignore[assignment]
 
     _check_same(cdl, reference_path, type_comparison_name="CDL")
 
@@ -543,9 +543,7 @@ def assert_repr(request: pytest.FixtureRequest, obj, reference_filename):
 def _check_same(item, reference_path, type_comparison_name="CML"):
     if _check_reference_file(reference_path):
         with open(reference_path, "rb") as reference_fh:
-            reference = "".join(
-                part.decode("utf-8") for part in reference_fh.readlines()
-            )
+            reference = "".join(part.decode("utf-8") for part in reference_fh)
         _assert_str_same(reference, item, reference_path, type_comparison_name)
     else:
         _ensure_folder(reference_path)
@@ -966,7 +964,7 @@ def wrapped(*args, **kwargs):
     return wrapped
 
 
-def env_bin_path(exe_name: AnyStr = None):
+def env_bin_path(exe_name: Optional[str] = None):
     """Return a Path object for (an executable in) the environment bin directory.
 
     Parameters

lib/iris/tests/conftest.py

@@ -9,6 +9,7 @@
 """
 
 from collections import defaultdict
+from typing import Callable
 
 import pytest
 
@@ -27,7 +28,7 @@ def test_call_counter():
 
 
 @pytest.fixture
-def _unique_id(request: pytest.FixtureRequest, test_call_counter) -> callable:
+def _unique_id(request: pytest.FixtureRequest, test_call_counter) -> Callable:
     """Provide a function returning a unique ID of calling test and call number.
 
     Example: ``iris.tests.unit.test_cube.TestCube.test_data.my_param.0``

lib/iris/tests/graphics/__init__.py

@@ -18,7 +18,7 @@
 from pathlib import Path
 import sys
 import threading
-from typing import Callable, Dict, Union
+from typing import Callable, Dict, Iterator, Union
 
 import filelock
 import pytest
@@ -285,7 +285,7 @@ def skip_plot(fn: Callable) -> Callable:
 
 
 @pytest.fixture
-def _check_graphic_caller(_unique_id) -> callable:
+def _check_graphic_caller(_unique_id) -> Iterator[Callable]:
     """Provide a function calling :func:`check_graphic` with safe configuration.
 
     Ensures a safe Matplotlib setup (and tears down afterwards), and generates

lib/iris/tests/integration/plot/test_animate.py

@@ -3,6 +3,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.
 """Integration tests for :func:`iris.plot.animate`."""
+
 import numpy as np
 import pytest
 

lib/iris/tests/integration/plot/test_colorbar.py

@@ -6,6 +6,7 @@
 :func:`matplotlib.pyplot.colorbar`.
 
 """
+
 import numpy as np
 import pytest
 

lib/iris/tests/integration/plot/test_netcdftime.py

@@ -3,6 +3,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.
 """Test plot of time coord with non-standard calendar."""
+
 from cf_units import Unit
 import cftime
 import numpy as np

lib/iris/tests/integration/plot/test_plot_2d_coords.py

@@ -4,7 +4,6 @@
 # See LICENSE in the root of the repository for full licensing details.
 """Test plots with two dimensional coordinates."""
 
-
 import cartopy.crs as ccrs
 import matplotlib.pyplot as plt
 import numpy as np

lib/iris/tests/unit/common/metadata/test_CubeMetadata.py

@@ -6,11 +6,8 @@
 
 # Import iris.tests first so that some things can be initialised before
 # importing anything else.
-from typing import Any, ClassVar
-
-from copy import deepcopy
-
 from copy import deepcopy
+from typing import Any, ClassVar
 
 import pytest
 

lib/iris/tests/unit/concatenate/test_concatenate.py

@@ -51,7 +51,6 @@ def test_concat_1d_with_same_time_units(self, simple_1d_time_cubes):
 
 
 class _MessagesMixin:
-
     @pytest.fixture()
     def placeholder(self):
         # Shim to allow sample_cubes to have identical signature in both parent and subclasses

lib/iris/tests/unit/fileformats/abf/test_ABFField.py

@@ -3,6 +3,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 the `iris.fileformats.abf.ABFField` class."""
+
 from iris.fileformats.abf import ABFField
 
 

lib/iris/tests/unit/fileformats/cf/test_CFGroup.py

@@ -3,6 +3,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 the :class:`iris.fileformats.cf.CFGroup` class."""
+
 from unittest.mock import MagicMock
 
 import pytest

lib/iris/tests/unit/fileformats/cf/test_CFReader.py

@@ -3,6 +3,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 the `iris.fileformats.cf.CFReader` class."""
+
 from unittest import mock
 
 import numpy as np
@@ -366,8 +367,8 @@ def _setup_class(self, mocker):
             file_format="NetCDF4", variables=self.variables, ncattrs=ncattrs
         )
 
-    # @pytest.fixture(autouse=True)
-    # def _setup(self, mocker):
+        # @pytest.fixture(autouse=True)
+        # def _setup(self, mocker):
         # Restrict the CFReader functionality to only performing
         # translations and building first level cf-groups for variables.
         mocker.patch("iris.fileformats.cf.CFReader._reset")
@@ -406,4 +407,3 @@ def test_ugrid_coords(self):
 
     def test_is_cf_ugrid_group(self):
         assert isinstance(self.cf_group, CFGroup)
-

lib/iris/tests/unit/fileformats/dot/test__dot_path.py

@@ -3,6 +3,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.fileformats.dot._dot_path`."""
+
 import os.path
 import subprocess
 

lib/iris/tests/unit/fileformats/name_loaders/test__build_cell_methods.py

@@ -3,6 +3,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.fileformats.name_loaders._build_cell_methods`."""
+
 import pytest
 
 import iris.coords

lib/iris/tests/unit/fileformats/name_loaders/test__build_lat_lon_for_NAME_timeseries.py

@@ -3,6 +3,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.analysis.name_loaders._build_lat_lon_for_NAME_timeseries`."""
+
 from iris.fileformats.name_loaders import NAMECoord, _build_lat_lon_for_NAME_timeseries
 from iris.tests._shared_utils import assert_array_equal
 

lib/iris/tests/unit/fileformats/name_loaders/test__calc_integration_period.py

@@ -3,6 +3,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.fileformats.name_loaders.__calc_integration_period`."""
+
 import datetime
 
 from iris.fileformats.name_loaders import _calc_integration_period

lib/iris/tests/unit/fileformats/name_loaders/test__cf_height_from_name.py

@@ -6,6 +6,7 @@
 function.
 
 """
+
 import numpy as np
 
 from iris.coords import AuxCoord

lib/iris/tests/unit/fileformats/name_loaders/test__generate_cubes.py

@@ -3,6 +3,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.analysis.name_loaders._generate_cubes`."""
+
 from datetime import datetime, timedelta
 from unittest import mock
 

lib/iris/tests/unit/fileformats/nimrod_load_rules/test_units.py

@@ -3,6 +3,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 the `iris.fileformats.nimrod_load_rules.units` function."""
+
 import numpy as np
 import pytest
 

lib/iris/tests/unit/fileformats/nimrod_load_rules/test_vertical_coord.py

@@ -6,6 +6,7 @@
 function.
 
 """
+
 import pytest
 
 from iris.fileformats.nimrod import NimrodField

lib/iris/tests/unit/fileformats/pp_load_rules/test__all_other_rules.py

@@ -3,6 +3,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 the `iris.fileformats.pp_load_rules._all_other_rules` function."""
+
 from unittest import mock
 
 from cf_units import CALENDAR_360_DAY, Unit

lib/iris/tests/unit/fileformats/pp_load_rules/test__collapse_degenerate_points_and_bounds.py

@@ -6,6 +6,7 @@
 :func:`iris.fileformats.pp_load_rules._collapse_degenerate_points_and_bounds`.
 
 """
+
 import numpy as np
 
 from iris.fileformats.pp_load_rules import _collapse_degenerate_points_and_bounds

lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_scalar_pseudo_level_coords.py

@@ -6,6 +6,7 @@
 :func:`iris.fileformats.pp_load_rules._convert_pseudo_level_coords`.
 
 """
+
 from iris.coords import DimCoord
 from iris.fileformats.pp_load_rules import _convert_scalar_pseudo_level_coords
 

lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_scalar_realization_coords.py

@@ -6,6 +6,7 @@
 :func:`iris.fileformats.pp_load_rules._convert_scalar_realization_coords`.
 
 """
+
 from iris.coords import DimCoord
 from iris.fileformats.pp_load_rules import _convert_scalar_realization_coords
 

lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_time_coords.py

@@ -6,6 +6,7 @@
 :func:`iris.fileformats.pp_load_rules._convert_time_coords`.
 
 """
+
 from cf_units import CALENDAR_360_DAY, CALENDAR_STANDARD, Unit
 from cftime import datetime as nc_datetime
 import numpy as np

lib/iris/tests/unit/fileformats/pp_load_rules/test__convert_vertical_coords.py

@@ -6,6 +6,7 @@
 :func:`iris.fileformats.pp_load_rules._convert_vertical_coords`.
 
 """
+
 import numpy as np
 
 from iris.aux_factory import HybridHeightFactory, HybridPressureFactory

lib/iris/tests/unit/fileformats/pp_load_rules/test__dim_or_aux.py

@@ -3,6 +3,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.fileformats.pp_load_rules._dim_or_aux`."""
+
 import pytest
 
 from iris.coords import AuxCoord, DimCoord

lib/iris/tests/unit/fileformats/pp_load_rules/test__epoch_date_hours.py

@@ -6,6 +6,7 @@
 :func:`iris.fileformats.pp_load_rules._epoch_date_hours`.
 
 """
+
 import cf_units
 from cf_units import Unit
 from cftime import datetime as nc_datetime

lib/iris/tests/unit/fileformats/pp_load_rules/test__model_level_number.py

@@ -3,6 +3,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.fileformats.pp_load_rules._model_level_number`."""
+
 from iris.fileformats.pp_load_rules import _model_level_number
 
 

lib/iris/tests/unit/fileformats/pp_load_rules/test__reduced_points_and_bounds.py

@@ -6,6 +6,7 @@
 :func:`iris.fileformats.pp_load_rules._reduce_points_and_bounds`.
 
 """
+
 import numpy as np
 
 from iris.fileformats.pp_load_rules import _reduce_points_and_bounds

lib/iris/tests/unit/fileformats/pp_load_rules/test__reshape_vector_args.py

@@ -6,6 +6,7 @@
 :func:`iris.fileformats.pp_load_rules._reshape_vector_args`.
 
 """
+
 import numpy as np
 import pytest
 

lib/iris/tests/unit/fileformats/pp_load_rules/test_convert.py

@@ -3,6 +3,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.fileformats.pp_load_rules.convert`."""
+
 from types import MethodType
 from unittest import mock
 

lib/iris/tests/unit/fileformats/rules/test_Loader.py

@@ -3,6 +3,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 :class:`iris.fileformats.rules.Loader`."""
+
 from iris.fileformats.rules import Loader
 from iris.tests._shared_utils import assert_no_warnings_regexp
 

lib/iris/tests/unit/fileformats/rules/test__make_cube.py

@@ -3,6 +3,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.fileformats.rules._make_cube`."""
+
 from unittest import mock
 
 import numpy as np

lib/iris/tests/unit/fileformats/rules/test_rules.py

@@ -3,6 +3,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.
 """Test iris.fileformats.rules.py - metadata translation rules."""
+
 import types
 from unittest import mock
 

lib/iris/tests/unit/fileformats/structured_array_identification/test_ArrayStructure.py

@@ -6,6 +6,7 @@
 :mod:`iris.fileformats._structured_array_identification.ArrayStructure` class.
 
 """
+
 import numpy as np
 import pytest