Revision: 4738
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4738&view=rev
Author: jswhit
Date: 2007-12-14 18:33:26 -0800 (Fri, 14 Dec 2007)
Log Message:
-----------
remove setuptools requirement.
Modified Paths:
--------------
trunk/toolkits/basemap/examples/plotsst.py
trunk/toolkits/basemap/setup-data.py
trunk/toolkits/basemap/setup.py
Modified: trunk/toolkits/basemap/examples/plotsst.py
===================================================================
--- trunk/toolkits/basemap/examples/plotsst.py 2007-12-15 00:12:13 UTC (rev
4737)
+++ trunk/toolkits/basemap/examples/plotsst.py 2007-12-15 02:33:26 UTC (rev
4738)
@@ -3,7 +3,7 @@
# read in sea-surface temperature and ice data
# can be a local file, a URL for a remote opendap dataset,
# or (if PyNIO is installed) a GRIB or HDF file.
-ncfile =
NetCDFFile('http://nomads.ncdc.noaa.gov:8085/thredds/dodsC/oisst/2007/AVHRR/sst4-navy-eot.20071201.nc')
+ncfile =
NetCDFFile('http://nomads.ncdc.noaa.gov:8085/thredds/dodsC/oisst/2007/AVHRR/sst4-navy-eot.20071213.nc')
# read sst. Will automatically create a masked array using
# missing_value variable attribute.
sst = ncfile.variables['sst'][:]
@@ -33,7 +33,7 @@
# missing values over land will show up this color.
m.drawmapboundary(fill_color='0.3')
# plot ice, then with pcolor
-im1 = m.pcolor(x,y,sst,shading='flat',cmap=pylab.cm.gist_ncar)
+im1 = m.pcolor(x,y,sst,shading='flat',cmap=pylab.cm.jet)
im2 = m.pcolor(x,y,ice,shading='flat',cmap=pylab.cm.gist_gray)
# draw parallels and meridians, but don't bother labelling them.
m.drawparallels(numpy.arange(-90.,120.,30.))
Modified: trunk/toolkits/basemap/setup-data.py
===================================================================
--- trunk/toolkits/basemap/setup-data.py 2007-12-15 00:12:13 UTC (rev
4737)
+++ trunk/toolkits/basemap/setup-data.py 2007-12-15 02:33:26 UTC (rev
4738)
@@ -1,13 +1,4 @@
import sys, glob, os
-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
packages = ['matplotlib.toolkits.basemap.data']
package_dirs = {'':'lib'}
boundaryfiles = glob.glob("lib/matplotlib/toolkits/basemap/data/*_f.dat")
Modified: trunk/toolkits/basemap/setup.py
===================================================================
--- trunk/toolkits/basemap/setup.py 2007-12-15 00:12:13 UTC (rev 4737)
+++ trunk/toolkits/basemap/setup.py 2007-12-15 02:33:26 UTC (rev 4738)
@@ -1,16 +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
- # 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""")
from distutils.core import Extension
from distutils.util import convert_path
import numpy
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
