Changeset 1017

Show
Ignore:
Timestamp:
01/16/08 15:01:50
Author:
seang
Message:

Work around #149, add explicit Windows instructions and correct fredj's name in the readme

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Shapely/trunk/HISTORY.txt

    r1014 r1017  
     1All ticket numbers are rooted at http://trac.gispython.org/projects/PCL/ticket/ 
     2 
     31.0 RC2: 16 January 2008 
     4------------------------ 
     5- Added temporary solution for #149. 
     6 
     7 
    181.0 RC1: 14 January 2008 
    29------------------------ 
    3  
    410- First release candidate 
    511 

  • Shapely/trunk/README.txt

    r1015 r1017  
    2626------------ 
    2727 
    28 Shapely can be installed from the Python package index:: 
     28Windows users should use the executable installer, which contains the required 
     29GEOS DLL. Other users should acquire libgeos_c by any means, make sure that it 
     30is on the system library path, and install from the Python package index:: 
    2931 
    3032  $ sudo easy_install Shapely 
    …… 
    3436  $ sudo python setup.py install 
    3537 
    36 or by using the development buildout on *nix, which also provides libgeos_c:: 
     38or by using the development buildout on Linux, which also provides libgeos_c:: 
    3739 
    3840  $ svn co http://svn.gispython.org/svn/gispy/buildout/shapely.buildout/trunk shapely.buildout 
    …… 
    138140------- 
    139141 
    140 Sean Gillies (Pleiades) 
    141 Howard Butler (Hobu, Inc.) 
    142 Kai Lautaportti (Hexagon IT) 
    143 Frederic Junod (Camptocamp SA) 
    144 Eric Lemoine (Camptocamp SA) 
    145 Justin Bronn (GeoDjango) for ctypes inspiration 
    146 Artem Pavlenko (Mapnik) for help with GEOS DLLs 
     142* Sean Gillies (Pleiades) 
     143* Howard Butler (Hobu, Inc.) 
     144* Kai Lautaportti (Hexagon IT) 
     145* Fr |eaigue| d |eaigue| ric Junod (Camptocamp SA) 
     146* Eric Lemoine (Camptocamp SA) 
     147* Justin Bronn (GeoDjango) for ctypes inspiration 
     148* Artem Pavlenko (Mapnik) for help with GEOS DLLs 
    147149 
    148 Some of this work was supported by a grant (Pleiades) from the U.S. National 
    149 Endowment for the Humanities (http://www.neh.gov). 
     150.. |eaigue| unicode:: U+00E9 
     151   :trim: 
    150152 
     153Major portions of this work were supported by a grant (to Pleiades) from the 
     154U.S.  National Endowment for the Humanities (http://www.neh.gov). 
     155 

  • Shapely/trunk/setup.py

    r1014 r1017  
    1212 
    1313setup(name          = 'Shapely', 
    14       version       = '1.0rc1', 
     14      version       = '1.0rc2', 
    1515      description   = 'Geospatial geometries, predicates, and operations', 
    1616      license       = 'BSD', 

  • Shapely/trunk/setup_windows.py

    r1014 r1017  
    1212 
    1313setup(name          = 'Shapely', 
    14       version       = '1.0rc1', 
     14      version       = '1.0rc2', 
    1515      description   = 'Geospatial geometries, predicates, and operations', 
    1616      license       = 'BSD', 
    …… 
    2323      long_description = readme_text, 
    2424      packages      = ['shapely', 'shapely.geometry'], 
    25       data_files=[('DLLs', ['DLLs/geos.dll', 'DLLs/geos_c.dll']),], 
     25      data_files=[('DLLs', ['DLLs/geos.dll']),], 
    2626      install_requires = install_requires, 
    2727      #tests_require = ['numpy'], -- not working with "tests" command 

  • Shapely/trunk/shapely/geos.py

    r1014 r1017  
    1313if sys.platform == 'win32': 
    1414    try: 
    15         geospath = os.path.abspath( 
    16             shapely.__file__ + "../../../../../DLLs/geos_c.dll" 
    17             ) 
    18         lgeos = CDLL(geospath) 
     15        local_dlls = os.path.abspath(os.__file__ + "../../../DLLs") 
     16        original_path = os.environ['PATH'] 
     17        os.environ['PATH'] = "%s;%s" % (local_dlls, original_path) 
     18        lgeos = CDLL("geos.dll") 
    1919    except (ImportError, WindowsError): 
    2020        raise 
    21     free = cdll.msvcrt.free 
     21    def free(m): 
     22        try: 
     23            cdll.msvcrt.free(m) 
     24        except WindowsError: 
     25            # XXX: See http://trac.gispython.org/projects/PCL/ticket/149 
     26            pass 
     27 
    2228elif sys.platform == 'darwin': 
    2329    lgeos = CDLL(find_library('geos_c'))