Merge branch 'main' into ioos_sprint

pyproject.toml

@@ -27,7 +27,11 @@ classifiers = [
 
 dynamic = ["version"]
 
-dependencies = ["numpy", "xarray", "cf_xarray", "dask[complete]"]
+dependencies = [
+  "numpy", 
+  "xarray>=2023.10.0", 
+  "cf_xarray", 
+  "dask[complete]"]
 
 [project.optional-dependencies]
 dev = [

xarray_subset_grid/accessor.py

@@ -1,8 +1,9 @@
 from typing import Optional
 import warnings
+#from typing import Optional, Union
 
+import numpy as np
 import xarray as xr
-from numpy import ndarray
 
 from xarray_subset_grid.grid import Grid
 from xarray_subset_grid.grids import SGrid, UGrid
@@ -98,10 +99,10 @@ def subset_vars(self, vars: list[str]) -> xr.Dataset:
             return self._grid.subset_vars(self._ds, vars)
         return self._ds
 
-    def subset_polygon(
-        self, polygon: list[tuple[float, float]] | ndarray
-    ) -> Optional[xr.Dataset]:
-        """Subset the dataset to the grid.
+    def subset_polygon(self, polygon: list[tuple[float, float]] | np.ndarray
+                       ) -> Optional[xr.Dataset]:
+        """
+        Subset the dataset to the grid.
 
         This call is forwarded to the grid implementation with the loaded dataset.
 

xarray_subset_grid/grid.py

@@ -1,9 +1,9 @@
 from abc import ABC, abstractmethod
 from collections.abc import Iterable
+from typing import Union
 
 import numpy as np
 import xarray as xr
-from numpy import ndarray
 
 
 class Grid(ABC):
@@ -55,7 +55,7 @@ def subset_vars(self, ds: xr.Dataset, vars: Iterable[str]) -> xr.Dataset:
 
     @abstractmethod
     def subset_polygon(
-        self, ds: xr.Dataset, polygon: list[tuple[float, float]] | ndarray
+        self, ds: xr.Dataset, polygon: Union[list[tuple[float, float]], np.ndarray]
     ) -> xr.Dataset:
         """Subset the dataset to the grid
         :param ds: The dataset to subset

xarray_subset_grid/grids/sgrid.py

@@ -1,6 +1,7 @@
+from typing import Union
+
 import numpy as np
 import xarray as xr
-from numpy import ndarray
 
 from xarray_subset_grid.grid import Grid
 from xarray_subset_grid.utils import normalize_polygon_x_coords, ray_tracing_numpy
@@ -55,7 +56,7 @@ def data_vars(self, ds: xr.Dataset) -> set[str]:
         return {var for var in ds.data_vars if not set(ds[var].dims).isdisjoint(dims)}
 
     def subset_polygon(
-        self, ds: xr.Dataset, polygon: list[tuple[float, float]] | ndarray
+        self, ds: xr.Dataset, polygon: Union[list[tuple[float, float]], np.ndarray]
     ) -> xr.Dataset:
         """Subset the dataset to the grid
         :param ds: The dataset to subset
@@ -94,9 +95,7 @@ def subset_polygon(
             # to match the original dimension shape
             x = np.array(lon.flat)
             polygon = normalize_polygon_x_coords(x, polygon)
-            polygon_mask = ray_tracing_numpy(x, lat.flat, polygon).reshape(
-                lon.shape
-            )
+            polygon_mask = ray_tracing_numpy(x, lat.flat, polygon).reshape(lon.shape)
 
             # Adjust the mask to only mask the rows and columns that are completely
             # outside the polygon. If the row and column both touch the target polygon
@@ -117,7 +116,9 @@ def subset_polygon(
             )
 
             # Now we can use the mask to subset the data
-            ds_subset = ds_subset[vars].where(ds_subset.subset_mask, drop=True).drop_encoding()
+            ds_subset = (
+                ds_subset[vars].where(ds_subset.subset_mask, drop=True).drop_encoding()
+            )
 
             # Add the subsetted dataset to the list for merging
             ds_out.append(ds_subset)

xarray_subset_grid/grids/ugrid.py

@@ -1,3 +1,5 @@
+from typing import Union
+
 import numpy as np
 import xarray as xr
 
@@ -96,7 +98,7 @@ def data_vars(self, ds: xr.Dataset) -> set[str]:
 
 
     def subset_polygon(
-        self, ds: xr.Dataset, polygon: list[tuple[float, float]] | np.ndarray
+        self, ds: xr.Dataset, polygon: Union[list[tuple[float, float]], np.ndarray]
     ) -> xr.Dataset:
         """Subset the dataset to the grid
         :param ds: The dataset to subset