try to unpin sphinx version

docs/environment.yml

@@ -19,7 +19,7 @@ dependencies:
   - descartes
   - numpydoc
   - ipython=4.0.1
-  - sphinx=1.2.3  # pin to avoid https://github.com/sphinx-doc/sphinx/issues/1822
+  - sphinx
   - pip:
     - git+https://github.com/fmaussion/motionless.git
     - sphinx-gallery

docs/whats-new.rst

@@ -5,9 +5,16 @@ What's New
 v0.1.1 (Unreleased)
 -------------------
 
+Enhancements
+~~~~~~~~~~~~
+
+- General documentation enhancements
+- New ``ds`` keyword to the accessors ``subset()`` and ``roi()`` methods
+
 Bug fixes
 ~~~~~~~~~
 
+- Remove use to deprecated ``rasterio.drivers()``
 - GeoNetCDF files without time variable should now open without error
 
 

salem/sio.py

@@ -444,7 +444,7 @@ def subset(self, margin=0, ds=None, **kwargs):
                           ]
         return out_ds
 
-    def roi(self, **kwargs):
+    def roi(self, ds=None, **kwargs):
         """roi(self, shape=None, geometry=None, grid=None, corners=None,
                crs=wgs84, roi=None)
 
@@ -454,6 +454,8 @@ def roi(self, **kwargs):
 
         Parameters
         ----------
+        ds : Dataset or DataArray
+            form the ROI from the extent of the Dataset or DataArray
         shape : str
             path to a shapefile
         geometry : geometry
@@ -469,6 +471,10 @@ def roi(self, **kwargs):
             if you have a mask ready, you can give it here
         """
 
+        if ds is not None:
+            grid = ds.salem.grid
+            kwargs.setdefault('grid', grid)
+
         mask = self.grid.region_of_interest(**kwargs)
         coords = {self.y_dim: self._obj[self.y_dim].values,
                   self.x_dim: self._obj[self.x_dim].values}

salem/tests/test_misc.py

@@ -461,6 +461,9 @@ def test_era(self):
         self.assertEqual(ds.salem.x_dim, 'longitude')
         self.assertEqual(ds.salem.y_dim, 'latitude')
 
+        dss = ds.salem.subset(ds=ds)
+        self.assertEqual(dss.salem.grid, ds.salem.grid)
+
         lon = 91.1
         lat = 31.1
         dss = ds.salem.subset(corners=((lon, lat), (lon, lat)), margin=1)