shapely 1.2.10__tar.gz → 1.2.13__tar.gz

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

@@ -2,6 +2,27 @@
 CHANGES
 =======
 
+1.2.13 (2011-09-16)
+-------------------
+- Fixed errors in speedups on 32bit systems when GEOS references memory above 2GB.
+- Add shapely.__version__ attribute.
+- Update the manual.
+
+1.2.12 (2011-08-15)
+-------------------
+- Build Windows distributions with VC7 or VC9 as appropriate.
+- More verbose report on failure to speed up.
+- Fix for prepared geometries broken in 1.2.11.
+- DO NOT INSTALL 1.2.11
+
+1.2.11 (2011-08-04)
+-------------------
+- Ignore AttributeError during exit.
+- PyPy 1.5 support.
+- Prevent operation on prepared geometry crasher (#12).
+- Optional Cython speedups for Windows.
+- Linux 3 platform support.
+
 1.2.10 (2011-05-09)
 -------------------
 - Add optional Cython speedups.

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

@@ -3,6 +3,7 @@ Shapely is written by:
 * Sean Gillies
 * Aron Bierbaum
 * Kai Lautaportti
+* Oliver Tonnhofer
 
 Patches contributed by:
 
@@ -11,7 +12,6 @@ Patches contributed by:
 * Eric Lemoine
 * Jonathan Tartley
 * Kristian Thy
-* Oliver Tonnhofer
 
 Additional help from:
 
@@ -22,3 +22,5 @@ Additional help from:
 
 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).
+
+.. _Pleiades: http://pleiades.stoa.org

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

@@ -1,34 +1,34 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.10
+Version: 1.2.13
 Summary: Geometric objects, predicates, and operations
-Home-page: http://trac.gispython.org/lab/wiki/Shapely
+Home-page: https://github.com/sgillies/shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
 License: BSD
-Description: ======
-        README
-        ======
+Description: =======
+        Shapely
+        =======
+        
+        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
         :height: 400
         
         Shapely is a BSD-licensed Python package for manipulation and analysis of
-        planar geometric objects. It is not concerned with data formats or coordinate
-        systems.  It is based on the widely deployed GEOS_ (the engine of PostGIS_) and
-        JTS_ (from which GEOS is ported) libraries. This C dependency is traded for the
-        ability to execute with blazing speed.
-        
-        In a nutshell: Shapely lets you do PostGIS-ish stuff outside the context of a
-        database using idiomatic Python. For more details, see:
+        planar geometric objects. It is based on the widely deployed GEOS_ (the engine
+        of PostGIS_) and JTS_ (from which GEOS is ported) libraries. This C dependency
+        is traded for the ability to execute with blazing speed. Shapely is not
+        concerned with data formats or coordinate systems, but can be readily
+        integrated with packages that are. For more details, see:
         
         * Shapely wiki_
         * Shapely manual_
         * Shapely `example apps`_
         
         Dependencies
-        ------------
+        ============
         
         Shapely 1.2 depends on:
         
@@ -36,7 +36,7 @@ Description: ======
         * libgeos_c >=3.1 (3.0 and below have not been tested, YMMV)
         
         Installation
-        ------------
+        ============
         
         Windows users should use the executable installer, which contains the required
         GEOS DLL. Other users should acquire libgeos_c by any means, make sure that it
@@ -49,7 +49,7 @@ Description: ======
         $ python setup.py install
         
         Usage
-        -----
+        =====
         
         Here is the canonical example of building an approximately circular patch by
         buffering a point::
@@ -65,7 +65,7 @@ Description: ======
         intersect.py `example apps`_.
         
         Integration
-        -----------
+        ===========
         
         Shapely does not read or write data files, but it can serialize and deserialize
         using several well known formats and protocols. The shapely.wkb and shapely.wkt
@@ -88,8 +88,8 @@ Description: ======
         [  1.00000000e+01,   0.00000000e+00]])
         
         That yields a numpy array of [x, y] arrays. This is not always exactly what one
-        wants for plotting shapes with Matplotlib, so Shapely 1.2 adds a `xy` property
-        for getting separate arrays of coordinate x and y values.::
+        wants for plotting shapes with Matplotlib (for example), so Shapely 1.2 adds
+        a `xy` property for obtaining separate arrays of coordinate x and y values.::
         
         >>> x, y = patch.exterior.xy
         >>> ax = asarray(x)
@@ -105,7 +105,7 @@ Description: ======
         'LINESTRING (10.0000000000000000 0.0000000000000000, ...)'
         
         Testing
-        -------
+        =======
         
         Shapely uses a Zope-stye suite of unittests and doctests, excercised via
         setup.py.::
@@ -116,16 +116,12 @@ Description: ======
         supported well by nose.
         
         Support
-        -------
-        
-        For current information about this project, see the wiki_.
-        
-        If you have questions, please consider joining our community list:
+        =======
         
-        http://trac.gispython.org/projects/PCL/wiki/CommunityList
+        Bugs may be reported and questions asked via https://github.com/sgillies/shapely.
         
         Credits
-        -------
+        =======
         
         Shapely is written by:
         
@@ -136,8 +132,8 @@ Description: ======
         Patches contributed by:
         
         * Howard Butler
-        * Fr |eaigue| d |eaigue| ric Junod
-        * Eric Lemoine
+        * Fr |eacute| d |eacute| ric Junod
+        * |Eacute| ric Lemoine
         * Jonathan Tartley
         * Kristian Thy
         * Oliver Tonnhofer
@@ -158,7 +154,9 @@ Description: ======
         .. _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
-        .. |eaigue| unicode:: U+00E9
+        .. |eacute| unicode:: U+00E9
+        :trim:
+        .. |Eacute| unicode:: U+00C9
         :trim:
         .. _Pleiades: http://pleiades.stoa.org
         
@@ -166,6 +164,27 @@ Description: ======
         CHANGES
         =======
         
+        1.2.13 (2011-09-16)
+        -------------------
+        - Fixed errors in speedups on 32bit systems when GEOS references memory above 2GB.
+        - Add shapely.__version__ attribute.
+        - Update the manual.
+        
+        1.2.12 (2011-08-15)
+        -------------------
+        - Build Windows distributions with VC7 or VC9 as appropriate.
+        - More verbose report on failure to speed up.
+        - Fix for prepared geometries broken in 1.2.11.
+        - DO NOT INSTALL 1.2.11
+        
+        1.2.11 (2011-08-04)
+        -------------------
+        - Ignore AttributeError during exit.
+        - PyPy 1.5 support.
+        - Prevent operation on prepared geometry crasher (#12).
+        - Optional Cython speedups for Windows.
+        - Linux 3 platform support.
+        
         1.2.10 (2011-05-09)
         -------------------
         - Add optional Cython speedups.

Shapely-1.2.10/README.txt → Shapely-1.2.13/README.rst

@@ -1,26 +1,26 @@
-======
-README
-======
+=======
+Shapely
+=======
+
+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
    :height: 400
 
 Shapely is a BSD-licensed Python package for manipulation and analysis of
-planar geometric objects. It is not concerned with data formats or coordinate
-systems.  It is based on the widely deployed GEOS_ (the engine of PostGIS_) and
-JTS_ (from which GEOS is ported) libraries. This C dependency is traded for the
-ability to execute with blazing speed.
-
-In a nutshell: Shapely lets you do PostGIS-ish stuff outside the context of a
-database using idiomatic Python. For more details, see:
+planar geometric objects. It is based on the widely deployed GEOS_ (the engine
+of PostGIS_) and JTS_ (from which GEOS is ported) libraries. This C dependency
+is traded for the ability to execute with blazing speed. Shapely is not
+concerned with data formats or coordinate systems, but can be readily
+integrated with packages that are. For more details, see:
 
 * Shapely wiki_
 * Shapely manual_
 * Shapely `example apps`_
 
 Dependencies
-------------
+============
 
 Shapely 1.2 depends on:
 
@@ -28,7 +28,7 @@ Shapely 1.2 depends on:
 * libgeos_c >=3.1 (3.0 and below have not been tested, YMMV)
 
 Installation
-------------
+============
 
 Windows users should use the executable installer, which contains the required
 GEOS DLL. Other users should acquire libgeos_c by any means, make sure that it
@@ -41,7 +41,7 @@ or from a source distribution with the setup script::
   $ python setup.py install
 
 Usage
------
+=====
 
 Here is the canonical example of building an approximately circular patch by
 buffering a point::
@@ -57,7 +57,7 @@ See the manual_ for comprehensive usage snippets and the dissolve.py and
 intersect.py `example apps`_.
 
 Integration 
------------
+===========
 
 Shapely does not read or write data files, but it can serialize and deserialize
 using several well known formats and protocols. The shapely.wkb and shapely.wkt
@@ -80,8 +80,8 @@ provide the Numpy array interface.::
          [  1.00000000e+01,   0.00000000e+00]])
 
 That yields a numpy array of [x, y] arrays. This is not always exactly what one
-wants for plotting shapes with Matplotlib, so Shapely 1.2 adds a `xy` property
-for getting separate arrays of coordinate x and y values.::
+wants for plotting shapes with Matplotlib (for example), so Shapely 1.2 adds
+a `xy` property for obtaining separate arrays of coordinate x and y values.::
 
   >>> x, y = patch.exterior.xy
   >>> ax = asarray(x)
@@ -97,7 +97,7 @@ Numpy arrays can also be adapted to Shapely linestrings::
   'LINESTRING (10.0000000000000000 0.0000000000000000, ...)'
 
 Testing
--------
+=======
 
 Shapely uses a Zope-stye suite of unittests and doctests, excercised via
 setup.py.::
@@ -108,16 +108,12 @@ Nosetests won't run the tests properly; Zope doctest suites are not currently
 supported well by nose.
 
 Support
--------
-
-For current information about this project, see the wiki_.
+=======
 
-If you have questions, please consider joining our community list:
-
-http://trac.gispython.org/projects/PCL/wiki/CommunityList
+Bugs may be reported and questions asked via https://github.com/sgillies/shapely.
 
 Credits
--------
+=======
 
 Shapely is written by:
 
@@ -128,8 +124,8 @@ Shapely is written by:
 Patches contributed by:
 
 * Howard Butler
-* Fr |eaigue| d |eaigue| ric Junod
-* Eric Lemoine
+* Fr |eacute| d |eacute| ric Junod
+* |Eacute| ric Lemoine
 * Jonathan Tartley
 * Kristian Thy
 * Oliver Tonnhofer
@@ -150,6 +146,8 @@ U.S. National Endowment for the Humanities (http://www.neh.gov).
 .. _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
-.. |eaigue| unicode:: U+00E9
+.. |eacute| unicode:: U+00E9
+   :trim:
+.. |Eacute| unicode:: U+00C9
    :trim:
 .. _Pleiades: http://pleiades.stoa.org

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

@@ -1,34 +1,34 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.10
+Version: 1.2.13
 Summary: Geometric objects, predicates, and operations
-Home-page: http://trac.gispython.org/lab/wiki/Shapely
+Home-page: https://github.com/sgillies/shapely
 Author: Sean Gillies
 Author-email: sean.gillies@gmail.com
 License: BSD
-Description: ======
-        README
-        ======
+Description: =======
+        Shapely
+        =======
+        
+        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
         :height: 400
         
         Shapely is a BSD-licensed Python package for manipulation and analysis of
-        planar geometric objects. It is not concerned with data formats or coordinate
-        systems.  It is based on the widely deployed GEOS_ (the engine of PostGIS_) and
-        JTS_ (from which GEOS is ported) libraries. This C dependency is traded for the
-        ability to execute with blazing speed.
-        
-        In a nutshell: Shapely lets you do PostGIS-ish stuff outside the context of a
-        database using idiomatic Python. For more details, see:
+        planar geometric objects. It is based on the widely deployed GEOS_ (the engine
+        of PostGIS_) and JTS_ (from which GEOS is ported) libraries. This C dependency
+        is traded for the ability to execute with blazing speed. Shapely is not
+        concerned with data formats or coordinate systems, but can be readily
+        integrated with packages that are. For more details, see:
         
         * Shapely wiki_
         * Shapely manual_
         * Shapely `example apps`_
         
         Dependencies
-        ------------
+        ============
         
         Shapely 1.2 depends on:
         
@@ -36,7 +36,7 @@ Description: ======
         * libgeos_c >=3.1 (3.0 and below have not been tested, YMMV)
         
         Installation
-        ------------
+        ============
         
         Windows users should use the executable installer, which contains the required
         GEOS DLL. Other users should acquire libgeos_c by any means, make sure that it
@@ -49,7 +49,7 @@ Description: ======
         $ python setup.py install
         
         Usage
-        -----
+        =====
         
         Here is the canonical example of building an approximately circular patch by
         buffering a point::
@@ -65,7 +65,7 @@ Description: ======
         intersect.py `example apps`_.
         
         Integration
-        -----------
+        ===========
         
         Shapely does not read or write data files, but it can serialize and deserialize
         using several well known formats and protocols. The shapely.wkb and shapely.wkt
@@ -88,8 +88,8 @@ Description: ======
         [  1.00000000e+01,   0.00000000e+00]])
         
         That yields a numpy array of [x, y] arrays. This is not always exactly what one
-        wants for plotting shapes with Matplotlib, so Shapely 1.2 adds a `xy` property
-        for getting separate arrays of coordinate x and y values.::
+        wants for plotting shapes with Matplotlib (for example), so Shapely 1.2 adds
+        a `xy` property for obtaining separate arrays of coordinate x and y values.::
         
         >>> x, y = patch.exterior.xy
         >>> ax = asarray(x)
@@ -105,7 +105,7 @@ Description: ======
         'LINESTRING (10.0000000000000000 0.0000000000000000, ...)'
         
         Testing
-        -------
+        =======
         
         Shapely uses a Zope-stye suite of unittests and doctests, excercised via
         setup.py.::
@@ -116,16 +116,12 @@ Description: ======
         supported well by nose.
         
         Support
-        -------
-        
-        For current information about this project, see the wiki_.
-        
-        If you have questions, please consider joining our community list:
+        =======
         
-        http://trac.gispython.org/projects/PCL/wiki/CommunityList
+        Bugs may be reported and questions asked via https://github.com/sgillies/shapely.
         
         Credits
-        -------
+        =======
         
         Shapely is written by:
         
@@ -136,8 +132,8 @@ Description: ======
         Patches contributed by:
         
         * Howard Butler
-        * Fr |eaigue| d |eaigue| ric Junod
-        * Eric Lemoine
+        * Fr |eacute| d |eacute| ric Junod
+        * |Eacute| ric Lemoine
         * Jonathan Tartley
         * Kristian Thy
         * Oliver Tonnhofer
@@ -158,7 +154,9 @@ Description: ======
         .. _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
-        .. |eaigue| unicode:: U+00E9
+        .. |eacute| unicode:: U+00E9
+        :trim:
+        .. |Eacute| unicode:: U+00C9
         :trim:
         .. _Pleiades: http://pleiades.stoa.org
         
@@ -166,6 +164,27 @@ Description: ======
         CHANGES
         =======
         
+        1.2.13 (2011-09-16)
+        -------------------
+        - Fixed errors in speedups on 32bit systems when GEOS references memory above 2GB.
+        - Add shapely.__version__ attribute.
+        - Update the manual.
+        
+        1.2.12 (2011-08-15)
+        -------------------
+        - Build Windows distributions with VC7 or VC9 as appropriate.
+        - More verbose report on failure to speed up.
+        - Fix for prepared geometries broken in 1.2.11.
+        - DO NOT INSTALL 1.2.11
+        
+        1.2.11 (2011-08-04)
+        -------------------
+        - Ignore AttributeError during exit.
+        - PyPy 1.5 support.
+        - Prevent operation on prepared geometry crasher (#12).
+        - Optional Cython speedups for Windows.
+        - Linux 3 platform support.
+        
         1.2.10 (2011-05-09)
         -------------------
         - Add optional Cython speedups.

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

@@ -1,7 +1,7 @@
 CHANGES.txt
 CREDITS.txt
 LICENSE.txt
-README.txt
+README.rst
 setup.cfg
 setup.py
 Shapely.egg-info/PKG-INFO

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

@@ -3,8 +3,8 @@ The Shapely User Manual
 =======================
 
 :Author: Sean Gillies, <sean.gillies@gmail.com>
-:Revision: 1.2.10
-:Date: 2 May 2011
+:Revision: 1.2.13
+:Date: 15 September 2011
 :Copyright: 
   This work is licensed under a `Creative Commons Attribution 3.0
   United States License`__.
@@ -1796,19 +1796,19 @@ Performance
 
 Shapely uses the GEOS_ library for all operations. GEOS is written in C++ and
 used in many applications and you can expect that all operations are highly
-optimized. Only the creation of new geometries involves some overhead that
-might slow down your code, if you create lots of geometries with a large number
-of coordinates.
+optimized. The creation of new geometries with many coordinates, however,
+involves some overhead that might slow down your code.
 
 .. versionadded:: 1.2.10
 
-The :mod:`shapely.speedups` module contains performance enhancements written
-in C. They are automaticaly installed when Python has access to a compiler
-during installation.
+The :mod:`shapely.speedups` module contains performance enhancements written in
+C. They are automaticaly installed when Python has access to a compiler during
+installation.
 
 You can check if the speedups are installed with the :attr:`available`
-attribute. To enable the speedups call :func:`enable`. You can revert to the
-default implementation with :func:`disable`.
+attribute. The constructor speedups are disabled by default. To enable the
+speedups call :func:`enable`. You can revert to the default implementation with
+:func:`disable`.
 
 .. sourcecode:: pycon
 

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

@@ -15,14 +15,15 @@ from setuptools.extension import Extension
 from setuptools.command.build_ext import build_ext
 from setuptools import setup, find_packages
 import sys
+import platform
 
-readme_text = file('README.txt', 'rb').read()
+readme_text = file('README.rst', 'rb').read()
 changes_text = file('CHANGES.txt', 'rb').read()
 
 setup_args = dict(
     metadata_version    = '1.2',
     name                = 'Shapely',
-    version             = '1.2.10',
+    version             = '1.2.13',
     requires_python     = '>=2.5,<3',
     requires_external   = 'libgeos_c (>=3.1)', 
     description         = 'Geometric objects, predicates, and operations',
@@ -32,7 +33,7 @@ setup_args = dict(
     author_email        = 'sean.gillies@gmail.com',
     maintainer          = 'Sean Gillies',
     maintainer_email    = 'sean.gillies@gmail.com',
-    url                 = 'http://trac.gispython.org/lab/wiki/Shapely',
+    url                 = 'https://github.com/sgillies/shapely',
     long_description    = readme_text + "\n" + changes_text,
     packages            = find_packages(),
     test_suite          = 'shapely.tests.test_suite',
@@ -51,11 +52,15 @@ setup_args = dict(
 if sys.platform == 'win32':
     if '(AMD64)' in sys.version:
         setup_args.update(
-            data_files=[('DLLs', glob.glob('DLLs_AMD64/*.dll'))]
+            data_files=[('DLLs', glob.glob('DLLs_AMD64_VC9/*.dll'))]
             )
+    elif platform.python_version().startswith('2.5.'):
+        setup_args.update(
+            data_files=[('DLLs', glob.glob('DLLs_x86_VC7/*.dll'))]
+            )       
     else:
         setup_args.update(
-            data_files=[('DLLs', glob.glob('DLLs_x86/*.dll'))]
+            data_files=[('DLLs', glob.glob('DLLs_x86_VC9/*.dll'))]
             )
 
 
@@ -88,6 +93,14 @@ class ve_build_ext(build_ext):
             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') 
+    and platform.python_implementation() == 'PyPy'):
+    # python_implementation >= 2.6
     ext_modules = []
 else:
     ext_modules = [

Shapely-1.2.13/shapely/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "1.2.13"
+

{Shapely-1.2.10 → Shapely-1.2.13}/shapely/ctypes_declarations.py

@@ -6,12 +6,17 @@ import ctypes
 class allocated_c_char_p(ctypes.c_char_p):
     pass
 
+EXCEPTION_HANDLER_FUNCTYPE = ctypes.CFUNCTYPE(None, ctypes.c_char_p, ctypes.c_char_p)
+
 def prototype(lgeos, geosVersion):
 
+    lgeos.initGEOS.argtypes = [EXCEPTION_HANDLER_FUNCTYPE, EXCEPTION_HANDLER_FUNCTYPE]
     lgeos.initGEOS.restype = None
 
+    lgeos.finishGEOS.argtypes = []
     lgeos.finishGEOS.restype = None
 
+    lgeos.GEOSversion.argtypes = []
     lgeos.GEOSversion.restype = ctypes.c_char_p
 
     lgeos.GEOSGeomFromWKT.restype = ctypes.c_void_p

{Shapely-1.2.10 → Shapely-1.2.13}/shapely/geometry/base.py

@@ -104,7 +104,10 @@ class BaseGeometry(object):
         # TODO: defer cleanup to the implementation. We shouldn't be
         # explicitly calling a lgeos method here.
         if not (self._owned or self._is_empty):
-            self._lgeos.GEOSGeom_destroy(self.__geom__)
+            try:
+                self._lgeos.GEOSGeom_destroy(self.__geom__)
+            except AttributeError:
+                pass # _lgeos might be empty on shutdown
         self.__geom__ = EMPTY
 
     def __del__(self):