[Git][debian-gis-team/python-shapely][upstream] New upstream version 1.6.4

Sebastiaan Couwenberg gitlab at salsa.debian.org
Wed Jan 24 17:19:45 UTC 2018


Sebastiaan Couwenberg pushed to branch upstream at Debian GIS Project / python-shapely


Commits:
d777d32c by Bas Couwenberg at 2018-01-24T17:32:13+01:00
New upstream version 1.6.4
- - - - -


5 changed files:

- CHANGES.txt
- docs/manual.rst
- shapely/__init__.py
- shapely/geometry/base.py
- shapely/ops.py


Changes:

=====================================
CHANGES.txt
=====================================
--- 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


=====================================
docs/manual.rst
=====================================
--- 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


=====================================
shapely/__init__.py
=====================================
--- a/shapely/__init__.py
+++ b/shapely/__init__.py
@@ -1 +1 @@
-__version__ = "1.6.3"
+__version__ = "1.6.4"


=====================================
shapely/geometry/base.py
=====================================
--- 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


=====================================
shapely/ops.py
=====================================
--- 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']



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-shapely/commit/d777d32ca11298d07f20c116ac87ccdbe32b5055

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-shapely/commit/d777d32ca11298d07f20c116ac87ccdbe32b5055
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180124/91d71227/attachment-0001.html>


More information about the Pkg-grass-devel mailing list