use requests_cache session with retry-params when 500 errors occur

Author: Mikejmnez

xarray/backends/pydap_.py

@@ -117,7 +117,6 @@ def __init__(
         """
         self.dataset = dataset
         self.group = group
-        self.session = session
         self._batch = batch
         self._batch_done = False
         self._array_cache = {}  # holds 1D dimension data

xarray/tests/test_backends.py

@@ -5983,10 +5983,11 @@ def test_session(self) -> None:
 def test_batchdap4_downloads(protocol, batch) -> None:
     """Test that in dap4, all dimensions are downloaded at once"""
     import pydap
-    from requests_cache import CachedSession
+    from pydap.net import create_session
 
     _version_ = Version(pydap.__version__)
-    session = CachedSession(cache_name="debug")  # so that urls are cached
+    # Create a session with pre-set params in pydap backend, to cache urls
+    session = create_session(use_cache=True, cache_kwargs={"cache_name": "debug"})
     session.cache.clear()
     url = "https://test.opendap.org/opendap/hyrax/data/nc/coads_climatology.nc"
 
@@ -6029,10 +6030,12 @@ def test_batchdap4_downloads(protocol, batch) -> None:
 @requires_pydap
 @network
 def test_batch_warnswithdap2() -> None:
-    from requests_cache import CachedSession
+    from pydap.net import create_session
 
-    session = CachedSession()
+    # Create a session with pre-set retry params in pydap backend, to cache urls
+    session = create_session(use_cache=True, cache_kwargs={"cache_name": "debug"})
     session.cache.clear()
+
     url = "dap2://test.opendap.org/opendap/hyrax/data/nc/coads_climatology.nc"
     with pytest.warns(UserWarning):
         open_dataset(

xarray/tests/test_backends_datatree.py

@@ -513,13 +513,14 @@ def test_inherited_coords(self, url=simplegroup_datatree_url) -> None:
             |       Salinity     (time, Z, Y, X) float32 ...
         """
         import pydap
-        from requests_cache import CachedSession
+        from pydap.net import create_session
 
-        _version_ = Version(pydap.__version__)
-
-        session = CachedSession(cache_name="debug")  # so that urls are cached
+        # Create a session with pre-set retry params in pydap backend, to cache urls
+        session = create_session(use_cache=True, cache_kwargs={"cache_name": "debug"})
         session.cache.clear()
 
+        _version_ = Version(pydap.__version__)
+
         tree = open_datatree(url, engine=self.engine, session=session)
         assert set(tree.dims) == {"time", "Z", "nv"}
         assert tree["/SimpleGroup"].coords["time"].dims == ("time",)