[python-shapely] 01/05: New upstream version 1.6.4

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository python-shapely.

commit d777d32ca11298d07f20c116ac87ccdbe32b5055
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jan 24 17:32:13 2018 +0100

    New upstream version 1.6.4
---
 CHANGES.txt              | 9 +++++++--
 docs/manual.rst          | 4 ++--
 shapely/__init__.py      | 2 +-
 shapely/geometry/base.py | 2 +-
 shapely/ops.py           | 3 +--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 393f8c2..98f932c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,13 @@
 Changes
 =======
 
+1.6.4 (2017-01-24)
+------------------
+
+- Handle a ``TypeError`` that can occur when geometries are torn down (#473,
+  #528).
+
+- 
 1.6.3 (2017-12-09)
 ------------------
 
@@ -21,8 +28,6 @@ Changes
 1.6.2 (2017-10-26)
 ------------------
 
-- Handle a ``TypeError`` that can occur when geometries are torn down (#473,
-  #528).
 - Splitting a linestring by one of its end points will now succeed instead of
   failing with a ``ValueError`` (#524, #533).
 - Missing documentation of a geometry's ``overlaps`` predicate has been added
diff --git a/docs/manual.rst b/docs/manual.rst
index 5d934e3..829154d 100644
--- a/docs/manual.rst
+++ b/docs/manual.rst
@@ -2553,8 +2553,8 @@ References
 
 
 .. _GEOS: http://trac.osgeo.org/geos/
-.. _Java Topology Suite: http://www.vividsolutions.com/jts/jtshome.htm
-.. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
+.. _Java Topology Suite: https://www.locationtech.org/projects/technology.jts
+.. _JTS: https://www.locationtech.org/projects/technology.jts
 .. _PostGIS: http://postgis.refractions.net
 .. _record: http://pypi.python.org/pypi/Shapely
 .. _wiki: http://trac.gispython.org/lab/wiki/Shapely
diff --git a/shapely/__init__.py b/shapely/__init__.py
index 31e744e..dc79f8f 100644
--- a/shapely/__init__.py
+++ b/shapely/__init__.py
@@ -1 +1 @@
-__version__ = "1.6.3"
+__version__ = "1.6.4"
diff --git a/shapely/geometry/base.py b/shapely/geometry/base.py
index 4931295..e953501 100644
--- a/shapely/geometry/base.py
+++ b/shapely/geometry/base.py
@@ -225,7 +225,7 @@ class BaseGeometry(object):
         if not self._is_empty and not self._other_owned and self.__geom__:
             try:
                 self._lgeos.GEOSGeom_destroy(self.__geom__)
-            except AttributeError:
+            except (AttributeError, TypeError):
                 pass  # _lgeos might be empty on shutdown
         self._is_empty = True
         self.__geom__ = val
diff --git a/shapely/ops.py b/shapely/ops.py
index 7f6c050..ee9506e 100644
--- a/shapely/ops.py
+++ b/shapely/ops.py
@@ -13,8 +13,7 @@ from ctypes import byref, c_void_p, c_double
 from shapely.geos import lgeos
 from shapely.geometry.base import geom_factory, BaseGeometry
 from shapely.geometry import asShape, asLineString, asMultiLineString, Point, MultiPoint,\
-                             LineString, MultiLineString, Polygon, MultiPolygon, GeometryCollection
-from shapely.algorithms.polylabel import polylabel
+                             LineString, MultiLineString, Polygon, GeometryCollection
 
 __all__ = ['cascaded_union', 'linemerge', 'operator', 'polygonize',
            'polygonize_full', 'transform', 'unary_union', 'triangulate', 'split']

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-shapely.git