Menu
▾
▴
matplotlib-checkins
|
From: <js...@us...> - 2007-11-01 03:16:10
|
Revision: 4075
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4075&view=rev
Author: jswhit
Date: 2007-10-31 20:16:07 -0700 (Wed, 31 Oct 2007)
Log Message:
-----------
new setup.py
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-01 03:10:51 UTC (rev 4074)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-01 03:16:07 UTC (rev 4075)
@@ -13,9 +13,6 @@
from distutils.core import Extension
from distutils.util import convert_path
-import numpy
-
-
def dbf_macros():
"""Return the macros to define when compiling the dbflib wrapper.
@@ -39,9 +36,7 @@
packages = ['matplotlib.toolkits.basemap']
package_dirs = {'':'lib'}
-extensions = [Extension("matplotlib.toolkits.basemap._proj",
- deps+['src/_proj.c'],
- include_dirs = ['src', numpy.get_include()],)]
+extensions = [Extension("matplotlib.toolkits.basemap._proj",deps+['src/_proj.c'],include_dirs = ['src'],)]
extensions.append(Extension("matplotlib.toolkits.basemap._geod",deps+['src/_geod.c'],include_dirs = ['src'],))
# install shapelib and dbflib.
@@ -66,30 +61,19 @@
if 'setuptools' in sys.modules:
# Are we running with setuptools?
# if so, need to specify all the packages in heirarchy
- additional_params = {'namespace_packages' : ['matplotlib.toolkits']}
+ additional_params = {'namespace_packages' : ['matplotlib.toolkits']}
packages.extend(['matplotlib', 'matplotlib.toolkits'])
setup = setuptools.setup
else:
additional_params = {}
from distutils.core import setup
-
-
+
+
# Specify all the required mpl data
pyproj_datafiles = ['data/epsg', 'data/esri', 'data/esri.extra', 'data/GL27', 'data/nad.lst', 'data/nad27', 'data/nad83', 'data/ntv2_out.dist', 'data/other.extra', 'data/pj_out27.dist', 'data/pj_out83.dist', 'data/proj_def.dat', 'data/README', 'data/td_out.dist', 'data/test27', 'data/test83', 'data/testntv2', 'data/testvarious', 'data/world']
-basemap_datafiles = [ 'data/countries_c.txt',
- 'data/states_c.txt',
- 'data/rivers_c.txt',
- 'data/gshhs_c.txt',
- 'data/countries_l.txt',
- 'data/states_l.txt',
- 'data/rivers_l.txt',
- 'data/gshhs_l.txt',
- 'data/countries_i.txt',
- 'data/states_i.txt',
- 'data/rivers_i.txt',
- 'data/gshhs_i.txt',
- 'data/5minmask.bin',
- ]
+boundaryfiles = glob.glob('lib/matplotlib/toolkits/basemap/data/*dat')
+boundaryfiles = [os.path.join('data',os.path.basename(bfile)) for bfile in boundaryfiles]
+basemap_datafiles = boundaryfiles + ['data/5minmask.bin']
package_data = {'matplotlib.toolkits.basemap':pyproj_datafiles+basemap_datafiles}
setup(
name = "basemap",
@@ -108,8 +92,8 @@
license = "OSI Approved",
keywords = ["python","plotting","plots","graphs","charts","GIS","mapping","map projections","maps"],
classifiers = ["Development Status :: 4 - Beta",
- "Intended Audience :: Science/Research",
- "License :: OSI Approved",
+ "Intended Audience :: Science/Research",
+ "License :: OSI Approved",
"Topic :: Scientific/Engineering :: Visualization",
"Topic :: Software Development :: Libraries :: Python Modules",
"Operating System :: OS Independent"],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-01 03:40:08
|
Revision: 4080
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4080&view=rev
Author: jswhit
Date: 2007-10-31 20:40:06 -0700 (Wed, 31 Oct 2007)
Log Message:
-----------
don't include proj_def.dat twice
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-01 03:30:07 UTC (rev 4079)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-01 03:40:06 UTC (rev 4080)
@@ -73,6 +73,7 @@
pyproj_datafiles = ['data/epsg', 'data/esri', 'data/esri.extra', 'data/GL27', 'data/nad.lst', 'data/nad27', 'data/nad83', 'data/ntv2_out.dist', 'data/other.extra', 'data/pj_out27.dist', 'data/pj_out83.dist', 'data/proj_def.dat', 'data/README', 'data/td_out.dist', 'data/test27', 'data/test83', 'data/testntv2', 'data/testvarious', 'data/world']
boundaryfiles = glob.glob('lib/matplotlib/toolkits/basemap/data/*dat')
boundaryfiles = [os.path.join('data',os.path.basename(bfile)) for bfile in boundaryfiles]
+boundaryfiles.remove('data/proj_def.dat')
basemap_datafiles = boundaryfiles + ['data/5minmask.bin']
package_data = {'matplotlib.toolkits.basemap':pyproj_datafiles+basemap_datafiles}
setup(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-10 17:18:26
|
Revision: 4207
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4207&view=rev
Author: jswhit
Date: 2007-11-10 09:18:22 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-10 16:26:53 UTC (rev 4206)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-10 17:18:22 UTC (rev 4207)
@@ -71,9 +71,8 @@
# Specify all the required mpl data
pyproj_datafiles = ['data/epsg', 'data/esri', 'data/esri.extra', 'data/GL27', 'data/nad.lst', 'data/nad27', 'data/nad83', 'data/ntv2_out.dist', 'data/other.extra', 'data/pj_out27.dist', 'data/pj_out83.dist', 'data/proj_def.dat', 'data/README', 'data/td_out.dist', 'data/test27', 'data/test83', 'data/testntv2', 'data/testvarious', 'data/world']
-boundaryfiles = glob.glob('lib/matplotlib/toolkits/basemap/data/*dat')
+boundaryfiles = glob.glob('lib/matplotlib/toolkits/basemap/data/*_{c,l,i,h}.dat')
boundaryfiles = [os.path.join('data',os.path.basename(bfile)) for bfile in boundaryfiles]
-boundaryfiles.remove('data/proj_def.dat')
basemap_datafiles = boundaryfiles + ['data/5minmask.bin']
package_data = {'matplotlib.toolkits.basemap':pyproj_datafiles+basemap_datafiles}
setup(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-10 18:19:10
|
Revision: 4210
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4210&view=rev
Author: jswhit
Date: 2007-11-10 10:19:02 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
fix boundaryfiles
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-10 17:52:19 UTC (rev 4209)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-10 18:19:02 UTC (rev 4210)
@@ -71,7 +71,10 @@
# Specify all the required mpl data
pyproj_datafiles = ['data/epsg', 'data/esri', 'data/esri.extra', 'data/GL27', 'data/nad.lst', 'data/nad27', 'data/nad83', 'data/ntv2_out.dist', 'data/other.extra', 'data/pj_out27.dist', 'data/pj_out83.dist', 'data/proj_def.dat', 'data/README', 'data/td_out.dist', 'data/test27', 'data/test83', 'data/testntv2', 'data/testvarious', 'data/world']
-boundaryfiles = glob.glob('lib/matplotlib/toolkits/basemap/data/*_{c,l,i,h}.dat')
+boundaryfiles = glob.glob('lib/matplotlib/toolkits/basemap/data/*_c.dat')
+boundaryfiles = boundaryfiles + glob.glob('lib/matplotlib/toolkits/basemap/data/*_l.dat')
+boundaryfiles = boundaryfiles + glob.glob('lib/matplotlib/toolkits/basemap/data/*_i.dat')
+boundaryfiles = boundaryfiles + glob.glob('lib/matplotlib/toolkits/basemap/data/*_h.dat')
boundaryfiles = [os.path.join('data',os.path.basename(bfile)) for bfile in boundaryfiles]
basemap_datafiles = boundaryfiles + ['data/5minmask.bin']
package_data = {'matplotlib.toolkits.basemap':pyproj_datafiles+basemap_datafiles}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-10 18:24:30
|
Revision: 4211
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4211&view=rev
Author: jswhit
Date: 2007-11-10 10:24:23 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
fix boundary file glob
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-10 18:19:02 UTC (rev 4210)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-10 18:24:23 UTC (rev 4211)
@@ -71,11 +71,9 @@
# Specify all the required mpl data
pyproj_datafiles = ['data/epsg', 'data/esri', 'data/esri.extra', 'data/GL27', 'data/nad.lst', 'data/nad27', 'data/nad83', 'data/ntv2_out.dist', 'data/other.extra', 'data/pj_out27.dist', 'data/pj_out83.dist', 'data/proj_def.dat', 'data/README', 'data/td_out.dist', 'data/test27', 'data/test83', 'data/testntv2', 'data/testvarious', 'data/world']
-boundaryfiles = glob.glob('lib/matplotlib/toolkits/basemap/data/*_c.dat')
-boundaryfiles = boundaryfiles + glob.glob('lib/matplotlib/toolkits/basemap/data/*_l.dat')
-boundaryfiles = boundaryfiles + glob.glob('lib/matplotlib/toolkits/basemap/data/*_i.dat')
-boundaryfiles = boundaryfiles + glob.glob('lib/matplotlib/toolkits/basemap/data/*_h.dat')
-boundaryfiles = [os.path.join('data',os.path.basename(bfile)) for bfile in boundaryfiles]
+boundaryfiles = []
+for resolution in ['c','l','i','h']:
+ boundaryfiles = boundaryfiles + glob.glob("lib/matplotlib/toolkits/basemap/data/*_"+resolution+".dat")
basemap_datafiles = boundaryfiles + ['data/5minmask.bin']
package_data = {'matplotlib.toolkits.basemap':pyproj_datafiles+basemap_datafiles}
setup(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-10 22:41:52
|
Revision: 4213
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4213&view=rev
Author: jswhit
Date: 2007-11-10 14:41:51 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
add back in accidentally deleted line
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-10 20:42:39 UTC (rev 4212)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-10 22:41:51 UTC (rev 4213)
@@ -74,6 +74,7 @@
boundaryfiles = []
for resolution in ['c','l','i','h']:
boundaryfiles = boundaryfiles + glob.glob("lib/matplotlib/toolkits/basemap/data/*_"+resolution+".dat")
+boundaryfiles = [os.path.join('data',os.path.basename(bfile)) for bfile in boundaryfiles]
basemap_datafiles = boundaryfiles + ['data/5minmask.bin']
package_data = {'matplotlib.toolkits.basemap':pyproj_datafiles+basemap_datafiles}
setup(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-14 15:55:55
|
Revision: 4270
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4270&view=rev
Author: jswhit
Date: 2007-11-14 07:55:43 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
check for existence of geos_c.h, make sure GEOS_VERSION is "2.2.3"
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-14 15:42:30 UTC (rev 4269)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-14 15:55:43 UTC (rev 4270)
@@ -31,11 +31,32 @@
else:
return [("HAVE_UPDATE_HEADER", "0")]
+def check_geosversion(GEOS_dir):
+ """check geos C-API header file (geos_c.h)"""
+ try:
+ f = open(os.path.join(GEOS_dir,'include/geos_c.h'))
+ except:
+ raise IOError('cannot find geos header file in %s/include'%GEOS_dir)
+ geos_version = None
+ for line in f:
+ if line.startswith('#define GEOS_VERSION'):
+ geos_version = line.split()[2]
+ return geos_version
+
+# get location of geos lib from environment variable.
GEOS_dir = os.environ.get('GEOS_DIR')
if GEOS_dir is None:
- raise KeyError, 'please specify the location of geos library and headers with GEOS_DIR environment variable'
-geos_include_dirs=[os.path.join(GEOS_dir,'include'),numpy.get_include()]
-geos_library_dirs=[os.path.join(GEOS_dir,'lib')]
+ raise KeyError('please specify the location of geos library and headers with GEOS_DIR environment variable')
+# check that header geos_c.h is in GEOS_dir/include,
+# and that the version number in the header file is 2.2.3.
+geos_version = check_geosversion(GEOS_dir)
+if geos_version != '"2.2.3"':
+ raise ValueError("""
+geos library version 2.2.3 is required, you have version %s.
+Please download and install 2.2.3 from http://geos.refractions.net.""" % geos_version)
+else:
+ geos_include_dirs=[os.path.join(GEOS_dir,'include'),numpy.get_include()]
+ geos_library_dirs=[os.path.join(GEOS_dir,'lib')]
# proj4 and geos extensions.
deps = glob.glob('src/*.c')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-14 16:16:36
|
Revision: 4271
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4271&view=rev
Author: jswhit
Date: 2007-11-14 08:16:30 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
clarify error messages.
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-14 15:55:43 UTC (rev 4270)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-14 16:16:30 UTC (rev 4271)
@@ -46,14 +46,20 @@
# get location of geos lib from environment variable.
GEOS_dir = os.environ.get('GEOS_DIR')
if GEOS_dir is None:
- raise KeyError('please specify the location of geos library and headers with GEOS_DIR environment variable')
+ msg = """\
+please specify the location of geos library and headers with
+the GEOS_DIR environment variable. For example if libgeos_c
+is installed in /usr/local/lib, and geos_c.h is installed in
+/usr/local/include, set GEOS_DIR to /usr/local."""
+ raise ValueError(msg)
# check that header geos_c.h is in GEOS_dir/include,
# and that the version number in the header file is 2.2.3.
geos_version = check_geosversion(GEOS_dir)
if geos_version != '"2.2.3"':
- raise ValueError("""
+ msg = """\
geos library version 2.2.3 is required, you have version %s.
-Please download and install 2.2.3 from http://geos.refractions.net.""" % geos_version)
+Please download and install 2.2.3 from http://geos.refractions.net.""" % geos_version
+ raise ValueError(msg)
else:
geos_include_dirs=[os.path.join(GEOS_dir,'include'),numpy.get_include()]
geos_library_dirs=[os.path.join(GEOS_dir,'lib')]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-14 16:17:57
|
Revision: 4272
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4272&view=rev
Author: jswhit
Date: 2007-11-14 08:17:55 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
just raise a SystemExit instead of ValueError if geos lib not found.
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-14 16:16:30 UTC (rev 4271)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-14 16:17:55 UTC (rev 4272)
@@ -51,7 +51,8 @@
the GEOS_DIR environment variable. For example if libgeos_c
is installed in /usr/local/lib, and geos_c.h is installed in
/usr/local/include, set GEOS_DIR to /usr/local."""
- raise ValueError(msg)
+ print msg
+ raise SystemExit(1)
# check that header geos_c.h is in GEOS_dir/include,
# and that the version number in the header file is 2.2.3.
geos_version = check_geosversion(GEOS_dir)
@@ -59,7 +60,8 @@
msg = """\
geos library version 2.2.3 is required, you have version %s.
Please download and install 2.2.3 from http://geos.refractions.net.""" % geos_version
- raise ValueError(msg)
+ print msg
+ raise SystemExit(1)
else:
geos_include_dirs=[os.path.join(GEOS_dir,'include'),numpy.get_include()]
geos_library_dirs=[os.path.join(GEOS_dir,'lib')]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-14 16:47:21
|
Revision: 4276
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4276&view=rev
Author: jswhit
Date: 2007-11-14 08:47:09 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
install full res coastlines if they are available
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-14 16:39:47 UTC (rev 4275)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-14 16:47:09 UTC (rev 4276)
@@ -112,7 +112,7 @@
# Specify all the required mpl data
pyproj_datafiles = ['data/epsg', 'data/esri', 'data/esri.extra', 'data/GL27', 'data/nad.lst', 'data/nad27', 'data/nad83', 'data/ntv2_out.dist', 'data/other.extra', 'data/pj_out27.dist', 'data/pj_out83.dist', 'data/proj_def.dat', 'data/README', 'data/td_out.dist', 'data/test27', 'data/test83', 'data/testntv2', 'data/testvarious', 'data/world']
boundaryfiles = []
-for resolution in ['c','l','i','h']:
+for resolution in ['c','l','i','h','f']:
boundaryfiles = boundaryfiles + glob.glob("lib/matplotlib/toolkits/basemap/data/*_"+resolution+".dat")
boundaryfiles = [os.path.join('data',os.path.basename(bfile)) for bfile in boundaryfiles]
basemap_datafiles = boundaryfiles + ['data/5minmask.bin']
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-14 18:11:13
|
Revision: 4279
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4279&view=rev
Author: jswhit
Date: 2007-11-14 10:11:07 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
clearer error message if wrong version of GEOS found.
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-14 18:10:00 UTC (rev 4278)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-14 18:11:07 UTC (rev 4279)
@@ -58,8 +58,10 @@
geos_version = check_geosversion(GEOS_dir)
if geos_version != '"2.2.3"':
msg = """\
-geos library version 2.2.3 is required, you have version %s.
-Please download and install 2.2.3 from http://geos.refractions.net.""" % geos_version
+geos library version 2.2.3 is required, you have version %s
+installed in %s. Please change the GEOS_DIR environment variable
+to point to the location where geos 2.2.3 is installed, or
+download and install 2.2.3 from http://geos.refractions.net.""" % (geos_version, GEOS_dir)
print msg
raise SystemExit(1)
else:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-14 18:22:04
|
Revision: 4280
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4280&view=rev
Author: jswhit
Date: 2007-11-14 10:22:01 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
more tweaking of error messages.
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-14 18:11:07 UTC (rev 4279)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-14 18:22:01 UTC (rev 4280)
@@ -36,7 +36,12 @@
try:
f = open(os.path.join(GEOS_dir,'include/geos_c.h'))
except:
- raise IOError('cannot find geos header file in %s/include'%GEOS_dir)
+ msg = """
+Cannot find geos header file (geos_c.h) in %s/include. Please check
+your geos installation and make sure the GEOS_DIR environment
+variable is set correctly""" %GEOS_dir
+ print msg
+ raise SystemExit(1)
geos_version = None
for line in f:
if line.startswith('#define GEOS_VERSION'):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-14 18:31:37
|
Revision: 4281
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4281&view=rev
Author: jswhit
Date: 2007-11-14 10:31:35 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
further refinement of GEOS library version checking
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-14 18:22:01 UTC (rev 4280)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-14 18:31:35 UTC (rev 4281)
@@ -5,7 +5,7 @@
# package_data
try: import setuptools
except ImportError:
- raise SystemExit("""\
+ raise SystemExit("""
matplotlib requires setuptools for installation. Please download
http://peak.telecommunity.com/dist/ez_setup.py and run it (as su if
you are doing a system wide install) to install the proper version of
@@ -36,12 +36,10 @@
try:
f = open(os.path.join(GEOS_dir,'include/geos_c.h'))
except:
- msg = """
+ raise SystemExit("""
Cannot find geos header file (geos_c.h) in %s/include. Please check
your geos installation and make sure the GEOS_DIR environment
-variable is set correctly""" %GEOS_dir
- print msg
- raise SystemExit(1)
+variable is set correctly.""" %GEOS_dir)
geos_version = None
for line in f:
if line.startswith('#define GEOS_VERSION'):
@@ -51,24 +49,20 @@
# get location of geos lib from environment variable.
GEOS_dir = os.environ.get('GEOS_DIR')
if GEOS_dir is None:
- msg = """\
+ raise SystemExit("""
please specify the location of geos library and headers with
the GEOS_DIR environment variable. For example if libgeos_c
is installed in /usr/local/lib, and geos_c.h is installed in
-/usr/local/include, set GEOS_DIR to /usr/local."""
- print msg
- raise SystemExit(1)
+/usr/local/include, set GEOS_DIR to /usr/local.""")
# check that header geos_c.h is in GEOS_dir/include,
# and that the version number in the header file is 2.2.3.
geos_version = check_geosversion(GEOS_dir)
if geos_version != '"2.2.3"':
- msg = """\
+ raise SystemExit("""
geos library version 2.2.3 is required, you have version %s
installed in %s. Please change the GEOS_DIR environment variable
to point to the location where geos 2.2.3 is installed, or
-download and install 2.2.3 from http://geos.refractions.net.""" % (geos_version, GEOS_dir)
- print msg
- raise SystemExit(1)
+download and install 2.2.3 from http://geos.refractions.net.""" % (geos_version, GEOS_dir))
else:
geos_include_dirs=[os.path.join(GEOS_dir,'include'),numpy.get_include()]
geos_library_dirs=[os.path.join(GEOS_dir,'lib')]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-14 22:58:44
|
Revision: 4298
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4298&view=rev
Author: jswhit
Date: 2007-11-14 14:58:40 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
fix building of _geos extension
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-14 22:51:09 UTC (rev 4297)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-14 22:58:40 UTC (rev 4298)
@@ -80,7 +80,7 @@
extensions.append(Extension("matplotlib.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._geos"
-extensions.append(Extension("_geos",deps+['src/_geos.c'],library_dirs=geos_library_dirs,include_dirs=geos_include_dirs,runtime_library_dirs=geos_library_dirs,libraries=['geos_c']))
+extensions.append(Extension("_geos",['src/_geos.c'],library_dirs=geos_library_dirs,include_dirs=geos_include_dirs,runtime_library_dirs=geos_library_dirs,libraries=['geos_c']))
# install shapelib and dbflib.
packages = packages + ['shapelib','dbflib']
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-15 14:59:59
|
Revision: 4301
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4301&view=rev
Author: jswhit
Date: 2007-11-15 06:59:53 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
link geos lib too (necessary if they are static libs)
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-15 14:59:03 UTC (rev 4300)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-15 14:59:53 UTC (rev 4301)
@@ -80,7 +80,7 @@
extensions.append(Extension("matplotlib.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._geos"
-extensions.append(Extension("_geos",['src/_geos.c'],library_dirs=geos_library_dirs,include_dirs=geos_include_dirs,runtime_library_dirs=geos_library_dirs,libraries=['geos_c']))
+extensions.append(Extension("_geos",['src/_geos.c'],library_dirs=geos_library_dirs,include_dirs=geos_include_dirs,runtime_library_dirs=geos_library_dirs,libraries=['geos_c','geos']))
# install shapelib and dbflib.
packages = packages + ['shapelib','dbflib']
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-21 20:50:57
|
Revision: 4410
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4410&view=rev
Author: jswhit
Date: 2007-11-21 12:50:55 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
remove runtime_library_dirs (not needed, causes problems with mingw32)
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-21 20:50:10 UTC (rev 4409)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-21 20:50:55 UTC (rev 4410)
@@ -80,7 +80,7 @@
extensions.append(Extension("matplotlib.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._geos"
-extensions.append(Extension("_geos",['src/_geos.c'],library_dirs=geos_library_dirs,include_dirs=geos_include_dirs,runtime_library_dirs=geos_library_dirs,libraries=['geos_c','geos']))
+extensions.append(Extension("_geos",['src/_geos.c'],library_dirs=geos_library_dirs,include_dirs=geos_include_dirs,libraries=['geos_c','geos']))
# install shapelib and dbflib.
packages = packages + ['shapelib','dbflib']
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X