Remove deprecation warning for regrid schemes already deprecated for v2.7.0

doc/recipe/preprocessor.rst

@@ -394,15 +394,6 @@ The vertical interpolation currently supports the following schemes:
 * ``nearest_extrapolate``: Nearest-neighbour interpolation with nearest-neighbour
   extrapolation, i.e., extrapolation points will take their value from the
   nearest source point.
-
-.. note::
-   Previous versions of ESMValCore (<2.5.0) supported the schemes
-   ``linear_horizontal_extrapolate_vertical`` and
-   ``nearest_horizontal_extrapolate_vertical``. These schemes have been renamed
-   to ``linear_extrapolate`` and ``nearest_extrapolate``, respectively, in
-   version 2.5.0 and are identical to the new schemes. Support for the old
-   names will be removed in version 2.7.0.
-
 * See also :func:`esmvalcore.preprocessor.extract_levels`.
 * See also :func:`esmvalcore.preprocessor.get_cmor_levels`.
 

esmvalcore/preprocessor/_regrid.py

@@ -4,7 +4,6 @@
 import logging
 import os
 import re
-import warnings
 from copy import deepcopy
 from decimal import Decimal
 from typing import Dict
@@ -17,8 +16,6 @@
 from iris.analysis import AreaWeighted, Linear, Nearest, UnstructuredNearest
 from iris.util import broadcast_to_shape
 
-from esmvalcore.exceptions import ESMValCoreDeprecationWarning
-
 from ..cmor._fixes.shared import add_altitude_from_plev, add_plev_from_altitude
 from ..cmor.fix import fix_file, fix_metadata
 from ..cmor.table import CMOR_TABLES
@@ -860,21 +857,6 @@ def parse_vertical_scheme(scheme):
     (str, str)
         A tuple containing the interpolation and extrapolation scheme.
     """
-    # Issue warning when deprecated schemes are used
-    deprecated_schemes = {
-        'linear_horizontal_extrapolate_vertical': 'linear_extrapolate',
-        'nearest_horizontal_extrapolate_vertical': 'nearest_extrapolate',
-    }
-    if scheme in deprecated_schemes:
-        new_scheme = deprecated_schemes[scheme]
-        deprecation_msg = (
-            f"The vertical regridding scheme ``{scheme}`` has been deprecated "
-            f"in ESMValCore version 2.5.0 and is scheduled for removal in "
-            f"version 2.7.0. It has been renamed to the identical scheme "
-            f"``{new_scheme}`` without any change in functionality.")
-        warnings.warn(deprecation_msg, ESMValCoreDeprecationWarning)
-        scheme = new_scheme
-
     # Check if valid scheme is given
     if scheme not in VERTICAL_SCHEMES:
         raise ValueError(

tests/unit/preprocessor/_regrid/test_extract_levels.py

@@ -6,11 +6,9 @@
 
 import iris
 import numpy as np
-import pytest
 from numpy import ma
 
 import tests
-from esmvalcore.exceptions import ESMValCoreDeprecationWarning
 from esmvalcore.preprocessor._regrid import (
     _MDI,
     VERTICAL_SCHEMES,
@@ -61,20 +59,6 @@ def test_parse_vertical_schemes(self):
             interpolation, extrapolation = parse_vertical_scheme(scheme)
             assert interpolation, extrapolation == reference[scheme]
 
-        # Deprecated schemes (remove in v2.7)
-        deprecated_references = {
-            'linear_horizontal_extrapolate_vertical': ('linear', 'nearest'),
-            'nearest_horizontal_extrapolate_vertical': ('nearest', 'nearest'),
-        }
-        for scheme in deprecated_references:
-            warn_msg = (
-                "`` has been deprecated in ESMValCore version 2.5.0 and is "
-                "scheduled for removal in version 2.7.0. It has been renamed "
-                "to the identical scheme ``")
-            with pytest.warns(ESMValCoreDeprecationWarning, match=warn_msg):
-                interp, extrap = parse_vertical_scheme(scheme)
-            assert interp, extrap == deprecated_references[scheme]
-
     def test_nop__levels_match(self):
         vcoord = _make_vcoord(self.z, dtype=self.dtype)
         self.assertEqual(self.cube.coord(axis='z', dim_coords=True), vcoord)