From: <js...@us...> - 2008-01-11 23:59:13
|
Revision: 4861 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4861&view=rev Author: jswhit Date: 2008-01-11 15:59:04 -0800 (Fri, 11 Jan 2008) Log Message: ----------- remove separate data package (won't work unless nested namespace packages are used anyway) Modified Paths: -------------- trunk/toolkits/basemap/MANIFEST.in Removed Paths: ------------- trunk/toolkits/basemap/setup-data.py trunk/toolkits/basemap/setupegg-data.py Modified: trunk/toolkits/basemap/MANIFEST.in =================================================================== --- trunk/toolkits/basemap/MANIFEST.in 2008-01-11 23:32:10 UTC (rev 4860) +++ trunk/toolkits/basemap/MANIFEST.in 2008-01-11 23:59:04 UTC (rev 4861) @@ -84,54 +84,4 @@ recursive-include lib/httplib2 * recursive-include lib/dbflib * recursive-include lib/shapelib * -include lib/mpl_toolkits/basemap/data/5minmask.bin -include lib/mpl_toolkits/basemap/data/GL27 -include lib/mpl_toolkits/basemap/data/countries_c.dat -include lib/mpl_toolkits/basemap/data/countries_h.dat -include lib/mpl_toolkits/basemap/data/countries_i.dat -include lib/mpl_toolkits/basemap/data/countries_l.dat -include lib/mpl_toolkits/basemap/data/countriesmeta_c.dat -include lib/mpl_toolkits/basemap/data/countriesmeta_h.dat -include lib/mpl_toolkits/basemap/data/countriesmeta_i.dat -include lib/mpl_toolkits/basemap/data/countriesmeta_l.dat -include lib/mpl_toolkits/basemap/data/epsg -include lib/mpl_toolkits/basemap/data/esri -include lib/mpl_toolkits/basemap/data/esri.extra -include lib/mpl_toolkits/basemap/data/gshhs_c.dat -include lib/mpl_toolkits/basemap/data/gshhs_h.dat -include lib/mpl_toolkits/basemap/data/gshhs_i.dat -include lib/mpl_toolkits/basemap/data/gshhs_l.dat -include lib/mpl_toolkits/basemap/data/gshhsmeta_c.dat -include lib/mpl_toolkits/basemap/data/gshhsmeta_h.dat -include lib/mpl_toolkits/basemap/data/gshhsmeta_i.dat -include lib/mpl_toolkits/basemap/data/gshhsmeta_l.dat -include lib/mpl_toolkits/basemap/data/nad.lst -include lib/mpl_toolkits/basemap/data/nad27 -include lib/mpl_toolkits/basemap/data/nad83 -include lib/mpl_toolkits/basemap/data/ntv2_out.dist -include lib/mpl_toolkits/basemap/data/other.extra -include lib/mpl_toolkits/basemap/data/pj_out27.dist -include lib/mpl_toolkits/basemap/data/pj_out83.dist -include lib/mpl_toolkits/basemap/data/proj_def.dat -include lib/mpl_toolkits/basemap/data/rivers_c.dat -include lib/mpl_toolkits/basemap/data/rivers_h.dat -include lib/mpl_toolkits/basemap/data/rivers_i.dat -include lib/mpl_toolkits/basemap/data/rivers_l.dat -include lib/mpl_toolkits/basemap/data/riversmeta_c.dat -include lib/mpl_toolkits/basemap/data/riversmeta_h.dat -include lib/mpl_toolkits/basemap/data/riversmeta_i.dat -include lib/mpl_toolkits/basemap/data/riversmeta_l.dat -include lib/mpl_toolkits/basemap/data/states_c.dat -include lib/mpl_toolkits/basemap/data/states_h.dat -include lib/mpl_toolkits/basemap/data/states_i.dat -include lib/mpl_toolkits/basemap/data/states_l.dat -include lib/mpl_toolkits/basemap/data/statesmeta_c.dat -include lib/mpl_toolkits/basemap/data/statesmeta_h.dat -include lib/mpl_toolkits/basemap/data/statesmeta_i.dat -include lib/mpl_toolkits/basemap/data/statesmeta_l.dat -include lib/mpl_toolkits/basemap/data/td_out.dist -include lib/mpl_toolkits/basemap/data/test27 -include lib/mpl_toolkits/basemap/data/test83 -include lib/mpl_toolkits/basemap/data/testntv2 -include lib/mpl_toolkits/basemap/data/testvarious -include lib/mpl_toolkits/basemap/data/world +recursive-include lib/mpl_toolkits/basemap/data * Deleted: trunk/toolkits/basemap/setup-data.py =================================================================== --- trunk/toolkits/basemap/setup-data.py 2008-01-11 23:32:10 UTC (rev 4860) +++ trunk/toolkits/basemap/setup-data.py 2008-01-11 23:59:04 UTC (rev 4861) @@ -1,41 +0,0 @@ -import sys, glob, os -major, minor1, minor2, s, tmp = sys.version_info -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""") - raise SystemExit("""The basemap toolkit requires python 2.4.""") -from distutils.core import setup - -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 = {'mpl_toolkits.basemap.data':basemap_datafiles} -setup( - name = "basemap-data-fullres", - version = "0.9.7", - description = "full-resolution boundary data for basemap", - url = "http://matplotlib.sourceforge.net/toolkits.html", - download_url = "http://sourceforge.net/projects/matplotlib", - author = "Jeff Whitaker", - author_email = "jef...@no...", - platforms = ["any"], - 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", - "Topic :: Scientific/Engineering :: Visualization", - "Topic :: Software Development :: Libraries :: Python Modules", - "Operating System :: OS Independent"], - packages = packages, - package_dir = package_dirs, - package_data = package_data - ) Deleted: trunk/toolkits/basemap/setupegg-data.py =================================================================== --- trunk/toolkits/basemap/setupegg-data.py 2008-01-11 23:32:10 UTC (rev 4860) +++ trunk/toolkits/basemap/setupegg-data.py 2008-01-11 23:59:04 UTC (rev 4861) @@ -1,8 +0,0 @@ -""" -Poor man's setuptools script... -""" - -from setuptools import setup -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. |