shapely 1.8.1__tar.gz → 1.8.2__tar.gz

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

@@ -1,6 +1,22 @@
 Changes
 =======
 
+1.8.2 (2022-05-03)
+------------------
+
+- Make Polygons and MultiPolygons closed by definition, like LinearRings.
+  Resolves #1246.
+- Perform frozen app check for GEOS before conda env check on macos as we
+  already do on linux (#1301).
+- Fix leak of GEOS coordinate sequence in nearest_points reported in #1098.
+
+1.8.1.post1 (2022-02-17)
+------------------------
+
+This post-release addresses a defect in the 1.8.1 source distribution. No .c
+files are included in the 1.8.1.post1 sdist and Cython is required to build and
+install from source.
+
 1.8.1 (2022-02-16)
 ------------------
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Shapely
-Version: 1.8.1
+Version: 1.8.2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/shapely/shapely
 Author: Sean Gillies
@@ -332,6 +332,22 @@ U.S. National Endowment for the Humanities (https://www.neh.gov).
 Changes
 =======
 
+1.8.2 (2022-05-03)
+------------------
+
+- Make Polygons and MultiPolygons closed by definition, like LinearRings.
+  Resolves #1246.
+- Perform frozen app check for GEOS before conda env check on macos as we
+  already do on linux (#1301).
+- Fix leak of GEOS coordinate sequence in nearest_points reported in #1098.
+
+1.8.1.post1 (2022-02-17)
+------------------------
+
+This post-release addresses a defect in the 1.8.1 source distribution. No .c
+files are included in the 1.8.1.post1 sdist and Cython is required to build and
+install from source.
+
 1.8.1 (2022-02-16)
 ------------------
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Shapely
-Version: 1.8.1
+Version: 1.8.2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/shapely/shapely
 Author: Sean Gillies
@@ -332,6 +332,22 @@ U.S. National Endowment for the Humanities (https://www.neh.gov).
 Changes
 =======
 
+1.8.2 (2022-05-03)
+------------------
+
+- Make Polygons and MultiPolygons closed by definition, like LinearRings.
+  Resolves #1246.
+- Perform frozen app check for GEOS before conda env check on macos as we
+  already do on linux (#1301).
+- Fix leak of GEOS coordinate sequence in nearest_points reported in #1098.
+
+1.8.1.post1 (2022-02-17)
+------------------------
+
+This post-release addresses a defect in the 1.8.1 source distribution. No .c
+files are included in the 1.8.1.post1 sdist and Cython is required to build and
+install from source.
+
 1.8.1 (2022-02-16)
 ------------------
 

{Shapely-1.8.1 → Shapely-1.8.2}/Shapely.egg-info/SOURCES.txt

@@ -65,7 +65,6 @@ shapely/geometry/point.py
 shapely/geometry/polygon.py
 shapely/geometry/proxy.py
 shapely/speedups/__init__.py
-shapely/speedups/_speedups.c
 shapely/speedups/_speedups.pyx
 shapely/vectorized/__init__.py
 shapely/vectorized/_vectorized.pyx

Shapely-1.8.2/VERSION.txt

@@ -0,0 +1 @@
+1.8.2

Shapely-1.8.2/shapely/__init__.py

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

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

@@ -721,7 +721,7 @@ class BaseGeometry:
         """True if the geometry is closed, else False
 
         Applicable only to 1-D geometries."""
-        if self.geom_type == 'LinearRing':
+        if self.geom_type in {"LinearRing", "Polygon", "MultiPolygon"}:
             return True
         elif self.geom_type == 'LineString':
             if 'is_closed' in self.impl:

{Shapely-1.8.1 → Shapely-1.8.2}/shapely/geos.py

@@ -56,11 +56,12 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE):
                 libname, fallbacks or []))
 
 _lgeos = None
+
+
 def exists_conda_env():
     """Does this module exist in a conda environment?"""
     return os.path.exists(os.path.join(sys.prefix, 'conda-meta'))
 
-
 if sys.platform.startswith('linux'):
     # Test to see if we have a wheel repaired by auditwheel which contains its
     # own libgeos_c. Note: auditwheel 3.1 changed the location of libs.
@@ -127,36 +128,39 @@ elif sys.platform == 'darwin':
             _lgeos = CDLL(geos_whl_dylib[-1])
             LOG.debug("Found GEOS DLL: %r, using it.", _lgeos)
 
+    elif hasattr(sys, "frozen"):
+        try:
+            # .app file from py2app
+            alt_paths = [
+                os.path.join(
+                    os.environ["RESOURCEPATH"], "..", "Frameworks", "libgeos_c.dylib"
+                )
+            ]
+        except KeyError:
+            alt_paths = [
+                # binary from pyinstaller
+                os.path.join(sys.executable, "libgeos_c.dylib"),
+                # .app from cx_Freeze
+                os.path.join(os.path.dirname(sys.executable), "libgeos_c.1.dylib"),
+            ]
+            if hasattr(sys, "_MEIPASS"):
+                alt_paths.append(os.path.join(sys._MEIPASS, "libgeos_c.1.dylib"))
+
     elif exists_conda_env():
         # conda package.
         _lgeos = CDLL(os.path.join(sys.prefix, 'lib', 'libgeos_c.dylib'))
+
     else:
-        if hasattr(sys, 'frozen'):
-            try:
-                # .app file from py2app
-                alt_paths = [os.path.join(
-                    os.environ['RESOURCEPATH'], '..', 'Frameworks',
-                    'libgeos_c.dylib')]
-            except KeyError:
-                alt_paths = [
-                    # binary from pyinstaller
-                    os.path.join(sys.executable, 'libgeos_c.dylib'),
-                    # .app from cx_Freeze
-                    os.path.join(os.path.dirname(sys.executable), 'libgeos_c.1.dylib')]
-                if hasattr(sys, '_MEIPASS'):
-                    alt_paths.append(
-                        os.path.join(sys._MEIPASS, 'libgeos_c.1.dylib'))
-        else:
-            alt_paths = [
-                # The Framework build from Kyng Chaos
-                "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
-                # macports
-                '/opt/local/lib/libgeos_c.dylib',
-                # homebrew Intel
-                '/usr/local/lib/libgeos_c.dylib',
-                # homebrew Apple Silicon
-                '/opt/homebrew/lib/libgeos_c.dylib',
-            ]
+        alt_paths = [
+            # The Framework build from Kyng Chaos
+            "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
+            # macports
+            "/opt/local/lib/libgeos_c.dylib",
+            # homebrew Intel
+            "/usr/local/lib/libgeos_c.dylib",
+            # homebrew Apple Silicon
+            "/opt/homebrew/lib/libgeos_c.dylib",
+        ]
         _lgeos = load_dll('geos_c', fallbacks=alt_paths)
 
     free = CDLL(None).free
@@ -165,8 +169,10 @@ elif sys.platform == 'darwin':
 
 elif sys.platform == 'win32':
     _conda_dll_path = os.path.join(sys.prefix, 'Library', 'bin', 'geos_c.dll')
+
     if exists_conda_env() and os.path.exists(_conda_dll_path):
         _lgeos = CDLL(_conda_dll_path)
+
     else:
         geos_whl_dll = glob.glob(
             os.path.abspath(
@@ -181,6 +187,7 @@ elif sys.platform == 'win32':
             # CDLL(geos_whl_so[0])
             _lgeos = CDLL(geos_whl_dll[-1])
             LOG.debug("Found GEOS DLL: %r, using it.", _lgeos)
+
         else:
             try:
                 egg_dlls = os.path.abspath(

{Shapely-1.8.1 → Shapely-1.8.2}/shapely/ops.py

@@ -336,14 +336,19 @@ def nearest_points(g1, g2):
             raise ValueError('The first input geometry is empty')
         else:
             raise ValueError('The second input geometry is empty')
-    x1 = c_double()
-    y1 = c_double()
-    x2 = c_double()
-    y2 = c_double()
-    lgeos.GEOSCoordSeq_getX(seq, 0, byref(x1))
-    lgeos.GEOSCoordSeq_getY(seq, 0, byref(y1))
-    lgeos.GEOSCoordSeq_getX(seq, 1, byref(x2))
-    lgeos.GEOSCoordSeq_getY(seq, 1, byref(y2))
+
+    try:
+        x1 = c_double()
+        y1 = c_double()
+        x2 = c_double()
+        y2 = c_double()
+        lgeos.GEOSCoordSeq_getX(seq, 0, byref(x1))
+        lgeos.GEOSCoordSeq_getY(seq, 0, byref(y1))
+        lgeos.GEOSCoordSeq_getX(seq, 1, byref(x2))
+        lgeos.GEOSCoordSeq_getY(seq, 1, byref(y2))
+    finally:
+        lgeos._lgeos.GEOSCoordSeq_destroy(seq)
+
     p1 = Point(x1.value, y1.value)
     p2 = Point(x2.value, y2.value)
     return (p1, p2)

{Shapely-1.8.1 → Shapely-1.8.2}/tests/test_predicates.py

@@ -1,10 +1,11 @@
-"""Test GEOS predicates
+"""Test GEOS predicates.
 """
 from . import unittest
-from shapely.geometry import Point, Polygon
+from shapely.geometry import LinearRing, MultiPolygon, Point, Polygon
 from shapely.geos import TopologicalError, PredicateError
 import pytest
 
+
 class PredicatesTestCase(unittest.TestCase):
 
     def test_binary_predicates(self):
@@ -64,3 +65,17 @@ class PredicatesTestCase(unittest.TestCase):
         # an invalid pattern should raise an exception
         with pytest.raises(PredicateError):
             g1.relate_pattern(g2, 'fail')
+
+
+@pytest.mark.parametrize(
+    "geom",
+    [
+        Point(0, 0).buffer(1.0).exterior,
+        Point(0, 0).buffer(1.0),
+        MultiPolygon([Point(0, 0).buffer(1.0)]),
+    ],
+)
+def test_polygon_closed(geom):
+    """Polygons and MultiPolygons are closed by definition."""
+    # See gh-1246
+    assert geom.is_closed

Shapely-1.8.1/VERSION.txt

@@ -1 +0,0 @@
-1.8.1

Shapely-1.8.1/shapely/__init__.py

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