Merge pull request #838 from DHI/mypy_upgrade

Mypy upgrade

Author: ecomodeller

mikeio/dataset/_dataarray.py

@@ -554,7 +554,7 @@ def dropna(self) -> DataArray:
         # this seems overly complicated...
         axes = tuple(range(1, x.ndim))
         idx = list(np.where(~np.isnan(x).all(axis=axes))[0])
-        return self.isel(time=idx)
+        return self.isel(time=idx)  # type: ignore
 
     def flipud(self) -> DataArray:
         """Flip upside down (on first non-time axis)."""

mikeio/dataset/_dataset.py

@@ -365,7 +365,7 @@ def dropna(self) -> Dataset:
 
             # this seems overly complicated...
             axes = tuple(range(1, x.ndim))
-            idx = list(np.where(~np.isnan(x).all(axis=axes))[0])
+            idx: Any = list(np.where(~np.isnan(x).all(axis=axes))[0])
             if i == 0:
                 all_index = idx
             else:

mikeio/dfsu/_layered.py

@@ -351,7 +351,7 @@ def read(
 
         dfs.Close()
 
-        dims = (
+        dims: tuple[str, ...] = (
             ("time", "element")
             if not (single_time_selected and not keepdims)  # TODO extract variable
             else ("element",)

mikeio/spatial/_FM_geometry.py

@@ -332,7 +332,7 @@ def _calc_element_coordinates(self, maxnodes: int = 4) -> np.ndarray:
 
     def _check_elements(
         self,
-        element_table: np.ndarray | list[Sequence[int]] | list[np.ndarray],
+        element_table: np.ndarray | list[Sequence[int] | np.ndarray],
         element_ids: np.ndarray | None = None,
         validate: bool = True,
     ) -> tuple[Any, Any]:

pyproject.toml

@@ -65,14 +65,14 @@ dev = [
     "rasterio",
     "polars",
     "ruff==0.6.2",
-    "mypy==1.11.1",
+    "mypy==1.16.1",
 ]
 
 test = [
     "pytest",
     "pytest-cov",
     "xarray",
-    "mypy==1.11.1",
+    "mypy==1.16.1",
     "shapely",
     "pyproj",
     "polars",