shapely 2.0.5__tar.gz → 2.0.7__tar.gz

{shapely-2.0.5 → shapely-2.0.7}/CHANGES.txt

@@ -1,6 +1,27 @@
 Changes
 =======
 
+2.0.7 (2025-01-30)
+------------------
+
+Bug fixes:
+
+- Fix compilation error on certain Linux platforms, such as Alpine (#1945).
+- Fixes crash when reading nonlinear geometry types (CircularString,
+  CompoundCurve, MultiCurve, CurvePolygon, MultiSurface) from WKB/WKT with
+  GEOS >= 3.13; these types are not yet supported in Shapely and now raise a
+  ``NotImplementedError`` (#2160)
+- Fix the ``project`` method to return a Python float (#2093).
+
+2.0.6 (2024-08-19)
+------------------
+
+Bug fixes:
+
+- Fix compatibility with NumPy 2.1.0 (#2099).
+
+Wheels are available for Python 3.13 (and still include GEOS 3.11.4).
+
 2.0.5 (2024-07-13)
 ------------------
 

{shapely-2.0.5 → shapely-2.0.7}/CITATION.cff

@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: "Please cite this software using these metadata."
 type: software
 title: Shapely
-version: "2.0.5"
-date-released: "2024-07-13"
+version: "2.0.7"
+date-released: "2025-01-30"
 doi: 10.5281/zenodo.5597138
 abstract: "Manipulation and analysis of geometric objects in the Cartesian plane."
 repository-artifact: https://pypi.org/project/Shapely

{shapely-2.0.5 → shapely-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: shapely
-Version: 2.0.5
+Version: 2.0.7
 Summary: Manipulation and analysis of geometric objects
 Author: Sean Gillies
 Maintainer: Shapely contributors
@@ -22,6 +22,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires-Python: >=3.7
 Description-Content-Type: text/x-rst
@@ -53,12 +54,6 @@ Shapely
    :alt: Github Actions status
    :target: https://github.com/shapely/shapely/actions?query=branch%3Amain
 
-.. Travis CI status -- https://travis-ci.com
-
-.. image:: https://travis-ci.com/shapely/shapely.svg?branch=main
-   :alt: Travis CI status
-   :target: https://travis-ci.com/github/shapely/shapely
-
 .. PyPI
 
 .. image:: https://img.shields.io/pypi/v/shapely.svg

{shapely-2.0.5 → shapely-2.0.7}/README.rst

@@ -14,12 +14,6 @@ Shapely
    :alt: Github Actions status
    :target: https://github.com/shapely/shapely/actions?query=branch%3Amain
 
-.. Travis CI status -- https://travis-ci.com
-
-.. image:: https://travis-ci.com/shapely/shapely.svg?branch=main
-   :alt: Travis CI status
-   :target: https://travis-ci.com/github/shapely/shapely
-
 .. PyPI
 
 .. image:: https://img.shields.io/pypi/v/shapely.svg

{shapely-2.0.5 → shapely-2.0.7}/pyproject.toml

@@ -39,6 +39,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Scientific/Engineering :: GIS",
 ]
 requires-python = ">=3.7"

{shapely-2.0.5 → shapely-2.0.7}/shapely/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-07-13T16:49:25+1200",
+ "date": "2025-01-30T18:00:49-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "a4fe42f45db97f264d7ba71671fc9718063a3aa2",
- "version": "2.0.5"
+ "full-revisionid": "341209eebf905ad10d3050b67ab495129963dae8",
+ "version": "2.0.7"
 }
 '''  # END VERSION_JSON
 

{shapely-2.0.5 → shapely-2.0.7}/shapely/creation.py

@@ -353,7 +353,7 @@ def multipoints(geometries, indices=None, out=None, **kwargs):
     ):
         geometries = points(geometries)
     if indices is None:
-        return lib.create_collection(geometries, typ, out=out, **kwargs)
+        return lib.create_collection(geometries, np.intc(typ), out=out, **kwargs)
     else:
         return collections_1d(geometries, indices, typ, out=out)
 
@@ -390,7 +390,7 @@ def multilinestrings(geometries, indices=None, out=None, **kwargs):
         geometries = linestrings(geometries)
 
     if indices is None:
-        return lib.create_collection(geometries, typ, out=out, **kwargs)
+        return lib.create_collection(geometries, np.intc(typ), out=out, **kwargs)
     else:
         return collections_1d(geometries, indices, typ, out=out)
 
@@ -426,7 +426,7 @@ def multipolygons(geometries, indices=None, out=None, **kwargs):
     ):
         geometries = polygons(geometries)
     if indices is None:
-        return lib.create_collection(geometries, typ, out=out, **kwargs)
+        return lib.create_collection(geometries, np.intc(typ), out=out, **kwargs)
     else:
         return collections_1d(geometries, indices, typ, out=out)
 
@@ -457,7 +457,7 @@ def geometrycollections(geometries, indices=None, out=None, **kwargs):
     """
     typ = GeometryType.GEOMETRYCOLLECTION
     if indices is None:
-        return lib.create_collection(geometries, typ, out=out, **kwargs)
+        return lib.create_collection(geometries, np.intc(typ), out=out, **kwargs)
     else:
         return collections_1d(geometries, indices, typ, out=out)
 

{shapely-2.0.5 → shapely-2.0.7}/shapely/geometry/base.py

@@ -830,7 +830,9 @@ class BaseGeometry(shapely.Geometry):
 
         Alias of `project`.
         """
-        return shapely.line_locate_point(self, other, normalized=normalized)
+        return _maybe_unpack(
+            shapely.line_locate_point(self, other, normalized=normalized)
+        )
 
     def project(self, other, normalized=False):
         """Returns the distance along this geometry to a point nearest the
@@ -841,7 +843,9 @@ class BaseGeometry(shapely.Geometry):
 
         Alias of `line_locate_point`.
         """
-        return shapely.line_locate_point(self, other, normalized=normalized)
+        return _maybe_unpack(
+            shapely.line_locate_point(self, other, normalized=normalized)
+        )
 
     def line_interpolate_point(self, distance, normalized=False):
         """Return a point at the specified distance along a linear geometry

{shapely-2.0.5 → shapely-2.0.7}/shapely/set_operations.py

@@ -403,7 +403,9 @@ def union_all(geometries, grid_size=None, axis=None, **kwargs):
         geometries = np.rollaxis(geometries, axis=axis, start=geometries.ndim)
 
     # create_collection acts on the inner axis
-    collections = lib.create_collection(geometries, GeometryType.GEOMETRYCOLLECTION)
+    collections = lib.create_collection(
+        geometries, np.intc(GeometryType.GEOMETRYCOLLECTION)
+    )
 
     if grid_size is not None:
         if lib.geos_version < (3, 9, 0):
@@ -501,5 +503,7 @@ def coverage_union_all(geometries, axis=None, **kwargs):
             np.asarray(geometries), axis=axis, start=geometries.ndim
         )
     # create_collection acts on the inner axis
-    collections = lib.create_collection(geometries, GeometryType.GEOMETRYCOLLECTION)
+    collections = lib.create_collection(
+        geometries, np.intc(GeometryType.GEOMETRYCOLLECTION)
+    )
     return lib.coverage_union(collections, **kwargs)

{shapely-2.0.5 → shapely-2.0.7}/shapely/tests/geometry/test_geometry_base.py

@@ -164,6 +164,10 @@ def test_array_argument_binary_predicates(op):
     expected = np.array([getattr(polygon, op)(p) for p in points], dtype=bool)
     np.testing.assert_array_equal(result, expected)
 
+    # check scalar
+    result = getattr(polygon, op)(points[0])
+    assert type(result) is bool
+
 
 @pytest.mark.parametrize(
     "op, kwargs",
@@ -188,6 +192,10 @@ def test_array_argument_binary_predicates2(op, kwargs):
     expected = np.array([getattr(polygon, op)(p, **kwargs) for p in points], dtype=bool)
     np.testing.assert_array_equal(result, expected)
 
+    # check scalar
+    result = getattr(polygon, op)(points[0], **kwargs)
+    assert type(result) is bool
+
 
 @pytest.mark.parametrize(
     "op",
@@ -207,6 +215,10 @@ def test_array_argument_binary_geo(op):
     expected = np.array([getattr(box, op)(g) for g in polygons], dtype=object)
     assert_geometries_equal(result, expected)
 
+    # check scalar
+    result = getattr(box, op)(polygons[0])
+    assert isinstance(result, (Polygon, MultiPolygon))
+
 
 @pytest.mark.parametrize("op", ["distance", "hausdorff_distance"])
 def test_array_argument_float(op):
@@ -218,23 +230,42 @@ def test_array_argument_float(op):
     expected = np.array([getattr(polygon, op)(p) for p in points], dtype="float64")
     np.testing.assert_array_equal(result, expected)
 
+    # check scalar
+    result = getattr(polygon, op)(points[0])
+    assert type(result) is float
 
-def test_array_argument_linear():
+
+@pytest.mark.parametrize("op", ["line_interpolate_point", "interpolate"])
+def test_array_argument_linear_point(op):
     line = LineString([(0, 0), (0, 1), (1, 1)])
     distances = np.array([0, 0.5, 1])
-    result = line.line_interpolate_point(distances)
+
+    result = getattr(line, op)(distances)
     assert isinstance(result, np.ndarray)
     expected = np.array(
         [line.line_interpolate_point(d) for d in distances], dtype=object
     )
     assert_geometries_equal(result, expected)
 
+    # check scalar
+    result = getattr(line, op)(distances[0])
+    assert isinstance(result, Point)
+
+
+@pytest.mark.parametrize("op", ["line_locate_point", "project"])
+def test_array_argument_linear_float(op):
+    line = LineString([(0, 0), (0, 1), (1, 1)])
     points = shapely.points([(0, 0), (0.5, 0.5), (1, 1)])
-    result = line.line_locate_point(points)
+
+    result = getattr(line, op)(points)
     assert isinstance(result, np.ndarray)
     expected = np.array([line.line_locate_point(p) for p in points], dtype="float64")
     np.testing.assert_array_equal(result, expected)
 
+    # check scalar
+    result = getattr(line, op)(points[0])
+    assert type(result) is float
+
 
 def test_array_argument_buffer():
     point = Point(1, 1)
@@ -244,3 +275,7 @@ def test_array_argument_buffer():
     assert isinstance(result, np.ndarray)
     expected = np.array([point.buffer(d) for d in distances], dtype=object)
     assert_geometries_equal(result, expected)
+
+    # check scalar
+    result = point.buffer(distances[0])
+    assert isinstance(result, Polygon)

{shapely-2.0.5 → shapely-2.0.7}/shapely/tests/legacy/test_operations.py

@@ -3,6 +3,7 @@ import unittest
 import pytest
 
 import shapely
+from shapely import geos_version
 from shapely.errors import TopologicalError
 from shapely.geometry import GeometryCollection, LineString, MultiPoint, Point, Polygon
 from shapely.wkt import loads
@@ -79,8 +80,11 @@ class OperationsTestCase(unittest.TestCase):
             "POLYGON ((40 100, 80 100, 80 60, 40 60, 40 100), (60 60, 80 60, 80 40, 60 40, 60 60))"
         )
         assert not invalid_polygon.is_valid
-        with pytest.raises((TopologicalError, shapely.GEOSException)):
-            invalid_polygon.relate(invalid_polygon)
+        if geos_version < (3, 13, 0):
+            with pytest.raises((TopologicalError, shapely.GEOSException)):
+                invalid_polygon.relate(invalid_polygon)
+        else:  # resolved with RelateNG
+            assert invalid_polygon.relate(invalid_polygon) == "2FFF1FFF2"
 
     def test_hausdorff_distance(self):
         point = Point(1, 1)

{shapely-2.0.5 → shapely-2.0.7}/shapely/tests/legacy/test_predicates.py

@@ -5,6 +5,7 @@ import unittest
 import pytest
 
 import shapely
+from shapely import geos_version
 from shapely.geometry import Point, Polygon
 
 
@@ -67,8 +68,15 @@ class PredicatesTestCase(unittest.TestCase):
             (339, 207),
         ]
 
-        with pytest.raises(shapely.GEOSException):
-            Polygon(p1).within(Polygon(p2))
+        g1 = Polygon(p1)
+        g2 = Polygon(p2)
+        assert not g1.is_valid
+        assert not g2.is_valid
+        if geos_version < (3, 13, 0):
+            with pytest.raises(shapely.GEOSException):
+                g1.within(g2)
+        else:  # resolved with RelateNG
+            assert not g1.within(g2)
 
     def test_relate_pattern(self):
 

{shapely-2.0.5 → shapely-2.0.7}/shapely/tests/test_io.py

@@ -157,6 +157,31 @@ def test_from_wkt_empty(wkt):
     assert shapely.to_wkt(geom) == wkt
 
 
+# WKT from https://github.com/libgeos/geos/blob/main/tests/unit/io/WKBReaderTest.cpp
+@pytest.mark.parametrize(
+    "wkt",
+    (
+        "CIRCULARSTRING(1 3,2 4,3 1)",
+        "COMPOUNDCURVE(CIRCULARSTRING(1 3,2 4,3 1),(3 1,0 0))",
+        "CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0,2 1,2 3,4 3),(4 3,4 5,1 4,0 0)),CIRCULARSTRING(1.7 1,1.4 0.4,1.6 0.4,1.6 0.5,1.7 1))",  # noqa: E501
+        "MULTICURVE((0 0,5 5),COMPOUNDCURVE((-1 -1,0 0),CIRCULARSTRING(0 0,1 1,2 0)),CIRCULARSTRING(4 0,4 4,8 4))",  # noqa: E501
+        "MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(0 0,4 0,4 4,0 4,0 0),(1 1,3 3,3 1,1 1)),((10 10,14 12,11 10,10 10),(11 11,11.5 11,11 11.5,11 11)))",  # noqa: E501
+    ),
+)
+def test_from_wkt_nonlinear_unsupported(wkt):
+    if shapely.geos_version >= (3, 13, 0):
+        with pytest.raises(
+            NotImplementedError,
+            match="Nonlinear geometry types are not currently supported",
+        ):
+            shapely.from_wkt(wkt)
+
+    else:
+        # prior to GEOS 3.13 nonlinear types were rejected by GEOS on read from WKT
+        with pytest.raises(shapely.errors.GEOSException, match="Unknown type"):
+            shapely.from_wkt(wkt)
+
+
 def test_from_wkb():
     expected = shapely.points(1, 1)
     actual = shapely.from_wkb(POINT11_WKB)
@@ -255,6 +280,36 @@ def test_from_wkb_empty(geom):
     assert shapely.to_wkb(geom) == wkb
 
 
+# WKB from https://github.com/libgeos/geos/blob/main/tests/unit/io/WKBReaderTest.cpp
+@pytest.mark.parametrize(
+    "wkb",
+    (
+        # "CIRCULARSTRING(1 3,2 4,3 1)",
+        "010800000003000000000000000000F03F0000000000000840000000000000004000000000000010400000000000000840000000000000F03F",
+        # "COMPOUNDCURVE(CIRCULARSTRING(1 3,2 4,3 1),(3 1,0 0))",
+        "01090000200E16000002000000010800000003000000000000000000F03F0000000000000840000000000000004000000000000010400000000000000840000000000000F03F0102000000020000000000000000000840000000000000F03F00000000000000000000000000000000",
+        # "CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0,2 1,2 3,4 3),(4 3,4 5,1 4,0 0)),CIRCULARSTRING(1.7 1,1.4 0.4,1.6 0.4,1.6 0.5,1.7 1))",  # noqa: E501
+        "010A0000200E1600000200000001090000000200000001080000000500000000000000000000000000000000000000000000000000004000000000000000000000000000000040000000000000F03F00000000000000400000000000000840000000000000104000000000000008400102000000040000000000000000001040000000000000084000000000000010400000000000001440000000000000F03F000000000000104000000000000000000000000000000000010800000005000000333333333333FB3F000000000000F03F666666666666F63F9A9999999999D93F9A9999999999F93F9A9999999999D93F9A9999999999F93F000000000000E03F333333333333FB3F000000000000F03F",
+        # "MULTICURVE((0 0,5 5),COMPOUNDCURVE((-1 -1,0 0),CIRCULARSTRING(0 0,1 1,2 0)),CIRCULARSTRING(4 0,4 4,8 4))",  # noqa: E501
+        "010B000000030000000102000000020000000000000000000000000000000000000000000000000014400000000000001440010900000002000000010200000002000000000000000000F0BF000000000000F0BF0000000000000000000000000000000001080000000300000000000000000000000000000000000000000000000000F03F000000000000F03F00000000000000400000000000000000010800000003000000000000000000104000000000000000000000000000001040000000000000104000000000000020400000000000001040",
+        # "MULTISURFACE(CURVEPOLYGON(CIRCULARSTRING(0 0,4 0,4 4,0 4,0 0),(1 1,3 3,3 1,1 1)),((10 10,14 12,11 10,10 10),(11 11,11.5 11,11 11.5,11 11)))",  # noqa: E501
+        "010C00000002000000010A000000020000000108000000050000000000000000000000000000000000000000000000000010400000000000000000000000000000104000000000000010400000000000000000000000000000104000000000000000000000000000000000010200000004000000000000000000F03F000000000000F03F000000000000084000000000000008400000000000000840000000000000F03F000000000000F03F000000000000F03F01030000000200000004000000000000000000244000000000000024400000000000002C40000000000000284000000000000026400000000000002440000000000000244000000000000024400400000000000000000026400000000000002640000000000000274000000000000026400000000000002640000000000000274000000000000026400000000000002640",
+    ),
+)
+def test_from_wkb_nonlinear_unsupported(wkb):
+    if shapely.geos_version >= (3, 13, 0):
+        with pytest.raises(
+            NotImplementedError,
+            match="Nonlinear geometry types are not currently supported",
+        ):
+            shapely.from_wkb(wkb)
+
+    else:
+        # prior to GEOS 3.13 nonlinear types were rejected by GEOS on read from WKB
+        with pytest.raises(shapely.errors.GEOSException, match="Unknown WKB type"):
+            shapely.from_wkb(wkb)
+
+
 def test_to_wkt():
     point = shapely.points(1, 1)
     actual = shapely.to_wkt(point)

{shapely-2.0.5 → shapely-2.0.7}/shapely/tests/test_strtree.py

@@ -368,39 +368,51 @@ def test_query_with_partially_prepared_inputs(tree):
 
 
 @pytest.mark.parametrize(
-    "predicate",
+    "predicate,expected",
     [
-        # intersects is intentionally omitted; it does not raise an exception
+        pytest.param(
+            "intersects",
+            [1],
+            marks=pytest.mark.xfail(geos_version < (3, 13, 0), reason="GEOS < 3.13"),
+        ),
         pytest.param(
             "within",
+            [],
             marks=pytest.mark.xfail(geos_version < (3, 8, 0), reason="GEOS < 3.8"),
         ),
         pytest.param(
             "contains",
+            [],
             marks=pytest.mark.xfail(geos_version < (3, 8, 0), reason="GEOS < 3.8"),
         ),
-        "overlaps",
-        "crosses",
-        "touches",
+        ("overlaps", []),
+        ("crosses", [1]),
+        ("touches", []),
         pytest.param(
             "covers",
+            [],
             marks=pytest.mark.xfail(geos_version < (3, 8, 0), reason="GEOS < 3.8"),
         ),
         pytest.param(
             "covered_by",
+            [],
             marks=pytest.mark.xfail(geos_version < (3, 8, 0), reason="GEOS < 3.8"),
         ),
         pytest.param(
             "contains_properly",
+            [],
             marks=pytest.mark.xfail(geos_version < (3, 8, 0), reason="GEOS < 3.8"),
         ),
     ],
 )
-def test_query_predicate_errors(tree, predicate):
+def test_query_predicate_errors(tree, predicate, expected):
     with ignore_invalid():
         line_nan = shapely.linestrings([1, 1], [1, float("nan")])
-    with pytest.raises(shapely.GEOSException):
-        tree.query(line_nan, predicate=predicate)
+    if geos_version < (3, 13, 0):
+        with pytest.raises(shapely.GEOSException):
+            tree.query(line_nan, predicate=predicate)
+    else:
+        assert_array_equal(tree.query(line_nan, predicate=predicate), expected)
 
 
 ### predicate == 'intersects'

{shapely-2.0.5 → shapely-2.0.7}/shapely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: shapely
-Version: 2.0.5
+Version: 2.0.7
 Summary: Manipulation and analysis of geometric objects
 Author: Sean Gillies
 Maintainer: Shapely contributors
@@ -22,6 +22,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires-Python: >=3.7
 Description-Content-Type: text/x-rst
@@ -53,12 +54,6 @@ Shapely
    :alt: Github Actions status
    :target: https://github.com/shapely/shapely/actions?query=branch%3Amain
 
-.. Travis CI status -- https://travis-ci.com
-
-.. image:: https://travis-ci.com/shapely/shapely.svg?branch=main
-   :alt: Travis CI status
-   :target: https://travis-ci.com/github/shapely/shapely
-
 .. PyPI
 
 .. image:: https://img.shields.io/pypi/v/shapely.svg

{shapely-2.0.5 → shapely-2.0.7}/src/pygeom.c

@@ -23,6 +23,16 @@ PyObject* GeometryObject_FromGEOS(GEOSGeometry* ptr, GEOSContextHandle_t ctx) {
   if (type_id == -1) {
     return NULL;
   }
+
+  // Nonlinear types (CircularString, CompoundCurve, MultiCurve, CurvePolygon,
+  // MultiSurface are not currently supported
+  // TODO: this can be removed once these types are added to the type registry
+  if (type_id >= 8) {
+    PyErr_Format(PyExc_NotImplementedError,
+                 "Nonlinear geometry types are not currently supported");
+    return NULL;
+  }
+
   PyObject* type_obj = PyList_GET_ITEM(geom_registry[0], type_id);
   if (type_obj == NULL) {
     return NULL;

{shapely-2.0.5 → shapely-2.0.7}/src/ufuncs.c

@@ -2178,7 +2178,7 @@ static void polygonize_func(char** args, const npy_intp* dimensions, const npy_i
 
   GEOS_INIT;
 
-  GEOSGeometry** geoms = malloc(sizeof(void*) * dimensions[1]);
+  const GEOSGeometry** geoms = malloc(sizeof(void*) * dimensions[1]);
   if (geoms == NULL) {
     errstate = PGERR_NO_MALLOC;
     goto finish;