#3707: Final sanity check and reorganisation of RTW

ESMValGroup · Jul 2, 2024 · f976b8c · f976b8c
1 parent 6846406
commit f976b8c
Show file tree

Hide file tree

Showing 32 changed files with 159 additions and 111 deletions.
diff --git a/.github/workflows/check-rtw.yml b/.github/workflows/check-rtw.yml
@@ -1,5 +1,4 @@
-# This workflow performs various validation steps for Cylc and Rose, and
-# checks the documentation.
+# This workflow performs various validation steps for Cylc and Rose.
 name: Check Recipe Test Workflow (RTW)
 
 # Controls when the action will run
@@ -12,6 +11,10 @@ on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
+# Common variables are defined here
+env:
+  RTW_ROOT_DIR: esmvaltool/utils/recipe_test_workflow
+
 # Required shell entrypoint to have properly configured bash shell
 defaults:
   run:
@@ -41,17 +44,17 @@ jobs:
 
       - name: Validate Cylc workflow
         run: |
-          cd esmvaltool/utils/recipe_test_workflow/recipe_test_workflow
+          cd ${RTW_ROOT_DIR}
           cylc validate . -O metoffice
 
       - name: Run Cylc configuration linter
         run: |
-          cd esmvaltool/utils/recipe_test_workflow/recipe_test_workflow
+          cd ${RTW_ROOT_DIR}
           cylc lint
 
       - name: Validate format of Rose configuration files
         run: |
-          cd esmvaltool/utils/recipe_test_workflow/recipe_test_workflow
+          cd ${RTW_ROOT_DIR}
           output="$(rose config-dump)"
           msg="Run 'rose config-dump' to re-dump the Rose configuration files"
           msg="${msg} in the common format, then commit the changes."
@@ -60,21 +63,16 @@ jobs:
 
       - name: Validate Rose configuration metadata
         run: |
-          cd esmvaltool/utils/recipe_test_workflow/recipe_test_workflow
+          cd ${RTW_ROOT_DIR}
           rose metadata-check -C meta/
 
       - name: Run Rose configuration validation macros
         run: |
-          cd esmvaltool/utils/recipe_test_workflow/recipe_test_workflow
+          cd ${RTW_ROOT_DIR}
           rose macro -V
 
-      - name: Check for broken links in the documentation
-        run: |
-          cd doc/sphinx/source/utils/RTW/
-          make linkcheck
-
       - name: Lint shell scripts
         run: |
-          cd esmvaltool/utils/recipe_test_workflow
+          cd ${RTW_ROOT_DIR}
           output=$(find . -name "*.sh" -exec shellcheck {} \;)
           if [ "$output" ]; then echo "${output}" && exit 1; fi
diff --git a/.zenodo.json b/.zenodo.json
@@ -81,13 +81,17 @@
       "name": "Berg, Peter",
       "orcid": "0000-0002-1469-2568"
     },
+    {
+      "affiliation": "Met Office, UK",
+      "name": "Billows, Chris"
+    },
     {
       "affiliation": "DLR, Germany",
       "name": "Bock, Lisa",
       "orcid": "0000-0001-7058-5938"
     },
     {
-      "affiliation": "MetOffice, UK",
+      "affiliation": "Met Office, UK",
       "name": "Bodas-Salcedo, Alejandro",
       "orcid": "0000-0002-7890-2536"
     },
@@ -142,21 +146,29 @@
       "name": "Docquier, David"
     },
     {
-      "affiliation": "MetOffice, UK",
+      "affiliation": "Met Office, UK",
       "name": "Dreyer, Laura"
     },
     {
       "affiliation": "DKRZ, Germany",
       "name": "Ehbrecht, Carsten"
     },
     {
-      "affiliation": "MetOffice, UK",
+      "affiliation": "Met Office, UK",
       "name": "Earnshaw, Paul"
     },
+    {
+      "affiliation": "Met Office, UK",
+      "name": "Geddes, Theo"
+    },
     {
       "affiliation": "University of Bremen, Germany",
       "name": "Gier, Bettina"
     },
+    {
+      "affiliation": "Met Office, UK",
+      "name": "Gillett, Ed"
+    },
     {
       "affiliation": "BSC, Spain",
       "name": "Gonzalez-Reviriego, Nube",
@@ -171,6 +183,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",
@@ -186,6 +203,10 @@
       "name": "Heuer, Helge",
       "orcid": "0000-0003-2411-7150"
     },
+    {
+      "affiliation": "Met Office, UK",
+      "name": "Hogan, Emma"
+    },
     {
       "affiliation": "BSC, Spain",
       "name": "Hunter, Alasdair",
@@ -274,7 +295,7 @@
       "name": "Sandstad, Marit"
     },
     {
-      "affiliation": "MetOffice, UK",
+      "affiliation": "Met Office, UK",
       "name": "Sellar, Alistair"
     },
     {
@@ -300,6 +321,10 @@
       "name": "Swaminathan, Ranjini",
       "orcid": "0000-0001-5853-2673"
     },
+    {
+      "affiliation": "Met Office, UK",
+      "name": "Tomkins, Katherine"
+    },
     {
       "affiliation": "BSC, Spain",
       "name": "Torralba, Verónica"
@@ -391,41 +416,41 @@
   "license": {
     "id": "Apache-2.0"
   },
-  "publication_date": "2023-07-06",
+  "publication_date": "2023-12-20",
   "title": "ESMValTool",
-  "version": "v2.9.0",
-  "communities": [ 
-      { 
-          "identifier": "is-enes3" 
-      }, 
-      { 
-          "identifier": "dlr_de" 
-      }, 
-      { 
-          "identifier": "ecfunded" 
-      }, 
-      { 
-          "identifier": "nlesc" 
-      } 
-  ], 
-  "grants": [ 
-      { 
-          "id": "10.13039/501100000780::282672" 
-      }, 
-      { 
-          "id": "10.13039/501100000780::641727" 
-      }, 
-      { 
-          "id": "10.13039/501100000780::641816" 
-      }, 
-      { 
-          "id": "10.13039/501100000780::727862" 
-      }, 
-      { 
-          "id": "10.13039/501100000780::776613" 
-      }, 
-      { 
-          "id": "10.13039/501100000780::824084" 
-      } 
-  ] 
+  "version": "v2.10.0",
+  "communities": [
+      {
+          "identifier": "is-enes3"
+      },
+      {
+          "identifier": "dlr_de"
+      },
+      {
+          "identifier": "ecfunded"
+      },
+      {
+          "identifier": "nlesc"
+      }
+  ],
+  "grants": [
+      {
+          "id": "10.13039/501100000780::282672"
+      },
+      {
+          "id": "10.13039/501100000780::641727"
+      },
+      {
+          "id": "10.13039/501100000780::641816"
+      },
+      {
+          "id": "10.13039/501100000780::727862"
+      },
+      {
+          "id": "10.13039/501100000780::776613"
+      },
+      {
+          "id": "10.13039/501100000780::824084"
+      }
+  ]
 }
diff --git a/CITATION.cff b/CITATION.cff
@@ -85,13 +85,17 @@ authors:
     family-names: Berg
     given-names: Peter
     orcid: "https://orcid.org/0000-0002-1469-2568"
+  -
+    affiliation: "Met Office, UK"
+    family-names: Billows
+    given-names: Chris
   -
     affiliation: "DLR, Germany"
     family-names: Bock
     given-names: Lisa
     orcid: "https://orcid.org/0000-0001-7058-5938"
   -
-    affiliation: "MetOffice, UK"
+    affiliation: "Met Office, UK"
     family-names: Bodas-Salcedo
     given-names: Alejandro
     orcid: "https://orcid.org/0000-0002-7890-2536"
@@ -146,21 +150,29 @@ authors:
     family-names: Docquier
     given-names: David
   -
-    affiliation: "MetOffice, UK"
+    affiliation: "Met Office, UK"
     family-names: Dreyer
     given-names: Laura
   -
     affiliation: "DKRZ, Germany"
     family-names: Ehbrecht
     given-names: Carsten
   -
-    affiliation: "MetOffice, UK"
+    affiliation: "Met Office, UK"
     family-names: Earnshaw
     given-names: Paul
+  -
+    affiliation: "Met Office, UK"
+    family-names: Geddes
+    given-names: Theo
   -
     affiliation: "University of Bremen, Germany"
     family-names: Gier
     given-names: Bettina
+  -
+    affiliation: "Met Office, UK"
+    family-names: Gillett
+    given-names: Ed
   -
     affiliation: "BSC, Spain"
     family-names: Gonzalez-Reviriego
@@ -196,6 +208,10 @@ authors:
     family-names: Heuer
     given-names: Helge
     orcid: "https://orcid.org/0000-0003-2411-7150"
+  -
+    affiliation: "Met Office, UK"
+    family-names: Hogan
+    given-names: Emma
   -
     affiliation: "BSC, Spain"
     family-names: Hunter
@@ -284,7 +300,7 @@ authors:
     family-names: Sandstad
     given-names: Marit
   -
-    affiliation: "MetOffice, UK"
+    affiliation: "Met Office, UK"
     family-names: Sellar
     given-names: Alistair
   -
@@ -310,6 +326,10 @@ authors:
     family-names: Swaminathan
     given-names: Ranjini
     orcid: "https://orcid.org/0000-0001-5853-2673"
+  -
+    affiliation: "Met Office, UK"
+    family-names: Tomkins
+    given-names: Katherine
   -
     affiliation: "BSC, Spain"
     family-names: Torralba
@@ -391,7 +411,7 @@ authors:
     family-names: Bonnet
     given-names: Pauline
     orcid: "https://orcid.org/0000-0003-3780-0784"
-  - 
+  -
     affiliation: "MetOffice, UK"
     family-names: Munday
     given-names: Gregory