shapely 1.7a2__tar.gz → 1.7a3__tar.gz

{Shapely-1.7a2 → Shapely-1.7a3}/CHANGES.txt

@@ -1,6 +1,20 @@
 Changes
 =======
 
+1.7a3 (2019-12-31)
+------------------
+
+Bug fixes:
+
+- Add /usr/local/lib to the list of directories to be searched for the GEOS
+  shared library (#795).
+- ops.substring now returns a line with coords in end-to-front order when given
+  a start position that is greater than the end position (#628).
+- Implement ``__bool__()`` for geometry base classes so that ``bool(geom)``
+  returns the logical complement of ``geom.is_empty`` (#754).
+- Remove assertion on the number of version-like strings found in the GEOS
+  version string. It could be 2 or 3.
+
 1.7a2 (2019-06-21)
 ------------------
 

{Shapely-1.7a2 → Shapely-1.7a3}/CREDITS.txt

@@ -6,12 +6,12 @@ Shapely is written by:
 * Sean Gillies <sean.gillies@gmail.com>
 * Oliver Tonnhofer <olt@bogosoft.com>
 * Joshua Arnott <josh@snorfalorpagus.net>
-* Mike Toews <mwtoews@gmail.com>
+* Mike Taves <mwtoews@gmail.com>
 * Jacob Wasserman <jwasserman@gmail.com>
 * Aron Bierbaum <aronbierbaum@gmail.com>
 * Allan Adair <allan@rfspot.com>
 * Johannes Schönberger <jschoenberger@demuc.de>
-* georgeouzou <geothrock@gmail.com>
+* George Ouzounoudis <geothrock@gmail.com>
 * Phil Elson <pelson.pub@gmail.com>
 * Howard Butler <hobu.inc@gmail.com>
 * Kelsey Jordahl <kjordahl@enthought.com>
@@ -20,7 +20,7 @@ Shapely is written by:
 * Gabi Davar <grizzly.nyo@gmail.com>
 * Thibault Deutsch <thibault.deutsch@gmail.com>
 * Dave Collins <dave@hopest.net>
-* fredj <frederic.junod@camptocamp.com>
+* Frédéric Junod <frederic.junod@camptocamp.com>
 * Brad Hards <bradh@frogmouth.net>
 * David Baumgold <david@davidbaumgold.com>
 * Henry Walshaw <henry.walshaw@gmail.com>
@@ -49,10 +49,15 @@ Shapely is written by:
 * giumas <gmasetti@ccom.unh.edu>
 * Leandro Lima <leandro@limaesilva.com.br>
 * Maarten Vermeyen <maarten.vermeyen@rwo.vlaanderen.be>
-* joelostblom <joelostblom@users.noreply.github.com>
+* Joel Ostblom <joelostblom@users.noreply.github.com>
 * Marco De Nadai <me@marcodena.it>
 * Johan Euphrosine <proppy@aminche.com>
 * James Gaboardi <jgaboardi@gmail.com>
+* Denis Rykov <rykovd@gmail.com>
+* Zachary Ware <zachary.ware@gmail.com>
+* Pierre PACI <villerupt@gmail.com>
+* Hugo van Kemenade (@hugovk)
+* Juan Luis Cano Rodríguez <juanlu@satellogic.com>
 
 See also: https://github.com/Toblerity/Shapely/graphs/contributors.
 
@@ -63,6 +68,6 @@ Additional help from:
 * Sandro Santilli, Mateusz Loskot, Paul Ramsey, et al (GEOS Project)
 
 Major portions of this work were supported by a grant (for Pleiades_) from the
-U.S. National Endowment for the Humanities (http://www.neh.gov).
+U.S. National Endowment for the Humanities (https://www.neh.gov).
 
-.. _Pleiades: http://pleiades.stoa.org
+.. _Pleiades: https://pleiades.stoa.org

{Shapely-1.7a2/Shapely.egg-info → Shapely-1.7a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Shapely
-Version: 1.7a2
+Version: 1.7a3
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -26,7 +26,7 @@ Description: =======
         
         Shapely is a BSD-licensed Python package for manipulation and analysis of
         planar geometric objects. It is based on the widely deployed `GEOS
-        <http://trac.osgeo.org/geos/>`__ (the engine of `PostGIS
+        <https://trac.osgeo.org/geos/>`__ (the engine of `PostGIS
         <http://postgis.org>`__) and `JTS
         <https://locationtech.github.io/jts/>`__ (from which GEOS is ported)
         libraries. Shapely is not concerned with data formats or coordinate systems,
@@ -53,8 +53,8 @@ Description: =======
         -------------------
         
         Windows users have two good installation options: the wheels at
-        http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely and the 
-        Anaconda platform's `conda-forge <https://conda-forge.github.io/>`__
+        https://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely and the 
+        Anaconda platform's `conda-forge <https://conda-forge.org/>`__
         channel.
         
         OS X and Linux users can get Shapely wheels with GEOS included from the 
@@ -165,7 +165,7 @@ Description: =======
         =======
         
         Questions about using Shapely may be asked on the `GIS StackExchange 
-        <http://gis.stackexchange.com/questions/tagged/shapely>`__ using the "shapely"
+        <https://gis.stackexchange.com/questions/tagged/shapely>`__ using the "shapely"
         tag.
         
         Bugs may be reported at https://github.com/Toblerity/Shapely/issues.
@@ -179,12 +179,12 @@ Description: =======
         * Sean Gillies <sean.gillies@gmail.com>
         * Oliver Tonnhofer <olt@bogosoft.com>
         * Joshua Arnott <josh@snorfalorpagus.net>
-        * Mike Toews <mwtoews@gmail.com>
+        * Mike Taves <mwtoews@gmail.com>
         * Jacob Wasserman <jwasserman@gmail.com>
         * Aron Bierbaum <aronbierbaum@gmail.com>
         * Allan Adair <allan@rfspot.com>
         * Johannes Schönberger <jschoenberger@demuc.de>
-        * georgeouzou <geothrock@gmail.com>
+        * George Ouzounoudis <geothrock@gmail.com>
         * Phil Elson <pelson.pub@gmail.com>
         * Howard Butler <hobu.inc@gmail.com>
         * Kelsey Jordahl <kjordahl@enthought.com>
@@ -193,7 +193,7 @@ Description: =======
         * Gabi Davar <grizzly.nyo@gmail.com>
         * Thibault Deutsch <thibault.deutsch@gmail.com>
         * Dave Collins <dave@hopest.net>
-        * fredj <frederic.junod@camptocamp.com>
+        * Frédéric Junod <frederic.junod@camptocamp.com>
         * Brad Hards <bradh@frogmouth.net>
         * David Baumgold <david@davidbaumgold.com>
         * Henry Walshaw <henry.walshaw@gmail.com>
@@ -222,10 +222,15 @@ Description: =======
         * giumas <gmasetti@ccom.unh.edu>
         * Leandro Lima <leandro@limaesilva.com.br>
         * Maarten Vermeyen <maarten.vermeyen@rwo.vlaanderen.be>
-        * joelostblom <joelostblom@users.noreply.github.com>
+        * Joel Ostblom <joelostblom@users.noreply.github.com>
         * Marco De Nadai <me@marcodena.it>
         * Johan Euphrosine <proppy@aminche.com>
         * James Gaboardi <jgaboardi@gmail.com>
+        * Denis Rykov <rykovd@gmail.com>
+        * Zachary Ware <zachary.ware@gmail.com>
+        * Pierre PACI <villerupt@gmail.com>
+        * Hugo van Kemenade (@hugovk)
+        * Juan Luis Cano Rodríguez <juanlu@satellogic.com>
         
         See also: https://github.com/Toblerity/Shapely/graphs/contributors.
         
@@ -236,14 +241,28 @@ Description: =======
         * Sandro Santilli, Mateusz Loskot, Paul Ramsey, et al (GEOS Project)
         
         Major portions of this work were supported by a grant (for Pleiades_) from the
-        U.S. National Endowment for the Humanities (http://www.neh.gov).
+        U.S. National Endowment for the Humanities (https://www.neh.gov).
         
-        .. _Pleiades: http://pleiades.stoa.org
+        .. _Pleiades: https://pleiades.stoa.org
         
         
         Changes
         =======
         
+        1.7a3 (2019-12-31)
+        ------------------
+        
+        Bug fixes:
+        
+        - Add /usr/local/lib to the list of directories to be searched for the GEOS
+          shared library (#795).
+        - ops.substring now returns a line with coords in end-to-front order when given
+          a start position that is greater than the end position (#628).
+        - Implement ``__bool__()`` for geometry base classes so that ``bool(geom)``
+          returns the logical complement of ``geom.is_empty`` (#754).
+        - Remove assertion on the number of version-like strings found in the GEOS
+          version string. It could be 2 or 3.
+        
         1.7a2 (2019-06-21)
         ------------------
         
@@ -918,12 +937,13 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires: Python (>=2.6)
 Requires: libgeos_c (>=3.3)
 Provides-Extra: test
-Provides-Extra: vectorized
 Provides-Extra: all
+Provides-Extra: vectorized

{Shapely-1.7a2 → Shapely-1.7a3}/README.rst

@@ -16,7 +16,7 @@ Manipulation and analysis of geometric objects in the Cartesian plane.
 
 Shapely is a BSD-licensed Python package for manipulation and analysis of
 planar geometric objects. It is based on the widely deployed `GEOS
-<http://trac.osgeo.org/geos/>`__ (the engine of `PostGIS
+<https://trac.osgeo.org/geos/>`__ (the engine of `PostGIS
 <http://postgis.org>`__) and `JTS
 <https://locationtech.github.io/jts/>`__ (from which GEOS is ported)
 libraries. Shapely is not concerned with data formats or coordinate systems,
@@ -43,8 +43,8 @@ Built distributions
 -------------------
 
 Windows users have two good installation options: the wheels at
-http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely and the 
-Anaconda platform's `conda-forge <https://conda-forge.github.io/>`__
+https://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely and the 
+Anaconda platform's `conda-forge <https://conda-forge.org/>`__
 channel.
 
 OS X and Linux users can get Shapely wheels with GEOS included from the 
@@ -155,7 +155,7 @@ Support
 =======
 
 Questions about using Shapely may be asked on the `GIS StackExchange 
-<http://gis.stackexchange.com/questions/tagged/shapely>`__ using the "shapely"
+<https://gis.stackexchange.com/questions/tagged/shapely>`__ using the "shapely"
 tag.
 
 Bugs may be reported at https://github.com/Toblerity/Shapely/issues.

{Shapely-1.7a2 → Shapely-1.7a3/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Shapely
-Version: 1.7a2
+Version: 1.7a3
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -26,7 +26,7 @@ Description: =======
         
         Shapely is a BSD-licensed Python package for manipulation and analysis of
         planar geometric objects. It is based on the widely deployed `GEOS
-        <http://trac.osgeo.org/geos/>`__ (the engine of `PostGIS
+        <https://trac.osgeo.org/geos/>`__ (the engine of `PostGIS
         <http://postgis.org>`__) and `JTS
         <https://locationtech.github.io/jts/>`__ (from which GEOS is ported)
         libraries. Shapely is not concerned with data formats or coordinate systems,
@@ -53,8 +53,8 @@ Description: =======
         -------------------
         
         Windows users have two good installation options: the wheels at
-        http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely and the 
-        Anaconda platform's `conda-forge <https://conda-forge.github.io/>`__
+        https://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely and the 
+        Anaconda platform's `conda-forge <https://conda-forge.org/>`__
         channel.
         
         OS X and Linux users can get Shapely wheels with GEOS included from the 
@@ -165,7 +165,7 @@ Description: =======
         =======
         
         Questions about using Shapely may be asked on the `GIS StackExchange 
-        <http://gis.stackexchange.com/questions/tagged/shapely>`__ using the "shapely"
+        <https://gis.stackexchange.com/questions/tagged/shapely>`__ using the "shapely"
         tag.
         
         Bugs may be reported at https://github.com/Toblerity/Shapely/issues.
@@ -179,12 +179,12 @@ Description: =======
         * Sean Gillies <sean.gillies@gmail.com>
         * Oliver Tonnhofer <olt@bogosoft.com>
         * Joshua Arnott <josh@snorfalorpagus.net>
-        * Mike Toews <mwtoews@gmail.com>
+        * Mike Taves <mwtoews@gmail.com>
         * Jacob Wasserman <jwasserman@gmail.com>
         * Aron Bierbaum <aronbierbaum@gmail.com>
         * Allan Adair <allan@rfspot.com>
         * Johannes Schönberger <jschoenberger@demuc.de>
-        * georgeouzou <geothrock@gmail.com>
+        * George Ouzounoudis <geothrock@gmail.com>
         * Phil Elson <pelson.pub@gmail.com>
         * Howard Butler <hobu.inc@gmail.com>
         * Kelsey Jordahl <kjordahl@enthought.com>
@@ -193,7 +193,7 @@ Description: =======
         * Gabi Davar <grizzly.nyo@gmail.com>
         * Thibault Deutsch <thibault.deutsch@gmail.com>
         * Dave Collins <dave@hopest.net>
-        * fredj <frederic.junod@camptocamp.com>
+        * Frédéric Junod <frederic.junod@camptocamp.com>
         * Brad Hards <bradh@frogmouth.net>
         * David Baumgold <david@davidbaumgold.com>
         * Henry Walshaw <henry.walshaw@gmail.com>
@@ -222,10 +222,15 @@ Description: =======
         * giumas <gmasetti@ccom.unh.edu>
         * Leandro Lima <leandro@limaesilva.com.br>
         * Maarten Vermeyen <maarten.vermeyen@rwo.vlaanderen.be>
-        * joelostblom <joelostblom@users.noreply.github.com>
+        * Joel Ostblom <joelostblom@users.noreply.github.com>
         * Marco De Nadai <me@marcodena.it>
         * Johan Euphrosine <proppy@aminche.com>
         * James Gaboardi <jgaboardi@gmail.com>
+        * Denis Rykov <rykovd@gmail.com>
+        * Zachary Ware <zachary.ware@gmail.com>
+        * Pierre PACI <villerupt@gmail.com>
+        * Hugo van Kemenade (@hugovk)
+        * Juan Luis Cano Rodríguez <juanlu@satellogic.com>
         
         See also: https://github.com/Toblerity/Shapely/graphs/contributors.
         
@@ -236,14 +241,28 @@ Description: =======
         * Sandro Santilli, Mateusz Loskot, Paul Ramsey, et al (GEOS Project)
         
         Major portions of this work were supported by a grant (for Pleiades_) from the
-        U.S. National Endowment for the Humanities (http://www.neh.gov).
+        U.S. National Endowment for the Humanities (https://www.neh.gov).
         
-        .. _Pleiades: http://pleiades.stoa.org
+        .. _Pleiades: https://pleiades.stoa.org
         
         
         Changes
         =======
         
+        1.7a3 (2019-12-31)
+        ------------------
+        
+        Bug fixes:
+        
+        - Add /usr/local/lib to the list of directories to be searched for the GEOS
+          shared library (#795).
+        - ops.substring now returns a line with coords in end-to-front order when given
+          a start position that is greater than the end position (#628).
+        - Implement ``__bool__()`` for geometry base classes so that ``bool(geom)``
+          returns the logical complement of ``geom.is_empty`` (#754).
+        - Remove assertion on the number of version-like strings found in the GEOS
+          version string. It could be 2 or 3.
+        
         1.7a2 (2019-06-21)
         ------------------
         
@@ -918,12 +937,13 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
 Classifier: Topic :: Scientific/Engineering :: GIS
 Requires: Python (>=2.6)
 Requires: libgeos_c (>=3.3)
 Provides-Extra: test
-Provides-Extra: vectorized
 Provides-Extra: all
+Provides-Extra: vectorized

{Shapely-1.7a2 → Shapely-1.7a3}/Shapely.egg-info/SOURCES.txt

@@ -72,6 +72,7 @@ tests/binascii_hex.txt
 tests/conftest.py
 tests/test_affinity.py
 tests/test_box.py
+tests/test_buffer.py
 tests/test_cga.py
 tests/test_clip_by_rect.py
 tests/test_collection.py
@@ -85,6 +86,7 @@ tests/test_emptiness.py
 tests/test_empty_polygons.py
 tests/test_equality.py
 tests/test_geointerface.py
+tests/test_geometry_base.py
 tests/test_geomseq.py
 tests/test_geos_err_handler.py
 tests/test_getitem.py

Shapely-1.7a3/VERSION.txt

@@ -0,0 +1 @@
+1.7a3

{Shapely-1.7a2 → Shapely-1.7a3}/docs/manual.rst

@@ -118,7 +118,7 @@ Relationships
 The spatial data model is accompanied by a group of natural language
 relationships between geometric objects – `contains`, `intersects`, `overlaps`,
 `touches`, etc. – and a theoretical framework for understanding them using the
-3x3 matrix of the mutual intersections of their component point sets [2]_: the
+3x3 matrix of the mutual intersections of their component point sets [3]_: the
 DE-9IM. A comprehensive review of the relationships in terms of the DE-9IM is
 found in [4]_ and will not be reiterated in this manual.
 
@@ -207,8 +207,8 @@ General Attributes and Methods
 
 .. code-block:: pycon
 
-  >>> print Point(0, 0).geom_type
-  Point
+  >>> Point(0, 0).geom_type
+  'Point'
 
 .. method:: object.distance(other)
 
@@ -1988,13 +1988,22 @@ for `func`.
     from functools import partial
     import pyproj
 
+    proj_in = pyproj.Proj(init='epsg:4326')
+    proj_out = pyproj.Proj(init='epsg:26913')
+
     project = partial(
         pyproj.transform,
-        pyproj.Proj(init='epsg:4326'),
-        pyproj.Proj(init='epsg:26913'))
+        proj_in,
+        proj_out)
 
     g2 = transform(project, g1)
 
+If using `pyproj>=2.1.0` a more performant method would be
+
+.. code-block:: python
+
+    project = pyproj.Transformer.from_proj(proj_in, proj_out).transform
+
 Lambda expressions such as the one in
 
 .. code-block:: python
@@ -2371,6 +2380,29 @@ accessible via :attr:`shapely.__version__`,
   >>> shapely.geos.geos_version_string
   '3.3.0-CAPI-1.7.0'
 
+Polylabel
+---------
+
+.. function:: shapely.ops.polylabel(polygon, tolerance)
+
+  Finds the approximate location of the pole of inaccessibility for a given
+  polygon. Based on Vladimir Agafonkin's polylabel_.
+
+  `New in version 1.6.0`
+
+.. note::
+
+  Prior to 1.7 `polylabel` must be imported from `shapely.algorithms.polylabel`
+  instead of `shapely.ops`.
+
+.. code-block:: pycon
+
+  >>> from shapely.ops import polylabel
+  >>> polygon = LineString([(0, 0), (50, 200), (100, 100), (20, 50),
+  ... (-100, -20), (-150, -200)]).buffer(100)
+  >>> label = polylabel(polygon, tolerance=10)
+  >>> label.wkt
+  'POINT (59.35615556364569 121.8391962974644)'
 
 STR-packed R-tree
 =================
@@ -2447,8 +2479,8 @@ appropriate type, use ``loads()``.
 
   >> from shapely.wkb import dumps, loads
   >>> wkb = dumps(Point(0, 0))
-  >>> print wkb.encode('hex')
-  010100000000000000000000000000000000000000
+  >>> wkb.encode('hex')
+  '010100000000000000000000000000000000000000'
   >>> loads(wkb).wkt
   'POINT (0.0000000000000000 0.0000000000000000)'
 
@@ -2466,10 +2498,10 @@ All of Shapely's geometry types are supported by these functions.
 
   >> from shapely.wkt import dumps, loads
   >> wkt = dumps(Point(0, 0))
-  >>> print wkt
-  POINT (0.0000000000000000 0.0000000000000000)
-  >>> loads(wkt).wkt
+  >>> wkt
   'POINT (0.0000000000000000 0.0000000000000000)'
+  >>> loads(wkt).wkt
+  'POINT (0 0)'
 
 Numpy and Python Arrays
 -----------------------
@@ -2680,12 +2712,8 @@ References
 
 .. _GEOS: https://trac.osgeo.org/geos/
 .. _Java Topology Suite: https://projects.eclipse.org/projects/locationtech.jts
-.. _JTS: https://projects.eclipse.org/projects/locationtech.jts
 .. _PostGIS: http://postgis.refractions.net
-.. _record: https://pypi.org/project/Shapely/
-.. _Open Geospatial Consortium: http://www.opengeospatial.org/
-.. _Davis: https://lin-ear-th-inking.blogspot.com/2007/06/subtleties-of-ogc-covers-spatial.html
-.. _Understanding spatial relations: http://edndoc.esri.com/arcsde/9.1/general_topics/understand_spatial_relations.htm
+.. _Open Geospatial Consortium: https://www.opengeospatial.org/
 .. _Strobl-PDF: https://giswiki.hsr.ch/images/3/3d/9dem_springer.pdf
 .. |Strobl-PDF| replace:: PDF
 .. _JTS-PDF: https://github.com/locationtech/jts/raw/master/doc/JTS%20Technical%20Specs.pdf
@@ -2693,3 +2721,4 @@ References
 .. _frozenset: https://docs.python.org/library/stdtypes.html#frozenset
 .. _Sorting HowTo: https://wiki.python.org/moin/HowTo/Sorting/
 .. _Python geo interface: https://gist.github.com/2217756
+.. _polylabel: https://github.com/mapbox/polylabel

{Shapely-1.7a2 → Shapely-1.7a3}/docs/project.rst

@@ -4,3 +4,4 @@
 
 .. include:: ../CHANGES.txt
 
+.. include:: ../FAQ.rst

{Shapely-1.7a2 → Shapely-1.7a3}/setup.py

@@ -220,9 +220,10 @@ setup_args = dict(
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Scientific/Engineering :: GIS',
     ],
     cmdclass           = {},
@@ -315,25 +316,18 @@ if (platform.python_implementation() == 'PyPy'):
     ext_modules = []
     libraries = []
 
-if os.path.exists("MANIFEST.in"):
-    pyx_file = "shapely/speedups/_speedups.pyx"
-    c_file = "shapely/speedups/_speedups.c"
 
-    force_cython = False
-    if 'sdist' in sys.argv:
-        force_cython = True
+pyx_file = "shapely/speedups/_speedups.pyx"
+c_file = "shapely/speedups/_speedups.c"
 
-    try:
-        if (force_cython or not os.path.exists(c_file)
-                or os.path.getmtime(pyx_file) > os.path.getmtime(c_file)):
-            log.info("Updating C extension with Cython.")
-            subprocess.check_call(["cython", "shapely/speedups/_speedups.pyx"])
-    except (subprocess.CalledProcessError, OSError):
-        log.warn("Could not (re)create C extension with Cython.")
-        if force_cython:
-            raise
-    if not os.path.exists(c_file):
-        log.warn("speedup extension not found")
+force_cython = False
+# Always regenerate for sdist or absent c file
+if 'sdist' in sys.argv or not os.path.exists(c_file):
+    force_cython = True
+# Also regenerate if pyx_file is outdated.
+elif os.path.exists(c_file):
+    if os.path.getmtime(pyx_file) > os.path.getmtime(c_file):
+        force_cython = True
 
 ext_modules = [
     Extension("shapely.speedups._speedups", ["shapely/speedups/_speedups.c"],
@@ -366,6 +360,19 @@ try:
 except ImportError:
     log.info("Numpy or Cython not available, shapely.vectorized submodule "
              "not being built.")
+    force_cython = False
+
+try:
+    if force_cython:
+        log.info("Updating C extension with Cython.")
+        subprocess.check_call(["cython", "shapely/speedups/_speedups.pyx"])
+except (subprocess.CalledProcessError, OSError):
+    log.warn("Could not (re)create C extension with Cython.")
+    if force_cython:
+        raise
+
+if not os.path.exists(c_file):
+    log.warn("speedup extension not found")
 
 try:
     # try building with speedups

Shapely-1.7a3/shapely/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.7a3"

{Shapely-1.7a2 → Shapely-1.7a3}/shapely/_buildcfg.py

@@ -165,7 +165,7 @@ if sys.platform.startswith('linux'):
     if not lgeos:
         lgeos = load_dll('geos_c',
                          fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
-    free = load_dll('c').free
+    free = load_dll('c', fallbacks=['libc.so.6']).free
     free.argtypes = [c_void_p]
     free.restype = None
 
@@ -181,6 +181,8 @@ elif sys.platform == 'darwin':
                 "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
                 # macports
                 '/opt/local/lib/libgeos_c.dylib',
+                # homebrew
+                '/usr/local/lib/libgeos_c.dylib',
             ]
         lgeos = load_dll('geos_c', fallbacks=alt_paths)
 
@@ -239,7 +241,6 @@ def _geos_version():
         geos_version_string = geos_version_string.decode('ascii')
 
     res = re.findall(r'(\d+)\.(\d+)\.(\d+)', geos_version_string)
-    assert len(res) == 2, res
     geos_version = tuple(int(x) for x in res[0])
     capi_version = tuple(int(x) for x in res[1])
 

{Shapely-1.7a2 → Shapely-1.7a3}/shapely/_geos.pxi

@@ -43,6 +43,8 @@ cdef extern from "geos_c.h":
     char GEOSHasZ_r(GEOSContextHandle_t, GEOSGeometry *) nogil
     char GEOSisRing_r(GEOSContextHandle_t, GEOSGeometry *) nogil
     char GEOSisClosed_r(GEOSContextHandle_t, GEOSGeometry *) nogil
+    char GEOSisValid_r(GEOSContextHandle_t, GEOSGeometry *) nogil
+    char GEOSisSimple_r(GEOSContextHandle_t, GEOSGeometry *) nogil
 
 
 cdef GEOSContextHandle_t get_geos_context_handle():

{Shapely-1.7a2 → Shapely-1.7a3}/shapely/affinity.py

@@ -151,8 +151,10 @@ def rotate(geom, angle, origin='center', use_radians=False):
         xoff = x0 - x0 * cos(r) + y0 * sin(r)
         yoff = y0 - x0 * sin(r) - y0 * cos(r)
     """
+    if geom.is_empty:
+        return geom
     if not use_radians:  # convert from degrees
-        angle *= pi/180.0
+        angle = angle * pi/180.0
     cosp = cos(angle)
     sinp = sin(angle)
     if abs(cosp) < 2.5e-16:
@@ -190,6 +192,8 @@ def scale(geom, xfact=1.0, yfact=1.0, zfact=1.0, origin='center'):
         yoff = y0 - y0 * yfact
         zoff = z0 - z0 * zfact
     """
+    if geom.is_empty:
+        return geom
     x0, y0, z0 = interpret_origin(geom, origin, 3)
 
     matrix = (xfact, 0.0, 0.0,
@@ -220,9 +224,11 @@ def skew(geom, xs=0.0, ys=0.0, origin='center', use_radians=False):
         xoff = -y0 * tan(xs)
         yoff = -x0 * tan(ys)
     """
+    if geom.is_empty:
+        return geom
     if not use_radians:  # convert from degrees
-        xs *= pi/180.0
-        ys *= pi/180.0
+        xs = xs * pi/180.0
+        ys = ys * pi/180.0
     tanx = tan(xs)
     tany = tan(ys)
     if abs(tanx) < 2.5e-16:
@@ -248,6 +254,8 @@ def translate(geom, xoff=0.0, yoff=0.0, zoff=0.0):
         | 0  0  1 zoff |
         \ 0  0  0   1  /
     """
+    if geom.is_empty:
+        return geom
     matrix = (1.0, 0.0, 0.0,
               0.0, 1.0, 0.0,
               0.0, 0.0, 1.0,