Use ESMValCore v2.10.0 release candidates (#3404)

Co-authored-by: Valeriu Predoi <[email protected]>

.github/workflows/test-development.yml

@@ -12,6 +12,7 @@ on:
   push:
     branches:
       - main
+      - fix_recipe_filler_bkwds_incompatibility
   schedule:
     - cron: '0 0 * * *'
 

.github/workflows/test.yml

@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - main
+      - fix_recipe_filler_bkwds_incompatibility
   schedule:
     - cron: '0 0 * * *'
 

environment.yml

@@ -4,7 +4,7 @@ channels:
   # The release candidate channel should only be activated
   # during the rc phase right before the next release of the
   # ESMValCore.
-  # - conda-forge/label/esmvalcore_rc
+  - conda-forge/label/esmvalcore_rc
   - conda-forge
   - nodefaults
 
@@ -24,7 +24,7 @@ dependencies:
   - ecmwf-api-client
   - eofs
   - esmpy
-  - esmvalcore 2.9.*
+  - esmvalcore =2.10.0rc1
   - fiona
   - fire
   - gdal

environment_osx.yml

@@ -4,7 +4,7 @@ channels:
   # The release candidate channel should only be activated
   # during the rc phase right before the next release of the
   # ESMValCore.
-  # - conda-forge/label/esmvalcore_rc
+  - conda-forge/label/esmvalcore_rc
   - conda-forge
   - nodefaults
 
@@ -24,7 +24,7 @@ dependencies:
   - ecmwf-api-client
   - eofs
   - esmpy
-  - esmvalcore 2.9.*
+  - esmvalcore =2.10.0rc1
   - fiona
   - fire
   - gdal

esmvaltool/cmorizers/data/formatters/datasets/esacci_watervapour.py

@@ -23,7 +23,7 @@
 import os
 
 import iris
-from esmvalcore.cmor.check import _get_time_bounds
+from esmvalcore.cmor.fixes import get_time_bounds
 from esmvalcore.preprocessor import concatenate
 
 from ...utilities import (
@@ -83,7 +83,7 @@ def cmorization(in_dir, out_dir, cfg, cfg_user, start_date, end_date):
             yearly_cube = concatenate(monthly_cubes)
             # Fix monthly time bounds
             time = yearly_cube.coord('time')
-            time.bounds = _get_time_bounds(time, 'mon')
+            time.bounds = get_time_bounds(time, 'mon')
             save_variable(yearly_cube,
                           var,
                           out_dir,

esmvaltool/utils/draft_release_notes.py

@@ -10,6 +10,7 @@
 """
 import datetime
 from pathlib import Path
+from zoneinfo import ZoneInfo
 
 import dateutil
 import esmvalcore
@@ -41,8 +42,10 @@
 }
 
 PREVIOUS_RELEASE = {
-    'esmvalcore': datetime.datetime(2023, 5, 19, 16),
-    'esmvaltool': datetime.datetime(2022, 10, 28, 18),
+    'esmvalcore':
+    datetime.datetime(2023, 7, 4, 11, tzinfo=ZoneInfo("CET")),
+    'esmvaltool':
+    datetime.datetime(2022, 10, 28, 18, tzinfo=ZoneInfo("CET")),
 }
 
 LABELS = {

esmvaltool/utils/recipe_filler.py

@@ -63,15 +63,6 @@
 CFG = {}
 
 
-# standard libs from esmvalcore ported here to avoid private func import
-def load_config_developer(cfg_file=None):
-    """Load the config developer file and initialize CMOR tables."""
-    cfg_developer = read_config_developer_file(cfg_file)
-    for key, value in cfg_developer.items():
-        CFG[key] = value
-    read_cmor_tables(CFG)
-
-
 def _purge_file_handlers(cfg: dict) -> None:
     """Remove handlers with filename set.
 
@@ -258,7 +249,7 @@ def read_config_user_file(config_file, folder_name, options=None):
     cfg['run_dir'] = os.path.join(cfg['output_dir'], 'run')
 
     # Read developer configuration file
-    load_config_developer(cfg['config_developer_file'])
+    read_cmor_tables(cfg['config_developer_file'])
 
     return cfg
 

tests/integration/test_recipe_filler.py

@@ -8,14 +8,8 @@
 import pytest
 import yaml
 
-import esmvaltool.utils.recipe_filler as recipe_filler
-from esmvalcore.cmor.table import read_cmor_tables
 from esmvaltool.utils.recipe_filler import run
 
-# Initialize with standard config developer file
-std_config = recipe_filler.read_config_developer_file()
-# Initialize CMOR tables
-read_cmor_tables(std_config)
 
 # Load test configuration
 with open(os.path.join(os.path.dirname(__file__),