shapely 1.0b4__tar.gz → 1.0rc2__tar.gz

Shapely-1.0rc2/CREDITS.txt

@@ -0,0 +1,10 @@
+Sean Gillies (Pleiades)
+Howard Butler (Hobu, Inc.)
+Kai Lautaportti (Hexagon IT)
+Frédéric Junod (Camptocamp SA)
+Eric Lemoine (Camptocamp SA)
+Justin Bronn (GeoDjango) for ctypes inspiration
+Artem Pavlenko (Mapnik) for help with GEOS DLLs
+
+Some of this work was supported by a grant from the U.S. National Endowment for
+the Humanities (http://www.neh.gov).

Shapely-1.0rc2/HISTORY.txt

@@ -0,0 +1,11 @@
+All ticket numbers are rooted at http://trac.gispython.org/projects/PCL/ticket/
+
+1.0 RC2: 16 January 2008
+------------------------
+- Added temporary solution for #149.
+
+
+1.0 RC1: 14 January 2008
+------------------------
+- First release candidate
+

{Shapely-1.0b4 → Shapely-1.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0b4
+Version: 1.0rc2
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
 Author: Sean Gillies
@@ -9,8 +9,8 @@ License: BSD
 Description: Shapely
         =======
         
-        Shapely is a Python package for programming with geospatial geometries. It is
-        based on GEOS (http://geos.refractions.net). Shapely 1.0 is ignorant about
+        Shapely is a Python package for programming with 2D geospatial geometries. It
+        is based on GEOS (http://geos.refractions.net). Shapely 1.0 is ignorant about
         coordinate and reference systems. Projection responsibility is left to specific
         applications. For more information, see:
         
@@ -20,6 +20,7 @@ Description: Shapely
         Shapely requires Python 2.4+. (I've also begun to port it to Python 3.0:
         http://zcologia.com/news/564/shapely-for-python-3-0/.)
         
+        
         Dependencies
         ------------
         
@@ -28,10 +29,13 @@ Description: Shapely
         
         .. _ctypes: http://pypi.python.org/pypi/ctypes/
         
+        
         Installation
         ------------
         
-        Shapely can be installed from the Python package index::
+        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
+        is on the system library path, and install from the Python package index::
         
         $ sudo easy_install Shapely
         
@@ -39,26 +43,29 @@ Description: Shapely
         
         $ sudo python setup.py install
         
-        or by using the development buildout, which also provides libgeos_c::
+        or by using the development buildout on Linux, which also provides libgeos_c::
         
         $ svn co http://svn.gispython.org/svn/gispy/buildout/shapely.buildout/trunk shapely.buildout
         $ cd shapely.buildout
         $ python bootstrap.py
         $ ./bin/buildout
         
+        
         Usage
         -----
         
-        Buffer a point::
+        To buffer a point::
         
         >>> from shapely.geometry import Point
         >>> point = Point(-106.0, 40.0) # longitude, latitude
         >>> point.buffer(10.0)
         <shapely.geometry.polygon.Polygon object at ...>
         
-        See Operations.txt and Predicates.txt under tests/ for more examples of the
-        spatial operations and predicates provided by Shapely. Also see Point.txt,
-        LineString.txt, etc for examples of the geometry APIs.
+        See the manual_ for comprehensive examples of usage. See also Operations.txt
+        and Predicates.txt under tests/ for more examples of the spatial operations and
+        predicates provided by Shapely. See also Point.txt, LineString.txt, etc for
+        examples of the geometry APIs.
+        
         
         Numpy integration
         -----------------
@@ -80,6 +87,7 @@ Description: Shapely
         >>> line.wkt
         'LINESTRING (1.0000000000000000 2.0000000000000000, 3.0000000000000000 4.0000000000000000)'
         
+        
         Python Geo Interface
         --------------------
         
@@ -107,6 +115,7 @@ Description: Shapely
         See http://trac.gispython.org/projects/PCL/wiki/PythonGeoInterface for more
         details on the interface.
         
+        
         Testing
         -------
         
@@ -116,7 +125,11 @@ Description: Shapely
         $ python point.py
         
         There are also two test runners under tests/. test_doctests.py requires
-        zope.testing. runalldoctests.py does not.
+        zope.testing. runalldoctests.py does not. Perhaps the easiest way to run the
+        tests is::
+        
+        $ python setup.py test
+        
         
         Support
         -------
@@ -131,9 +144,27 @@ Description: Shapely
         http://trac.gispython.org/projects/PCL/wiki/CommunityList
         
         
+        Credits
+        -------
+        
+        * Sean Gillies (Pleiades)
+        * Howard Butler (Hobu, Inc.)
+        * Kai Lautaportti (Hexagon IT)
+        * Fr |eaigue| d |eaigue| ric Junod (Camptocamp SA)
+        * Eric Lemoine (Camptocamp SA)
+        * Justin Bronn (GeoDjango) for ctypes inspiration
+        * Artem Pavlenko (Mapnik) for help with GEOS DLLs
+        
+        .. |eaigue| unicode:: U+00E9
+        :trim:
+        
+        Major portions of this work were supported by a grant (to Pleiades) from the
+        U.S.  National Endowment for the Humanities (http://www.neh.gov).
+        
+        
 Keywords: geometry topology
 Platform: UNKNOWN
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: BSD License

{Shapely-1.0b4 → Shapely-1.0rc2}/README.txt

@@ -1,8 +1,8 @@
 Shapely
 =======
 
-Shapely is a Python package for programming with geospatial geometries. It is
-based on GEOS (http://geos.refractions.net). Shapely 1.0 is ignorant about
+Shapely is a Python package for programming with 2D geospatial geometries. It
+is based on GEOS (http://geos.refractions.net). Shapely 1.0 is ignorant about
 coordinate and reference systems. Projection responsibility is left to specific
 applications. For more information, see:
 
@@ -12,6 +12,7 @@ applications. For more information, see:
 Shapely requires Python 2.4+. (I've also begun to port it to Python 3.0:
 http://zcologia.com/news/564/shapely-for-python-3-0/.)
 
+
 Dependencies
 ------------
 
@@ -20,10 +21,13 @@ Dependencies
 
 .. _ctypes: http://pypi.python.org/pypi/ctypes/
 
+
 Installation
 ------------
 
-Shapely can be installed from the Python package index::
+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
+is on the system library path, and install from the Python package index::
 
   $ sudo easy_install Shapely
 
@@ -31,26 +35,29 @@ with the setup script::
 
   $ sudo python setup.py install
 
-or by using the development buildout, which also provides libgeos_c::
+or by using the development buildout on Linux, which also provides libgeos_c::
+
+  $ svn co http://svn.gispython.org/svn/gispy/buildout/shapely.buildout/trunk shapely.buildout
+  $ cd shapely.buildout
+  $ python bootstrap.py
+  $ ./bin/buildout
 
- $ svn co http://svn.gispython.org/svn/gispy/buildout/shapely.buildout/trunk shapely.buildout
- $ cd shapely.buildout
- $ python bootstrap.py
- $ ./bin/buildout
 
 Usage
 -----
 
-Buffer a point::
+To buffer a point::
 
   >>> from shapely.geometry import Point
   >>> point = Point(-106.0, 40.0) # longitude, latitude
   >>> point.buffer(10.0)
   <shapely.geometry.polygon.Polygon object at ...>
 
-See Operations.txt and Predicates.txt under tests/ for more examples of the
-spatial operations and predicates provided by Shapely. Also see Point.txt,
-LineString.txt, etc for examples of the geometry APIs.
+See the manual_ for comprehensive examples of usage. See also Operations.txt
+and Predicates.txt under tests/ for more examples of the spatial operations and
+predicates provided by Shapely. See also Point.txt, LineString.txt, etc for
+examples of the geometry APIs.
+
 
 Numpy integration
 -----------------
@@ -72,6 +79,7 @@ Numpy arrays can also be adapted to Shapely points and linestrings::
   >>> line.wkt
   'LINESTRING (1.0000000000000000 2.0000000000000000, 3.0000000000000000 4.0000000000000000)'
 
+
 Python Geo Interface
 --------------------
 
@@ -99,6 +107,7 @@ geometry with the asShape factory::
 See http://trac.gispython.org/projects/PCL/wiki/PythonGeoInterface for more
 details on the interface.
 
+
 Testing
 -------
 
@@ -108,7 +117,11 @@ Several of the modules have docstring doctests::
   $ python point.py
 
 There are also two test runners under tests/. test_doctests.py requires
-zope.testing. runalldoctests.py does not.
+zope.testing. runalldoctests.py does not. Perhaps the easiest way to run the 
+tests is::
+
+  $ python setup.py test
+
 
 Support
 -------
@@ -122,3 +135,21 @@ If you have questions, please consider joining our community list:
 
 http://trac.gispython.org/projects/PCL/wiki/CommunityList
 
+
+Credits
+-------
+
+* Sean Gillies (Pleiades)
+* Howard Butler (Hobu, Inc.)
+* Kai Lautaportti (Hexagon IT)
+* Fr |eaigue| d |eaigue| ric Junod (Camptocamp SA)
+* Eric Lemoine (Camptocamp SA)
+* Justin Bronn (GeoDjango) for ctypes inspiration
+* Artem Pavlenko (Mapnik) for help with GEOS DLLs
+
+.. |eaigue| unicode:: U+00E9
+   :trim:
+
+Major portions of this work were supported by a grant (to Pleiades) from the
+U.S.  National Endowment for the Humanities (http://www.neh.gov).
+

{Shapely-1.0b4 → Shapely-1.0rc2}/Shapely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0b4
+Version: 1.0rc2
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
 Author: Sean Gillies
@@ -9,8 +9,8 @@ License: BSD
 Description: Shapely
         =======
         
-        Shapely is a Python package for programming with geospatial geometries. It is
-        based on GEOS (http://geos.refractions.net). Shapely 1.0 is ignorant about
+        Shapely is a Python package for programming with 2D geospatial geometries. It
+        is based on GEOS (http://geos.refractions.net). Shapely 1.0 is ignorant about
         coordinate and reference systems. Projection responsibility is left to specific
         applications. For more information, see:
         
@@ -20,6 +20,7 @@ Description: Shapely
         Shapely requires Python 2.4+. (I've also begun to port it to Python 3.0:
         http://zcologia.com/news/564/shapely-for-python-3-0/.)
         
+        
         Dependencies
         ------------
         
@@ -28,10 +29,13 @@ Description: Shapely
         
         .. _ctypes: http://pypi.python.org/pypi/ctypes/
         
+        
         Installation
         ------------
         
-        Shapely can be installed from the Python package index::
+        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
+        is on the system library path, and install from the Python package index::
         
         $ sudo easy_install Shapely
         
@@ -39,26 +43,29 @@ Description: Shapely
         
         $ sudo python setup.py install
         
-        or by using the development buildout, which also provides libgeos_c::
+        or by using the development buildout on Linux, which also provides libgeos_c::
         
         $ svn co http://svn.gispython.org/svn/gispy/buildout/shapely.buildout/trunk shapely.buildout
         $ cd shapely.buildout
         $ python bootstrap.py
         $ ./bin/buildout
         
+        
         Usage
         -----
         
-        Buffer a point::
+        To buffer a point::
         
         >>> from shapely.geometry import Point
         >>> point = Point(-106.0, 40.0) # longitude, latitude
         >>> point.buffer(10.0)
         <shapely.geometry.polygon.Polygon object at ...>
         
-        See Operations.txt and Predicates.txt under tests/ for more examples of the
-        spatial operations and predicates provided by Shapely. Also see Point.txt,
-        LineString.txt, etc for examples of the geometry APIs.
+        See the manual_ for comprehensive examples of usage. See also Operations.txt
+        and Predicates.txt under tests/ for more examples of the spatial operations and
+        predicates provided by Shapely. See also Point.txt, LineString.txt, etc for
+        examples of the geometry APIs.
+        
         
         Numpy integration
         -----------------
@@ -80,6 +87,7 @@ Description: Shapely
         >>> line.wkt
         'LINESTRING (1.0000000000000000 2.0000000000000000, 3.0000000000000000 4.0000000000000000)'
         
+        
         Python Geo Interface
         --------------------
         
@@ -107,6 +115,7 @@ Description: Shapely
         See http://trac.gispython.org/projects/PCL/wiki/PythonGeoInterface for more
         details on the interface.
         
+        
         Testing
         -------
         
@@ -116,7 +125,11 @@ Description: Shapely
         $ python point.py
         
         There are also two test runners under tests/. test_doctests.py requires
-        zope.testing. runalldoctests.py does not.
+        zope.testing. runalldoctests.py does not. Perhaps the easiest way to run the
+        tests is::
+        
+        $ python setup.py test
+        
         
         Support
         -------
@@ -131,9 +144,27 @@ Description: Shapely
         http://trac.gispython.org/projects/PCL/wiki/CommunityList
         
         
+        Credits
+        -------
+        
+        * Sean Gillies (Pleiades)
+        * Howard Butler (Hobu, Inc.)
+        * Kai Lautaportti (Hexagon IT)
+        * Fr |eaigue| d |eaigue| ric Junod (Camptocamp SA)
+        * Eric Lemoine (Camptocamp SA)
+        * Justin Bronn (GeoDjango) for ctypes inspiration
+        * Artem Pavlenko (Mapnik) for help with GEOS DLLs
+        
+        .. |eaigue| unicode:: U+00E9
+        :trim:
+        
+        Major portions of this work were supported by a grant (to Pleiades) from the
+        U.S.  National Endowment for the Humanities (http://www.neh.gov).
+        
+        
 Keywords: geometry topology
 Platform: UNKNOWN
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: BSD License

{Shapely-1.0b4 → Shapely-1.0rc2}/Shapely.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ HISTORY.txt
 LICENSE.txt
 README.txt
 setup.py
+setup_windows.py
 Shapely.egg-info/PKG-INFO
 Shapely.egg-info/SOURCES.txt
 Shapely.egg-info/dependency_links.txt

{Shapely-1.0b4 → Shapely-1.0rc2}/setup.py

@@ -11,7 +11,7 @@ if version_info[:2] < (2,5):
 readme_text = file('README.txt', 'rb').read()
 
 setup(name          = 'Shapely',
-      version       = '1.0b4',
+      version       = '1.0rc2',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',
@@ -26,7 +26,7 @@ setup(name          = 'Shapely',
       #tests_require = ['numpy'], -- not working with "tests" command
       test_suite = 'tests.test_suite',
       classifiers   = [
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'Intended Audience :: Science/Research',
         'License :: OSI Approved :: BSD License',

Shapely-1.0rc2/setup_windows.py

@@ -0,0 +1,39 @@
+
+from setuptools import setup, Extension
+from sys import version_info
+
+# Require ctypes egg only for Python < 2.5
+install_requires = ['setuptools']
+if version_info[:2] < (2,5):
+    install_requires.append('ctypes')
+
+# Get text from README.txt
+readme_text = file('README.txt', 'rb').read()
+
+setup(name          = 'Shapely',
+      version       = '1.0rc2',
+      description   = 'Geospatial geometries, predicates, and operations',
+      license       = 'BSD',
+      keywords      = 'geometry topology',
+      author        = 'Sean Gillies',
+      author_email  = 'sgillies@frii.com',
+      maintainer    = 'Sean Gillies',
+      maintainer_email  = 'sgillies@frii.com',
+      url   = 'http://trac.gispython.org/projects/PCL/wiki/Shapely',
+      long_description = readme_text,
+      packages      = ['shapely', 'shapely.geometry'],
+      data_files=[('DLLs', ['DLLs/geos.dll']),],
+      install_requires = install_requires,
+      #tests_require = ['numpy'], -- not working with "tests" command
+      test_suite = 'tests.test_suite',
+      classifiers   = [
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Science/Research',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Scientific/Engineering :: GIS',
+        ],
+)
+

{Shapely-1.0b4 → Shapely-1.0rc2}/shapely/geos.py

@@ -5,18 +5,26 @@ Exports the libgeos_c shared lib, GEOS-specific exceptions, and utilities.
 import atexit
 from ctypes import cdll, CDLL, CFUNCTYPE, c_char_p
 from ctypes.util import find_library
+import os
 import sys
 
+import shapely
+
 if sys.platform == 'win32':
     try:
-        lgeos = CDLL('libgeos_c.dll')
+        local_dlls = os.path.abspath(os.__file__ + "../../../DLLs")
+        original_path = os.environ['PATH']
+        os.environ['PATH'] = "%s;%s" % (local_dlls, original_path)
+        lgeos = CDLL("geos.dll")
     except (ImportError, WindowsError):
-        # Try GEOS DLL from the Windows PostGIS installer for
-        # PostgreSQL 8.2 before failing
-        lgeos = CDLL('libgeos_c-1.dll')
-    except:
         raise
-    free = cdll.msvcrt.free
+    def free(m):
+        try:
+            cdll.msvcrt.free(m)
+        except WindowsError:
+            # XXX: See http://trac.gispython.org/projects/PCL/ticket/149
+            pass
+
 elif sys.platform == 'darwin':
     lgeos = CDLL(find_library('geos_c'))
     free = CDLL(find_library('libc')).free

Shapely-1.0b4/CREDITS.txt

@@ -1,6 +0,0 @@
-Sean Gillies (PCL)
-Howard Butler (PCL)
-Kai Lautaportti (PCL)
-Frédéric Junod (Camptocamp SA)
-Eric Lemoine (Camptocamp SA)
-Justin Bronn (GeoDjango) for ctypes inspiration