Revision: 4736
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4736&view=rev
Author: jswhit
Date: 2007-12-14 13:16:38 -0800 (Fri, 14 Dec 2007)
Log Message:
-----------
took out namespace package stuff (because I don't understand it,
and it apparently is not needed).
Modified Paths:
--------------
trunk/toolkits/basemap/setup.py
Modified: trunk/toolkits/basemap/setup.py
===================================================================
--- trunk/toolkits/basemap/setup.py 2007-12-14 20:12:18 UTC (rev 4735)
+++ trunk/toolkits/basemap/setup.py 2007-12-14 21:16:38 UTC (rev 4736)
@@ -1,4 +1,5 @@
import sys, glob, os
+from distutils.core import setup
major, minor1, minor2, s, tmp = sys.version_info
if major==2 and minor1<=3:
# setuptools monkeypatches distutils.core.Distribution to support
@@ -132,16 +133,6 @@
packages = packages + ['httplib2']
package_dirs['httlib2'] = os.path.join('lib','httplib2')
-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']}
- 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']
boundaryfiles = []
@@ -175,6 +166,5 @@
packages = packages,
package_dir = package_dirs,
ext_modules = extensions,
- package_data = package_data,
- **additional_params
+ package_data = package_data
)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
