Bump shapely to 2.1.* (#13847)

Author: donbarbos

stubs/shapely/@tests/stubtest_allowlist.txt

@@ -1,4 +1,4 @@
-shapely\.geometry\.conftest
+shapely\.conftest
 shapely\.tests.*
 
 shapely\._typing  # stubs only module

stubs/shapely/METADATA.toml

@@ -1,4 +1,4 @@
-version = "2.0.*"
+version = "2.1.*"
 # Requires a version of numpy with a `py.typed` file
 requires = ["numpy>=1.20"]
 upstream_repository = "https://github.com/shapely/shapely"

stubs/shapely/shapely/_geometry.pyi

@@ -13,28 +13,29 @@ from .lib import Geometry
 
 __all__ = [
     "GeometryType",
-    "get_type_id",
-    "get_dimensions",
+    "force_2d",
+    "force_3d",
     "get_coordinate_dimension",
+    "get_dimensions",
+    "get_exterior_ring",
+    "get_geometry",
+    "get_interior_ring",
+    "get_m",
     "get_num_coordinates",
+    "get_num_geometries",
+    "get_num_interior_rings",
+    "get_num_points",
+    "get_parts",
+    "get_point",
+    "get_precision",
+    "get_rings",
     "get_srid",
-    "set_srid",
+    "get_type_id",
     "get_x",
     "get_y",
     "get_z",
-    "get_exterior_ring",
-    "get_num_points",
-    "get_num_interior_rings",
-    "get_num_geometries",
-    "get_point",
-    "get_interior_ring",
-    "get_geometry",
-    "get_parts",
-    "get_rings",
-    "get_precision",
     "set_precision",
-    "force_2d",
-    "force_3d",
+    "set_srid",
 ]
 
 _PrecisionMode: TypeAlias = Literal["valid_output", "pointwise", "keep_collapsed", 0, 1, 2]
@@ -89,6 +90,10 @@ def get_z(point: Geometry | None, **kwargs) -> float: ...
 @overload
 def get_z(point: OptGeoArrayLikeSeq, **kwargs) -> NDArray[np.float64]: ...
 @overload
+def get_m(point: Geometry | None, **kwargs) -> float: ...
+@overload
+def get_m(point: OptGeoArrayLikeSeq, **kwargs) -> NDArray[np.float64]: ...
+@overload
 def get_point(geometry: LineString, index: SupportsIndex, **kwargs) -> Point | Any: ...
 @overload
 def get_point(geometry: Point | Polygon | BaseMultipartGeometry | None, index: SupportsIndex, **kwargs) -> None: ...

stubs/shapely/shapely/_ragged_array.pyi

@@ -5,7 +5,7 @@ from ._geometry import GeometryType
 from ._typing import ArrayLike, ArrayLikeSeq, GeoArray, OptGeoArrayLikeSeq
 
 def to_ragged_array(
-    geometries: OptGeoArrayLikeSeq, include_z: bool | None = None
+    geometries: OptGeoArrayLikeSeq, include_z: bool | None = None, include_m: bool | None = None
 ) -> tuple[GeometryType, NDArray[np.float64], tuple[NDArray[np.int64], ...]]: ...
 def from_ragged_array(
     geometry_type: GeometryType, coords: ArrayLike[float], offsets: ArrayLikeSeq[int] | None = None

stubs/shapely/shapely/algorithms/cga.pyi

@@ -1,6 +1,3 @@
-from collections.abc import Callable
-
 from ..geometry import LinearRing
 
 def signed_area(ring: LinearRing) -> float: ...
-def is_ccw_impl(name: None = None) -> Callable[[LinearRing], bool]: ...

stubs/shapely/shapely/algorithms/polylabel.pyi

@@ -1,19 +1,3 @@
-from ..errors import TopologicalError as TopologicalError
 from ..geometry import Point, Polygon
 
-class Cell:
-    x: float
-    y: float
-    h: float
-    centroid: Point
-    distance: float
-    max_distance: float
-    def __init__(self, x: float, y: float, h: float, polygon: Polygon) -> None: ...
-    def __lt__(self, other: Cell) -> bool: ...
-    def __le__(self, other: Cell) -> bool: ...
-    def __eq__(self, other: object) -> bool: ...
-    def __ne__(self, other: object) -> bool: ...
-    def __gt__(self, other: Cell) -> bool: ...
-    def __ge__(self, other: Cell) -> bool: ...
-
 def polylabel(polygon: Polygon, tolerance: float = 1.0) -> Point: ...

stubs/shapely/shapely/constructive.pyi

@@ -1,5 +1,6 @@
 from collections.abc import Sequence
 from typing import Any, Literal, SupportsIndex, overload
+from typing_extensions import TypeAlias
 
 from ._enum import ParamEnum
 from ._typing import ArrayLike, ArrayLikeSeq, GeoArray, OptGeoArrayLike, OptGeoArrayLikeSeq, OptGeoT
@@ -12,32 +13,38 @@ __all__ = [
     "BufferJoinStyle",
     "boundary",
     "buffer",
-    "offset_curve",
+    "build_area",
     "centroid",
     "clip_by_rect",
     "concave_hull",
+    "constrained_delaunay_triangles",
     "convex_hull",
     "delaunay_triangles",
-    "segmentize",
     "envelope",
     "extract_unique_points",
-    "build_area",
     "make_valid",
-    "normalize",
+    "maximum_inscribed_circle",
+    "minimum_bounding_circle",
+    "minimum_clearance_line",
+    "minimum_rotated_rectangle",
     "node",
+    "normalize",
+    "offset_curve",
+    "orient_polygons",
+    "oriented_envelope",
     "point_on_surface",
     "polygonize",
     "polygonize_full",
     "remove_repeated_points",
     "reverse",
+    "segmentize",
     "simplify",
     "snap",
     "voronoi_polygons",
-    "oriented_envelope",
-    "minimum_rotated_rectangle",
-    "minimum_bounding_circle",
 ]
 
+_Method: TypeAlias = Literal["linework", "structure"]
+
 class BufferCapStyle(ParamEnum):
     round = 1
     flat = 2
@@ -229,6 +236,14 @@ def delaunay_triangles(
     geometry: OptGeoArrayLikeSeq, tolerance: ArrayLike[float] = 0.0, only_edges: ArrayLike[bool] = False, **kwargs
 ) -> GeoArray: ...
 @overload
+def constrained_delaunay_triangles(geometry: Geometry, **kwargs) -> GeometryCollection: ...
+@overload
+def constrained_delaunay_triangles(geometry: None, **kwargs) -> None: ...
+@overload
+def constrained_delaunay_triangles(geometry: Geometry | None, **kwargs) -> GeometryCollection | None: ...
+@overload
+def constrained_delaunay_triangles(geometry: OptGeoArrayLikeSeq | OptGeoArrayLike, **kwargs) -> GeoArray: ...
+@overload
 def envelope(geometry: Point, **kwargs) -> Point: ...
 @overload
 def envelope(geometry: Geometry, **kwargs) -> BaseGeometry: ...
@@ -255,13 +270,37 @@ def build_area(geometry: Geometry | None, **kwargs) -> BaseGeometry | None: ...
 @overload
 def build_area(geometry: OptGeoArrayLikeSeq, **kwargs) -> GeoArray: ...
 @overload
-def make_valid(geometry: Geometry, **kwargs) -> BaseGeometry: ...
+def make_valid(geometry: Geometry, *, method: _Method = "linework", keep_collapsed: bool = True, **kwargs) -> BaseGeometry: ...
+@overload
+def make_valid(geometry: None, *, method: _Method = "linework", keep_collapsed: bool = True, **kwargs) -> None: ...
+@overload
+def make_valid(
+    geometry: Geometry | None, *, method: Literal["structure"], keep_collapsed: bool = True, **kwargs
+) -> BaseGeometry | None: ...
+@overload
+def make_valid(
+    geometry: Geometry | None, *, method: Literal["linework"], keep_collapsed: Literal[True], **kwargs
+) -> BaseGeometry | None: ...
+@overload
+def make_valid(
+    geometry: OptGeoArrayLikeSeq, *, method: Literal["structure"], keep_collapsed: bool = True, **kwargs
+) -> GeoArray: ...
+@overload
+def make_valid(
+    geometry: OptGeoArrayLikeSeq, *, method: Literal["linework"], keep_collapsed: Literal[True], **kwargs
+) -> GeoArray: ...
+@overload
+def minimum_clearance_line(geometry: Point, **kwargs) -> Point: ...
 @overload
-def make_valid(geometry: None, **kwargs) -> None: ...
+def minimum_clearance_line(geometry: LineString | Polygon | BaseMultipartGeometry, **kwargs) -> Polygon: ...
 @overload
-def make_valid(geometry: Geometry | None, **kwargs) -> BaseGeometry | None: ...
+def minimum_clearance_line(geometry: Geometry, **kwargs) -> Polygon | Point: ...
 @overload
-def make_valid(geometry: OptGeoArrayLikeSeq, **kwargs) -> GeoArray: ...
+def minimum_clearance_line(geometry: None, **kwargs) -> None: ...
+@overload
+def minimum_clearance_line(geometry: Geometry | None, **kwargs) -> Polygon | Point | None: ...
+@overload
+def minimum_clearance_line(geometry: OptGeoArrayLikeSeq, **kwargs) -> GeoArray: ...
 @overload
 def normalize(geometry: OptGeoT, **kwargs) -> OptGeoT: ...
 @overload
@@ -335,34 +374,61 @@ def snap(geometry: OptGeoArrayLike, reference: OptGeoArrayLikeSeq, tolerance: Ar
 def snap(geometry: OptGeoArrayLike, reference: OptGeoArrayLike, tolerance: ArrayLikeSeq[float], **kwargs) -> GeoArray: ...
 @overload
 def voronoi_polygons(
-    geometry: Geometry, tolerance: float = 0.0, extend_to: Geometry | None = None, only_edges: Literal[False] = False, **kwargs
+    geometry: Geometry,
+    tolerance: float = 0.0,
+    extend_to: Geometry | None = None,
+    only_edges: Literal[False] = False,
+    ordered: bool = False,
+    **kwargs,
 ) -> GeometryCollection[Polygon]: ...
 @overload
 def voronoi_polygons(
-    geometry: Geometry, tolerance: float, extend_to: Geometry | None, only_edges: Literal[True], **kwargs
+    geometry: Geometry, tolerance: float, extend_to: Geometry | None, only_edges: Literal[True], ordered: bool = False, **kwargs
 ) -> LineString | MultiLineString: ...
 @overload
 def voronoi_polygons(
-    geometry: Geometry, tolerance: float = 0.0, extend_to: Geometry | None = None, *, only_edges: Literal[True], **kwargs
+    geometry: Geometry,
+    tolerance: float = 0.0,
+    extend_to: Geometry | None = None,
+    *,
+    only_edges: Literal[True],
+    ordered: bool = False,
+    **kwargs,
 ) -> LineString | MultiLineString: ...
 @overload
 def voronoi_polygons(
-    geometry: Geometry, tolerance: float = 0.0, extend_to: Geometry | None = None, only_edges: bool = False, **kwargs
+    geometry: Geometry,
+    tolerance: float = 0.0,
+    extend_to: Geometry | None = None,
+    only_edges: bool = False,
+    ordered: bool = False,
+    **kwargs,
 ) -> GeometryCollection[Polygon] | LineString | MultiLineString: ...
 @overload
 def voronoi_polygons(
-    geometry: None, tolerance: float = 0.0, extend_to: Geometry | None = None, only_edges: bool = False, **kwargs
+    geometry: None,
+    tolerance: float = 0.0,
+    extend_to: Geometry | None = None,
+    only_edges: bool = False,
+    ordered: bool = False,
+    **kwargs,
 ) -> None: ...
 @overload
 def voronoi_polygons(
-    geometry: Geometry | None, tolerance: float = 0.0, extend_to: Geometry | None = None, only_edges: bool = False, **kwargs
+    geometry: Geometry | None,
+    tolerance: float = 0.0,
+    extend_to: Geometry | None = None,
+    only_edges: bool = False,
+    ordered: bool = False,
+    **kwargs,
 ) -> GeometryCollection[Polygon] | LineString | MultiLineString | None: ...
 @overload
 def voronoi_polygons(
     geometry: OptGeoArrayLikeSeq,
     tolerance: ArrayLike[float] = 0.0,
     extend_to: OptGeoArrayLike = None,
     only_edges: ArrayLike[bool] = False,
+    ordered: bool = False,
     **kwargs,
 ) -> GeoArray: ...
 @overload
@@ -371,6 +437,7 @@ def voronoi_polygons(
     tolerance: ArrayLikeSeq[float],
     extend_to: OptGeoArrayLike = None,
     only_edges: ArrayLike[bool] = False,
+    ordered: bool = False,
     **kwargs,
 ) -> GeoArray: ...
 @overload
@@ -379,6 +446,7 @@ def voronoi_polygons(
     tolerance: ArrayLike[float],
     extend_to: OptGeoArrayLikeSeq,
     only_edges: ArrayLike[bool] = False,
+    ordered: bool = False,
     **kwargs,
 ) -> GeoArray: ...
 @overload
@@ -388,11 +456,17 @@ def voronoi_polygons(
     *,
     extend_to: OptGeoArrayLikeSeq,
     only_edges: ArrayLike[bool] = False,
+    ordered: bool = False,
     **kwargs,
 ) -> GeoArray: ...
 @overload
 def voronoi_polygons(
-    geometry: OptGeoArrayLike, tolerance: ArrayLike[float], extend_to: OptGeoArrayLike, only_edges: ArrayLikeSeq[bool], **kwargs
+    geometry: OptGeoArrayLike,
+    tolerance: ArrayLike[float],
+    extend_to: OptGeoArrayLike,
+    only_edges: ArrayLikeSeq[bool],
+    ordered: bool = False,
+    **kwargs,
 ) -> GeoArray: ...
 @overload
 def voronoi_polygons(
@@ -401,6 +475,7 @@ def voronoi_polygons(
     extend_to: OptGeoArrayLike = None,
     *,
     only_edges: ArrayLikeSeq[bool],
+    ordered: bool = False,
     **kwargs,
 ) -> GeoArray: ...
 @overload
@@ -428,3 +503,27 @@ def minimum_bounding_circle(geometry: None, **kwargs) -> None: ...
 def minimum_bounding_circle(geometry: Geometry | None, **kwargs) -> Polygon | Point | None: ...
 @overload
 def minimum_bounding_circle(geometry: OptGeoArrayLikeSeq, **kwargs) -> GeoArray: ...
+@overload
+def maximum_inscribed_circle(geometry: Point, tolerance: float | None = None, **kwargs) -> Point: ...
+@overload
+def maximum_inscribed_circle(
+    geometry: LineString | Polygon | BaseMultipartGeometry, tolerance: float | None = None, **kwargs
+): ...
+@overload
+def maximum_inscribed_circle(geometry: Geometry, tolerance: float | None = None, **kwargs) -> Polygon | Point: ...
+@overload
+def maximum_inscribed_circle(geometry: None, tolerance: float | None = None, **kwargs) -> None: ...
+@overload
+def maximum_inscribed_circle(geometry: Geometry | None, tolerance: float | None = None, **kwargs) -> Polygon | Point | None: ...
+@overload
+def maximum_inscribed_circle(geometry: OptGeoArrayLikeSeq, tolerance: ArrayLike[float] | None = None, **kwargs) -> GeoArray: ...
+@overload
+def orient_polygons(geometry: Point, *, exterior_cw: bool = False, **kwargs) -> Point: ...
+@overload
+def orient_polygons(geometry: Geometry, *, exterior_cw: bool = False, **kwargs) -> BaseGeometry: ...
+@overload
+def orient_polygons(geometry: None, *, exterior_cw: bool = False, **kwargs) -> None: ...
+@overload
+def orient_polygons(geometry: Geometry | None, *, exterior_cw: bool = False, **kwargs) -> BaseGeometry | None: ...
+@overload
+def orient_polygons(geometry: OptGeoArrayLikeSeq, *, exterior_cw: bool = False, **kwargs) -> GeoArray: ...