Merge pull request #651 from DHI/collections

Use collections.abc

mikeio/__init__.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from pathlib import Path
 from platform import architecture
-from typing import Sequence
+from collections.abc import Sequence
 
 # PEP0440 compatible formatted version, see:
 # https://www.python.org/dev/peps/pep-0440/

mikeio/_spectral.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
-from typing import Sequence, Tuple, Literal
+from collections.abc import Sequence
+from typing import Literal, Tuple
 import numpy as np
 from matplotlib.axes import Axes
 from matplotlib.projections.polar import PolarAxes

mikeio/_time.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 from datetime import datetime
 from dataclasses import dataclass
-from typing import List, Iterable
+from typing import List
+from collections.abc import Iterable
 
 import pandas as pd
 
@@ -14,7 +15,9 @@ class DateTimeSelector:
 
     def isel(
         self,
-        x: int | Iterable[int] | str | datetime | pd.DatetimeIndex | slice | None = None,
+        x: (
+            int | Iterable[int] | str | datetime | pd.DatetimeIndex | slice | None
+        ) = None,
     ) -> List[int]:
         """Select time steps from a pandas DatetimeIndex
 
@@ -64,4 +67,4 @@ def isel(
         if isinstance(x, Iterable):
             return [self.isel(t)[0] for t in x]
 
-        return indices
+        return indices

mikeio/_track.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 from pathlib import Path
-from typing import Callable, Sequence, Tuple
+from collections.abc import Sequence
+from typing import Callable, Tuple
 
 import numpy as np
 import pandas as pd
@@ -50,7 +51,7 @@ def _extract_track(
 
         times = df.index
         coords = df.iloc[:, 0:2].to_numpy(copy=True)
-            
+
     elif isinstance(track, Dataset):
         times = track.time
         coords = np.zeros(shape=(len(times), 2))

mikeio/dataset/_data_utils.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 from datetime import datetime
 import re
-from typing import Iterable, Sized,  List
+from typing import List
+from collections.abc import Iterable, Sized
 
 import pandas as pd
 
@@ -19,7 +20,10 @@ def _n_selected_timesteps(x: Sized, k: slice | Sized) -> int:
     return len(k)
 
 
-def _get_time_idx_list(time: pd.DatetimeIndex, steps: int | Iterable[int] | str | datetime | pd.DatetimeIndex | slice) -> List[int] | slice:
+def _get_time_idx_list(
+    time: pd.DatetimeIndex,
+    steps: int | Iterable[int] | str | datetime | pd.DatetimeIndex | slice,
+) -> List[int] | slice:
     """Find list of idx in DatetimeIndex"""
 
     # indexing with a slice needs to be handled differently, since slicing returns a view
@@ -30,9 +34,3 @@ def _get_time_idx_list(time: pd.DatetimeIndex, steps: int | Iterable[int] | str
 
     dts = DateTimeSelector(time)
     return dts.isel(steps)
-
-
-
-
-
-

mikeio/dataset/_dataarray.py

@@ -4,20 +4,14 @@
 from pathlib import Path
 from datetime import datetime
 from functools import cached_property
-from typing import (
-    Any,
+from collections.abc import (
     Iterable,
+    Sized,
     Sequence,
-    Tuple,
     Mapping,
-    Union,
-    Sized,
-    Literal,
-    TYPE_CHECKING,
-    overload,
     MutableMapping,
-    Callable,
 )
+from typing import Any, Union, Literal, TYPE_CHECKING, overload, Callable, Tuple
 
 
 import numpy as np

mikeio/dfs/_dfs.py

@@ -2,7 +2,7 @@
 import warnings
 from abc import abstractmethod
 from dataclasses import dataclass
-from datetime import datetime
+from datetime import datetime, timedelta
 from typing import List, Tuple, Sequence
 import numpy as np
 import pandas as pd
@@ -705,10 +705,8 @@ def time(self) -> pd.DatetimeIndex:
         if not self._is_equidistant:
             raise NotImplementedError("Not implemented for non-equidistant files")
 
-        # TODO using 'S' works in Python 3.8, but is deprecated, 's' doesn't work in 3.8
-        return pd.date_range(
-            start=self.start_time, periods=self.n_timesteps, freq=f"{self.timestep}S"
-        )
+        dt = timedelta(seconds=self.timestep)
+        return pd.date_range(start=self.start_time, periods=self.n_timesteps, freq=dt)
 
     @property
     def projection_string(self):

mikeio/generic.py

@@ -5,7 +5,9 @@
 from copy import deepcopy
 from datetime import datetime, timedelta
 from shutil import copyfile
-from typing import Iterable, List, Sequence, Tuple, Union
+from collections.abc import Iterable, Sequence
+from typing import Union, List, Tuple
+
 
 import numpy as np
 import pandas as pd