Merge branch 'main' into easy-ipcc-recipe

ESMValGroup · Oct 25, 2023 · ad0e019 · ad0e019
2 parents 99ec013 + 5858bf4
commit ad0e019
Show file tree

Hide file tree

Showing 15 changed files with 1,376 additions and 311 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -214,7 +214,7 @@ jobs:
             conda activate esmvaltool
             mkdir -p ~/climate_data
             esmvaltool config get_config_user
-            echo "offline: false" >> ~/.esmvaltool/config-user.yml
+            echo "search_esgf: when_missing" >> ~/.esmvaltool/config-user.yml
             cat ~/.esmvaltool/config-user.yml
             for recipe in esmvaltool/recipes/testing/recipe_*.yml; do
               esmvaltool run "$recipe"

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -14,11 +14,12 @@ build:
   jobs:
     pre_create_environment:
       # update mamba just in case
-      - mamba update --yes --quiet --name=base mamba
+      - mamba update --yes --quiet --name=base mamba 'zstd=1.5.2'
       - mamba --version
       - mamba install --name=base mamba zstandard
       - 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

diff --git a/.zenodo.json b/.zenodo.json
@@ -86,6 +86,11 @@
             "name": "Bock, Lisa",
             "orcid": "0000-0001-7058-5938"
         },
+        {
+            "affiliation": "DLR, Germany",
+            "name": "Bonnet, Pauline",
+            "orcid": "0000-0003-3780-0784"
+        },
         {
             "affiliation": "BSC, Spain",
             "name": "Caron, Louis-Philippe",
@@ -176,6 +181,11 @@
             "name": "Hassler, Birgit",
             "orcid": "0000-0003-2724-709X"
         },
+        {
+            "affiliation": "DLR, Germany",
+            "name": "Heuer, Helge",
+            "orcid": "0000-0003-2411-7150"
+        },
         {
             "affiliation": "BSC, Spain",
             "name": "Hunter, Alasdair",
@@ -194,6 +204,10 @@
             "affiliation": "MPI for Biogeochemistry, Germany",
             "name": "Koirala, Sujan"
         },
+        {
+            "affiliation": "DLR, Germany",
+            "name": "Kuehbacher, Birgit"
+        },
         {
             "affiliation": "BSC, Spain",
             "name": "Lledó, Llorenç"
@@ -263,6 +277,10 @@
             "affiliation": "CICERO, Norway",
             "name": "Sandstad, Marit"
         },
+        {
+            "affiliation": "DLR, Germany",
+            "name": "Sarauer, Ellen"
+        },
         {
             "affiliation": "MetOffice, UK",
             "name": "Sellar, Alistair"
@@ -338,6 +356,15 @@
             "affiliation": "DLR, Germany",
             "name": "Kazeroni, Rémi",
             "orcid": "0000-0001-7205-9528"
+        },
+        {
+            "affiliation": "DLR, Germany",
+            "name": "Kraft, Jeremy"
+        },
+        {
+            "affiliation": "University of Bremen, Germany",
+            "name": "Ruhe, Lukas",
+            "orcid": "0000-0001-6349-9118"
         }
     ],
     "description": "ESMValTool: A community diagnostic and performance metrics tool for routine evaluation of Earth system models in CMIP.",

diff --git a/CITATION.cff b/CITATION.cff
@@ -181,6 +181,11 @@ authors:
     family-names: Hassler
     given-names: Birgit
     orcid: "https://orcid.org/0000-0003-2724-709X"
+  -
+    affiliation: "DLR, Germany"
+    family-names: Heuer
+    given-names: Helge
+    orcid: "https://orcid.org/0000-0003-2411-7150"
   -
     affiliation: "BSC, Spain"
     family-names: Hunter
@@ -199,6 +204,10 @@ authors:
     affiliation: "MPI for Biogeochemistry, Germany"
     family-names: Koirala
     given-names: Sujan
+  -
+    affiliation: "DLR, Germany"
+    family-names: Kuehbacher
+    given-names: Birgit
   -
     affiliation: "BSC, Spain"
     family-names: Lledó
@@ -300,6 +309,10 @@ authors:
     family-names: Weigel
     given-names: Katja
     orcid: "https://orcid.org/0000-0001-6133-7801"
+  -
+    affiliation: "DLR, Germany"
+    family-names: Sarauer
+    given-names: Ellen
   -
     affiliation: "University of Reading, UK"
     family-names: Roberts
@@ -354,6 +367,20 @@ authors:
     family-names: Beucher
     given-names: Romain
     orcid: "https://orcid.org/0000-0003-3891-5444"
+  -
+    affiliation: "DLR, Germany"
+    family-names: Kraft
+    given-names: Jeremy
+  -
+    affiliation: "University of Bremen, Germany"
+    family-names: Ruhe
+    given-names: Lukas
+    orcid: "https://orcid.org/0000-0001-6349-9118"
+  -
+    affiliation: "DLR, Germany"
+    family-names: Bonnet
+    given-names: Pauline
+    orcid: "https://orcid.org/0000-0003-3780-0784"
 
 cff-version: 1.2.0
 date-released: 2023-07-06

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/79bf6932c2e844eea15d0fb1ed7e415c)](https://www.codacy.com/gh/ESMValGroup/ESMValTool?utm_source=github.com&utm_medium=referral&utm_content=ESMValGroup/ESMValTool&utm_campaign=Badge_Coverage)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/79bf6932c2e844eea15d0fb1ed7e415c)](https://www.codacy.com/gh/ESMValGroup/ESMValTool?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=ESMValGroup/ESMValTool&amp;utm_campaign=Badge_Grade)
 [![Docker Build Status](https://img.shields.io/docker/cloud/build/esmvalgroup/esmvaltool.svg)](https://hub.docker.com/r/esmvalgroup/esmvaltool/)
-[![Anaconda-Server Badge](https://anaconda.org/conda-forge/esmvaltool/badges/version.svg)](https://anaconda.org/conda-forge/esmvaltool)
+[![Anaconda-Server Badge](https://img.shields.io/badge/Anaconda.org-2.9.0-blue.svg)](https://anaconda.org/conda-forge/esmvaltool)
 ![stand with Ukraine](https://badgen.net/badge/stand%20with/UKRAINE/?color=0057B8&labelColor=FFD700)
 
 ![esmvaltoollogo](https://raw.githubusercontent.com/ESMValGroup/ESMValTool/main/doc/sphinx/source/figures/ESMValTool-logo-2.png)