Revision: 7914
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7914&view=rev
Author: jswhit
Date: 2009-11-02 17:46:59 +0000 (Mon, 02 Nov 2009)
Log Message:
-----------
use geos 3.1.1 instead of 2.2.3
Modified Paths:
--------------
trunk/toolkits/basemap/Changelog
trunk/toolkits/basemap/MANIFEST.in
trunk/toolkits/basemap/README
trunk/toolkits/basemap/setup.py
Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog 2009-11-02 17:32:09 UTC (rev 7913)
+++ trunk/toolkits/basemap/Changelog 2009-11-02 17:46:59 UTC (rev 7914)
@@ -1,4 +1,5 @@
version 0.99.5 (not yet released)
+ * geos-3.1.1 now required. 3.1.1 source included (instead of 2.2.3).
* shiftgrid no longer requires a cyclic point to be present
(patch from Eric Bruning).
* fix date2index bugs.
Modified: trunk/toolkits/basemap/MANIFEST.in
===================================================================
--- trunk/toolkits/basemap/MANIFEST.in 2009-11-02 17:32:09 UTC (rev 7913)
+++ trunk/toolkits/basemap/MANIFEST.in 2009-11-02 17:46:59 UTC (rev 7914)
@@ -94,7 +94,7 @@
include doc/make.py
include doc/conf.py
include doc/index.rst
-recursive-include geos-2.2.3 *
+recursive-include geos-3.1.1 *
recursive-include lib/dap *
recursive-include lib/httplib2 *
recursive-include lib/dbflib *
Modified: trunk/toolkits/basemap/README
===================================================================
--- trunk/toolkits/basemap/README 2009-11-02 17:32:09 UTC (rev 7913)
+++ trunk/toolkits/basemap/README 2009-11-02 17:46:59 UTC (rev 7914)
@@ -11,8 +11,8 @@
numpy 1.1 (or higher)
-The GEOS (Geometry Engine - Open Source) library (version 2.2.3 or higher).
-Source code is included in the geos-2.2.3 directory.
+The GEOS (Geometry Engine - Open Source) library (version 3.1.1 or higher).
+Source code is included in the geos-3.1.1 directory.
PIL (http://pythonware.com/products/pil) is optional (only
needed for Basemap warpimage and bluemarble methods).
@@ -28,7 +28,7 @@
'src' directory under the terms given in LICENSE_proj4.
source code for the GEOS library is
-included in the 'geos-2.2.3' directory under the terms given in
+included in the 'geos-3.1.1' directory under the terms given in
LICENSE_geos.
pyshapelib by Bernhard Herzog is included in the 'pyshapelib' directory
@@ -93,7 +93,7 @@
Then go to step (3). If you don't have it, you can build it from
the source code included with basemap by following these steps:
- > cd geos-2.2.3
+ > cd geos-3.1.1
> export GEOS_DIR=<where you want the libs and headers to go>
A reasonable choice on a Unix-like system is /usr/local, or
if you don't have permission to write there, your home directory.
Modified: trunk/toolkits/basemap/setup.py
===================================================================
--- trunk/toolkits/basemap/setup.py 2009-11-02 17:32:09 UTC (rev 7913)
+++ trunk/toolkits/basemap/setup.py 2009-11-02 17:46:59 UTC (rev 7914)
@@ -45,11 +45,11 @@
if GEOS_dir is None:
# if GEOS_dir not set, check a few standard locations.
- GEOS_dirs =
['/usr','/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')]
+ GEOS_dirs =
[os.path.expanduser('~'),'/usr','/usr/local','/sw','/opt','/opt/local']
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 < '"3.1.1"':
continue
else:
print 'GEOS lib (version %s) found in %s' %
(geos_version[1:-1],direc)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
