shapely 1.0rc1__tar.gz → 1.0rc2__tar.gz

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.0rc1 → Shapely-1.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0rc1
+Version: 1.0rc2
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
 Author: Sean Gillies
@@ -33,7 +33,9 @@ Description: Shapely
         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
         
@@ -145,16 +147,19 @@ Description: Shapely
         Credits
         -------
         
-        Sean Gillies (Pleiades)
-        Howard Butler (Hobu, Inc.)
-        Kai Lautaportti (Hexagon IT)
-        Frederic Junod (Camptocamp SA)
-        Eric Lemoine (Camptocamp SA)
-        Justin Bronn (GeoDjango) for ctypes inspiration
-        Artem Pavlenko (Mapnik) for help with GEOS DLLs
+        * 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
         
-        Some of this work was supported by a grant (Pleiades) from the U.S. National
-        Endowment for the Humanities (http://www.neh.gov).
+        .. |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

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

@@ -25,7 +25,9 @@ Dependencies
 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
 
@@ -137,14 +139,17 @@ http://trac.gispython.org/projects/PCL/wiki/CommunityList
 Credits
 -------
 
-Sean Gillies (Pleiades)
-Howard Butler (Hobu, Inc.)
-Kai Lautaportti (Hexagon IT)
-Frederic Junod (Camptocamp SA)
-Eric Lemoine (Camptocamp SA)
-Justin Bronn (GeoDjango) for ctypes inspiration
-Artem Pavlenko (Mapnik) for help with GEOS DLLs
+* 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
 
-Some of this work was supported by a grant (Pleiades) from the U.S. National
-Endowment for the Humanities (http://www.neh.gov).
+.. |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.0rc1 → Shapely-1.0rc2}/Shapely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0rc1
+Version: 1.0rc2
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
 Author: Sean Gillies
@@ -33,7 +33,9 @@ Description: Shapely
         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
         
@@ -145,16 +147,19 @@ Description: Shapely
         Credits
         -------
         
-        Sean Gillies (Pleiades)
-        Howard Butler (Hobu, Inc.)
-        Kai Lautaportti (Hexagon IT)
-        Frederic Junod (Camptocamp SA)
-        Eric Lemoine (Camptocamp SA)
-        Justin Bronn (GeoDjango) for ctypes inspiration
-        Artem Pavlenko (Mapnik) for help with GEOS DLLs
+        * 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
         
-        Some of this work was supported by a grant (Pleiades) from the U.S. National
-        Endowment for the Humanities (http://www.neh.gov).
+        .. |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

{Shapely-1.0rc1 → 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.0rc1',
+      version       = '1.0rc2',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',

{Shapely-1.0rc1 → Shapely-1.0rc2}/setup_windows.py

@@ -11,7 +11,7 @@ if version_info[:2] < (2,5):
 readme_text = file('README.txt', 'rb').read()
 
 setup(name          = 'Shapely',
-      version       = '1.0rc1',
+      version       = '1.0rc2',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',
@@ -22,7 +22,7 @@ setup(name          = 'Shapely',
       url   = 'http://trac.gispython.org/projects/PCL/wiki/Shapely',
       long_description = readme_text,
       packages      = ['shapely', 'shapely.geometry'],
-      data_files=[('DLLs', ['DLLs/geos.dll', 'DLLs/geos_c.dll']),],
+      data_files=[('DLLs', ['DLLs/geos.dll']),],
       install_requires = install_requires,
       #tests_require = ['numpy'], -- not working with "tests" command
       test_suite = 'tests.test_suite',

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

@@ -12,13 +12,19 @@ import shapely
 
 if sys.platform == 'win32':
     try:
-        geospath = os.path.abspath(
-            shapely.__file__ + "../../../../../DLLs/geos_c.dll"
-            )
-        lgeos = CDLL(geospath)
+        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):
         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.0rc1/HISTORY.txt

@@ -1,5 +0,0 @@
-1.0 RC1: 14 January 2008
-------------------------
-
-- First release candidate
-