lint + format

Author: benbovy

pyproject.toml

@@ -65,12 +65,12 @@ select = [
     "F",
     # Pycodestyle
     "E",
-    "W",
     # isort
     "I",
     # Pyupgrade
     "UP",
 ]
+line-length = 100
 
 [tool.ruff.isort]
 known-first-party = ["xdggs"]
@@ -79,6 +79,3 @@ known-third-party=[
     "healpy",
     "h3",
 ]
-
-[tool.ruff.format]
-line-length = 100

xdggs/__init__.py

@@ -1,9 +1,8 @@
 from importlib.metadata import PackageNotFoundError, version
 
-from .accessor import DGGSAccessor   # noqa
-from .index import DGGSIndex
-from .healpix import HealpixIndex
-
+from xdggs.accessor import DGGSAccessor  # noqa
+from xdggs.healpix import HealpixIndex
+from xdggs.index import DGGSIndex
 
 try:
     __version__ = version("xdggs")

xdggs/accessor.py

@@ -1,20 +1,17 @@
 import xarray as xr
 
-from .index import DGGSIndex
+from xdggs.index import DGGSIndex
 
 
 @xr.register_dataset_accessor("dggs")
 class DGGSAccessor:
-
     def __init__(self, obj):
         self._obj = obj
-        
-        indexes = {
-            k: idx for k, idx in obj.xindexes.items() if isinstance(idx, DGGSIndex)
-        }
+
+        indexes = {k: idx for k, idx in obj.xindexes.items() if isinstance(idx, DGGSIndex)}
         if len(indexes) > 1:
             raise ValueError("Only one DGGSIndex per object is supported")
-        
+
         self._name, self._index = next(iter(indexes.items()))
 
     def sel_latlon(self, lat, lon):
@@ -31,4 +28,4 @@ def assign_latlon_coords(self):
         return self._obj.assign_coords(
             latitude=(self._index._dim, lat_data),
             longitude=(self._index._dim, lon_data),
-        )
+        )

xdggs/healpix.py

@@ -1,12 +1,11 @@
 import healpy
 
-from .index import DGGSIndex
-from .utils import register_dggs, _extract_cell_id_variable
+from xdggs.index import DGGSIndex
+from xdggs.utils import _extract_cell_id_variable, register_dggs
 
 
 @register_dggs("healpix")
 class HealpixIndex(DGGSIndex):
-
     def __init__(self, cell_ids, dim, nside, nest, rot_latlon):
         super().__init__(cell_ids, dim)
 
@@ -20,13 +19,13 @@ def from_variables(cls, variables, *, options):
 
         nside = var.attrs.get("nside", options.get("nside"))
         nest = var.attrs.get("nest", options.get("nest", False))
-        rot_latlon = var.attrs.get("rot_latlon", options.get("rot_latlon", (0., 0.)))
-        
+        rot_latlon = var.attrs.get("rot_latlon", options.get("rot_latlon", (0.0, 0.0)))
+
         return cls(var.data, dim, nside, nest, rot_latlon)
 
     def _replace(self, new_pd_index):
         return type(self)(new_pd_index, self._dim, self._nside, self._nest, self._rot_latlon)
-    
+
     def _latlon2cellid(self, lat, lon):
         return healpy.ang2pix(self._nside, -lon, lat, lonlat=True, nest=self._nest)
 
@@ -35,4 +34,6 @@ def _cellid2latlon(self, cell_ids):
         return lat, -lon
 
     def _repr_inline_(self, max_width):
-        return f"HealpixIndex(nside={self._nside}, nest={self._nest}, rot_latlon={self._rot_latlon!r})"
+        return (
+            f"HealpixIndex(nside={self._nside}, nest={self._nest}, rot_latlon={self._rot_latlon!r})"
+        )

xdggs/index.py

@@ -3,18 +3,7 @@
 from .utils import GRID_REGISTRY, _extract_cell_id_variable
 
 
-def _extract_cell_id_variable(variables):
-    # TODO: only one variable supported (raise otherwise)
-    name, var = next(iter(variables.items()))
-
-    # TODO: only 1-d variable supported (raise otherwise)
-    dim = next(iter(var.dims))
-
-    return name, var, dim
-
-
 class DGGSIndex(Index):
-
     def __init__(self, cell_ids, dim):
         self._dim = dim
 
@@ -31,7 +20,7 @@ def from_variables(cls, variables, *, options):
         cls = GRID_REGISTRY[grid_name]
 
         return cls.from_variables(variables, options=options)
-    
+
     def create_variables(self, variables=None):
         return self._pd_index.create_variables(variables)
 
@@ -41,15 +30,15 @@ def isel(self, indexers):
             return self._replace(new_pd_index)
         else:
             return None
-    
+
     def sel(self, labels, method=None, tolerance=None):
         if method == "nearest":
             raise ValueError("finding nearest grid cell has no meaning")
         return self._pd_index.sel(labels, method=method, tolerance=tolerance)
 
     def _replace(self, new_pd_index):
         raise NotImplementedError()
-    
+
     def _latlon2cellid(self, lat, lon):
         """convert latitude / longitude points to cell ids."""
         raise NotImplementedError()
@@ -60,4 +49,4 @@ def _cellid2latlon(self, cell_ids):
 
     @property
     def cell_centers(self):
-        return self._cellid2latlon(self._pd_index.index.values)
+        return self._cellid2latlon(self._pd_index.index.values)

xdggs/utils.py

@@ -5,6 +5,7 @@ def register_dggs(name):
     def inner(cls):
         GRID_REGISTRY[name] = cls
         return cls
+
     return inner
 
 
@@ -15,4 +16,4 @@ def _extract_cell_id_variable(variables):
     # TODO: only 1-d variable supported (raise otherwise)
     dim = next(iter(var.dims))
 
-    return name, var, dim
+    return name, var, dim