Also convert attribute units

Author: bouweandela

lib/iris/coords.py

@@ -747,6 +747,9 @@ def pointwise_convert(values):
             else:
                 new_bounds = self.units.convert(self.bounds, unit)
             self.bounds = new_bounds
+        for key in "actual_range", "valid_max", "valid_min", "valid_range":
+            if key in self.attributes:
+                self.attributes[key] = self.units.convert(self.attributes[key], unit)
         self.units = unit
 
     def is_compatible(self, other, ignore=None):

lib/iris/cube.py

@@ -1478,6 +1478,11 @@ def convert_units(self, unit: str | Unit) -> None:
         else:
             new_data = self.units.convert(self.data, unit)
         self.data = new_data
+        for key in "actual_range", "valid_max", "valid_min", "valid_range":
+            if key in self.attributes.locals:
+                self.attributes.locals[key] = self.units.convert(
+                    self.attributes.locals[key], unit
+                )
         self.units = unit
 
     def add_cell_method(self, cell_method: CellMethod) -> None:

lib/iris/tests/unit/coords/test_Coord.py

@@ -23,6 +23,7 @@
 from iris.coords import AuxCoord, Coord, DimCoord
 from iris.cube import Cube
 from iris.exceptions import UnitConversionError
+from iris.tests import _shared_utils
 from iris.tests.unit.coords import CoordTestMixin
 from iris.warnings import IrisVagueMetadataWarning
 
@@ -1187,6 +1188,25 @@ def test_convert_unknown_units(self):
         with self.assertRaisesRegex(UnitConversionError, emsg):
             coord.convert_units("degrees")
 
+    @pytest.mark.parametrize(
+        "attribute",
+        [
+            "valid_min",
+            "valid_max",
+            "valid_range",
+            "actual_range",
+        ],
+    )
+    def test_convert_attributes(self, attribute):
+        coord = iris.coords.AuxCoord(1, units="m")
+        value = np.array([0, 10]) if attribute.endswith("range") else 0
+        coord.attributes.locals[attribute] = value
+        coord.convert_units("ft")
+        converted_value = cf_units.Unit("m").convert(value, "ft")
+        _shared_utils.assert_array_all_close(
+            coord.attributes.locals[attribute], converted_value
+        )
+
 
 class Test___str__(tests.IrisTest):
     def test_short_time_interval(self):

lib/iris/tests/unit/cube/test_Cube.py

@@ -3024,6 +3024,25 @@ def test_unit_multiply(self):
         cube.data
         _client.close()
 
+    @pytest.mark.parametrize(
+        "attribute",
+        [
+            "valid_min",
+            "valid_max",
+            "valid_range",
+            "actual_range",
+        ],
+    )
+    def test_convert_attributes(self, attribute):
+        cube = iris.cube.Cube(1, units="degrees_C")
+        value = np.array([0, 10]) if attribute.endswith("range") else 0
+        cube.attributes.locals[attribute] = value
+        cube.convert_units("K")
+        converted_value = Unit("degrees_C").convert(value, "K")
+        _shared_utils.assert_array_all_close(
+            cube.attributes.locals[attribute], converted_value
+        )
+
 
 class Test__eq__data:
     """Partial cube equality testing, for data type only."""