Merge pull request #910 from ecmwf/feature/merge-0-19-1-into-develop

Merge 0.19.1 into develop

Author: sandorkertesz

docs/release_notes/version_0.19_updates.rst

@@ -2,6 +2,17 @@
 Version 0.19 Updates
 /////////////////////////
 
+
+
+Version 0.19.1
+===============
+
+Fixes
+++++++++
+
+- Fixed a bug in the CDS source when could load not cached data when no network connection was available (:pr:`907`).
+
+
 Version 0.19.0
 ===============
 

src/earthkit/data/sources/cds.py

@@ -101,8 +101,6 @@ def __init__(self, dataset, *args, request=None, prompt=True, **kwargs):
         )
         self.request = request_builder.requests
 
-        self.client()  # Trigger password prompt before threading
-
         # Download each request in parallel when the config allows it
         retriever = FileRequestRetriever(self, retriever=self._retrieve_one)
         self.path = retriever.retrieve(self.request, self.dataset)

tests/sources/test_cds.py

@@ -65,7 +65,7 @@ def test_cds_grib_kwargs():
 @pytest.mark.download
 @pytest.mark.skipif(NO_CDS, reason="No access to CDS")
 @pytest.mark.timeout(CDS_TIMEOUT)
-def test_cds_grib_dict():
+def test_cds_grib_dict_1():
     s = from_source(
         "cds",
         "reanalysis-era5-single-levels",
@@ -85,19 +85,21 @@ def test_cds_grib_dict():
 @pytest.mark.download
 @pytest.mark.skipif(NO_CDS, reason="No access to CDS")
 @pytest.mark.timeout(CDS_TIMEOUT)
-def test_cds_grib_invalid_args_kwargs():
-    with pytest.raises(TypeError):
-        from_source(
-            "cds",
-            "reanalysis-era5-single-levels",
-            dict(
-                variable=["2t", "msl"],
-                product_type="reanalysis",
-                area=[50, -50, 20, 50],
-                date="2012-12-12",
-            ),
-            time="12:00",
-        )
+def test_cds_grib_dict_2():
+    s = from_source(
+        "cds",
+        "reanalysis-era5-single-levels",
+        dict(
+            variable=["2t", "msl"],
+            product_type="reanalysis",
+            area=[50, -50, 20, 50],
+            date="2012-12-12",
+        ),
+        time="12:00",
+    )
+
+    assert len(s) == 2
+    assert s.metadata("param") == ["2t", "msl"]
 
 
 @pytest.mark.long_test