fix typing

Author: dcherian

cf_xarray/accessor.py

@@ -437,7 +437,7 @@ def _get_coords(obj: DataArray | Dataset, key: Hashable) -> list[Hashable]:
 def _variables(func: F) -> F:
     @functools.wraps(func)
     def wrapper(obj: DataArray | Dataset, key: Hashable) -> list[DataArray]:
-        return [obj[k] for k in func(obj, key)]  # type: ignore
+        return [obj[k] for k in func(obj, key)]
 
     return cast(F, wrapper)
 

cf_xarray/formatting.py

@@ -1,4 +1,5 @@
 import warnings
+from typing import Dict, Hashable, Iterable, List
 
 STAR = " * "
 TAB = len(STAR) * " "
@@ -11,7 +12,7 @@ def _format_missing_row(row: str, rich: bool) -> str:
         return row
 
 
-def _format_varname(name: str, rich: bool) -> str:
+def _format_varname(name, rich: bool):
     return name
 
 
@@ -39,12 +40,14 @@ def make_text_section(
     rich: bool = False,
 ):
 
+    from .accessor import sort_maybe_hashable
+
     if dims is None:
         dims = []
     with warnings.catch_warnings():
         warnings.simplefilter("ignore")
         try:
-            vardict = getattr(accessor, attr, {})
+            vardict: Dict[str, Iterable[Hashable]] = getattr(accessor, attr, {})
         except ValueError:
             vardict = {}
 
@@ -67,7 +70,8 @@ def make_text_section(
     rows = [
         (
             f"{STAR if dims and set(value) <= set(dims) else TAB}"
-            f"{_format_cf_name(key, rich)}: {_format_varname(sorted(value), rich)}"
+            f"{_format_cf_name(key, rich)}: "
+            f"{_format_varname(sort_maybe_hashable(value), rich)}"
         )
         for key, value in vardict.items()
     ]
@@ -85,7 +89,7 @@ def make_text_section(
     return _print_rows(subtitle, rows, rich)
 
 
-def _print_rows(subtitle: str, rows: list[str], rich: bool):
+def _print_rows(subtitle: str, rows: List[str], rich: bool):
     subtitle = f"{subtitle.rjust(20)}:"
 
     # Add subtitle to the first row, align other rows

cf_xarray/tests/test_accessor.py

@@ -297,7 +297,7 @@ def test_accessor_getattr_and_describe() -> None:
             "areacella",
         )
     )
-    ds_vertb = xr.decode_cf(vert, decode_coords="all")  # type: ignore
+    ds_vertb = xr.decode_cf(vert, decode_coords="all")
 
     assert ds_verta.cf.cell_measures == ds_vertb.cf.cell_measures
     assert ds_verta.o3.cf.cell_measures == ds_vertb.o3.cf.cell_measures
@@ -821,7 +821,7 @@ def test_add_bounds_nd_variable() -> None:
     # 2D
     expected = (
         vertices_to_bounds(
-            np.arange(0, 13, 3).reshape(5, 1) + np.arange(-2, 2).reshape(1, 4)  # type: ignore
+            np.arange(0, 13, 3).reshape(5, 1) + np.arange(-2, 2).reshape(1, 4)
         )
         .rename("z_bounds")
         .assign_coords(**ds.coords)
@@ -1358,7 +1358,7 @@ def test_new_standard_name_mappers() -> None:
     )
     assert_identical(forecast.cf.chunk({"realization": 1}), forecast.chunk({"M": 1}))
     assert_identical(forecast.cf.isel({"realization": 1}), forecast.isel({"M": 1}))
-    assert_identical(forecast.cf.isel(**{"realization": 1}), forecast.isel(**{"M": 1}))  # type: ignore
+    assert_identical(forecast.cf.isel(**{"realization": 1}), forecast.isel(**{"M": 1}))
     assert_identical(
         forecast.cf.groupby("forecast_reference_time.month").mean(),
         forecast.groupby("S.month").mean(),