shapely 1.8.2__tar.gz → 1.8.4__tar.gz

{Shapely-1.8.2 → Shapely-1.8.4}/CHANGES.txt

@@ -1,6 +1,38 @@
 Changes
 =======
 
+1.8.4 (2022-08-17)
+------------------
+
+Bug fixes:
+
+- The new c_geom_p type caused a regression and has been removed (#1487).
+
+1.8.3 (2022-08-16)
+------------------
+
+Deprecations:
+
+The STRtree class will be changed in 2.0.0 and will not be compatible with the
+class in versions 1.8.x. This change obsoletes the deprecation announcement in
+1.8a3 (below).
+
+Packaging:
+
+Wheels for 1.8.3 published on PyPI include GEOS 3.10.3.
+
+Bug fixes:
+
+- The signature for GEOSMinimumClearance has been corrected, fixing an issue
+  affecting aarch64-darwin (#1480)
+- Return and arg types have been corrected and made more strict for area,
+  length, and distance properties.
+- A new c_geom_p type has been created to replace c_void_p when calling GEOS
+  functions (#1479).
+- An incorrect polygon-line intersection (#1427) has been fixed in GEOS 3.10.3,
+  which will be included in wheels published to PyPI.
+- GEOS buffer parameters are now destroyed, fixing a memory leak (#1440).
+
 1.8.2 (2022-05-03)
 ------------------
 
@@ -23,7 +55,7 @@ install from source.
 Packaging:
 
 Wheels for 1.8.1 published on PyPI include GEOS 3.10.2. This version is the
-best version of GDAL yet. Discrepancies in behavior compared to previous
+best version of GEOS yet. Discrepancies in behavior compared to previous
 versions are considered to be improvements.
 
 For the first time, we will publish wheels for macos_arm64 (see PR #1310).

{Shapely-1.8.2/Shapely.egg-info → Shapely-1.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Shapely
-Version: 1.8.2
+Version: 1.8.4
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/shapely/shapely
 Author: Sean Gillies
@@ -9,7 +9,6 @@ Maintainer: Sean Gillies
 Maintainer-email: sean.gillies@gmail.com
 License: BSD
 Keywords: geometry topology gis
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
@@ -332,6 +331,38 @@ U.S. National Endowment for the Humanities (https://www.neh.gov).
 Changes
 =======
 
+1.8.4 (2022-08-17)
+------------------
+
+Bug fixes:
+
+- The new c_geom_p type caused a regression and has been removed (#1487).
+
+1.8.3 (2022-08-16)
+------------------
+
+Deprecations:
+
+The STRtree class will be changed in 2.0.0 and will not be compatible with the
+class in versions 1.8.x. This change obsoletes the deprecation announcement in
+1.8a3 (below).
+
+Packaging:
+
+Wheels for 1.8.3 published on PyPI include GEOS 3.10.3.
+
+Bug fixes:
+
+- The signature for GEOSMinimumClearance has been corrected, fixing an issue
+  affecting aarch64-darwin (#1480)
+- Return and arg types have been corrected and made more strict for area,
+  length, and distance properties.
+- A new c_geom_p type has been created to replace c_void_p when calling GEOS
+  functions (#1479).
+- An incorrect polygon-line intersection (#1427) has been fixed in GEOS 3.10.3,
+  which will be included in wheels published to PyPI.
+- GEOS buffer parameters are now destroyed, fixing a memory leak (#1440).
+
 1.8.2 (2022-05-03)
 ------------------
 
@@ -354,7 +385,7 @@ install from source.
 Packaging:
 
 Wheels for 1.8.1 published on PyPI include GEOS 3.10.2. This version is the
-best version of GDAL yet. Discrepancies in behavior compared to previous
+best version of GEOS yet. Discrepancies in behavior compared to previous
 versions are considered to be improvements.
 
 For the first time, we will publish wheels for macos_arm64 (see PR #1310).
@@ -1224,5 +1255,3 @@ TODO: fill gap here
 1.0 RC1 (2008-01-14)
 --------------------
 - First release candidate
-
-

{Shapely-1.8.2 → Shapely-1.8.4/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Shapely
-Version: 1.8.2
+Version: 1.8.4
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/shapely/shapely
 Author: Sean Gillies
@@ -9,7 +9,6 @@ Maintainer: Sean Gillies
 Maintainer-email: sean.gillies@gmail.com
 License: BSD
 Keywords: geometry topology gis
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
@@ -332,6 +331,38 @@ U.S. National Endowment for the Humanities (https://www.neh.gov).
 Changes
 =======
 
+1.8.4 (2022-08-17)
+------------------
+
+Bug fixes:
+
+- The new c_geom_p type caused a regression and has been removed (#1487).
+
+1.8.3 (2022-08-16)
+------------------
+
+Deprecations:
+
+The STRtree class will be changed in 2.0.0 and will not be compatible with the
+class in versions 1.8.x. This change obsoletes the deprecation announcement in
+1.8a3 (below).
+
+Packaging:
+
+Wheels for 1.8.3 published on PyPI include GEOS 3.10.3.
+
+Bug fixes:
+
+- The signature for GEOSMinimumClearance has been corrected, fixing an issue
+  affecting aarch64-darwin (#1480)
+- Return and arg types have been corrected and made more strict for area,
+  length, and distance properties.
+- A new c_geom_p type has been created to replace c_void_p when calling GEOS
+  functions (#1479).
+- An incorrect polygon-line intersection (#1427) has been fixed in GEOS 3.10.3,
+  which will be included in wheels published to PyPI.
+- GEOS buffer parameters are now destroyed, fixing a memory leak (#1440).
+
 1.8.2 (2022-05-03)
 ------------------
 
@@ -354,7 +385,7 @@ install from source.
 Packaging:
 
 Wheels for 1.8.1 published on PyPI include GEOS 3.10.2. This version is the
-best version of GDAL yet. Discrepancies in behavior compared to previous
+best version of GEOS yet. Discrepancies in behavior compared to previous
 versions are considered to be improvements.
 
 For the first time, we will publish wheels for macos_arm64 (see PR #1310).
@@ -1224,5 +1255,3 @@ TODO: fill gap here
 1.0 RC1 (2008-01-14)
 --------------------
 - First release candidate
-
-

Shapely-1.8.4/VERSION.txt

@@ -0,0 +1 @@
+1.8.4

Shapely-1.8.4/pyproject.toml

@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "Cython>=0.29.24,<3",
+    "oldest-supported-numpy",
+    "setuptools<64",
+]

Shapely-1.8.4/shapely/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.8.4"

{Shapely-1.8.2 → Shapely-1.8.4}/shapely/ctypes_declarations.py

@@ -132,6 +132,9 @@ def prototype(lgeos, geos_version):
     lgeos.GEOSBufferParams_create.restype = c_void_p
     lgeos.GEOSBufferParams_create.argtypes = None
 
+    lgeos.GEOSBufferParams_destroy.restype = None
+    lgeos.GEOSBufferParams_destroy.argtypes = [c_void_p]
+
     lgeos.GEOSBufferParams_setEndCapStyle.restype = c_int
     lgeos.GEOSBufferParams_setEndCapStyle.argtypes = [c_void_p, c_int]
 
@@ -393,17 +396,17 @@ def prototype(lgeos, geos_version):
 
     # Misc functions
 
-    lgeos.GEOSArea.restype = c_double
-    lgeos.GEOSArea.argtypes = [c_void_p, c_void_p]
+    lgeos.GEOSArea.restype = c_int
+    lgeos.GEOSArea.argtypes = [c_void_p, POINTER(c_double)]
 
     lgeos.GEOSLength.restype = c_int
-    lgeos.GEOSLength.argtypes = [c_void_p, c_void_p]
+    lgeos.GEOSLength.argtypes = [c_void_p, POINTER(c_double)]
 
     lgeos.GEOSDistance.restype = c_int
-    lgeos.GEOSDistance.argtypes = [c_void_p, c_void_p, c_void_p]
+    lgeos.GEOSDistance.argtypes = [c_void_p, c_void_p, POINTER(c_double)]
 
     lgeos.GEOSHausdorffDistance.restype = c_int
-    lgeos.GEOSHausdorffDistance.argtypes = [c_void_p, c_void_p, c_void_p]
+    lgeos.GEOSHausdorffDistance.argtypes = [c_void_p, c_void_p, POINTER(c_double)]
 
     # Reader and Writer APIs
 
@@ -521,8 +524,8 @@ def prototype(lgeos, geos_version):
             c_void_p, py_object, c_void_p, lgeos.GEOSDistanceCallback, py_object]
         lgeos.GEOSSTRtree_nearest_generic.restype = c_void_p
 
-        lgeos.GEOSMinimumClearance.argtypes = [c_void_p]
-        lgeos.GEOSMinimumClearance.restype = c_double
+        lgeos.GEOSMinimumClearance.argtypes = [c_void_p, POINTER(c_double)]
+        lgeos.GEOSMinimumClearance.restype = c_int
 
     if geos_version >= (3, 8, 0):
         lgeos.GEOSMakeValid.restype = c_void_p

{Shapely-1.8.2 → Shapely-1.8.4}/shapely/geometry/base.py

@@ -625,12 +625,16 @@ class BaseGeometry:
 
         if 'buffer_with_params' in self.impl:
             params = self._lgeos.GEOSBufferParams_create()
-            self._lgeos.GEOSBufferParams_setEndCapStyle(params, cap_style)
-            self._lgeos.GEOSBufferParams_setJoinStyle(params, join_style)
-            self._lgeos.GEOSBufferParams_setMitreLimit(params, mitre_limit)
-            self._lgeos.GEOSBufferParams_setQuadrantSegments(params, res)
-            self._lgeos.GEOSBufferParams_setSingleSided(params, single_sided)
-            return geom_factory(self.impl['buffer_with_params'](self, params, distance))
+            try:
+                self._lgeos.GEOSBufferParams_setEndCapStyle(params, cap_style)
+                self._lgeos.GEOSBufferParams_setJoinStyle(params, join_style)
+                self._lgeos.GEOSBufferParams_setMitreLimit(params, mitre_limit)
+                self._lgeos.GEOSBufferParams_setQuadrantSegments(params, res)
+                self._lgeos.GEOSBufferParams_setSingleSided(params, single_sided)
+                return geom_factory(self.impl['buffer_with_params'](self, params, distance))
+            finally:
+                if params:
+                    self._lgeos.GEOSBufferParams_destroy(params)
 
         if cap_style == CAP_STYLE.round and join_style == JOIN_STYLE.round:
             return geom_factory(self.impl['buffer'](self, distance, res))

{Shapely-1.8.2 → Shapely-1.8.4}/shapely/geometry/proxy.py

@@ -34,14 +34,17 @@ class CachingGeometryProxy:
                 self.__geom__, n = self.factory(self.context)
         self._gtag = gtag
         return self.__geom__
-        
+
     def gtag(self):
         return hash(repr(self.context))
 
     def __setattr__(self, name, value):
         # to override the custom one in BaseGeometry, so we don't warn
         # for the proxy classes, which are already deprecated itself
-        object.__setattr__(self, name, value)
+        try:
+            object.__setattr__(self, name, value)
+        except AttributeError:
+            pass
 
 
 class PolygonProxy(CachingGeometryProxy):

{Shapely-1.8.2 → Shapely-1.8.4}/shapely/strtree.py

@@ -22,7 +22,9 @@ import ctypes
 import logging
 from typing import Any, ItemsView, Iterable, Iterator, Optional, Sequence, Tuple, Union
 import sys
+from warnings import warn
 
+from shapely.errors import ShapelyDeprecationWarning
 from shapely.geometry.base import BaseGeometry
 from shapely.geos import lgeos
 
@@ -97,6 +99,19 @@ class STRtree:
         items: Iterable[Any] = None,
         node_capacity: int = 10,
     ):
+        if items is not None:
+            warn(
+                "STRtree will be changed in 2.0.0 and will not be compatible with versions < 2. "
+                "Specifically: the items keyword argument will be removed.",
+                ShapelyDeprecationWarning,
+                stacklevel=2,
+            )
+        else:
+            warn(
+                "STRtree will be changed in 2.0.0 and will not be compatible with versions < 2.",
+                ShapelyDeprecationWarning,
+                stacklevel=2,
+            )
         self.node_capacity = node_capacity
 
         # Keep references to geoms
@@ -247,8 +262,11 @@ class STRtree:
                 if callback_userdata["exclusive"] and self._geoms[idx].equals(geom2):
                     dist[0] = sys.float_info.max
                 else:
-                    lgeos.GEOSDistance(self._geoms[idx]._geom, geom2._geom, dist)
-                
+                    lgeos.GEOSDistance(
+                        self._geoms[idx]._geom,
+                        geom2._geom,
+                        dist,
+                    )
                 return 1
             except Exception:
                 log.exception("Caught exception")

{Shapely-1.8.2 → Shapely-1.8.4}/shapely/topology.py

@@ -7,7 +7,8 @@ to GEOS functions via ctypes.
 These methods return ctypes objects that should be recast by the caller.
 """
 
-from ctypes import byref, c_double
+from ctypes import byref, cast, c_double
+
 from shapely.geos import TopologicalError, lgeos
 from shapely.errors import InvalidGeometryError
 

{Shapely-1.8.2 → Shapely-1.8.4}/tests/test_geos_err_handler.py

@@ -19,7 +19,8 @@ def test_error_handler_exception(tmpdir):
     with pytest.raises(ReadingError):
         loads('POINT (LOLWUT)')
 
-    log = open(logfile).read()
+    with open(logfile) as fobj:
+        log = fobj.read()
     assert "Expected number but encountered word: 'LOLWUT'" in log
 
 
@@ -33,7 +34,8 @@ def test_error_handler(tmpdir):
     # has *no* conversion specifiers.
     LineString([(0, 0), (2, 2)]).project(LineString([(1, 1), (1.5, 1.5)]))
 
-    log = open(logfile).read()
+    with open(logfile) as fobj:
+        log = fobj.read()
     assert "third argument of GEOSProject_r must be Point" in log
 
 
@@ -57,7 +59,8 @@ def test_info_handler(tmpdir):
     g = loads('MULTIPOLYGON (((10 20, 10 120, 60 70, 30 70, 30 40, 60 40, 60 70, 90 20, 10 20)))')
     assert not g.is_valid
 
-    log = open(logfile).read()
+    with open(logfile) as fobj:
+        log = fobj.read()
     assert "Ring Self-intersection at or near point 60 70" in log
 
 
@@ -71,5 +74,6 @@ def test_info_handler_quiet(tmpdir):
     g = loads('MULTIPOLYGON (((10 20, 10 120, 60 70, 30 70, 30 40, 60 40, 60 70, 90 20, 10 20)))')
     assert not g.is_valid
 
-    log = open(logfile).read()
+    with open(logfile) as fobj:
+        log = fobj.read()
     assert "Ring Self-intersection at or near point 60 70" not in log

{Shapely-1.8.2 → Shapely-1.8.4}/tests/test_linear_referencing.py

@@ -1,5 +1,7 @@
+import pytest
+
 from . import unittest
-from shapely.errors import GeometryTypeError
+from shapely.errors import GeometryTypeError, ShapelyDeprecationWarning
 from shapely.geometry import Point, LineString, MultiLineString
 
 
@@ -28,8 +30,9 @@ class LinearReferencingTestCase(unittest.TestCase):
             self.multiline.project(self.point, normalized=True), 0.125)
 
     def test_not_supported_project(self):
-        with self.assertRaises(GeometryTypeError):
-            self.point.buffer(1.0).project(self.point)
+        with pytest.warns(ShapelyDeprecationWarning):
+            with self.assertRaises(GeometryTypeError):
+                self.point.buffer(1.0).project(self.point)
 
     def test_not_on_line_project(self):
         # Points that aren't on the line project to 0.

{Shapely-1.8.2 → Shapely-1.8.4}/tests/test_parallel_offset.py

@@ -9,9 +9,11 @@ class OperationsTestCase(unittest.TestCase):
         left = line1.parallel_offset(5, 'left')
         self.assertEqual(left, LineString([(0, 5), (10, 5)]))
         right = line1.parallel_offset(5, 'right')
-        self.assertEqual(right, LineString([(10, -5), (0, -5)]))
+        # using spatial equality because the order of coordinates is not guaranteed
+        # (GEOS 3.11 changed this, see https://github.com/shapely/shapely/issues/1436)
+        assert right.equals(LineString([(10, -5), (0, -5)]))
         right = line1.parallel_offset(-5, 'left')
-        self.assertEqual(right, LineString([(10, -5), (0, -5)]))
+        assert right.equals(LineString([(10, -5), (0, -5)]))
         left = line1.parallel_offset(-5, 'right')
         self.assertEqual(left, LineString([(0, 5), (10, 5)]))
 

{Shapely-1.8.2 → Shapely-1.8.4}/tests/test_shared_paths.py

@@ -1,16 +1,19 @@
+import pytest
+
 from . import unittest
 
-from shapely.errors import GeometryTypeError
+from shapely.errors import GeometryTypeError, ShapelyDeprecationWarning
 from shapely.geometry import Point, LineString, Polygon, MultiLineString, \
                              GeometryCollection
 from shapely.ops import shared_paths
 
+
 class SharedPaths(unittest.TestCase):
     def test_shared_paths_forward(self):
         g1 = LineString([(0, 0), (10, 0), (10, 5), (20, 5)])
         g2 = LineString([(5, 0), (15, 0)])
         result = shared_paths(g1, g2)
-        
+
         self.assertTrue(isinstance(result, GeometryCollection))
         self.assertTrue(len(result.geoms) == 2)
         a, b = result.geoms
@@ -23,7 +26,7 @@ class SharedPaths(unittest.TestCase):
         g1 = LineString([(0, 0), (10, 0), (10, 5), (20, 5)])
         g2 = LineString([(15, 0), (5, 0)])
         result = shared_paths(g1, g2)
-        
+
         self.assertTrue(isinstance(result, GeometryCollection))
         self.assertTrue(len(result.geoms) == 2)
         a, b = result.geoms
@@ -31,13 +34,15 @@ class SharedPaths(unittest.TestCase):
         self.assertTrue(len(b.geoms) == 1)
         self.assertEqual(b.geoms[0].coords[:], [(5, 0), (10, 0)])
         self.assertTrue(a.is_empty)
-    
+
     def test_wrong_type(self):
         g1 = Point(0, 0)
         g2 = LineString([(5, 0), (15, 0)])
-        
-        with self.assertRaises(GeometryTypeError):
-            result = shared_paths(g1, g2)
-            
-        with self.assertRaises(GeometryTypeError):
-            result = shared_paths(g2, g1)
+
+        with pytest.warns(ShapelyDeprecationWarning):
+            with self.assertRaises(GeometryTypeError):
+                result = shared_paths(g1, g2)
+
+        with pytest.warns(ShapelyDeprecationWarning):
+            with self.assertRaises(GeometryTypeError):
+                result = shared_paths(g2, g1)