Fix failing xesmf remap test

monet/monet_accessor.py

@@ -66,7 +66,7 @@ def _monet_to_latlon(da):
         dset = da.to_dataset()
     dset["x"] = da.longitude[0, :].values
     dset["y"] = da.latitude[:, 0].values
-    dset = dset.drop(["latitude", "longitude"])
+    dset = dset.drop_vars(["latitude", "longitude"])
     dset = dset.set_coords(["x", "y"])
     dset = dset.rename({"x": "lon", "y": "lat"})
     if isinstance(da, xr.DataArray):
@@ -1303,7 +1303,7 @@ def remap_xesmf(self, dataarray, method="bilinear", **kwargs):
 
         Parameters
         ----------
-        daaarray : ndarray or xarray DataArray
+        dataarray : ndarray or xarray DataArray
             Description of parameter `dset`.
         radius_of_influence : float or integer
             radius of influcence for pyresample in meters.
@@ -1323,6 +1323,9 @@ def remap_xesmf(self, dataarray, method="bilinear", **kwargs):
             out = resample.resample_xesmf(source, target, method=method, **kwargs)
             return _rename_to_monet_latlon(out)
 
+        else:
+            print("xesmf unavailable. Try `import xesmf` and check the failure message.")
+
     def combine_point(self, data, suffix=None, pyresample=True, **kwargs):
         """Short summary.
 
@@ -1452,20 +1455,15 @@ def cf_to_dt64(x):
         return da
 
     def remap_xesmf(self, data, **kwargs):
-        """Resample the xesmf
+        """Resample using xESMF.
 
         Parameters
         ----------
-        data : type
-            Description of parameter `data`.
-        **kwargs : type
-            Description of parameter `**kwargs`.
-
-        Returns
-        -------
-        type
-            Description of returned object.
-
+        data : xarray.DataArray or xarray.Dataset
+            Data to be remapped.
+        **kwargs
+            Passed on to :func:`~monet.util.resample.resample_xesmf`
+            and then to ``xesmf.Regridder``.
         """
         if has_xesmf:
             try:
@@ -1481,6 +1479,9 @@ def remap_xesmf(self, data, **kwargs):
                 print("data must be an xarray.DataArray or xarray.Dataset")
                 # TODO: raise
 
+        else:
+            print("xesmf unavailable. Try `import xesmf` and check the failure message.")
+
     def _remap_xesmf_dataset(self, dset, filename="monet_xesmf_regrid_file.nc", **kwargs):
         skip_keys = ["lat", "lon", "time", "TFLAG"]
         vars = pd.Series(list(dset.variables))

tests/test_remap.py

@@ -5,6 +5,10 @@
 import monet  # noqa: F401
 
 
+def test_import_xesmf():
+    import xesmf  # noqa: F401
+
+
 def test_remap_ds_ds():
     # Barry noted a problem with this