Merge branch 'main' into 3688_update_version_release_notes

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ exclude: |
   ^esmvaltool/diag_scripts/cvdp/
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -19,7 +19,7 @@ repos:
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
   - repo: https://github.com/adrienverge/yamllint
-    rev: 'v1.31.0'
+    rev: 'v1.35.1'
     hooks:
       - id: yamllint
   - repo: local  # nclcodestyle is installed alongside ESMValTool
@@ -30,16 +30,16 @@ repos:
         language: system
         files: '\.(ncl|NCL)$'
   - repo: https://github.com/lorenzwalthert/precommit/  # Checks for R
-    rev: 'v0.3.2.9007'
+    rev: 'v0.4.2'
     hooks:
       - id: style-files  # styler
       - id: lintr
   - repo: https://github.com/codespell-project/codespell
-    rev: 'v2.2.4'
+    rev: 'v2.3.0'
     hooks:
       - id: codespell
   - repo: https://github.com/PyCQA/isort
-    rev: '5.12.0'
+    rev: '5.13.2'
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/mirrors-yapf
@@ -49,10 +49,10 @@ repos:
         additional_dependencies:
           - 'toml'
   - repo: https://github.com/myint/docformatter
-    rev: 'v1.6.5'
+    rev: 'v1.7.5'
     hooks:
       - id: docformatter
   - repo: https://github.com/pycqa/flake8
-    rev: '6.0.0'
+    rev: '5.0.4'
     hooks:
       - id: flake8

doc/sphinx/source/recipes/broken_recipe_list.rst

@@ -9,26 +9,41 @@ More details can be found in the :ref:`broken recipe policy
 <broken-recipe-policy>`.
 
 .. list-table:: Broken recipes
-   :widths: 25 25 25 25
+   :widths: 25 25 25 25 25
    :header-rows: 1
 
    * - Broken recipe
      - Affected diagnostics
+     - Broken since release
      - Problem
      - GitHub issue
-   * - `recipe_check_obs.yml`
-     - `ERA5_native6`
-     - Derivation of custom variables `rlus` and `rsus`
-     - `#1388 <https://github.com/ESMValGroup/ESMValCore/issues/1388>`_
    * - :ref:`recipe_julia.yml <recipe_examples>`
      - `example`
-     - fill values are not interpreted, resulting in an unusable plot
+     - v2.5.0
+     - Fill values are not interpreted, resulting in an unusable plot
      - `#2595 <https://github.com/ESMValGroup/ESMValTool/issues/2595>`_
-   * - :ref:`recipe_seaice_drift.yml <recipes_seaice_drift>`
-     - `sea_ice_drift_SCICEX`
-     - ``shapely 2`` issue
-     - `#3243 <https://github.com/ESMValGroup/ESMValTool/issues/3243>`_
-   * - :ref:`recipe_pysplot.yml <recipes_psyplot_diag>`
-     - `plot_map`
-     - ``shapely 2`` issue
-     - `#3483 <https://github.com/ESMValGroup/ESMValTool/issues/3483>`_
+   * - :ref:`recipe_climwip_brunner2019_med.yml <recipe_climwip>`
+     - All (preprocessor issue)
+     - v2.11.0
+     - Failed to run preprocessor function ``fix_metadata`` on the data: Unable to convert units
+     - `#3694 <https://github.com/ESMValGroup/ESMValTool/issues/3694>`_
+   * - :ref:`recipe_ocean_amoc.yml <XML_oceans>`
+     - ``diag_timeseries_amoc``, ``diag_transects``
+     - v2.11.0
+     - CESM1 CMIP5 Omon data no longer available
+     - `#3693 <https://github.com/ESMValGroup/ESMValTool/issues/3693>`_
+   * - :ref:`recipe_preprocessor_derive_test.yml <recipe_examples>`
+     - ``cmip6/toz``
+     - v2.11.0
+     - Failed to run preprocessor function ``derive`` on the data: Unable to convert units
+     - `#3709 <https://github.com/ESMValGroup/ESMValTool/issues/3709>`_
+   * - :ref:`recipe_russell18jgr.yml <nml_oceanmetrics>`
+     - ``Figure_4``
+     - v2.11.0
+     - CESM1 CMIP5 Omon data no longer available
+     - `#3693 <https://github.com/ESMValGroup/ESMValTool/issues/3693>`_
+   * - :ref:`recipe_wenzel14jgr.yml <recipe_wenzel14jgr>`
+     - ``diag_tsline_Fig2d``
+     - v2.11.0
+     - CESM1 CMIP5 Omon data no longer available
+     - `#3693 <https://github.com/ESMValGroup/ESMValTool/issues/3693>`_

doc/sphinx/source/recipes/recipe_wenzel14jgr.rst

@@ -1,3 +1,5 @@
+.. _recipe_wenzel14jgr:
+
 Emergent constraints on carbon cycle feedbacks
 ==============================================
 

environment.yml

@@ -70,7 +70,7 @@ dependencies:
   - xlsxwriter
   - zarr
   # Python packages needed for unit testing
-  - flake8
+  - flake8 ==5.0.4
   - pytest >=3.9,!=6.0.0rc1,!=6.0.0
   - pytest-cov
   - pytest-env
@@ -84,16 +84,16 @@ dependencies:
   - sphinx >=6.1.3
   - pydata-sphinx-theme
   # Python packages needed for development
-  - codespell
-  - docformatter
+  - codespell ==2.3.0
+  - docformatter ==1.7.5
   - imagehash
-  - isort
+  - isort ==5.13.2
   - pre-commit
   - prospector
   - pyroma
   # - vprof not on conda-forge
-  - yamllint
-  - yapf
+  - yamllint ==1.35.1
+  - yapf ==0.32.0
 
   # NCL and dependencies
   - ncl
@@ -113,7 +113,6 @@ dependencies:
   - r-functional
   - r-ggplot2
   - r-gridextra
-  - r-lintr
   - r-logging
   - r-mapproj
   - r-maps
@@ -127,13 +126,12 @@ dependencies:
   - r-s2dverification
   - r-snow
   - r-spei
-  - r-styler
   - r-udunits2
   - r-yaml
   # R packages needed for development
   - r-git2r  # dependency of lintr
-  - r-lintr
-  - r-styler
+  - r-lintr ==3.1.2
+  - r-styler ==1.10.3
 
   # Julia (dependencies installed by separate script)
   - julia

environment_osx.yml

@@ -24,8 +24,8 @@ dependencies:
   - esmpy >=8.6.0  # github.com/SciTools-incubator/iris-esmf-regrid/pull/342
   - esmvalcore 2.11.*
   - fiona
-  - fsspec
   - fire
+  - fsspec
   - gdal
   - iris >=3.6.1
   - iris-esmf-regrid >=0.10.0  # github.com/SciTools-incubator/iris-esmf-regrid/pull/342
@@ -70,7 +70,7 @@ dependencies:
   - xlsxwriter
   - zarr
   # Python packages needed for unit testing
-  - flake8
+  - flake8 ==5.0.4
   - pytest >=3.9,!=6.0.0rc1,!=6.0.0
   - pytest-cov
   - pytest-env
@@ -84,13 +84,13 @@ dependencies:
   - sphinx >=6.1.3
   - pydata-sphinx-theme
   # Python packages needed for development
-  - codespell
-  - docformatter
+  - codespell ==2.3.0
+  - docformatter ==1.7.5
   - imagehash
-  - isort
+  - isort ==5.13.2
   - pre-commit
   - prospector
   - pyroma
   # - vprof not on conda-forge
-  - yamllint
-  - yapf
+  - yamllint ==1.35.1
+  - yapf ==0.32.0

esmvaltool/cmorizers/data/cmor_config/AERONET.yml

@@ -5,7 +5,7 @@ filename: 'AOD_Level20_Monthly_V3.tar.gz'
 # Common global attributes for Cmorizer output
 attributes:
   dataset_id: AERONET
-  version: 20230610
+  version: 20240406
   tier: 3
   modeling_realm: atmos
   project_id: OBS6

esmvaltool/cmorizers/data/datasets.yml

@@ -4,7 +4,7 @@ datasets:
   AERONET:
     tier: 3
     source: "https://aeronet.gsfc.nasa.gov/"
-    last_access: 2023-06-13
+    last_access: 2024-04-06
     info: |
       Aerosol Optical Depth information from a worldwide network of stations.
 

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

@@ -7,7 +7,7 @@
     https://aeronet.gsfc.nasa.gov/
 
 Last access
-    20230613
+    20240406
 
 Download and processing instructions
     Download the following file:

esmvaltool/recipes/examples/recipe_easy_ipcc.yml

@@ -63,7 +63,7 @@ diagnostics:
         script: examples/make_plot.py
 
 datasets:
-  - {dataset: ACCESS-CM2, ensemble: 'r(1:5)i1p1f1', grid: gn}
+  - {dataset: ACCESS-CM2, ensemble: 'r(1:10)i1p1f1', grid: gn}
   - {dataset: ACCESS-ESM1-5, ensemble: 'r(1:40)i1p1f1', grid: gn}
   - {dataset: AWI-CM-1-1-MR, ensemble: r1i1p1f1, grid: gn}
   - {dataset: BCC-CSM2-MR, ensemble: r1i1p1f1, grid: gn}
@@ -118,11 +118,11 @@ datasets:
   - {dataset: MIROC6, ensemble: 'r(1:50)i1p1f1', grid: gn}
   - {dataset: MPI-ESM1-2-HR, ensemble: 'r1i1p1f1', grid: gn}
   # - {dataset: MPI-ESM1-2-HR, ensemble: 'r(1:2)i1p1f1', grid: gn}  # second ensemble member causes warnings about large graphs in `concatenate` preprocessor step
-  - {dataset: MPI-ESM1-2-LR, ensemble: 'r(1:30)i1p1f1', grid: gn}
+  - {dataset: MPI-ESM1-2-LR, ensemble: 'r(1:50)i1p1f1', grid: gn}
   - {dataset: MRI-ESM2-0, ensemble: 'r(1:5)i1p1f1', grid: gn}
   # - {dataset: NESM3, ensemble: 'r(1:2)i1p1f1', grid: gn}  # cannot be used due to https://github.com/ESMValGroup/ESMValCore/issues/2101
   # - {dataset: NorESM2-LM, ensemble: r1i1p1f1, grid: gn}  # duplicated areacello file with wrong name
   - {dataset: NorESM2-MM, ensemble: r1i1p1f1, grid: gn}
-  - {dataset: TaiESM1, ensemble: r1i1p1f1, grid: gn}
+  # - {dataset: TaiESM1, ensemble: r1i1p1f1, grid: gn}  # download failure of ssp585
   - {dataset: UKESM1-0-LL, ensemble: 'r(1:4)i1p1f2', grid: gn}
   - {dataset: UKESM1-0-LL, ensemble: r8i1p1f2, grid: gn}

esmvaltool/recipes/recipe_aod_aeronet_assess.yml

@@ -44,7 +44,7 @@ diagnostics:
         start_year: 1994
         end_year: 2014
         additional_datasets:
-          - {dataset: AERONET, project: OBS6, mip: AERmon, tier: 3, type: atmos, version: 20231021}
+          - {dataset: AERONET, project: OBS6, mip: AERmon, tier: 3, type: atmos, version: 20240406}
 
       od440aer_season:
         <<: *var_od440aer