SF.net SVN: matplotlib: [4332] trunk/toolkits/basemap-testing

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

Revision: 4332
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4332&view=rev
Author:   jswhit
Date:     2007-11-16 07:53:50 -0800 (Fri, 16 Nov 2007)

Log Message:
-----------
added NetCDF reader to basemap namespace
(from matplotlib.toolkits.basemap import NetCDFFile)

Modified Paths:
--------------
    trunk/toolkits/basemap-testing/MANIFEST.in
    trunk/toolkits/basemap-testing/examples/ccsm_popgrid.py
    trunk/toolkits/basemap-testing/examples/plotprecip.py
    trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/__init__.py

Modified: trunk/toolkits/basemap-testing/MANIFEST.in
===================================================================
--- trunk/toolkits/basemap-testing/MANIFEST.in	2007-11-16 13:46:59 UTC (rev 4331)
+++ trunk/toolkits/basemap-testing/MANIFEST.in	2007-11-16 15:53:50 UTC (rev 4332)
@@ -54,7 +54,6 @@
 include examples/setwh.py
 include examples/ccsm_popgrid.py
 include examples/ccsm_popgrid.nc
-include examples/pupynere.py
 include examples/plot_tissot.py
 include examples/tissot.dbf
 include examples/tissot.shp
@@ -69,6 +68,7 @@
 include lib/matplotlib/toolkits/basemap/proj.py
 include lib/matplotlib/toolkits/basemap/pyproj.py
 include lib/matplotlib/toolkits/basemap/cm.py
+include lib/matplotlib/toolkits/basemap/pupynere.py
 include pyshapelib/README pyshapelib/COPYING pyshapelib/ChangeLog pyshapelib/NEWS
 include pyshapelib/*.i pyshapelib/*.c pyshapelib/*.py pyshapelib/*.h
 include pyshapelib/*.shp pyshapelib/*.shx pyshapelib/*.dbf

Modified: trunk/toolkits/basemap-testing/examples/ccsm_popgrid.py
===================================================================
--- trunk/toolkits/basemap-testing/examples/ccsm_popgrid.py	2007-11-16 13:46:59 UTC (rev 4331)
+++ trunk/toolkits/basemap-testing/examples/ccsm_popgrid.py	2007-11-16 15:53:50 UTC (rev 4332)
@@ -24,7 +24,6 @@
 from Roberto De Almeida for reading netCDF files (included).
 
 """
-from pupynere import NetCDFFile
 import pylab as pl
 from matplotlib import rcParams
 try:
@@ -34,7 +33,7 @@
     raise ImportError('this example requires numpy')
 import matplotlib.numerix.ma as MA
 import matplotlib.numerix as N
-from matplotlib.toolkits.basemap import Basemap
+from matplotlib.toolkits.basemap import Basemap, NetCDFFile
 
 # read in data from netCDF file.
 infile    = 'ccsm_popgrid.nc'

Modified: trunk/toolkits/basemap-testing/examples/plotprecip.py
===================================================================
--- trunk/toolkits/basemap-testing/examples/plotprecip.py	2007-11-16 13:46:59 UTC (rev 4331)
+++ trunk/toolkits/basemap-testing/examples/plotprecip.py	2007-11-16 15:53:50 UTC (rev 4332)
@@ -1,5 +1,4 @@
-from pupynere import NetCDFFile
-from matplotlib.toolkits.basemap import Basemap, cm
+from matplotlib.toolkits.basemap import Basemap, cm, NetCDFFile
 import pylab, copy
 from matplotlib import rcParams
 

Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/__init__.py	2007-11-16 13:46:59 UTC (rev 4331)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/__init__.py	2007-11-16 15:53:50 UTC (rev 4332)
@@ -1,2 +1,3 @@
 from basemap import __doc__, __version__
 from basemap import *
+from pupynere import NetCDFFile


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