Merge remote-tracking branch 'upstream/main' into ruff7

* upstream/main:
  ruff rule D411 compliance. (SciTools#5657)
  ruff rule D208 compliance. (SciTools#5656)

.ruff.toml

@@ -37,7 +37,6 @@ lint.ignore = [
     "D200",  # One-line docstring should fit on one line
     "D202",  # No blank lines allowed after function docstring
     "D205",  # 1 blank line required between summary line and description
-    "D208",  # Docstring is over-indented
     "D209",  # Multi-line docstring closing quotes should be on a separate line
     "D211",  # No blank lines allowed before class docstring
     "D300",  # triple double quotes `""" / Use triple single quotes `'''`
@@ -49,7 +48,6 @@ lint.ignore = [
     "D407",  # Missing dashed underline after section
     "D409",  # Section underline should match the length of its name
     "D410",  # Missing blank line after section
-    "D411",  # Missing blank line before section
 
     # pyupgrade (UP)
     # https://docs.astral.sh/ruff/rules/#pyupgrade-up

lib/iris/analysis/_regrid.py

@@ -988,6 +988,7 @@ def _create_cube(data, src, src_dims, tgt_coords, num_tgt_dims, regrid_callback)
     regrid_callback : callable
         The routine that will be used to calculate the interpolated
         values of any reference surfaces.
+
     Returns
     -------
     cube

lib/iris/common/resolve.py

@@ -205,7 +205,7 @@ class Resolve:
         >>> resolver = Resolve(cube1, cube2)
         >>> results = [resolver.cube(data) for data in payload]
 
-    """  # noqa: D214
+    """  # noqa: D214, D411
 
     def __init__(self, lhs=None, rhs=None):
         """Resolve the provided ``lhs`` :class:`~iris.cube.Cube` operand and
@@ -2493,7 +2493,7 @@ def mapped(self):
             >>> resolver.map_rhs_to_lhs
             False
 
-        """  # noqa: D214
+        """  # noqa: D214, D411
         result = None
         if self.mapping is not None:
             result = self._src_cube.ndim == len(self.mapping)
@@ -2554,5 +2554,5 @@ def shape(self):
             >>> Resolve(cube2, cube1).shape
             (240, 37, 49)
 
-        """  # noqa: D214
+        """  # noqa: D214, D411
         return self._broadcast_shape

lib/iris/cube.py

@@ -4517,7 +4517,7 @@ def rolling_window(self, coord, aggregator, window, **kwargs):
             Notice that the forecast_period dimension now represents the 4
             possible windows of size 3 from the original cube.
 
-        """  # noqa: D214
+        """  # noqa: D214, D411
         # Update weights kwargs (if necessary) to handle different types of
         # weights
         weights_info = None

lib/iris/fileformats/dot.py

@@ -337,16 +337,16 @@ def _coord_system_text(cs, uid):
 def _dot_node(indent, id, name, attributes):
     """Return a string containing the dot representation for a single node.
 
-    Args
-    ----
-    id
+    Parameters
+    ----------
+    id :
         The ID of the node.
-    name
+    name :
         The visual name of the node.
-    attributes
+    attributes:
         An iterable of (name, value) attribute pairs.
 
-    """
+    """  # noqa: D411
     attributes = r"\n".join("%s: %s" % item for item in attributes)
     template = """%(indent)s"%(id)s" [
 %(indent)s    label = "%(name)s|%(attributes)s"

lib/iris/tests/unit/analysis/geometry/test_geometry_area_weights.py

@@ -2,10 +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 the :func:`iris.analysis.geometry.geometry_area_weights`
-function.
-
- """
+"""Unit tests for the :func:`iris.analysis.geometry.geometry_area_weights` function."""
 
 # Import iris.tests first so that some things can be initialised before
 # importing anything else.