Merge pull request #127 from lukecampbell/pass-engine

Pass engine to xr.open_mfdataset in OpenDapSource

Author: martindurant

ci/environment-py310.yml

@@ -21,3 +21,4 @@ dependencies:
   - zarr
   - moto < 3
   - s3fs
+  - werkzeug < 2.2.0

ci/environment-py38.yml

@@ -21,3 +21,4 @@ dependencies:
   - zarr
   - moto < 3
   - s3fs
+  - werkzeug < 2.2.0

ci/environment-py39.yml

@@ -21,3 +21,4 @@ dependencies:
   - zarr
   - moto < 3
   - s3fs
+  - werkzeug < 2.2.0

ci/environment-upstream.yml

@@ -23,6 +23,7 @@ dependencies:
   - intake
   - rioxarray
   - gdal
+  - werkzeug < 2.2.0
   - pip:
        - git+https://github.com/fsspec/filesystem_spec.git
        - git+https://github.com/intake/intake.git

intake_xarray/opendap.py

@@ -92,7 +92,7 @@ def _open_dataset(self):
         import xarray as xr
 
         if isinstance(self.urlpath, list):
-            self._ds = xr.open_mfdataset(self.urlpath, chunks=self.chunks, **self._kwargs)
+            self._ds = xr.open_mfdataset(self.urlpath, chunks=self.chunks, engine=self.engine, **self._kwargs)
         else:
             store = self._get_store()
-            self._ds = xr.open_dataset(store, chunks=self.chunks, **self._kwargs)
+            self._ds = xr.open_dataset(store, chunks=self.chunks, **self._kwargs)

intake_xarray/tests/test_intake_xarray.py

@@ -332,6 +332,22 @@ def test_read_opendap_with_auth(auth):
         )
 
 
+def test_read_opendap_mfdataset_with_engine():
+    pytest.importorskip("pydap")
+    from intake_xarray.opendap import OpenDapSource
+    urls = [
+        'http://example.com/opendap/fake1.nc',
+        'http://example.com/opendap/fake2.nc',
+    ]
+    with patch('xarray.open_mfdataset') as open_mfdataset_mock:
+        open_mfdataset_mock.return_value = 'dataset'
+        source = OpenDapSource(urlpath=urls, chunks={}, auth=None, engine='fake-engine')
+        source._open_dataset()
+        retval = source._ds
+        assert open_mfdataset_mock.called_with(urls, chunks={}, engine='fake-engine')
+    assert retval == 'dataset'
+
+
 @pytest.mark.parametrize("auth", ["esgf", "urs"])
 def test_read_opendap_with_auth_netcdf4(auth):
     from intake_xarray.opendap import OpenDapSource

intake_xarray/tests/test_remote.py

@@ -159,19 +159,24 @@ def s3_base():
     import shlex
     import subprocess
 
-    proc = subprocess.Popen(shlex.split("moto_server s3 -p %s" % PORT_S3))
+    proc = subprocess.Popen(shlex.split("moto_server s3 -p %s" % PORT_S3),
+                            stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stdin=subprocess.DEVNULL)
 
     timeout = 5
     while timeout > 0:
         try:
+            print("polling for moto server")
+
             r = requests.get(endpoint_uri)
             if r.ok:
                 break
         except:
             pass
         timeout -= 0.1
         time.sleep(0.1)
+    print("server up")
     yield
+    print("moto done")
     proc.terminate()
     proc.wait()