Menu
▾
▴
matplotlib-checkins
|
From: <js...@us...> - 2008-08-07 22:20:03
|
Revision: 5999
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5999&view=rev
Author: jswhit
Date: 2008-08-07 22:20:01 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
remove 2.2.3 geos version restriction (now accept geos >= 2.2.3)
Modified Paths:
--------------
trunk/toolkits/basemap/setup.py
Modified: trunk/toolkits/basemap/setup.py
===================================================================
--- trunk/toolkits/basemap/setup.py 2008-08-07 22:13:31 UTC (rev 5998)
+++ trunk/toolkits/basemap/setup.py 2008-08-07 22:20:01 UTC (rev 5999)
@@ -49,7 +49,7 @@
for direc in GEOS_dirs:
geos_version = checkversion(direc)
print 'checking for GEOS lib in %s ....' % direc
- if geos_version != '"2.2.3"':
+ if geos_version < '"2.2.3"':
continue
else:
print 'GEOS lib found in %s' % direc
@@ -58,11 +58,11 @@
else:
geos_version = checkversion(GEOS_dir)
-if geos_version != '"2.2.3"' or GEOS_dir is None:
+if GEOS_dir is None:
raise SystemExit("""
-Can't find geos library version 2.2.3. Please set the
+Can't find geos library . Please set the
environment variable GEOS_DIR to point to the location
-where geos 2.2.3 is installed (for example, if geos_c.h
+where geos is installed (for example, if geos_c.h
is in /usr/local/include, and libgeos_c is in /usr/local/lib,
set GEOS_DIR to /usr/local), or edit the setup.py script
manually and set the variable GEOS_dir (right after the line
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2008-09-11 18:47:32
|
Revision: 6083
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6083&view=rev
Author: jswhit
Date: 2008-09-11 18:47:29 +0000 (Thu, 11 Sep 2008)
Log Message:
-----------
install _geoslib in mpl_toolkits.basemap
Modified Paths:
--------------
trunk/toolkits/basemap/setup.py
Modified: trunk/toolkits/basemap/setup.py
===================================================================
--- trunk/toolkits/basemap/setup.py 2008-09-11 12:17:34 UTC (rev 6082)
+++ trunk/toolkits/basemap/setup.py 2008-09-11 18:47:29 UTC (rev 6083)
@@ -81,17 +81,15 @@
package_dirs = {'':'lib'}
extensions = [Extension("mpl_toolkits.basemap._proj",deps+['src/_proj.c'],include_dirs = ['src'],)]
extensions.append(Extension("mpl_toolkits.basemap._geod",deps+['src/_geod.c'],include_dirs = ['src'],))
-# for some reason, pickling won't work if this extension is installed
-# as "matplotlib.toolkits.basemap._geoslib"
if sys.platform == 'win32':
# don't use runtime_library_dirs on windows (workaround
# for a distutils bug - http://bugs.python.org/issue2437).
- extensions.append(Extension("_geoslib",['src/_geoslib.c'],
+ extensions.append(Extension("mpl_toolkits.basemap._geoslib",['src/_geoslib.c'],
library_dirs=geos_library_dirs,
include_dirs=geos_include_dirs,
libraries=['geos_c','geos']))
else:
- extensions.append(Extension("_geoslib",['src/_geoslib.c'],
+ extensions.append(Extension("mpl_toolkits.basemap._geoslib",['src/_geoslib.c'],
library_dirs=geos_library_dirs,
runtime_library_dirs=geos_library_dirs,
include_dirs=geos_include_dirs,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2008-10-07 00:41:31
|
Revision: 6160
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6160&view=rev
Author: jswhit
Date: 2008-10-07 00:38:35 +0000 (Tue, 07 Oct 2008)
Log Message:
-----------
fix pickling
Modified Paths:
--------------
trunk/toolkits/basemap/setup.py
Modified: trunk/toolkits/basemap/setup.py
===================================================================
--- trunk/toolkits/basemap/setup.py 2008-10-06 19:18:09 UTC (rev 6159)
+++ trunk/toolkits/basemap/setup.py 2008-10-07 00:38:35 UTC (rev 6160)
@@ -81,15 +81,19 @@
package_dirs = {'':'lib'}
extensions = [Extension("mpl_toolkits.basemap._proj",deps+['src/_proj.c'],include_dirs = ['src'],)]
extensions.append(Extension("mpl_toolkits.basemap._geod",deps+['src/_geod.c'],include_dirs = ['src'],))
+# can't install _geoslib in mpl_toolkits.basemap namespace,
+# or Basemap objects won't be pickleable.
if sys.platform == 'win32':
# don't use runtime_library_dirs on windows (workaround
# for a distutils bug - http://bugs.python.org/issue2437).
- extensions.append(Extension("mpl_toolkits.basemap._geoslib",['src/_geoslib.c'],
+ #extensions.append(Extension("mpl_toolkits.basemap._geoslib",['src/_geoslib.c'],
+ extensions.append(Extension("_geoslib",['src/_geoslib.c'],
library_dirs=geos_library_dirs,
include_dirs=geos_include_dirs,
libraries=['geos_c','geos']))
else:
- extensions.append(Extension("mpl_toolkits.basemap._geoslib",['src/_geoslib.c'],
+ #extensions.append(Extension("mpl_toolkits.basemap._geoslib",['src/_geoslib.c'],
+ extensions.append(Extension("_geoslib",['src/_geoslib.c'],
library_dirs=geos_library_dirs,
runtime_library_dirs=geos_library_dirs,
include_dirs=geos_include_dirs,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2008-10-30 14:58:51
|
Revision: 6357
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6357&view=rev
Author: jswhit
Date: 2008-10-30 14:58:47 +0000 (Thu, 30 Oct 2008)
Log Message:
-----------
add /usr to GEOS search dirs
Modified Paths:
--------------
trunk/toolkits/basemap/setup.py
Modified: trunk/toolkits/basemap/setup.py
===================================================================
--- trunk/toolkits/basemap/setup.py 2008-10-30 14:56:51 UTC (rev 6356)
+++ trunk/toolkits/basemap/setup.py 2008-10-30 14:58:47 UTC (rev 6357)
@@ -45,7 +45,7 @@
if GEOS_dir is None:
# if GEOS_dir not set, check a few standard locations.
- GEOS_dirs = ['/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')]
+ GEOS_dirs = ['/usr','/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')]
for direc in GEOS_dirs:
geos_version = checkversion(direc)
print 'checking for GEOS lib in %s ....' % direc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
