ESMValCore 2.11.0rc2__tar.gz → 2.11.1__tar.gz

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/.github/workflows/install-from-conda.yml

@@ -39,7 +39,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
       # fail-fast set to False allows all other tests
       # in the workflow to run regardless of any fail
       fail-fast: false
@@ -75,7 +75,7 @@ jobs:
     runs-on: "macos-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
         architecture: ["x64"]  # need to force Intel, arm64 builds have issues
       fail-fast: false
     name: OSX Python ${{ matrix.python-version }}

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/.github/workflows/install-from-condalock-file.yml

@@ -29,7 +29,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
       fail-fast: false
     name: Linux Python ${{ matrix.python-version }}
     steps:

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/.github/workflows/install-from-pypi.yml

@@ -39,7 +39,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
       # fail-fast set to False allows all other tests
       # in the workflow to run regardless of any fail
       fail-fast: false
@@ -77,7 +77,7 @@ jobs:
     runs-on: "macos-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
         architecture: ["x64"]  # need to force Intel, arm64 builds have issues
       fail-fast: false
     name: OSX Python ${{ matrix.python-version }}

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/.github/workflows/install-from-source.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
       fail-fast: false
     name: Linux Python ${{ matrix.python-version }}
     steps:
@@ -74,7 +74,7 @@ jobs:
     runs-on: "macos-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
         architecture: ["x64"]  # need to force Intel, arm64 builds have issues
       fail-fast: false
     name: OSX Python ${{ matrix.python-version }}

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/.github/workflows/run-tests-monitor.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
       fail-fast: false
     name: Linux Python ${{ matrix.python-version }}
     steps:
@@ -46,7 +46,7 @@ jobs:
       - run: python tests/parse_pymon.py
       - name: Upload artifacts
         if: ${{ always() }}  # upload artifacts even if fail
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Test_Linux_python_${{ matrix.python-version }}
           path: test_linux_artifacts_python_${{ matrix.python-version }}
@@ -55,7 +55,7 @@ jobs:
     runs-on: "macos-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
         architecture: ["x64"]  # need to force Intel, arm64 builds have issues
       fail-fast: false
     name: OSX Python ${{ matrix.python-version }}
@@ -81,7 +81,7 @@ jobs:
       - run: python tests/parse_pymon.py
       - name: Upload artifacts
         if: ${{ always() }}  # upload artifacts even if fail
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Test_OSX_python_${{ matrix.python-version }}
           path: test_osx_artifacts_python_${{ matrix.python-version }}

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/.github/workflows/run-tests.yml

@@ -39,7 +39,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
       fail-fast: false
     name: Linux Python ${{ matrix.python-version }}
     steps:
@@ -64,7 +64,7 @@ jobs:
       - run: pytest -n 2 -m "not installation" 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/test_report.txt
       - name: Upload artifacts
         if: ${{ always() }}  # upload artifacts even if fail
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Test_Linux_python_${{ matrix.python-version }}
           path: test_linux_artifacts_python_${{ matrix.python-version }}
@@ -73,7 +73,7 @@ jobs:
     runs-on: "macos-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12"]
         architecture: ["x64"]  # need to force Intel, arm64 builds have issues
       fail-fast: false
     name: OSX Python ${{ matrix.python-version }}
@@ -100,7 +100,7 @@ jobs:
       - run: pytest -n 2 -m "not installation" 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/test_report.txt
       - name: Upload artifacts
         if: ${{ always() }}  # upload artifacts even if fail
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Test_OSX_python_${{ matrix.python-version }}
           path: test_osx_artifacts_python_${{ matrix.python-version }}

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/.readthedocs.yaml

@@ -7,20 +7,13 @@ version: 2
 
 # Set the version of Python and other tools you might need
 build:
-  os: ubuntu-22.04
+  os: ubuntu-lts-latest
   tools:
-    # updated and deployed from Aug 1, 2023
-    python: "mambaforge-22.9"
+    # try miniforge3 when available? see github.com/ESMValGroup/ESMValCore/issues/2557
+    # DO NOT use mambaforge-*; that is currently sunsetted
+    python: "miniconda-latest"
   jobs:
-    pre_create_environment:
-      # update mamba just in case
-      - mamba update --yes --quiet --name=base mamba 'zstd=1.5.2'
-      - mamba --version
-      - mamba list --name=base
     post_create_environment:
-      - conda run -n ${CONDA_DEFAULT_ENV} mamba list
-      # use conda run executable wrapper to have all env variables
-      - conda run -n ${CONDA_DEFAULT_ENV} mamba --version
       - conda run -n ${CONDA_DEFAULT_ENV} pip install . --no-deps
 
 # Declare the requirements required to build your docs

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/CITATION.cff

@@ -210,11 +210,11 @@ authors:
     given-names: Diego
 
 cff-version: 1.2.0
-date-released: 2024-06-20
+date-released: 2024-11-26
 doi: "10.5281/zenodo.3387139"
 license: "Apache-2.0"
 message: "If you use this software, please cite it using these metadata."
 repository-code: "https://github.com/ESMValGroup/ESMValCore/"
 title: ESMValCore
-version: "v2.11.0rc2"
+version: "v2.11.1"
 ...

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1/ESMValCore.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ESMValCore
-Version: 2.11.0rc2
+Version: 2.11.1
 Summary: ESMValCore: A community tool for pre-processing data from Earth system models in CMIP and running analysis scripts.
 Home-page: https://www.esmvaltool.org
 Download-URL: https://github.com/ESMValGroup/ESMValCore
@@ -14,9 +14,9 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
 Classifier: Topic :: Scientific/Engineering :: GIS
@@ -27,25 +27,24 @@ License-File: LICENSE
 License-File: NOTICE
 Requires-Dist: cartopy
 Requires-Dist: cf-units
-Requires-Dist: dask[array,distributed]
+Requires-Dist: dask[array,distributed]!=2024.8.0
 Requires-Dist: dask-jobqueue
 Requires-Dist: esgf-pyclient>=0.3.1
-Requires-Dist: esmf-regrid
+Requires-Dist: esmf-regrid>=0.11.0
 Requires-Dist: esmpy!=8.1.0
 Requires-Dist: filelock
 Requires-Dist: fiona
 Requires-Dist: fire
 Requires-Dist: geopy
 Requires-Dist: humanfriendly
-Requires-Dist: importlib_metadata; python_version < "3.10"
-Requires-Dist: isodate
+Requires-Dist: isodate>=0.7.0
 Requires-Dist: jinja2
 Requires-Dist: nc-time-axis
 Requires-Dist: nested-lookup
 Requires-Dist: netCDF4
 Requires-Dist: numpy!=1.24.3,<2.0.0
 Requires-Dist: packaging
-Requires-Dist: pandas!=2.2.0,!=2.2.1,!=2.2.2
+Requires-Dist: pandas
 Requires-Dist: pillow
 Requires-Dist: prov
 Requires-Dist: psutil
@@ -54,7 +53,7 @@ Requires-Dist: pybtex
 Requires-Dist: pyyaml
 Requires-Dist: requests
 Requires-Dist: scipy>=1.6
-Requires-Dist: scitools-iris>3.8.0
+Requires-Dist: scitools-iris>=3.11.0
 Requires-Dist: shapely>=2.0.0
 Requires-Dist: stratify>=0.3
 Requires-Dist: yamale

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/ESMValCore.egg-info/SOURCES.txt

@@ -932,7 +932,6 @@ tests/unit/preprocessor/_other/test_other.py
 tests/unit/preprocessor/_regrid/__init__.py
 tests/unit/preprocessor/_regrid/test__create_cube.py
 tests/unit/preprocessor/_regrid/test__stock_cube.py
-tests/unit/preprocessor/_regrid/test_broadcast_to_shape.py
 tests/unit/preprocessor/_regrid/test_extract_levels.py
 tests/unit/preprocessor/_regrid/test_extract_point.py
 tests/unit/preprocessor/_regrid/test_extract_regional_grid.py

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/ESMValCore.egg-info/requires.txt

@@ -1,23 +1,23 @@
 cartopy
 cf-units
-dask[array,distributed]
+dask[array,distributed]!=2024.8.0
 dask-jobqueue
 esgf-pyclient>=0.3.1
-esmf-regrid
+esmf-regrid>=0.11.0
 esmpy!=8.1.0
 filelock
 fiona
 fire
 geopy
 humanfriendly
-isodate
+isodate>=0.7.0
 jinja2
 nc-time-axis
 nested-lookup
 netCDF4
 numpy!=1.24.3,<2.0.0
 packaging
-pandas!=2.2.0,!=2.2.1,!=2.2.2
+pandas
 pillow
 prov
 psutil
@@ -26,14 +26,11 @@ pybtex
 pyyaml
 requests
 scipy>=1.6
-scitools-iris>3.8.0
+scitools-iris>=3.11.0
 shapely>=2.0.0
 stratify>=0.3
 yamale
 
-[:python_version < "3.10"]
-importlib_metadata
-
 [develop]
 codespell
 docformatter

{esmvalcore-2.11.0rc2/ESMValCore.egg-info → esmvalcore-2.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ESMValCore
-Version: 2.11.0rc2
+Version: 2.11.1
 Summary: ESMValCore: A community tool for pre-processing data from Earth system models in CMIP and running analysis scripts.
 Home-page: https://www.esmvaltool.org
 Download-URL: https://github.com/ESMValGroup/ESMValCore
@@ -14,9 +14,9 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Atmospheric Science
 Classifier: Topic :: Scientific/Engineering :: GIS
@@ -27,25 +27,24 @@ License-File: LICENSE
 License-File: NOTICE
 Requires-Dist: cartopy
 Requires-Dist: cf-units
-Requires-Dist: dask[array,distributed]
+Requires-Dist: dask[array,distributed]!=2024.8.0
 Requires-Dist: dask-jobqueue
 Requires-Dist: esgf-pyclient>=0.3.1
-Requires-Dist: esmf-regrid
+Requires-Dist: esmf-regrid>=0.11.0
 Requires-Dist: esmpy!=8.1.0
 Requires-Dist: filelock
 Requires-Dist: fiona
 Requires-Dist: fire
 Requires-Dist: geopy
 Requires-Dist: humanfriendly
-Requires-Dist: importlib_metadata; python_version < "3.10"
-Requires-Dist: isodate
+Requires-Dist: isodate>=0.7.0
 Requires-Dist: jinja2
 Requires-Dist: nc-time-axis
 Requires-Dist: nested-lookup
 Requires-Dist: netCDF4
 Requires-Dist: numpy!=1.24.3,<2.0.0
 Requires-Dist: packaging
-Requires-Dist: pandas!=2.2.0,!=2.2.1,!=2.2.2
+Requires-Dist: pandas
 Requires-Dist: pillow
 Requires-Dist: prov
 Requires-Dist: psutil
@@ -54,7 +53,7 @@ Requires-Dist: pybtex
 Requires-Dist: pyyaml
 Requires-Dist: requests
 Requires-Dist: scipy>=1.6
-Requires-Dist: scitools-iris>3.8.0
+Requires-Dist: scitools-iris>=3.11.0
 Requires-Dist: shapely>=2.0.0
 Requires-Dist: stratify>=0.3
 Requires-Dist: yamale

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/doc/changelog.rst

@@ -3,6 +3,37 @@
 Changelog
 =========
 
+.. _changelog-v2-11-1:
+
+v2.11.1
+-------
+Highlights
+
+This is a bugfix release which enables lazy computations in more preprocessors
+and allows installing the latests version of various dependencies, including
+Iris (`v3.11.0 <https://github.com/SciTools/iris/releases/tag/v3.11.0>`__).
+
+This release includes
+
+Computational performance improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  Optimize functions ``mask_landsea()``, ``mask_landseaice()`` and ``calculate_volume()`` for lazy input (:pull:`2515`) by :user:`schlunma`
+
+Installation
+~~~~~~~~~~~~
+
+-  Remove support for Python 3.9 (:pull:`2447`) by :user:`valeriupredoi`
+-  Switch to new iris >= 3.10.0 API (:pull:`2500`) by :user:`schlunma`
+-  Pin dask to avoid 2024.8.0 - problems with masked fill/missing values (:pull:`2504`) by :user:`valeriupredoi`
+-  Fix rounding of Pandas datetimes in ICON CMORizer to allow installing latest Pandas version (:pull:`2529`) by :user:`valeriupredoi`
+
+Automatic testing
+~~~~~~~~~~~~~~~~~
+
+-  Fix type hint for new mypy version (:pull:`2497`) by :user:`schlunma`
+-  Reformat datetime strings be in line with new ``isodate==0.7.0`` and actual ISO8601 and pin ``isodate>=0.7.0`` (:pull:`2546`) by :user:`valeriupredoi`
+
 .. _changelog-v2-11-0:
 
 v2.11.0

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/doc/quickstart/install.rst

@@ -22,7 +22,7 @@ and install ESMValCore into it with a single command:
 
 .. code-block:: bash
 
-    conda create --name esmvalcore -c conda-forge esmvalcore 'python=3.10'
+    conda create --name esmvalcore -c conda-forge esmvalcore
 
 Don't forget to activate the newly created environment after the installation:
 

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/environment.yml

@@ -8,21 +8,19 @@ dependencies:
   - cartopy
   - cf-units
   - cftime
-  - compilers
-  - dask
+  - dask !=2024.8.0  # github.com/ESMValGroup/ESMValCore/issues/2503
   - dask-jobqueue
   - distributed
   - esgf-pyclient >=0.3.1
-  - esmpy !=8.1.0,<8.6.0  # https://github.com/SciTools-incubator/iris-esmf-regrid/pull/342#issuecomment-2092921514
+  - esmpy !=8.1.0
   - filelock
   - fiona
   - fire
   - geopy
   - humanfriendly
-  - importlib_metadata  # required for Python < 3.10
-  - iris >3.8.0
-  - iris-esmf-regrid >=0.7.0
-  - isodate
+  - iris >=3.11.0
+  - iris-esmf-regrid >=0.11.0
+  - isodate >=0.7.0  # incompatible with very old 0.6.1
   - jinja2
   - libnetcdf !=4.9.1  # to avoid hdf5 warnings
   - nc-time-axis
@@ -30,14 +28,14 @@ dependencies:
   - netcdf4
   - numpy !=1.24.3,<2.0.0  # avoid pulling 2.0.0rcX
   - packaging
-  - pandas !=2.2.0,!=2.2.1,!=2.2.2  # github.com/ESMValGroup/ESMValCore/pull/2305 and #2349
+  - pandas
   - pillow
   - pip !=21.3
   - prov
   - psutil
   - py-cordex
   - pybtex
-  - python >=3.9
+  - python >=3.10
   - python-stratify >=0.3
   - pyyaml
   - requests

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/esmvalcore/_recipe/check.py

@@ -339,19 +339,34 @@ def _check_delimiter(timerange):
 
 
 def _check_duration_periods(timerange):
-    try:
-        isodate.parse_duration(timerange[0])
-    except ValueError:
-        pass
-    else:
+    # isodate duration must always start with P
+    if timerange[0].startswith("P") and timerange[1].startswith("P"):
+        raise RecipeError(
+            "Invalid value encountered for `timerange`. "
+            "Cannot set both the beginning and the end "
+            "as duration periods."
+        )
+
+    if timerange[0].startswith("P"):
+        try:
+            isodate.parse_duration(timerange[0])
+        except isodate.isoerror.ISO8601Error as exc:
+            raise RecipeError(
+                "Invalid value encountered for `timerange`. "
+                f"{timerange[0]} is not valid duration according to ISO 8601."
+                + "\n"
+                + str(exc)
+            )
+    elif timerange[1].startswith("P"):
         try:
             isodate.parse_duration(timerange[1])
-        except ValueError:
-            pass
-        else:
-            raise RecipeError("Invalid value encountered for `timerange`. "
-                              "Cannot set both the beginning and the end "
-                              "as duration periods.")
+        except isodate.isoerror.ISO8601Error as exc:
+            raise RecipeError(
+                "Invalid value encountered for `timerange`. "
+                f"{timerange[1]} is not valid duration according to ISO 8601."
+                + "\n"
+                + str(exc)
+            )
 
 
 def _check_format_years(date):
@@ -362,18 +377,26 @@ def _check_format_years(date):
 
 
 def _check_timerange_values(date, timerange):
+    # Wildcards are fine
+    if date == "*":
+        return
+    # P must always be in a duration string
+    # if T in date, that is a datetime; otherwise it's date
     try:
-        isodate.parse_date(date)
-    except ValueError:
-        try:
+        if date.startswith("P"):
             isodate.parse_duration(date)
-        except ValueError as exc:
-            if date != '*':
-                raise RecipeError("Invalid value encountered for `timerange`. "
-                                  "Valid value must follow ISO 8601 standard "
-                                  "for dates and duration periods, or be "
-                                  "set to '*' to load available years. "
-                                  f"Got {timerange} instead.") from exc
+        elif "T" in date:
+            isodate.parse_datetime(date)
+        else:
+            isodate.parse_date(date)
+    except isodate.isoerror.ISO8601Error as exc:
+        raise RecipeError(
+            "Invalid value encountered for `timerange`. "
+            "Valid value must follow ISO 8601 standard "
+            "for dates and duration periods, or be "
+            "set to '*' to load available years. "
+            f"Got {timerange} instead." + "\n" + str(exc)
+        )
 
 
 def valid_time_selection(timerange):
@@ -401,7 +424,7 @@ def _check_literal(
     *,
     step: str,
     option: str,
-    allowed_values: tuple[str],
+    allowed_values: tuple[None | str, ...],
 ) -> None:
     """Check that an option for a preprocessor has a valid value."""
     if step not in settings:

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/esmvalcore/cmor/_fixes/icon/_base_fixes.py

@@ -16,7 +16,7 @@ import numpy as np
 import requests
 from iris import NameConstraint
 from iris.cube import Cube, CubeList
-from iris.experimental.ugrid import Connectivity, Mesh
+from iris.mesh import Connectivity, MeshXY
 
 from esmvalcore.cmor._fixes.native_datasets import NativeDatasetFix
 from esmvalcore.local import _get_rootpath, _replace_tags, _select_drs
@@ -38,24 +38,24 @@ class IconFix(NativeDatasetFix):
         self._horizontal_grids = {}
         self._meshes = {}
 
-    def _create_mesh(self, cube):
+    def _create_mesh(self, cube: Cube) -> MeshXY:
         """Create mesh from horizontal grid file.
 
         Note
         ----
-        This functions creates a new :class:`iris.experimental.ugrid.Mesh` from
-        the ``clat`` (already present in the cube), ``clon`` (already present
-        in the cube), ``vertex_index``, ``vertex_of_cell``, ``vlat``, and
-        ``vlon`` variables of the horizontal grid file.
-
-        We do not use :func:`iris.experimental.ugrid.Mesh.from_coords` with the
-        existing latitude and longitude coordinates here because this would
-        produce lots of duplicated entries for the node coordinates. The reason
-        for this is that the node coordinates are constructed from the bounds;
-        since each node is contained 6 times in the bounds array (each node is
-        shared by 6 neighboring cells) the number of nodes is 6 times higher
-        with :func:`iris.experimental.ugrid.Mesh.from_coords` compared to using
-        the information already present in the horizontal grid file.
+        This functions creates a new :class:`iris.mesh.MeshXY` from the
+        ``clat`` (already present in the cube), ``clon`` (already present in
+        the cube), ``vertex_index``, ``vertex_of_cell``, ``vlat``, and ``vlon``
+        variables of the horizontal grid file.
+
+        We do not use :func:`iris.mesh.MeshXY.from_coords` with the existing
+        latitude and longitude coordinates here because this would produce lots
+        of duplicated entries for the node coordinates. The reason for this is
+        that the node coordinates are constructed from the bounds; since each
+        node is contained 6 times in the bounds array (each node is shared by 6
+        neighboring cells) the number of nodes is 6 times higher with
+        :func:`iris.mesh.MeshXY.from_coords` compared to using the information
+        already present in the horizontal grid file.
 
         """
         horizontal_grid = self.get_horizontal_grid(cube)
@@ -91,7 +91,7 @@ class IconFix(NativeDatasetFix):
         if not np.allclose(
                 face_lat.bounds,
                 node_lat.points[conn_node_inds],
-                **close_kwargs,
+                **close_kwargs,  # type: ignore
         ):
             logger.warning(
                 "Latitude bounds of the face coordinate ('clat_vertices' in "
@@ -108,7 +108,7 @@ class IconFix(NativeDatasetFix):
         # differ by 360°, which is also okay.
         face_lon_bounds_to_check = face_lon.bounds % 360
         node_lon_conn_to_check = node_lon.points[conn_node_inds] % 360
-        idx_notclose = ~np.isclose(
+        idx_notclose = ~np.isclose(  # type: ignore
             face_lon_bounds_to_check,
             node_lon_conn_to_check,
             **close_kwargs,
@@ -131,7 +131,7 @@ class IconFix(NativeDatasetFix):
             start_index=start_index,
             location_axis=0,
         )
-        mesh = Mesh(
+        mesh = MeshXY(
             topology_dimension=2,
             node_coords_and_axes=[(node_lat, 'y'), (node_lon, 'x')],
             connectivities=[connectivity],
@@ -429,8 +429,8 @@ class IconFix(NativeDatasetFix):
 
         Returns
         -------
-        iris.experimental.ugrid.Mesh
-            Mesh.
+        iris.mesh.MeshXY
+            Mesh of the cube.
 
         Raises
         ------

{esmvalcore-2.11.0rc2 → esmvalcore-2.11.1}/esmvalcore/cmor/_fixes/icon/icon.py

@@ -492,8 +492,11 @@ class AllVars(IconFix):
         # Finally, add date and day fraction to get final datetime and convert
         # it to correct units. Note: we also round to next second, otherwise
         # this results in times that are off by 1s (e.g., 13:59:59 instead of
-        # 14:00:00).
-        rounded_datetimes = (year_month_day + day_float).round('s')
+        # 14:00:00). We round elements individually since rounding the
+        # pd.Series object directly is broken
+        # (https://github.com/pandas-dev/pandas/issues/57002).
+        datetimes = year_month_day + day_float
+        rounded_datetimes = pd.Series(dt.round('s') for dt in datetimes)
         with warnings.catch_warnings():
             # We already fixed the deprecated code as recommended in the
             # warning, but it still shows up -> ignore it