Bounds on derived coords

.github/workflows/ci-manifest.yml

@@ -23,4 +23,4 @@ concurrency:
 jobs:
   manifest:
     name: "check-manifest"
-    uses: scitools/workflows/.github/workflows/ci-manifest.yml@2024.10.2
+    uses: scitools/workflows/.github/workflows/ci-manifest.yml@2025.02.1

.github/workflows/ci-tests.yml

@@ -143,6 +143,6 @@ jobs:
 
       - name: "upload coverage report"
         if: ${{ matrix.coverage }}
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/refresh-lockfiles.yml

@@ -14,5 +14,5 @@ on:
 
 jobs:
   refresh_lockfiles:
-    uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2024.10.2
+    uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2025.02.1
     secrets: inherit

.gitignore

@@ -79,3 +79,6 @@ docs/iris_image_test_output/
 
 # Files generated during test runs.
 lib/iris/tests/results/**/*.dot
+
+# Uses of SciTools-incubator/nothing.
+**/.nothing

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
     -   id: no-commit-to-branch
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.7.0"
+    rev: "v0.9.6"
     hooks:
     -   id: ruff
         types: [file, python]
@@ -38,32 +38,32 @@ repos:
         types: [file, python]
 
 -   repo: https://github.com/codespell-project/codespell
-    rev: "v2.3.0"
+    rev: "v2.4.1"
     hooks:
     -   id: codespell
         types_or: [asciidoc, python, markdown, rst]
         additional_dependencies: [tomli]
 
 -   repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
+    rev: 7.1.2
     hooks:
     -   id: flake8
         types: [file, python]
 
 -   repo: https://github.com/asottile/blacken-docs
-    rev: 1.19.0
+    rev: 1.19.1
     hooks:
     -   id: blacken-docs
         types: [file, rst]
 
 -   repo: https://github.com/aio-libs/sort-all
-    rev: v1.2.0
+    rev: v1.3.0
     hooks:
     -   id: sort-all
         types: [file, python]
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v1.12.1'
+    rev: 'v1.15.0'
     hooks:
     -   id: mypy
         additional_dependencies:

benchmarks/benchmarks/load/__init__.py

@@ -132,6 +132,58 @@ def time_many_var_load(self) -> None:
         _ = load(str(self.FILE_PATH))
 
 
+class ManyCubes:
+    FILE_PATH = BENCHMARK_DATA / "many_cube_file.nc"
+
+    @staticmethod
+    def _create_file(save_path: str) -> None:
+        """Run externally - everything must be self-contained."""
+        import numpy as np
+
+        from iris import save
+        from iris.coords import AuxCoord, DimCoord
+        from iris.cube import Cube, CubeList
+
+        data_len = 81920
+        bnds_len = 3
+        data = np.arange(data_len).astype(np.float32)
+        bnds_data = (
+            np.arange(data_len * bnds_len)
+            .astype(np.float32)
+            .reshape(data_len, bnds_len)
+        )
+        time = DimCoord(np.array([0]), standard_name="time")
+        lat = AuxCoord(
+            data, bounds=bnds_data, standard_name="latitude", units="degrees"
+        )
+        lon = AuxCoord(
+            data, bounds=bnds_data, standard_name="longitude", units="degrees"
+        )
+        cube = Cube(data.reshape(1, -1), units="unknown")
+        cube.add_dim_coord(time, 0)
+        cube.add_aux_coord(lat, 1)
+        cube.add_aux_coord(lon, 1)
+
+        n_cubes = 100
+        cubes = CubeList()
+        for i in range(n_cubes):
+            cube = cube.copy()
+            cube.long_name = f"var_{i}"
+            cubes.append(cube)
+        save(cubes, save_path)
+
+    def setup_cache(self) -> None:
+        if not REUSE_DATA or not self.FILE_PATH.is_file():
+            # See :mod:`benchmarks.generate_data` docstring for full explanation.
+            _ = run_function_elsewhere(
+                self._create_file,
+                str(self.FILE_PATH),
+            )
+
+    def time_many_cube_load(self) -> None:
+        _ = load(str(self.FILE_PATH))
+
+
 class StructuredFF:
     """Test structured loading of a large-ish fieldsfile.
 

benchmarks/bm_runner.py

@@ -27,7 +27,7 @@
 GH_REPORT_DIR = ROOT_DIR.joinpath(".github", "workflows", "benchmark_reports")
 
 # Common ASV arguments for all run_types except `custom`.
-ASV_HARNESS = "run {posargs} --attribute rounds=4 --interleave-rounds --show-stderr"
+ASV_HARNESS = "run {posargs} --attribute rounds=3 --interleave-rounds --show-stderr"
 
 
 def echo(echo_string: str):

docs/src/community/iris_xarray.rst

@@ -141,7 +141,7 @@ output is not fully CF compliant (as-per `the cf checker <https://cfchecker.ncas
   approach in Iris, and means that the use of the "coordinates" attribute in output is
   often not CF compliant.
 * dates are converted to datetime-like objects internally.  There are special features
-  providing `support for  non-standard calendars <https://docs.xarray.dev/en/stable/user-guide/weather-climate.html#non-standard-calendars-and-dates-outside-the-nanosecond-precision-range>`_,
+  providing `support for  non-standard calendars <https://docs.xarray.dev/en/stable/user-guide/weather-climate.html#non-standard-calendars-and-dates-outside-the-precision-range>`_,
   however date units may not always be saved correctly.
 * CF-style coordinate bounds variables are not fully understood.  The CF approach
   where bounds variables do not usually define their units or standard_names can cause

docs/src/conf.py

@@ -141,7 +141,7 @@ def _dotv(version):
 .. |python_version| replace:: {build_python_version}
 .. |python_support| replace:: {python_support}
 .. |iris_version| replace:: v{version}
-.. |build_date| replace:: ({datetime.datetime.now().strftime('%d %b %Y')})
+.. |build_date| replace:: ({datetime.datetime.now().strftime("%d %b %Y")})
 """
 
 # Add any Sphinx extension module names here, as strings. They can be

docs/src/developers_guide/contributing_pytest_conversions.rst

@@ -0,0 +1,76 @@
+.. include:: ../common_links.inc
+
+.. _contributing_pytest_conversions:
+
+*******************************************
+Converting From ``unittest`` to ``pytest``
+*******************************************
+
+Conversion Checklist
+--------------------
+.. note::
+    Please bear in mind the following checklist is for general use; there may be
+    some cases which require extra context or thought before implementing these changes.
+
+#. Before making any manual changes, run https://github.com/dannysepler/pytestify
+   on the file. This does a lot of the brunt work for you!
+#. Check for references to :class:`iris.tests.IrisTest`. If a class inherits
+   from this, remove the inheritance. Inheritance is unnecessary for
+   pytest tests, so :class:`iris.tests.IrisTest` has been deprecated
+   and its convenience methods have been moved to the
+   :mod:`iris.tests._shared_utils` module.
+#. Check for references  to ``unittest``. Many of the functions within unittest
+   are also in pytest, so often you can just change where the function is imported
+   from.
+#. Check for references to ``self.assert``. Pytest has a lighter-weight syntax for
+   assertions, e.g. ``assert x == 2`` instead of ``assertEqual(x, 2)``. In the
+   case of custom :class:`~iris.tests.IrisTest` assertions, the majority of these
+   have been replicated in
+   :mod:`iris.tests._shared_utils`, but with snake_case instead of camelCase.
+   Some :class:`iris.tests.IrisTest` assertions have not been converted into
+   :mod:`iris.tests._shared_utils`, as these were deemed easy to achieve via
+   simple ``assert ...`` statements.
+#. Check for references to ``setUp()``. Replace this with ``_setup()`` instead.
+   Ensure that this is decorated with ``@pytest.fixture(autouse=True)``.
+
+   .. code-block:: python
+
+      @pytest.fixture(autouse=True)
+      def _setup(self):
+         ...
+
+#. Check for references to ``@tests``. These should be changed to ``@_shared_utils``.
+#. Check for references to ``with mock.patch("...")``. These should be replaced with
+   ``mocker.patch("...")``. ``mocker`` is a fixture, and can be passed into functions.
+#. Check for ``np.testing.assert...``. This can usually be swapped for
+   ``_shared_utils.assert...``.
+#. Check for references to ``super()``. Most test classes used to inherit from
+   :class:`iris.tests.IrisTest`, so references to this should be removed.
+#. Check for references to ``self.tmp_dir``. In pytest, ``tmp_path`` is used instead,
+   and can be passed into functions as a fixture.
+#. Check for ``if __name__ == 'main'``. This is no longer needed with pytest.
+#. Check for ``mock.patch("warnings.warn")``. This can be replaced with
+   ``pytest.warns(match=message)``.
+#. Check the file against https://github.com/astral-sh/ruff , using ``pip install ruff`` ->
+   ``ruff check --select PT <file>``.
+
+Common Translations
+-------------------
+
+.. list-table::
+   :widths: 50 50
+   :header-rows: 1
+
+   * - ``unittest`` method
+     - ``pytest`` equivalent
+   * - ``assertTrue(x)``
+     - ``assert x``
+   * - ``assertFalse(x)``
+     - ``assert not x``
+   * - ``assertRegex(x, y)``
+     - ``assert re.match(y, x)``
+   * - ``assertRaisesRegex(cls, msg_re)``
+     - ``with pytest.raises(cls, match=msg_re):``
+   * - ``mock.patch(...)``
+     - ``mocker.patch(...)``
+

docs/src/developers_guide/contributing_running_tests.rst

@@ -87,7 +87,7 @@ experimental dependency not being present.
       SKIPPED [1] lib/iris/tests/unit/util/test_demote_dim_coord_to_aux_coord.py:29: Test(s) require external data.
 
    All Python decorators that skip tests will be defined in
-   ``lib/iris/tests/__init__.py`` with a function name with a prefix of
+   ``lib/iris/tests/_shared_utils.py`` with a function name with a prefix of
    ``skip_``.
 
 You can also run a specific test module.  The example below runs the tests for