Update dependencies (#11)

Author: hamdanal

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -10,7 +10,7 @@ repos:
       - id: mixed-line-ending
       - id: check-case-conflict
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.0 # must match requirements-tests.txt
+    rev: v0.7.3 # must match requirements-tests.txt
     hooks:
       - id: ruff
       - id: ruff-format

requirements-tests.txt

@@ -1,10 +1,10 @@
 # Tools
 # -----
-ruff==0.5.0  # must match .pre-commit-config.yaml
+ruff==0.7.3  # must match .pre-commit-config.yaml
 pytest>=8.0
 rich-argparse>=1.5.2
-mypy==1.10.1
-pyright==1.1.369
+mypy==1.13.0
+pyright==1.1.388
 
 # Runtime dependencies
 # --------------------
@@ -13,8 +13,8 @@ geopandas>=1.0.0
 # Transient dependencies
 # ----------------------
 # geopandas
-types-shapely>=2.0.0.20240613
-pandas-stubs>=2.2.2.240603
+types-shapely>=2.0.0.20240820
+pandas-stubs>=2.2.3.241009
 matplotlib>=3.8.0
 folium>=0.16.0
 rtree>=1.2.0

stubs/pandapower-stubs/toolbox.pyi

@@ -252,11 +252,11 @@ def get_element_index(net: pandapowerNet, element: str, name: str, exact_match:
 @overload
 def get_element_index(net: pandapowerNet, element: str, name: str, exact_match: bool = True) -> int | pd.Index[int]: ...
 @overload
-def get_element_indices(  # type: ignore[overload-overlap]
+def get_element_indices(
     net: pandapowerNet, element: str | Iterable[str], name: str | Iterable[str], exact_match: Literal[True] = True
 ) -> list[int]: ...
 @overload
-def get_element_indices(  # type: ignore[overload-overlap]
+def get_element_indices(
     net: pandapowerNet, element: str | Iterable[str], name: str | Iterable[str], exact_match: Literal[False]
 ) -> list[pd.Index[int]]: ...
 @overload

tests/__init__.py

@@ -1,14 +1,19 @@
 from __future__ import annotations
 
 from collections.abc import Iterable
-from types import UnionType
+from types import GenericAlias, UnionType
 from typing import Any, TypeAlias, TypeVar, cast
 
 import numpy as np
+from shapely.geometry.base import BaseMultipartGeometry, GeometrySequence
 
 T = TypeVar("T")
 _ClassInfo: TypeAlias = type | UnionType | tuple["_ClassInfo", ...]  # see isinstance
 
+# Make stubs generic classes generic at runtime
+setattr(BaseMultipartGeometry, "__class_getitem__", classmethod(GenericAlias))
+setattr(GeometrySequence, "__class_getitem__", classmethod(GenericAlias))
+
 
 def check(obj: T, cls: _ClassInfo, dtype: _ClassInfo | None = None) -> T:
     __tracebackhide__ = True

tests/shapely/test_constructive.py

@@ -36,6 +36,13 @@
 
 GEOMS: list[Geometry] = [P, MP, LS, MLS, LR, PO, MPO, GC]
 
+PolygonizeFullCollections = tuple[
+    GeometryCollection, GeometryCollection, GeometryCollection, GeometryCollection
+]
+PolygonizeFullArrays = tuple[
+    NDArray[np.object_], NDArray[np.object_], NDArray[np.object_], NDArray[np.object_]
+]
+
 
 def test_boundary() -> None:
     check(assert_type(shapely.boundary(P), GeometryCollection), GeometryCollection)
@@ -310,30 +317,34 @@ def test_polygonize() -> None:
 
 
 def test_polygonize_full() -> None:
-    FourCollections = tuple[
-        GeometryCollection, GeometryCollection, GeometryCollection, GeometryCollection
-    ]
-    FourArrays = tuple[
-        NDArray[np.object_], NDArray[np.object_], NDArray[np.object_], NDArray[np.object_]
-    ]
-    check(
-        assert_type(shapely.polygonize_full([P, LS]), FourCollections),
+    check(
+        assert_type(shapely.polygonize_full([P, LS]), PolygonizeFullCollections),
         tuple,
         dtype=GeometryCollection,
     )
     check(
-        assert_type(shapely.polygonize_full((LS, None)), FourCollections),
+        assert_type(shapely.polygonize_full((LS, None)), PolygonizeFullCollections),
         tuple,
         dtype=GeometryCollection,
     )
-    check(assert_type(shapely.polygonize_full([(LS, None)]), FourArrays), tuple, dtype=np.ndarray)
     check(
-        assert_type(shapely.polygonize_full(np.array([P, LS])), FourCollections | FourArrays),
+        assert_type(shapely.polygonize_full([(LS, None)]), PolygonizeFullArrays),
+        tuple,
+        dtype=np.ndarray,
+    )
+    check(
+        assert_type(
+            shapely.polygonize_full(np.array([P, LS])),
+            PolygonizeFullCollections | PolygonizeFullArrays,
+        ),
         tuple,
         dtype=GeometryCollection,
     )
     check(
-        assert_type(shapely.polygonize_full(np.array([[P, LS]])), FourCollections | FourArrays),
+        assert_type(
+            shapely.polygonize_full(np.array([[P, LS]])),
+            PolygonizeFullCollections | PolygonizeFullArrays,
+        ),
         tuple,
         dtype=np.ndarray,
     )
@@ -449,7 +460,7 @@ def test_voronoi_polygons() -> None:
     check(assert_type(shapely.voronoi_polygons(None), None), NoneType)
     for geom in (LS, MLS, LR, PO, MPO, GC):
         check(
-            assert_type(shapely.voronoi_polygons(geom), "GeometryCollection[Polygon]"),
+            assert_type(shapely.voronoi_polygons(geom), GeometryCollection[Polygon]),
             GeometryCollection,
         )
         check(
@@ -467,7 +478,7 @@ def test_voronoi_polygons() -> None:
         check(
             assert_type(
                 shapely.voronoi_polygons(geom, only_edges=bool(0.5)),
-                "GeometryCollection[Polygon] | LineString | MultiLineString",
+                GeometryCollection[Polygon] | LineString | MultiLineString,
             ),
             LineString | MultiLineString,
         )

tests/shapely/test_geometry.py

@@ -41,7 +41,7 @@
 
 def test_base_geometry_constructor() -> None:
     with pytest.warns(FutureWarning):
-        check(assert_type(BaseGeometry(), GeometryCollection), GeometryCollection)
+        check(assert_type(BaseGeometry(), GeometryCollection), GeometryCollection)  # pyright: ignore[reportDeprecated]
 
 
 def test_geometry_operators() -> None:
@@ -237,20 +237,18 @@ def test_multipart_geometry() -> None:
     with pytest.raises(NotImplementedError):
         assert_never(MLS.coords)
 
-    check(assert_type(MP.geoms, "GeometrySequence[MultiPoint]"), GeometrySequence, Point)
-    check(assert_type(MLS.geoms, "GeometrySequence[MultiLineString]"), GeometrySequence, LineString)
-    check(assert_type(MPO.geoms, "GeometrySequence[MultiPolygon]"), GeometrySequence, Polygon)
+    check(assert_type(MP.geoms, GeometrySequence[MultiPoint]), GeometrySequence, Point)
+    check(assert_type(MLS.geoms, GeometrySequence[MultiLineString]), GeometrySequence, LineString)
+    check(assert_type(MPO.geoms, GeometrySequence[MultiPolygon]), GeometrySequence, Polygon)
     check(
-        assert_type(GC.geoms, "GeometrySequence[GeometryCollection]"),
-        GeometrySequence,
-        BaseGeometry,
+        assert_type(GC.geoms, GeometrySequence[GeometryCollection]), GeometrySequence, BaseGeometry
     )
     check(assert_type(iter(MP.geoms), Iterator[Point]), Iterator, dtype=Point)
     check(assert_type(iter(MLS.geoms), Iterator[LineString]), Iterator, dtype=LineString)
     check(assert_type(iter(MPO.geoms), Iterator[Polygon]), Iterator, dtype=Polygon)
     check(assert_type(iter(GC.geoms), Iterator[BaseGeometry]), Iterator, dtype=BaseGeometry)
     polygons_collection = GeometryCollection(MPO)
-    check(assert_type(polygons_collection, "GeometryCollection[Polygon]"), GeometryCollection)
+    check(assert_type(polygons_collection, GeometryCollection[Polygon]), GeometryCollection)
     check(assert_type(iter(polygons_collection.geoms), Iterator[Polygon]), Iterator, dtype=Polygon)
     check(assert_type(MP.geoms[0], Point), Point)
     check(assert_type(MLS.geoms[0], LineString), LineString)

tests/shapely/test_linear.py

@@ -17,6 +17,8 @@
 MP = MultiPoint([(0, 0), (1, 1), (0, 2), (2, 2), (3, 1), (1, 0)])
 MLS = MultiLineString([LS, PO.exterior])
 
+LineMergeType = LineString | MultiLineString | GeometryCollection
+
 
 def test_line_interpolate_point() -> None:
     check(assert_type(shapely.line_interpolate_point(LS, 1.0), Point), Point)
@@ -86,13 +88,12 @@ def test_line_locate_point() -> None:
 
 
 def test_line_merge() -> None:
-    expected_type = LineString | MultiLineString | GeometryCollection
-    check(assert_type(shapely.line_merge(P), expected_type), GeometryCollection)
-    check(assert_type(shapely.line_merge(LineString()), expected_type), GeometryCollection)
-    check(assert_type(shapely.line_merge(MultiLineString()), expected_type), GeometryCollection)
-    check(assert_type(shapely.line_merge(LS), expected_type), LineString)
-    check(assert_type(shapely.line_merge(MLS), expected_type), MultiLineString)
-    check(assert_type(shapely.line_merge(GeometryCollection(MLS)), expected_type), MultiLineString)
+    check(assert_type(shapely.line_merge(P), LineMergeType), GeometryCollection)
+    check(assert_type(shapely.line_merge(LineString()), LineMergeType), GeometryCollection)
+    check(assert_type(shapely.line_merge(MultiLineString()), LineMergeType), GeometryCollection)
+    check(assert_type(shapely.line_merge(LS), LineMergeType), LineString)
+    check(assert_type(shapely.line_merge(MLS), LineMergeType), MultiLineString)
+    check(assert_type(shapely.line_merge(GeometryCollection(MLS)), LineMergeType), MultiLineString)
     check(assert_type(shapely.line_merge(None), None), NoneType)
     check(
         assert_type(shapely.line_merge([LS, None]), NDArray[np.object_]),
@@ -104,12 +105,12 @@ def test_line_merge() -> None:
         np.ndarray,
         dtype=MultiLineString,
     )
-    check(assert_type(shapely.line_merge(LS, directed=True), expected_type), LineString)
+    check(assert_type(shapely.line_merge(LS, directed=True), LineMergeType), LineString)
 
 
 def test_shared_paths() -> None:
     check(
-        assert_type(shapely.shared_paths(MLS, LS), "GeometryCollection[MultiLineString]"),
+        assert_type(shapely.shared_paths(MLS, LS), GeometryCollection[MultiLineString]),
         GeometryCollection,
     )
     check(assert_type(shapely.shared_paths(MLS, None), None), NoneType)

tests/shapely/test_ops.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from types import NoneType
+from typing import TypeAlias
 
 import pyproj
 import pytest
@@ -16,10 +17,17 @@
 PO: Polygon = P.buffer(1)
 MP = MultiPoint([(0, 0), (1, 1), (0, 2), (2, 2), (3, 1), (1, 0)])
 
+PolygonizeFull: TypeAlias = tuple[
+    GeometryCollection[Polygon],
+    GeometryCollection[LineString],
+    GeometryCollection[LineString],
+    GeometryCollection[Polygon],
+]
+
 
 def test_polygonize() -> None:
     check(
-        assert_type(shapely.ops.polygonize(PO), "GeometrySequence[GeometryCollection[Polygon]]"),
+        assert_type(shapely.ops.polygonize(PO), GeometrySequence[GeometryCollection[Polygon]]),
         GeometrySequence,
         dtype=Polygon,
     )
@@ -32,7 +40,7 @@ def test_polygonize() -> None:
     ]
     check(
         assert_type(
-            shapely.ops.polygonize(line_likes), "GeometrySequence[GeometryCollection[Polygon]]"
+            shapely.ops.polygonize(line_likes), GeometrySequence[GeometryCollection[Polygon]]
         ),
         GeometrySequence,
         dtype=Polygon,
@@ -44,12 +52,12 @@ def test_polygonize() -> None:
     ]
     poly = shapely.ops.polygonize(lines)
     check(
-        assert_type(poly, "GeometrySequence[GeometryCollection[Polygon]]"),
+        assert_type(poly, GeometrySequence[GeometryCollection[Polygon]]),
         GeometrySequence,
         dtype=Polygon,
     )
     check(assert_type(poly[0], Polygon), Polygon)
-    check(assert_type(poly[:], "GeometryCollection[Polygon]"), GeometryCollection)
+    check(assert_type(poly[:], GeometryCollection[Polygon]), GeometryCollection)
     check(assert_type(list(poly), list[Polygon]), list, dtype=Polygon)
     check(assert_type(len(poly), int), int)
 
@@ -64,22 +72,18 @@ def test_polygonize() -> None:
                     None,
                 )
             ),
-            "GeometrySequence[GeometryCollection[Polygon]]",
+            GeometrySequence[GeometryCollection[Polygon]],
         ),
         GeometrySequence,
         dtype=Polygon,
     )
 
 
 def test_polygonize_full() -> None:
-    expected_type = tuple[
-        "GeometryCollection[Polygon]",
-        "GeometryCollection[LineString]",
-        "GeometryCollection[LineString]",
-        "GeometryCollection[Polygon]",
-    ]
     check(
-        assert_type(shapely.ops.polygonize_full(PO), expected_type), tuple, dtype=GeometryCollection
+        assert_type(shapely.ops.polygonize_full(PO), PolygonizeFull),
+        tuple,
+        dtype=GeometryCollection,
     )
     line_likes = [
         ((0, 0), (1, 1)),
@@ -89,7 +93,7 @@ def test_polygonize_full() -> None:
         ((1, 0), (0, 0)),
     ]
     check(
-        assert_type(shapely.ops.polygonize_full(line_likes), expected_type),
+        assert_type(shapely.ops.polygonize_full(line_likes), PolygonizeFull),
         tuple,
         dtype=GeometryCollection,
     )
@@ -100,7 +104,7 @@ def test_polygonize_full() -> None:
     ]
     poly = shapely.ops.polygonize_full(lines)
     assert len(poly) == 4
-    check(assert_type(poly, expected_type), tuple, dtype=GeometryCollection)
+    check(assert_type(poly, PolygonizeFull), tuple, dtype=GeometryCollection)
 
     check(
         assert_type(
@@ -113,7 +117,7 @@ def test_polygonize_full() -> None:
                     None,
                 )
             ),
-            expected_type,
+            PolygonizeFull,
         ),
         tuple,
         dtype=GeometryCollection,
@@ -163,12 +167,10 @@ def test_triangulate() -> None:
 
 def test_voronoi_diagram() -> None:
     regions = shapely.ops.voronoi_diagram(MP)
-    check(assert_type(regions, "GeometryCollection[Polygon]"), GeometryCollection)
+    check(assert_type(regions, GeometryCollection[Polygon]), GeometryCollection)
     check(list(regions.geoms), list, dtype=Polygon)
     edges = shapely.ops.voronoi_diagram(MP, edges=True)
-    check(
-        assert_type(edges, "GeometryCollection[LineString | MultiLineString]"), GeometryCollection
-    )
+    check(assert_type(edges, GeometryCollection[LineString | MultiLineString]), GeometryCollection)
     check(list(edges.geoms), list, dtype=MultiLineString)
 
 
@@ -212,7 +214,7 @@ def test_snap() -> None:
 
 def test_shared_paths() -> None:
     shared = shapely.ops.shared_paths(LS, PO.exterior)
-    check(assert_type(shared, "GeometryCollection[MultiLineString]"), GeometryCollection)
+    check(assert_type(shared, GeometryCollection[MultiLineString]), GeometryCollection)
     with pytest.raises(Exception):
         shapely.ops.shared_paths(LS, PO)  # type: ignore[arg-type] # pyright: ignore[reportArgumentType]