shapely 1.2.13__tar.gz → 1.2.15__tar.gz

{Shapely-1.2.13 → Shapely-1.2.15}/CHANGES.txt

@@ -1,10 +1,27 @@
 =======
-CHANGES
+Changes
 =======
 
+1.2.15 (2012-)
+--------------
+- Eliminate numerical sensitivity in a method chaining test (Debian bug
+  #663210).
+- Account for cascaded union of random buffered test points being a polygon
+  or multipolygon (Debian bug #666655).
+- Use Cython to build speedups if it is installed.
+- Avoid stumbling over SVN revision numbers in GEOS C API version strings.
+
+1.2.14 (2012-01-23)
+-------------------
+- A geometry's coords property is now sliceable, yielding a list of coordinate
+  values.
+- Homogeneous collections are now sliceable, yielding a new collection of the
+  same type.
+
 1.2.13 (2011-09-16)
 -------------------
-- Fixed errors in speedups on 32bit systems when GEOS references memory above 2GB.
+- Fixed errors in speedups on 32bit systems when GEOS references memory above
+  2GB.
 - Add shapely.__version__ attribute.
 - Update the manual.
 
@@ -139,9 +156,7 @@ TODO: fill gap here
 - Prototype libgeos_c functions in a way that lets py2exe apps import shapely
   (#189).
 
-=========================
 1.2 Branched (2009-09-19)
-=========================
 
 1.0.12 (2009-04-09)
 -------------------

{Shapely-1.2.13 → Shapely-1.2.15}/CREDITS.txt

@@ -12,6 +12,7 @@ Patches contributed by:
 * Eric Lemoine
 * Jonathan Tartley
 * Kristian Thy
+* Mike Toews (https://github.com/mwtoews)
 
 Additional help from:
 

{Shapely-1.2.13/Shapely.egg-info → Shapely-1.2.15}/PKG-INFO

@@ -1,16 +1,17 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.13
+Version: 1.2.15
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/sgillies/shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
 License: BSD
-Description: =======
-        Shapely
-        =======
+Description: ======
+        README
+        ======
         
-        PostGIS-ish operations outside a database context for Pythoneers and Pythonistas
+        PostGIS-ish operations outside a database context for Pythoneers and
+        Pythonistas.
         
         .. image:: http://farm3.static.flickr.com/2738/4511827859_b5822043b7_o_d.png
         :width: 800
@@ -107,7 +108,7 @@ Description: =======
         Testing
         =======
         
-        Shapely uses a Zope-stye suite of unittests and doctests, excercised via
+        Shapely uses a Zope-stye suite of unittests and doctests, exercised via
         setup.py.::
         
         $ python setup.py test
@@ -118,7 +119,7 @@ Description: =======
         Support
         =======
         
-        Bugs may be reported and questions asked via https://github.com/sgillies/shapely.
+        Bugs may be reported and questions asked via https://github.com/Toblerity/Shapely.
         
         Credits
         =======
@@ -128,22 +129,23 @@ Description: =======
         * Sean Gillies
         * Aron Bierbaum
         * Kai Lautaportti
+        * Oliver Tonnhofer
         
         Patches contributed by:
         
         * Howard Butler
-        * Fr |eacute| d |eacute| ric Junod
-        * |Eacute| ric Lemoine
+        * Frédéric Junod
+        * Éric Lemoine
         * Jonathan Tartley
         * Kristian Thy
-        * Oliver Tonnhofer
+        * Mike Toews (https://github.com/mwtoews)
         
         Additional help from:
         
         * Justin Bronn (GeoDjango) for ctypes inspiration
         * Martin Davis (JTS)
         * Jaakko Salli for the Windows distributions
-        * Sandro Santilli, Mateusz Loskot, Paul Ramsey, et al (GEOS Project)
+        * 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).
@@ -153,20 +155,33 @@ Description: =======
         .. _GEOS: http://trac.osgeo.org/geos/
         .. _example apps: http://trac.gispython.org/lab/wiki/Examples
         .. _wiki: http://trac.gispython.org/lab/wiki/Shapely
-        .. _manual: http://gispython.org/shapely/docs/1.2
-        .. |eacute| unicode:: U+00E9
-        :trim:
-        .. |Eacute| unicode:: U+00C9
-        :trim:
+        .. _manual: http://toblerity.github.com/shapely/manual.html
         .. _Pleiades: http://pleiades.stoa.org
         
+        
+        Changes
         =======
-        CHANGES
-        =======
+        
+        1.2.15 (2012-)
+        --------------
+        - Eliminate numerical sensitivity in a method chaining test (Debian bug
+        #663210).
+        - Account for cascaded union of random buffered test points being a polygon
+        or multipolygon (Debian bug #666655).
+        - Use Cython to build speedups if it is installed.
+        - Avoid stumbling over SVN revision numbers in GEOS C API version strings.
+        
+        1.2.14 (2012-01-23)
+        -------------------
+        - A geometry's coords property is now sliceable, yielding a list of coordinate
+        values.
+        - Homogeneous collections are now sliceable, yielding a new collection of the
+        same type.
         
         1.2.13 (2011-09-16)
         -------------------
-        - Fixed errors in speedups on 32bit systems when GEOS references memory above 2GB.
+        - Fixed errors in speedups on 32bit systems when GEOS references memory above
+        2GB.
         - Add shapely.__version__ attribute.
         - Update the manual.
         
@@ -301,9 +316,7 @@ Description: =======
         - Prototype libgeos_c functions in a way that lets py2exe apps import shapely
         (#189).
         
-        =========================
         1.2 Branched (2009-09-19)
-        =========================
         
         1.0.12 (2009-04-09)
         -------------------

{Shapely-1.2.13 → Shapely-1.2.15}/README.rst

@@ -1,8 +1,9 @@
-=======
-Shapely
-=======
+======
+README
+======
 
-PostGIS-ish operations outside a database context for Pythoneers and Pythonistas
+PostGIS-ish operations outside a database context for Pythoneers and
+Pythonistas.
 
 .. image:: http://farm3.static.flickr.com/2738/4511827859_b5822043b7_o_d.png
    :width: 800
@@ -99,7 +100,7 @@ Numpy arrays can also be adapted to Shapely linestrings::
 Testing
 =======
 
-Shapely uses a Zope-stye suite of unittests and doctests, excercised via
+Shapely uses a Zope-stye suite of unittests and doctests, exercised via
 setup.py.::
 
   $ python setup.py test
@@ -110,7 +111,7 @@ supported well by nose.
 Support
 =======
 
-Bugs may be reported and questions asked via https://github.com/sgillies/shapely.
+Bugs may be reported and questions asked via https://github.com/Toblerity/Shapely.
 
 Credits
 =======
@@ -120,22 +121,23 @@ Shapely is written by:
 * Sean Gillies
 * Aron Bierbaum
 * Kai Lautaportti
+* Oliver Tonnhofer
 
 Patches contributed by:
 
 * Howard Butler
-* Fr |eacute| d |eacute| ric Junod
-* |Eacute| ric Lemoine
+* Frédéric Junod
+* Éric Lemoine
 * Jonathan Tartley
 * Kristian Thy
-* Oliver Tonnhofer
+* Mike Toews (https://github.com/mwtoews)
 
 Additional help from:
 
 * Justin Bronn (GeoDjango) for ctypes inspiration
 * Martin Davis (JTS)
 * Jaakko Salli for the Windows distributions
-* Sandro Santilli, Mateusz Loskot, Paul Ramsey, et al (GEOS Project)
+* 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).
@@ -145,9 +147,6 @@ U.S. National Endowment for the Humanities (http://www.neh.gov).
 .. _GEOS: http://trac.osgeo.org/geos/
 .. _example apps: http://trac.gispython.org/lab/wiki/Examples
 .. _wiki: http://trac.gispython.org/lab/wiki/Shapely
-.. _manual: http://gispython.org/shapely/docs/1.2
-.. |eacute| unicode:: U+00E9
-   :trim:
-.. |Eacute| unicode:: U+00C9
-   :trim:
+.. _manual: http://toblerity.github.com/shapely/manual.html
 .. _Pleiades: http://pleiades.stoa.org
+

{Shapely-1.2.13 → Shapely-1.2.15/Shapely.egg-info}/PKG-INFO

@@ -1,16 +1,17 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.13
+Version: 1.2.15
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/sgillies/shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
 License: BSD
-Description: =======
-        Shapely
-        =======
+Description: ======
+        README
+        ======
         
-        PostGIS-ish operations outside a database context for Pythoneers and Pythonistas
+        PostGIS-ish operations outside a database context for Pythoneers and
+        Pythonistas.
         
         .. image:: http://farm3.static.flickr.com/2738/4511827859_b5822043b7_o_d.png
         :width: 800
@@ -107,7 +108,7 @@ Description: =======
         Testing
         =======
         
-        Shapely uses a Zope-stye suite of unittests and doctests, excercised via
+        Shapely uses a Zope-stye suite of unittests and doctests, exercised via
         setup.py.::
         
         $ python setup.py test
@@ -118,7 +119,7 @@ Description: =======
         Support
         =======
         
-        Bugs may be reported and questions asked via https://github.com/sgillies/shapely.
+        Bugs may be reported and questions asked via https://github.com/Toblerity/Shapely.
         
         Credits
         =======
@@ -128,22 +129,23 @@ Description: =======
         * Sean Gillies
         * Aron Bierbaum
         * Kai Lautaportti
+        * Oliver Tonnhofer
         
         Patches contributed by:
         
         * Howard Butler
-        * Fr |eacute| d |eacute| ric Junod
-        * |Eacute| ric Lemoine
+        * Frédéric Junod
+        * Éric Lemoine
         * Jonathan Tartley
         * Kristian Thy
-        * Oliver Tonnhofer
+        * Mike Toews (https://github.com/mwtoews)
         
         Additional help from:
         
         * Justin Bronn (GeoDjango) for ctypes inspiration
         * Martin Davis (JTS)
         * Jaakko Salli for the Windows distributions
-        * Sandro Santilli, Mateusz Loskot, Paul Ramsey, et al (GEOS Project)
+        * 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).
@@ -153,20 +155,33 @@ Description: =======
         .. _GEOS: http://trac.osgeo.org/geos/
         .. _example apps: http://trac.gispython.org/lab/wiki/Examples
         .. _wiki: http://trac.gispython.org/lab/wiki/Shapely
-        .. _manual: http://gispython.org/shapely/docs/1.2
-        .. |eacute| unicode:: U+00E9
-        :trim:
-        .. |Eacute| unicode:: U+00C9
-        :trim:
+        .. _manual: http://toblerity.github.com/shapely/manual.html
         .. _Pleiades: http://pleiades.stoa.org
         
+        
+        Changes
         =======
-        CHANGES
-        =======
+        
+        1.2.15 (2012-)
+        --------------
+        - Eliminate numerical sensitivity in a method chaining test (Debian bug
+        #663210).
+        - Account for cascaded union of random buffered test points being a polygon
+        or multipolygon (Debian bug #666655).
+        - Use Cython to build speedups if it is installed.
+        - Avoid stumbling over SVN revision numbers in GEOS C API version strings.
+        
+        1.2.14 (2012-01-23)
+        -------------------
+        - A geometry's coords property is now sliceable, yielding a list of coordinate
+        values.
+        - Homogeneous collections are now sliceable, yielding a new collection of the
+        same type.
         
         1.2.13 (2011-09-16)
         -------------------
-        - Fixed errors in speedups on 32bit systems when GEOS references memory above 2GB.
+        - Fixed errors in speedups on 32bit systems when GEOS references memory above
+        2GB.
         - Add shapely.__version__ attribute.
         - Update the manual.
         
@@ -301,9 +316,7 @@ Description: =======
         - Prototype libgeos_c functions in a way that lets py2exe apps import shapely
         (#189).
         
-        =========================
         1.2 Branched (2009-09-19)
-        =========================
         
         1.0.12 (2009-04-09)
         -------------------

{Shapely-1.2.13 → Shapely-1.2.15}/Shapely.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ CHANGES.txt
 CREDITS.txt
 LICENSE.txt
 README.rst
+VERSION.txt
 setup.cfg
 setup.py
 Shapely.egg-info/PKG-INFO
@@ -44,7 +45,6 @@ shapely/geometry/polygon.py
 shapely/geometry/proxy.py
 shapely/speedups/__init__.py
 shapely/speedups/_speedups.c
-shapely/speedups/_speedups.pyx
 shapely/tests/Array.txt
 shapely/tests/GeoInterface.txt
 shapely/tests/IterOps.txt
@@ -74,8 +74,10 @@ shapely/tests/test_doctests.py
 shapely/tests/test_emptiness.py
 shapely/tests/test_equality.py
 shapely/tests/test_geomseq.py
+shapely/tests/test_getitem.py
 shapely/tests/test_linear_referencing.py
 shapely/tests/test_mapping.py
+shapely/tests/test_ndarrays.py
 shapely/tests/test_prepared.py
 shapely/tests/test_products_z.py
 shapely/tests/test_singularity.py

Shapely-1.2.15/VERSION.txt

@@ -0,0 +1 @@
+1.2.15

{Shapely-1.2.13 → Shapely-1.2.15}/docs/manual.txt

@@ -1,10 +1,12 @@
+.. _manual:
+
 =======================
 The Shapely User Manual
 =======================
 
 :Author: Sean Gillies, <sean.gillies@gmail.com>
-:Revision: 1.2.13
-:Date: 15 September 2011
+:Revision: 1.2.14
+:Date: 21 January 2012
 :Copyright: 
   This work is licensed under a `Creative Commons Attribution 3.0
   United States License`__.
@@ -15,8 +17,6 @@ The Shapely User Manual
   This document explains how to use the Shapely Python package for
   computational geometry.
 
-.. sectnum::
-
 .. _intro:
 
 Introduction
@@ -267,6 +267,13 @@ Coordinate values are accessed via `coords`, `x`, `y`, and `z` properties.
   >>> point.y
   0.0
 
+Coordinates may also be sliced. `New in version 1.2.14`.
+
+.. sourcecode:: pycon
+
+  >>> point.coords[:]
+  [(0.0, 0.0)]
+
 The `Point` constructor also accepts another `Point` instance, thereby making
 a copy.
 
@@ -323,6 +330,15 @@ The defining coordinate values are accessed via the `coords` property.
   >>> list(line.coords)
   [(0.0, 0.0), (1.0, 1.0)]
 
+Coordinates may also be sliced. `New in version 1.2.14`.
+
+.. sourcecode:: pycon
+
+  >>> point.coords[:]
+  [(0.0, 0.0), (1.0, 1.0)]
+  >>> point.coords[1:]
+  [(1.0, 1.0)]
+
 The constructor also accepts another `LineString` instance, thereby making a
 copy.
 
@@ -509,12 +525,11 @@ To obtain a polygon with a known orientation, use
 Collections
 -----------
 
-Shapely provides frozenset_-like, immutable collections of geometric objects.
-The collections may be homogeneous (`MultiPoint` etc.) or heterogeneous.
-
 Heterogeneous collections of geometric objects may result from some Shapely
 operations. For example, two `LineStrings` may intersect along a line and at a
-point.
+point. To represent these kind of results, Shapely provides frozenset_-like,
+immutable collections of geometric objects.  The collections may be homogeneous
+(`MultiPoint` etc.) or heterogeneous.
 
 .. sourcecode:: python
 
@@ -547,6 +562,22 @@ the iterator protocol using ``in``  or ``list()``.
   [<shapely.geometry.point.Point object at 0x...>,
    <shapely.geometry.linestring.LineString object at 0x...>]
 
+Homogeneous collections can also be sliced, resulting in a new object of the
+same type.
+
+.. sourcecode:: pycon 
+
+  >>> from shapely.geometry import MultiPoint
+  >>> m = MultiPoint([(0, 0), (1, 1), (1,2), (2,2)])
+  >>> m[:1].wkt
+  'MULTIPOINT (0.0000000000000000 0.0000000000000000)'
+  >>> m[3:].wkt
+  'MULTIPOINT (2.0000000000000000 2.0000000000000000)'
+  >>> m[4:].wkt
+  'GEOMETRYCOLLECTION EMPTY'
+
+`New in version 1.2.14`.
+
 .. note::
   
   When possible, it is better to use one of the homogeneous collection types
@@ -1824,7 +1855,7 @@ Conclusion
 We hope that you will enjoy and profit from using Shapely. Questions and
 comments are welcome on the GIS-Python email list_. This manual will be updated
 and improved regularly. Its source is available at
-http://github.com/sgillies/shapely/tree/master/docs/. 
+http://github.com/Toblerity/Shapely/tree/master/docs/. 
 
 
 References
@@ -1857,7 +1888,7 @@ References
    1973, pp. 112-122.
 
 
-.. _GEOS: http://geos.refractions.net
+.. _GEOS: http://trac.osgeo.org/geos/
 .. _Java Topology Suite: http://www.vividsolutions.com/jts/jtshome.htm
 .. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
 .. _PostGIS: http://postgis.refractions.net

{Shapely-1.2.13 → Shapely-1.2.15}/setup.py

@@ -1,4 +1,3 @@
-import glob
 import warnings
 
 try:
@@ -11,19 +10,35 @@ except:
 
 from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
+import glob
+import os
+import platform
 from setuptools.extension import Extension
-from setuptools.command.build_ext import build_ext
 from setuptools import setup, find_packages
+import subprocess
 import sys
-import platform
 
-readme_text = file('README.rst', 'rb').read()
-changes_text = file('CHANGES.txt', 'rb').read()
+# Parse the version from the shapely module
+for line in open('shapely/__init__.py', 'rb'):
+    if line.find("__version__") >= 0:
+        version = line.split("=")[1].strip()
+        version = version.strip('"')
+        version = version.strip("'")
+        continue
+
+open('VERSION.txt', 'wb').write(version)
+
+readme_text = open('README.rst', 'rb').read()
+
+# Skip the first line of the changes file to get the right header level
+f = open('CHANGES.txt', 'rb')
+f.readline()
+changes_text = f.read()
 
 setup_args = dict(
     metadata_version    = '1.2',
     name                = 'Shapely',
-    version             = '1.2.13',
+    version             = version,
     requires_python     = '>=2.5,<3',
     requires_external   = 'libgeos_c (>=3.1)', 
     description         = 'Geometric objects, predicates, and operations',
@@ -77,41 +92,53 @@ else:
 class BuildFailed(Exception):
     pass
 
-class ve_build_ext(build_ext):
-    # This class allows C extension building to fail.
-
-    def run(self):
-        try:
-            build_ext.run(self)
-        except DistutilsPlatformError, x:
-            raise BuildFailed(x)
-
-    def build_extension(self, ext):
-        try:
-            build_ext.build_extension(self, ext)
-        except ext_errors, x:
-            raise BuildFailed(x)
-
-if sys.platform == 'win32':
-    # geos DLL is geos.dll instead of geos_c.dll on Windows
-    ext_modules = [
-        Extension("shapely.speedups._speedups",
-              ["shapely/speedups/_speedups.c"], libraries=['geos']),
-    ]
-elif (hasattr(platform, 'python_implementation') 
+try:
+    # try to use Cython if present
+    from Cython.Distutils import build_ext
+except ImportError:
+    # else try to build from existing .c file
+    from setuptools.command.build_ext import build_ext as distutils_build_ext
+
+    class build_ext(distutils_build_ext):
+        # This class allows C extension building to fail.
+
+        def run(self):
+            try:
+                distutils_build_ext.run(self)
+            except DistutilsPlatformError, x:
+                raise BuildFailed(x)
+
+        def build_extension(self, ext):
+            try:
+                distutils_build_ext.build_extension(self, ext)
+            except ext_errors, x:
+                raise BuildFailed(x)
+
+if (hasattr(platform, 'python_implementation') 
     and platform.python_implementation() == 'PyPy'):
-    # python_implementation >= 2.6
+    # python_implementation is only available since 2.6
     ext_modules = []
-else:
-    ext_modules = [
-        Extension("shapely.speedups._speedups", 
-              ["shapely/speedups/_speedups.c"], libraries=['geos_c']),
-    ]
 
+elif sys.platform == 'win32':
+    libraries = ['geos']
+else:
+    libraries = ['geos_c']
+
+if os.path.exists("MANIFEST.in"):
+    subprocess.check_call(["cython", "shapely/speedups/_speedups.pyx"])
+    if not os.path.exists("shapely/speedups/_speedups.c"):
+        raise RuntimeError("Failed to generate C extension from PYX")
+
+ext_modules = [
+    Extension(
+        "shapely.speedups._speedups",
+        ["shapely/speedups/_speedups.c"],
+        libraries=libraries )]
+    
 try:
     # try building with speedups
     setup(
-        cmdclass={'build_ext': ve_build_ext},
+        cmdclass={'build_ext': build_ext},
         ext_modules=ext_modules,
         **setup_args
     )

Shapely-1.2.15/shapely/__init__.py

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