SF.net SVN: matplotlib: [4860] trunk/toolkits/basemap

[<js...@us...>]

Revision: 4860
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4860&view=rev
Author:   jswhit
Date:     2008-01-11 15:32:10 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------
fixed installation of fullres data for new mpl_toolkits namespace

Modified Paths:
--------------
    trunk/toolkits/basemap/setup-data.py
    trunk/toolkits/basemap/setupegg-data.py

Modified: trunk/toolkits/basemap/setup-data.py
===================================================================
--- trunk/toolkits/basemap/setup-data.py	2008-01-11 21:08:45 UTC (rev 4859)
+++ trunk/toolkits/basemap/setup-data.py	2008-01-11 23:32:10 UTC (rev 4860)
@@ -3,21 +3,21 @@
 if major==2 and minor1<=3:
     # setuptools monkeypatches distutils.core.Distribution to support
     # package_data
-    #try: import setuptools
-    #except ImportError:
-    #    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
-#setuptools for your system""")
+    try: import setuptools
+    except ImportError:
+        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
+setuptools for your system""")
     raise SystemExit("""The basemap toolkit requires python 2.4.""")
 from distutils.core import setup
 
-packages          = ['matplotlib.toolkits.basemap.data']
+packages          = ['mpl_toolkits.basemap.data']
 package_dirs       = {'':'lib'}
 boundaryfiles = glob.glob("lib/matplotlib/toolkits/basemap/data/*_f.dat")
 basemap_datafiles = [os.path.basename(bfile) for bfile in boundaryfiles]
-package_data = {'matplotlib.toolkits.basemap.data':basemap_datafiles}
+package_data = {'mpl_toolkits.basemap.data':basemap_datafiles}
 setup(
   name              = "basemap-data-fullres",
   version           = "0.9.7",

Modified: trunk/toolkits/basemap/setupegg-data.py
===================================================================
--- trunk/toolkits/basemap/setupegg-data.py	2008-01-11 21:08:45 UTC (rev 4859)
+++ trunk/toolkits/basemap/setupegg-data.py	2008-01-11 23:32:10 UTC (rev 4860)
@@ -3,4 +3,6 @@
 """
 
 from setuptools import setup
-execfile('setup-data.py')
+execfile('setup-data.py',
+         {'additional_params' :
+         {'namespace_packages' : ['mpl_toolkits']}})


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.