Merge branch 'main' into add-intake-esgf-support

Author: valeriupredoi

.circleci/config.yml

@@ -2,8 +2,8 @@
 version: 2.1
 
 orbs:
-  coverage-reporter: codacy/coverage-reporter@14.0.0
-  codecov: codecov/codecov@4.1.0
+  coverage-reporter: codacy/coverage-reporter@14.1.0
+  codecov: codecov/codecov@5.3.0
 
 commands:
   check_changes:
@@ -144,8 +144,8 @@ jobs:
           name: Install gpg (required by codecov orb)
           command: apt update && apt install -y gpg
       - codecov/upload:
-          when: always
-          file: 'test-reports/coverage.xml'
+          files: 'test-reports/coverage.xml'
+          disable_search: true
       - coverage-reporter/send_report:
           coverage-reports: 'test-reports/coverage.xml'
           project-token: $CODACY_PROJECT_TOKEN

doc/quickstart/configure.rst

@@ -847,28 +847,38 @@ The default settings are:
 
 .. code-block:: yaml
 
-    urls:
-      - 'https://esgf.ceda.ac.uk/esg-search'
-      - 'https://esgf-node.llnl.gov/esg-search'
-      - 'https://esgf-data.dkrz.de/esg-search'
-      - 'https://esgf-node.ipsl.upmc.fr/esg-search'
-      - 'https://esg-dn1.nsc.liu.se/esg-search'
-      - 'https://esgf.nci.org.au/esg-search'
-      - 'https://esgf.nccs.nasa.gov/esg-search'
-      - 'https://esgdata.gfdl.noaa.gov/esg-search'
-    distrib: true
-    timeout: 120  # seconds
-    cache: '~/.esmvaltool/cache/pyesgf-search-results'
-    expire_after: 86400  # cache expires after 1 day
-
-Note that by default the tool will try the
+    search_connection:
+      urls:
+        - 'https://esgf-node.ornl.gov/esgf-1-5-bridge'
+        - 'https://esgf.ceda.ac.uk/esg-search'
+        - 'https://esgf-data.dkrz.de/esg-search'
+        - 'https://esgf-node.ipsl.upmc.fr/esg-search'
+        - 'https://esg-dn1.nsc.liu.se/esg-search'
+        - 'https://esgf.nci.org.au/esg-search'
+        - 'https://esgf.nccs.nasa.gov/esg-search'
+        - 'https://esgdata.gfdl.noaa.gov/esg-search'
+      distrib: true
+      timeout: 120  # seconds
+      cache: '~/.esmvaltool/cache/pyesgf-search-results'
+      expire_after: 86400  # cache expires after 1 day
+
+Note that by default the tool will try searching the
 `ESGF index nodes <https://esgf.llnl.gov/nodes.html>`_
 in the order provided in the configuration file and use the first one that is
 online.
 Some ESGF index nodes may return search results faster than others, so you may
 be able to speed up the search for files by experimenting with placing different
 index nodes at the top of the list.
 
+.. warning::
+
+   ESGF is currently
+   `transitioning to new server technology <https://github.com/ESGF/esgf-roadmap/blob/main/status/README.md>`__
+   and all of the above indices are expected to go offline except the first one.
+
+Issues with https://esgf-node.ornl.gov/esgf-1-5-bridge can be reported
+`here <https://github.com/esgf2-us/esg_fastapi/issues>`__.
+
 If you experience errors while searching, it sometimes helps to delete the
 cached results.
 

esmvalcore/cmor/_fixes/cmip6/ukesm1_0_ll.py

@@ -26,7 +26,7 @@ def fix_metadata(self, cubes):
             try:
                 if cube.attributes[parent_units] == bad_value:
                     cube.attributes[parent_units] = "days since 1850-01-01"
-            except AttributeError:
+            except KeyError:
                 pass
         return cubes
 

esmvalcore/config/_esgf_pyclient.py

@@ -50,11 +50,10 @@ def load_esgf_pyclient_config():
         # Arguments to
         # https://esgf-pyclient.readthedocs.io/en/latest/api.html#pyesgf.search.connection.SearchConnection
         "search_connection": {
-            # List of available index nodes: https://esgf.llnl.gov/nodes.html
             # Be careful about the url, not all search urls have CMIP3 data?
             "urls": [
+                "https://esgf-node.ornl.gov/esgf-1-5-bridge",  # Report any issues here: https://github.com/esgf2-us/esg_fastapi/issues
                 "https://esgf.ceda.ac.uk/esg-search",
-                "https://esgf-node.llnl.gov/esg-search",
                 "https://esgf-data.dkrz.de/esg-search",
                 "https://esgf-node.ipsl.upmc.fr/esg-search",
                 "https://esg-dn1.nsc.liu.se/esg-search",

tests/unit/config/test_esgf_pyclient.py

@@ -8,8 +8,8 @@
 DEFAULT_CONFIG: dict = {
     "search_connection": {
         "urls": [
+            "https://esgf-node.ornl.gov/esgf-1-5-bridge",
             "https://esgf.ceda.ac.uk/esg-search",
-            "https://esgf-node.llnl.gov/esg-search",
             "https://esgf-data.dkrz.de/esg-search",
             "https://esgf-node.ipsl.upmc.fr/esg-search",
             "https://esg-dn1.nsc.liu.se/esg-search",