Merge branch 'maint-1.7'

sgillies · sgillies · commit d1ad37cab7c5 · 2020-08-20T17:37:43.000-06:00
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,14 @@
+<allan.m.adair@gmail.com> <allan@rfspot.com>
+Aron Bierbaum <aronbierbaum@gmail.com> aronbierbaum <aronbierbaum@b426a367-1105-0410-b9ff-cdf4ab011145>
+Filipe Fernandes <ocefpaf@gmail.com>
+Sean Gillies <sean.gillies@gmail.com>
+Sean Gillies <sean.gillies@gmail.com> Sean Gillies <sean@mapbox.com>
+Sean Gillies <sean.gillies@gmail.com> Sean C. Gillies <sean@mapbox.com>
+Sean Gillies <sean.gillies@gmail.com> Sean Gillies <seang@krusty-2.local>
+Sean Gillies <sean.gillies@gmail.com> seang <seang@b426a367-1105-0410-b9ff-cdf4ab011145>
+Mike Taves <mwtoews@gmail.com>
+Mike Taves <mwtoews@gmail.com> Mike Toews <mwtoews@debian.(none)>
+Frédéric Junod <frederic.junod@camptocamp.com>
+Kai Lautaportti <dokai@b426a367-1105-0410-b9ff-cdf4ab011145>
+<wursterk@gmail.com> <kevin@skytruth.org>
+<kveretennicov@gmail.com> <kveretennicov+github@gmail.com>
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -6,12 +6,20 @@ Changes
 
 New features:
 
-- shapely.ops.voronoi_diagram() computes the Voronoi Diagram of a geometry or geometry collection (#833, #851).
+- shapely.ops.voronoi_diagram() computes the Voronoi Diagram of a geometry or
+  geometry collection (#833, #851).
 - shapely.validation.make_valid() fixes invalid geometries (#883)
 
-1.7.1 (TBD)
------------
+1.7.1 (2020-08-20)
+------------------
 
+- ``STRtree`` now safely implements the pickle protocol (#915).
+- Documentation has been added for ``minimum_clearance`` (#875, #874).
+- In ``STRtree.__del__()`` we guard against calling ``GEOSSTRtree_destroy``
+  when the lgeos module has already been torn down on exit (#897, #830).
+- Documentation for the ``overlaps()`` method has been corrected (#920).
+- Correct the test in ``shapely.geometry.base.BaseGeometry.empty()`` to
+  eliminate memory leaks like the one reported in #745.
 - Get free() not from libc but from the processes global symbols (#891),
   fixing a bug that manifests on OS X 10.15 and 10.16.
 - Extracting substrings from complex lines has been made more correct (#848,
@@ -22,6 +30,7 @@ New features:
 - Improved documentation of STRtree usage (#857).
 - Improved handling for empty list or list of lists in GeoJSON coordinates
   (#852).
+- The polylabel algorithm now accounts for polygon holes (#851, #817).
 
 1.7.0 (2020-01-28)
 ------------------
diff --git a/CREDITS.txt b/CREDITS.txt
@@ -8,6 +8,7 @@ Shapely is written by:
 * Andy Freeland <andy@andyfreeland.net>
 * Ariel Kadouri <ariel@arielsartistry.com>
 * Aron Bierbaum <aronbierbaum@gmail.com>
+* Bart Broere <2715782+bartbroere@users.noreply.github.com>
 * Bas Couwenberg <sebastic@xs4all.nl>
 * Benjamin Root <ben.v.root@gmail.com>
 * BertrandGervais <bertrand.gervais.pro@gmail.com>
@@ -16,6 +17,7 @@ Shapely is written by:
 * Chad Hawkins <cwh@chadwhawkins.com>
 * Christian Prior <cprior@gmail.com>
 * Christian Quest <github@cquest.org>
+* Christophe Pradal <christophe.pradal@inria.fr>
 * Daniele Esposti <expobrain@users.noreply.github.com>
 * Dave Collins <dave@hopest.net>
 * David Baumgold <david@davidbaumgold.com>
@@ -24,6 +26,7 @@ Shapely is written by:
 * Erwin Sterrenburg <e.w.sterrenburg@gmail.com>
 * Felix Yan <felixonmars@archlinux.org>
 * Filipe Fernandes <ocefpaf@gmail.com>
+* Frédéric Junod <frederic.junod@camptocamp.com>
 * Gabi Davar <grizzly.nyo@gmail.com>
 * Gerrit Holl <gerrit.holl@dwd.de>
 * Hannes <kannes@users.noreply.github.com>
@@ -40,22 +43,28 @@ Shapely is written by:
 * Jamie Hall <jamie1212@gmail.com>
 * Jason Sanford <jason.sanford@mapmyfitness.com>
 * Jeethu Rao <jeethu@jeethurao.com>
+* Jeremiah England <34973839+Jeremiah-England@users.noreply.github.com>
 * Jinkun Wang <mejkunw@gmail.com>
 * Johan Euphrosine <proppy@aminche.com>
 * Johannes Schönberger <jschoenberger@demuc.de>
 * Jonathan Schoonhoven <jschoonhoven@lyft.com>
 * Joris Van den Bossche <jorisvandenbossche@gmail.com>
 * Joshua Arnott <josh@snorfalorpagus.net>
 * Juan Luis Cano Rodríguez <juanlu@satellogic.com>
+* Kai Lautaportti <dokai@b426a367-1105-0410-b9ff-cdf4ab011145>
 * Kelsey Jordahl <kjordahl@enthought.com>
 * Kevin Wurster <wursterk@gmail.com>
+* Konstantin Veretennicov <kveretennicov@gmail.com>
+* Koshy Thomas <koshy1123@gmail.com>
 * Kristian Evers <kristianevers@gmail.com>
+* Kyle Barron <kylebarron2@gmail.com>
 * Leandro Lima <leandro@limaesilva.com.br>
 * Lukasz <uhho@users.noreply.github.com>
 * Luke Lee <durdenmisc@gmail.com>
 * Maarten Vermeyen <maarten.vermeyen@rwo.vlaanderen.be>
 * Marc Jansen <jansen@terrestris.de>
 * Marco De Nadai <me@marcodena.it>
+* Mathieu <mathieu.nivel@gmail.com>
 * Matt Amos <matt.amos@mapzen.com>
 * Michel Blancard <michel.blancard@data.gouv.fr>
 * Mike Taves <mwtoews@gmail.com>
@@ -67,6 +76,7 @@ Shapely is written by:
 * Phil Elson <pelson.pub@gmail.com>
 * Pierre PACI <villerupt@gmail.com>
 * Ricardo Zilleruelo <51384295+zetaatlyft@users.noreply.github.com>
+* S Murthy <sr-murthy@users.noreply.github.com>
 * Sampo Syrjanen <sampo.syrjanen@here.com>
 * Samuel Chin <samuelchin91@gmail.com>
 * Sean Gillies <sean.gillies@gmail.com>
@@ -76,17 +86,15 @@ Shapely is written by:
 * Taro Matsuzawa aka. btm <btm@tech.email.ne.jp>
 * Thibault Deutsch <thibault.deutsch@gmail.com>
 * Thomas Kluyver <takowl@gmail.com>
-* Tom Caruso <carusot42@gmail.com>
 * Tobias Sauerwein <tobias.sauerwein@camptocamp.com>
+* Tom Caruso <carusot42@gmail.com>
 * Tom Clancy <17627475+clncy@users.noreply.github.com>
 * WANG Aiyong <gepcelway@gmail.com>
 * Will May <williamcmay@live.com>
 * Zachary Ware <zachary.ware@gmail.com>
 * cclauss <cclauss@me.com>
 * clefrks <33859587+clefrks@users.noreply.github.com>
 * davidh-ssec <david.hoese@ssec.wisc.edu>
-* dokai <dokai@b426a367-1105-0410-b9ff-cdf4ab011145>
-* fredj <frederic.junod@camptocamp.com>
 * georgeouzou <geothrock@gmail.com>
 * giumas <gmasetti@ccom.unh.edu>
 * joelostblom <joelostblom@users.noreply.github.com>
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,4 +1,4 @@
-cython==0.29.14
+cython==0.29.21
 descartes==1.0.1
 matplotlib
 numpy>=1.4.1
diff --git a/shapely/geometry/base.py b/shapely/geometry/base.py
@@ -9,6 +9,7 @@
 from binascii import a2b_hex
 from ctypes import pointer, c_size_t, c_char_p, c_void_p
 from itertools import islice
+import logging
 import math
 import sys
 from warnings import warn
@@ -22,6 +23,7 @@
 from shapely.geos import lgeos
 from shapely.impl import DefaultImplementation, delegated
 
+log = logging.getLogger(__name__)
 
 try:
     import numpy as np
@@ -213,13 +215,13 @@ class BaseGeometry(object):
     _lgeos = lgeos
 
     def empty(self, val=EMPTY):
-        # TODO: defer cleanup to the implementation. We shouldn't be
-        # explicitly calling a lgeos method here.
-        if not self._is_empty and not self._other_owned and self.__geom__:
+        if not self._other_owned and self.__geom__ and self.__geom__ != EMPTY:
             try:
                 self._lgeos.GEOSGeom_destroy(self.__geom__)
             except (AttributeError, TypeError):
-                pass  # _lgeos might be empty on shutdown
+                # _lgeos might be empty on shutdown
+                log.exception("Failed to delete GEOS geom")
+
         self._is_empty = True
         self.__geom__ = val
 
diff --git a/shapely/geos.py b/shapely/geos.py
@@ -64,8 +64,13 @@ def exists_conda_env():
 if sys.platform.startswith('linux'):
     # Test to see if we have a wheel repaired by 'auditwheel' containing its
     # own libgeos_c
-    geos_whl_so = glob.glob(os.path.abspath(os.path.join(os.path.dirname(
-        __file__), '.libs/libgeos_c-*.so.*')))
+    geos_whl_so = glob.glob(
+        os.path.abspath(
+            os.path.join(
+                os.path.dirname(__file__), ".libs/libgeos_c-*.so.*"
+            )
+        )
+    )
     if len(geos_whl_so) == 1:
         _lgeos = CDLL(geos_whl_so[0])
         LOG.debug("Found GEOS DLL: %r, using it.", _lgeos)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cython==0.29.14`
	`1`	`+cython==0.29.21`
`2`	`2`	`descartes==1.0.1`
`3`	`3`	`matplotlib`
`4`	`4`	`numpy>=1.4.1`