Fix for eccodes>=2.32.1 and python-eccodes>=1.6.1 (#361)

* Fix for eccodes>=2.32.1 and python-eccodes>=1.6.1

* Update iris_grib/message.py

Co-authored-by: Patrick Peglar <patrick.peglar@metoffice.gov.uk>

---------

Co-authored-by: Patrick Peglar <patrick.peglar@metoffice.gov.uk>

Author: bjlittle

iris_grib/_save_rules.py

@@ -315,9 +315,9 @@ def latlon_points_irregular(cube, grib):
     # So, this only works at present if the x and y dimensions are **equal**.
     lon_values = x_coord.points / _DEFAULT_DEGREES_UNITS
     lat_values = y_coord.points / _DEFAULT_DEGREES_UNITS
-    eccodes.codes_set_array(grib, 'longitudes',
+    eccodes.codes_set_array(grib, 'longitude',
                             np.array(np.round(lon_values), dtype=np.int64))
-    eccodes.codes_set_array(grib, 'latitudes',
+    eccodes.codes_set_array(grib, 'latitude',
                             np.array(np.round(lat_values), dtype=np.int64))
 
 

iris_grib/message.py

@@ -20,6 +20,14 @@
 
 _SUPPORTED_GRID_DEFINITIONS = (0, 1, 5, 10, 12, 20, 30, 40, 90, 140)
 
+# Alias names for eccodes spatial computed keys.
+KEY_ALIAS = {
+    'latitude': 'latitudes',
+    'longitude': 'longitudes',
+    'latitudes': 'latitude',
+    'longitudes': 'longitude',
+}
+
 
 class _OpenFileRef:
     """
@@ -404,12 +412,18 @@ def __getitem__(self, key):
         if key not in self._cache:
             if key == 'numberOfSection':
                 value = self._number
-            elif key not in self._keys:
-                raise KeyError('{!r} not defined in section {}'.format(
-                    key, self._number))
             else:
+                if key not in self._keys:
+                    key2 = KEY_ALIAS.get(key)
+                    if key2 and key2 in self._keys:
+                        key = key2
+                    else:
+                        emsg = f"{key} not defined in section {self._number}"
+                        raise KeyError(emsg)
                 value = self._get_key_value(key)
+
             self._cache[key] = value
+
         return self._cache[key]
 
     def __setitem__(self, key, value):
@@ -437,6 +451,7 @@ def _get_key_value(self, key):
                        'satelliteNumber', 'instrumentType',
                        'scaleFactorOfCentralWaveNumber',
                        'scaledValueOfCentralWaveNumber',
+                       'longitude', 'latitude',
                        'longitudes', 'latitudes')
         if key in vector_keys:
             res = eccodes.codes_get_array(self._message_id, key)

iris_grib/tests/unit/save_rules/test_grid_definition_template_4.py

@@ -62,8 +62,8 @@ def test__grid_points(self):
         grid_definition_template_4(test_cube, self.mock_grib)
         x_longs = np.array(np.round(1e6 * x_floats), dtype=int)
         y_longs = np.array(np.round(1e6 * y_floats), dtype=int)
-        self._check_key("longitudes", x_longs)
-        self._check_key("latitudes", y_longs)
+        self._check_key("longitude", x_longs)
+        self._check_key("latitude", y_longs)
 
     def test__scanmode(self):
         grid_definition_template_4(self.test_cube, self.mock_grib)

iris_grib/tests/unit/save_rules/test_grid_definition_template_5.py

@@ -112,8 +112,8 @@ def test__grid_points(self):
         grid_definition_template_5(test_cube, self.mock_grib)
         x_longs = np.array(np.round(1e6 * x_floats), dtype=int)
         y_longs = np.array(np.round(1e6 * y_floats), dtype=int)
-        self._check_key("longitudes", x_longs)
-        self._check_key("latitudes", y_longs)
+        self._check_key("longitude", x_longs)
+        self._check_key("latitude", y_longs)
 
     def test__true_winds_orientation(self):
         self.test_cube.rename('eastward_wind')

requirements/core.txt

@@ -1,4 +1,4 @@
 # Core dependencies.
 
 scitools-iris>=3.0.2
-eccodes-python
+eccodes>=1.6.1

requirements/py310.yml

@@ -11,7 +11,8 @@ dependencies:
 
 # Core dependencies.
   - iris>=3.0.2
-  - python-eccodes
+  - python-eccodes>=1.6.1
+  - eccodes>=2.32.1
 
 # Optional dependencies.
   - mo_pack

requirements/py311.yml

@@ -11,7 +11,8 @@ dependencies:
 
 # Core dependencies.
   - iris>=3.0.2
-  - python-eccodes
+  - python-eccodes>=1.6.1
+  - eccodes>=2.32.1
 
 # Optional dependencies.
   - mo_pack

requirements/py39.yml

@@ -11,7 +11,8 @@ dependencies:
 
 # Core dependencies.
   - iris>=3.0.2
-  - python-eccodes
+  - python-eccodes>=1.6.1
+  - eccodes>=2.32.1
 
 # Optional dependencies.
   - mo_pack