Merge branch 'main' into update_docu_obs_tiers

ESMValGroup · Aug 27, 2024 · 5db3101 · 5db3101
2 parents 74a5fa5 + 45e5217
commit 5db3101
Show file tree

Hide file tree

Showing 78 changed files with 3,313 additions and 921 deletions.
diff --git a/.github/workflows/install-from-conda.yml b/.github/workflows/install-from-conda.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
     name: Linux Python ${{ matrix.python-version }}
     steps:
       - uses: conda-incubator/setup-miniconda@v3
@@ -56,7 +56,7 @@ jobs:
 #    runs-on: "macos-latest"
 #    strategy:
 #      matrix:
-#        python-version: ["3.9", "3.10", "3.11"]
+#        python-version: ["3.10", "3.11"]
 #      fail-fast: false
 #    name: OSX Python ${{ matrix.python-version }}
 #    steps:

diff --git a/.github/workflows/install-from-condalock-file.yml b/.github/workflows/install-from-condalock-file.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
       fail-fast: false
     name: Linux Python ${{ matrix.python-version }}
     steps:

diff --git a/.github/workflows/install-from-source.yml b/.github/workflows/install-from-source.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
       fail-fast: false
     name: Linux Python ${{ matrix.python-version }}
     steps:
@@ -59,7 +59,7 @@ jobs:
 #    runs-on: "macos-latest"
 #    strategy:
 #      matrix:
-#        python-version: ["3.9", "3.10", "3.11"]
+#        python-version: ["3.10", "3.11"]
 #      fail-fast: false
 #    name: OSX Python ${{ matrix.python-version }}
 #    steps:

diff --git a/.github/workflows/run-tests-monitor.yml b/.github/workflows/run-tests-monitor.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
     name: Linux Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v4
@@ -67,7 +67,7 @@ jobs:
     runs-on: "macos-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
         architecture: ["x64"]  # need to force Intel, arm64 builds have issues
       fail-fast: false
     name: OSX Python ${{ matrix.python-version }}

diff --git a/.github/workflows/test-development.yml b/.github/workflows/test-development.yml
@@ -12,7 +12,6 @@ on:
   push:
     branches:
       - main
-      - fix_recipe_filler_bkwds_incompatibility
   schedule:
     - cron: '0 0 * * *'
 
@@ -27,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
     name: Linux Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
     name: Linux Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v4
@@ -72,7 +72,7 @@ jobs:
     runs-on: "macos-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
         architecture: ["x64"]  # need to force Intel, arm64 builds have issues
       fail-fast: false
     name: OSX Python ${{ matrix.python-version }}

diff --git a/.pre-commit-config.yaml b/.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
diff --git a/.zenodo.json b/.zenodo.json
@@ -171,6 +171,11 @@
       "name": "Hagemann, Stefan",
       "orcid": "0000-0001-5444-2945"
     },
+    {
+      "affiliation": "University of Canterbury, New Zealand",
+      "name": "Hardacre, Catherine",
+      "orcid": "0000-0001-9093-4656"
+    },
     {
       "affiliation": "ISAC-CNR, Italy",
       "name": "von Hardenberg, Jost",
@@ -380,15 +385,20 @@
       "affiliation": "DLR, Germany",
       "name": "Bonnet, Pauline",
       "orcid": "0000-0003-3780-0784"
+    },
+    {
+      "affiliation": "MetOffice, UK",
+      "name": "Munday, Gregory",
+      "orcid": "0000-0003-4750-9923"
     }
   ],
   "description": "ESMValTool: A community diagnostic and performance metrics tool for routine evaluation of Earth system models in CMIP.",
   "license": {
     "id": "Apache-2.0"
   },
-  "publication_date": "2023-07-06",
+  "publication_date": "2024-07-04",
   "title": "ESMValTool",
-  "version": "v2.9.0",
+  "version": "v2.11.0",
   "communities": [ 
       { 
           "identifier": "is-enes3" 

diff --git a/CITATION.cff b/CITATION.cff
@@ -391,13 +391,18 @@ authors:
     family-names: Bonnet
     given-names: Pauline
     orcid: "https://orcid.org/0000-0003-3780-0784"
+  - 
+    affiliation: "MetOffice, UK"
+    family-names: Munday
+    given-names: Gregory
+    orcid: "https://orcid.org/0000-0003-4750-9923"
 
 cff-version: 1.2.0
-date-released: 2023-12-20
+date-released: 2024-07-04
 doi: "10.5281/zenodo.3401363"
 license: "Apache-2.0"
 message: "If you use this software, please cite it using these metadata."
 repository-code: "https://github.com/ESMValGroup/ESMValTool/"
 title: ESMValTool
-version: "v2.10.0"
+version: "v2.11.0"
 ...