Merge pull request #162 from Bjoern-Rapp/typehint

Mindre rettelser til typehint

src/sgis/geopandas_tools/bounds.py

@@ -1,5 +1,6 @@
 import numbers
-from typing import Any, Callable, Iterable
+from typing import Any
+from collections.abc import Callable, Collection, Mapping
 
 import geopandas as gpd
 import numpy as np
@@ -439,7 +440,7 @@ def bounds_to_points(
 
 
 def to_bbox(
-    obj: GeoDataFrame | GeoSeries | Geometry | Iterable | dict,
+    obj: GeoDataFrame | GeoSeries | Geometry | Collection | Mapping,
 ) -> tuple[float, float, float, float]:
     """Returns 4-length tuple of bounds if possible, else raises ValueError.
 

src/sgis/geopandas_tools/duplicates.py

@@ -1,4 +1,4 @@
-from typing import Callable, Iterable
+from collections.abc import Iterable
 
 import networkx as nx
 import pandas as pd

src/sgis/geopandas_tools/general.py

@@ -1,6 +1,7 @@
 import numbers
 import warnings
-from typing import Any, Iterable
+from typing import Any
+from collections.abc import Iterable, Hashable
 
 import numpy as np
 import pandas as pd
@@ -22,7 +23,7 @@
 from .geometry_types import get_geom_type, make_all_singlepart, to_single_geom_type
 
 
-def get_common_crs(iterable: Iterable[Any], strict: bool = False) -> pyproj.CRS | None:
+def get_common_crs(iterable: Iterable[Hashable], strict: bool = False) -> pyproj.CRS | None:
     """Returns the common not-None crs or raises a ValueError if more than one.
 
     Args:

src/sgis/helpers.py

@@ -3,7 +3,7 @@
 import inspect
 import os
 import warnings
-from typing import Callable
+from collections.abc import Callable
 
 import numpy as np
 from geopandas import GeoDataFrame

src/sgis/io/write_municipality_data.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Callable
+from collections.abc import Callable
 
 import pandas as pd
 from dapla import write_pandas

src/sgis/maps/explore.py

@@ -7,7 +7,7 @@
 import warnings
 from numbers import Number
 from statistics import mean
-from typing import Iterable
+from collections.abc import Iterable
 
 import branca as bc
 import folium

src/sgis/parallel/parallel.py

@@ -2,8 +2,8 @@
 import itertools
 import multiprocessing
 from pathlib import Path
-from typing import Any, Callable, Iterable, Sized
-
+from typing import Any
+from collections.abc import Collection, Callable, Iterable
 
 try:
     import dapla as dp
@@ -73,7 +73,7 @@ def __init__(
     def map(
         self,
         func: Callable,
-        iterable: Iterable,
+        iterable: Collection,
         kwargs: dict | None = None,
     ) -> list[Any]:
         """Run functions in parallel with items of an iterable as first arguemnt.
@@ -151,7 +151,7 @@ def map(
     def starmap(
         self,
         func: Callable,
-        iterable: Iterable[Iterable[Any]],
+        iterable: Collection[Iterable[Any]],
         kwargs: dict | None = None,
     ) -> list[Any]:
         """Run functions in parallel where items of the iterable are unpacked.

src/sgis/raster/raster.py

@@ -5,7 +5,7 @@
 from copy import copy, deepcopy
 from json import loads
 from pathlib import Path
-from typing import Callable
+from collections.abc import Callable
 
 import geopandas as gpd
 import matplotlib.pyplot as plt

src/sgis/raster/zonal.py

@@ -1,4 +1,4 @@
-from typing import Callable
+from collections.abc import Callable
 
 import geopandas as gpd
 import numpy as np