Merge branch 'main' of https://github.com/ESMValGroup/ESMValTool

valeriupredoi · valeriupredoi · commit 6201c59dae12 · 2026-06-15T13:29:21.000+01:00
diff --git a/.github/workflows/check-rtw.yml b/.github/workflows/check-rtw.yml
@@ -38,7 +38,7 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job
       # can access it
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/check_links.yml b/.github/workflows/check_links.yml
@@ -17,7 +17,7 @@ jobs:
     permissions:
       issues: write # Required for peter-evans/create-issue-from-file
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/check_links_in_pr.yml b/.github/workflows/check_links_in_pr.yml
@@ -12,7 +12,7 @@ jobs:
     outputs:
       files: ${{ steps.changed-doc-files.outputs.all_changed_files }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
       - name: Get changed doc files
@@ -33,7 +33,7 @@ jobs:
         file: ${{ fromJSON(needs.changedFiles.outputs.files) }}
       fail-fast: false
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 2
           persist-credentials: false
diff --git a/.github/workflows/citation_file_validator.yml b/.github/workflows/citation_file_validator.yml
@@ -19,7 +19,7 @@ jobs:
     if: github.event_name != 'schedule' || github.repository == 'ESMValGroup/ESMValTool' # avoid scheduled GHAs in forks
     steps:
       - name: Check out a copy of the repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/cron_esmvalbot_test.yml b/.github/workflows/cron_esmvalbot_test.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: 'ubuntu-latest'
     if: github.repository == 'ESMValGroup/ESMValTool'  # avoid GAs in forks
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           persist-credentials: false
diff --git a/.github/workflows/install-from-source-without-pixi.yml b/.github/workflows/install-from-source-without-pixi.yml
@@ -28,7 +28,7 @@ jobs:
           - macos-latest
     name: Install esmvaltool from source on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           persist-credentials: false
diff --git a/.github/workflows/pypi-build-and-deploy.yml b/.github/workflows/pypi-build-and-deploy.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           persist-credentials: false
diff --git a/.github/workflows/run-tests-monitor.yml b/.github/workflows/run-tests-monitor.yml
@@ -36,7 +36,7 @@ jobs:
           - test-py314
     name: ${{ matrix.os }} ${{ matrix.environment }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           persist-credentials: false
diff --git a/.github/workflows/test-development.yml b/.github/workflows/test-development.yml
@@ -28,7 +28,7 @@ jobs:
     if: github.repository == 'ESMValGroup/ESMValTool' # avoid GAs in forks
     name: Linux Python ${{ matrix.python-version }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           persist-credentials: false
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -32,7 +32,7 @@ jobs:
           - test-py314
     name: ${{ matrix.os }} ${{ matrix.environment }}
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           persist-credentials: false
diff --git a/.github/workflows/update-lockfiles.yml b/.github/workflows/update-lockfiles.yml
@@ -14,7 +14,7 @@ jobs:
   pixi-update:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           fetch-depth: 0
           persist-credentials: false
diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
 
diff --git a/doc/sphinx/source/community/release_strategy/release_strategy.rst b/doc/sphinx/source/community/release_strategy/release_strategy.rst
@@ -73,11 +73,11 @@ Upcoming releases
 +------------+------------+----------------------------------------+-------------------------------------+
 |  Planned   |    Done    |            Event                       |             Changelog               |
 +============+============+========================================+=====================================+
-| 2026-06-12 |            | ESMValCore `Feature Freeze`_           |                                     |
+| 2026-06-19 |            | ESMValCore `Feature Freeze`_           |                                     |
 +------------+------------+----------------------------------------+-------------------------------------+
-| 2026-06-30 |            | ESMValCore Release 2.15.0              |                                     |
+| 2026-06-26 |            | ESMValTool `Feature Freeze`_           |                                     |
 +------------+------------+----------------------------------------+-------------------------------------+
-| 2026-07-03 |            | ESMValTool `Feature Freeze`_           |                                     |
+| 2026-07-03 |            | ESMValCore Release 2.15.0              |                                     |
 +------------+------------+----------------------------------------+-------------------------------------+
 | 2026-07-17 |            | ESMValTool Release 2.15.0              |                                     |
 +------------+------------+----------------------------------------+-------------------------------------+
diff --git a/doc/sphinx/source/recipes/figures/seaice/Annual_Antarctic_sea_ice_trends.png b/doc/sphinx/source/recipes/figures/seaice/Annual_Antarctic_sea_ice_trends.png
diff --git a/doc/sphinx/source/recipes/figures/seaice/September_Arctic_sea_ice_sensitivity.png b/doc/sphinx/source/recipes/figures/seaice/September_Arctic_sea_ice_sensitivity.png
diff --git a/doc/sphinx/source/recipes/recipe_seaice_sensitivity.rst b/doc/sphinx/source/recipes/recipe_seaice_sensitivity.rst
@@ -25,18 +25,36 @@ Diagnostic is in `diag_scripts/seaice/`
 Recipe settings
 ~~~~~~~~~~~~~~~
 
-Years to be evaluated are specified in the ``extract_test_period`` preprocessor. Arctic sea ice is evaluated using data from September, and Antarctic sea ice is evaluated using annually meaned data. This can be amended by changing the preprocessor for each variable (shown below).
+Years to be evaluated are specified with the ``start_year`` and ``end_year`` keywords in the model dataset section, which are automatically duplicated into the observational datasets section.
+
+.. code-block:: yaml
+
+    model_defaults: &model_defaults { ..., start_year: &data_start 1979, end_year: &data_end 2014}
+
+Pre-calculated values for the mean sensitivity of sea ice area to global warming (and an associated standard deviation and plausible range) can be entered be for both arctic and antarctic diagnostics (more details are given in the "References" section below).
+
+.. code-block:: yaml
+
+    diagnostics:
+      arctic:
+        scripts:
+          sea_ice_sensitivity_script:
+            observations:
+              observation_period:
+                start_year:
+                end_year:
+              sea_ice_sensitivity:
+                mean:
+                standard deviation:
+                plausible range:
+
+If the years to be evaluated differ from those specified for pre-calculated observational values for either hemisphere, then the "observational period" is assumed to be a subset of the dataset evaluation period and all statistics will be calculated for both periods, with these results shown as two halves of the sensitivity (one dimensional) plot. The two dimensional plot will only use values from the entire evaluation period.
+
+Arctic sea ice is evaluated using data from September, and Antarctic sea ice is evaluated using annually meaned data. This can be amended by changing the preprocessor for each variable (shown below).
 
 .. code-block:: yaml
 
     pp_arctic_sept_sea_ice:
-      extract_time:
-        start_day: 1
-        start_month: 1
-        start_year: 1979
-        end_day: 31
-        end_month: 12
-        end_year: 2014
       extract_month:
         month: 9
       extract_region:
@@ -57,6 +75,15 @@ Only one ensemble member is used for each model.
 
 All, some or no datasets may be labelled in the plots, using ``label_dataset: True`` in the recipe settings.
 
+.. note::
+
+   **The same time range must be used for all observational datasets specified.**
+
+   This is because the linear regression of sea ice area against temperature
+   is calculated directly for some values in the plots,
+   and so both types of observation must have the same number of data points.
+
+
 References
 ----------
 
@@ -71,6 +98,8 @@ Example plots
    :width:   8cm
 
    Plot of sensitivity of northern hemisphere sea ice area loss (millions of square kilometres) in the month of September to the annual mean global temperature change (K).
+   Models are shown on the left in blue, and the relationships between SIA-GMST pairs of observational datasets are shown on the right in orange.
+   The shading around the position of each observational pair shows the standard error as computed by :func:`scipy.stats.linregress`.
 
    The dashed black line shows the observational mean, the shaded area denotes one one standard deviation of observational uncertainty, as calculated by Notz et al (2020).
    The dotted grey lines reflect Notz et al estimate of a plausible range incorporating both internal variability and observational uncertainty.
@@ -89,4 +118,5 @@ plausible  1.28 million km2 K-1
 
    Plot of the trend of annually averaged southern hemisphere sea ice area (millions of square kilometres) over time against the trend of annually and globally averaged air temperature near the surface (degrees Kelvin) over time. The values plotted are 10 times the annual trend, which was calculated using :func:`scipy.stats.linregress`, for consistency with the decadal values used in the published plot.
 
-   The colour of each point is determined by the Pearson correlation coefficient between the two variables, and the hatching indicates a ``p_value`` greater than 0.05, both calculated using :func:`scipy.stats.linregress`.
+   The colour of each point is determined by the Pearson correlation coefficient between the two variables, and the hatching indicates that the trend of sea ice area over time has a ``p_value`` greater than 0.05, both calculated using :func:`scipy.stats.linregress`.
+   Models are shown as circles and observational datasets are shown as squares.
diff --git a/esmvaltool/cmorizers/data/cmorizer.py b/esmvaltool/cmorizers/data/cmorizer.py
@@ -22,6 +22,9 @@
 from esmvalcore.config import CFG
 from esmvalcore.config._dask import get_distributed_client
 from esmvalcore.config._logging import configure_logging
+from rich.console import Console
+from rich.markdown import Markdown
+from rich.table import Table
 
 from esmvaltool.cmorizers.data.utilities import read_cmor_config
 
@@ -624,26 +627,41 @@ class DataCommand:
     def __init__(self) -> None:
         self._info = yaml.safe_load(DATASETS_FILE.read_text(encoding="utf8"))
         self.formatter = _Formatter(self._info)
+        self._console = Console(soft_wrap=True)
 
     def _has_downloader(self, dataset: str) -> Literal["Yes", "No"]:
         return "Yes" if self.formatter.has_downloader(dataset) else "No"
 
     def list(self) -> None:
         """List all supported datasets."""
-        print()
-        print(f"| {'Dataset name':30} | Tier | Auto-download | Last access |")
-        print("-" * 71)
+        table = Table(title="Datasets that can be CMORized with ESMValTool")
+        table.add_column("Dataset")
+        table.add_column("Tier")
+        table.add_column("Auto-download")
+        table.add_column("Last access")
+
         for dataset, dataset_info in self._info["datasets"].items():
             date = datetime.datetime.strptime(
                 str(dataset_info["last_access"]),
                 "%Y-%m-%d",
             )
-            print(
-                f"| {dataset:30} | {dataset_info['tier']:4} "
-                f"| {self._has_downloader(dataset):13} "
-                f"|  {date.strftime('%Y-%m-%d')} |",
+            age = datetime.datetime.now(datetime.UTC).year - date.year
+            shade = max(100, 255 - age * 15)
+            color = f"rgb({shade},{shade},{shade})"
+            tier = dataset_info["tier"]
+            unrestricted_tier = 2
+            has_downloader = self._has_downloader(dataset)
+            table.add_row(
+                dataset,
+                f"[green]{tier}[/green]"
+                if tier == unrestricted_tier
+                else f"[orange3]{tier}[/orange3]",
+                f"[green]{has_downloader}[/green]"
+                if has_downloader == "Yes"
+                else f"[red]{has_downloader}[/red]",
+                f"[{color}]{date.strftime('%Y-%m-%d')}[/{color}]",
             )
-        print("-" * 71)
+        self._console.print(table)
 
     def info(self, dataset: str) -> None:
         """Show detailed info about a specific dataset.
@@ -654,13 +672,14 @@ def info(self, dataset: str) -> None:
             dataset to show
         """
         dataset_info = self._info["datasets"][dataset]
-        print(dataset)
-        print()
-        print(f"Tier: {dataset_info['tier']}")
-        print(f"Source: {dataset_info['source']}")
-        print(f"Automatic download: {self._has_downloader(dataset)}")
-        print()
-        print(dataset_info["info"])
+        lines = [f"# {dataset}"]
+        lines.append(f"- Dataset: `{dataset}`")
+        lines.append(f"- Tier: {dataset_info['tier']}")
+        lines.append(f"- Source: {dataset_info['source']}")
+        lines.append(f"- Automatic download: {self._has_downloader(dataset)}")
+        lines.append("")
+        lines.append(dataset_info["info"])
+        self._console.print(Markdown("\n".join(lines)))
 
     def download(
         self,
diff --git a/esmvaltool/diag_scripts/seaice/seaice_sensitivity.py b/esmvaltool/diag_scripts/seaice/seaice_sensitivity.py
diff --git a/esmvaltool/recipes/recipe_seaice_sensitivity.yml b/esmvaltool/recipes/recipe_seaice_sensitivity.yml
diff --git a/esmvaltool/recipes/recipe_seaice_sensitivity_cmip7.yml b/esmvaltool/recipes/recipe_seaice_sensitivity_cmip7.yml
diff --git a/pyproject.toml b/pyproject.toml
