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

* upstream/main:
  libnetcdf <4.9 pin (SciTools#5242)
  update cf standard units (SciTools#5244)

Author: tkknight

docs/src/whatsnew/latest.rst

@@ -50,6 +50,9 @@ This document explains the changes made to Iris for this release
    enable lazy computation of rotated wind vector components (:issue:`4934`,
    :pull:`4972`)
 
+#. `@ESadek-MO`_ updated to the latest CF Standard Names Table v80
+   (07 February 2023). (:pull:`5244`)
+
 
 🐛 Bugs Fixed
 =============
@@ -105,7 +108,7 @@ This document explains the changes made to Iris for this release
 🔗 Dependencies
 ===============
 
-#. N/A
+#. `@trexfeathers`_ introduced the ``libnetcdf <4.9`` pin. (:pull:`5242`)
 
 
 📚 Documentation

etc/cf-standard-name-table.xml

@@ -345,12 +345,13 @@ def as_cubes(
     ...     var_name="longitude",
     ...     value_name="air_temperature"
     ... )
+    >>> my_df["longitude"] = my_df["longitude"].infer_objects()
     >>> print(my_df)
-       latitude longitude  air_temperature
-    0        35         0              300
-    1        25         0              301
-    2        35        10              302
-    3        25        10              303
+       latitude  longitude  air_temperature
+    0        35          0              300
+    1        25          0              301
+    2        35         10              302
+    3        25         10              303
     >>> my_df = my_df.set_index(["latitude", "longitude"])
     >>> my_df = my_df.sort_index()
     >>> converted_cube = as_cubes(my_df)[0]

lib/iris/pandas.py

@@ -15,6 +15,7 @@ dependencies:
   - cf-units >=3.1
   - cftime >=1.5
   - dask-core >=2022.9.0
+  - libnetcdf <4.9
   - matplotlib >=3.5
   - netcdf4
   - numpy >=1.19

requirements/locks/py310-linux-64.lock

@@ -15,6 +15,7 @@ dependencies:
   - cf-units >=3.1
   - cftime >=1.5
   - dask-core >=2022.9.0
+  - libnetcdf <4.9
   - matplotlib >=3.5
   - netcdf4
   - numpy >=1.19

requirements/locks/py38-linux-64.lock

@@ -15,6 +15,7 @@ dependencies:
   - cf-units >=3.1
   - cftime >=1.5
   - dask-core >=2022.9.0
+  - libnetcdf <4.9
   - matplotlib >=3.5
   - netcdf4
   - numpy >=1.19