Merge pull request #401 from ocefpaf/update_examples

WeatherGod · web-flow · commit 66aa4582c520 · 2018-04-28T09:20:13.000-04:00
Update examples
diff --git a/examples/allskymap.py b/examples/allskymap.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from __future__ import unicode_literals
 """
 AllSkyMap is a subclass of Basemap, specialized for handling common plotting
diff --git a/examples/allskymap_cr_example.py b/examples/allskymap_cr_example.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 """
 Example of astronomical use of AllSkyMap class in allskymap.py module
 
diff --git a/examples/animate.py b/examples/animate.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 # example using matplotlib.animation to create a movie
 # reads data over http - needs an active internet connection.
 
diff --git a/examples/barb_demo.py b/examples/barb_demo.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/ccsm_popgrid.py b/examples/ccsm_popgrid.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 """
 This example shows how to plot data on rectangular 2D grids
 (grids that are not rectlinear in geographic or native map projection
@@ -56,7 +58,7 @@
 m.fillcontinents(color='white')
 
 x, y = m(tlon,tlat)
-im = m.pcolor(x,y,ma.masked_array(np.zeros(temp.shape,'f'), temp.mask),
+im = m.pcolormesh(x,y,ma.masked_array(np.zeros(temp.shape,'f'), temp.mask),
                 shading='faceted', antialiased=True, cmap=plt.cm.cool,
                 vmin=0, vmax=0)
 # disclaimer:  these are not really the grid cells because of the
diff --git a/examples/contour_demo.py b/examples/contour_demo.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/counties.py b/examples/counties.py
@@ -1,8 +1,10 @@
+from __future__ import (absolute_import, division, print_function)
+
 import matplotlib.pyplot as plt
 from mpl_toolkits.basemap import Basemap
 
 def draw_map_background(m, ax):
-    ax.set_axis_bgcolor('#729FCF')
+    ax.set_facecolor('#729FCF')
     m.fillcontinents(color='#FAFAFA', ax=ax, zorder=0)
     m.drawcounties(ax=ax)
     m.drawstates(ax=ax)
diff --git a/examples/cubed_sphere.py b/examples/cubed_sphere.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 import matplotlib.pyplot as plt
 import numpy as np
diff --git a/examples/customticks.py b/examples/customticks.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from __future__ import unicode_literals
 from mpl_toolkits.basemap import Basemap
 import numpy as np
diff --git a/examples/daynight.py b/examples/daynight.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 import numpy as np
 from mpl_toolkits.basemap import Basemap
 import matplotlib.pyplot as plt
diff --git a/examples/embedding_map_in_wx.py b/examples/embedding_map_in_wx.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 #!/usr/bin/env python
 """
 An example of how to use wx or wxagg in an application with the Basemap module
diff --git a/examples/fcstmaps.py b/examples/fcstmaps.py
@@ -1,4 +1,5 @@
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
 from __future__ import unicode_literals
 # this example reads today's numerical weather forecasts
 # from the NOAA OpenDAP servers and makes a multi-panel plot.
diff --git a/examples/fcstmaps_axesgrid.py b/examples/fcstmaps_axesgrid.py
@@ -1,4 +1,5 @@
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
 from __future__ import unicode_literals
 # this example reads today's numerical weather forecasts
 # from the NOAA OpenDAP servers and makes a multi-panel plot.
diff --git a/examples/fillstates.py b/examples/fillstates.py
@@ -1,4 +1,5 @@
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
 import numpy as np
 import matplotlib.pyplot as plt
 from mpl_toolkits.basemap import Basemap as Basemap
diff --git a/examples/garp.py b/examples/garp.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/geos_demo.py b/examples/geos_demo.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/geos_demo_2.py b/examples/geos_demo_2.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 """geos_demo_2.py
 
 This script shows how to plot data onto the Geostationary Satellite projection
diff --git a/examples/geos_demo_3.py b/examples/geos_demo_3.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 import numpy as np
 import matplotlib.pyplot as plt
@@ -6,7 +8,7 @@
 lon_0=57
 # global geos map
 m1 = Basemap(projection='geos',lon_0=lon_0,rsphere=(6378137.00,6356752.3142),resolution=None)
-ax = fig.add_axes([0.1,0.1,0.8,0.8],axisbg='k')
+ax = fig.add_axes([0.1,0.1,0.8,0.8], facecolor='k')
 # plot just upper right quadrant (coordinates determined from global map).
 m = Basemap(projection='geos',lon_0=lon_0,rsphere=(6378137.00,6356752.3142),resolution='l',llcrnrx=0.,llcrnry=0.,urcrnrx=m1.urcrnrx/2.,urcrnry=m1.urcrnry/2.)
 m.drawcoastlines()
@@ -22,7 +24,7 @@
 # global ortho map
 lat_0=10.
 m1 = Basemap(projection='ortho',lon_0=lon_0,lat_0=lat_0,resolution=None)
-ax = fig.add_axes([0.1,0.1,0.8,0.8],axisbg='k')
+ax = fig.add_axes([0.1,0.1,0.8,0.8], facecolor='k')
 # plot just upper right quadrant (corners determined from global map).
 m = Basemap(projection='ortho',lon_0=lon_0,lat_0=lat_0,resolution='l',llcrnrx=0.,llcrnry=0.,urcrnrx=m1.urcrnrx/2.,urcrnry=m1.urcrnry/2.)
 m.drawcoastlines()
diff --git a/examples/hexbin_demo.py b/examples/hexbin_demo.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 # example showing how to plot scattered data with hexbin.
 from numpy.random import uniform
 import matplotlib.pyplot as plt
@@ -54,7 +56,7 @@
 H = np.ma.masked_where(mask, H/bincount)
 # set color of masked values to axes background (hexbin does this by default)
 palette = plt.cm.jet
-palette.set_bad(ax.get_axis_bgcolor(), 1.0)
+palette.set_bad(ax.get_facecolor(), 1.0)
 CS = m.pcolormesh(xedges,yedges,H.T,shading='flat',cmap=palette)
 # draw coastlines, lat/lon lines.
 m.drawcoastlines()
diff --git a/examples/hires.py b/examples/hires.py
@@ -1,4 +1,5 @@
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/hurrtracks.py b/examples/hurrtracks.py
@@ -1,4 +1,5 @@
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
 """
 draw Atlantic Hurricane Tracks for storms that reached Cat 4 or 5.
 part of the track for which storm is cat 4 or 5 is shown red.
diff --git a/examples/lic_demo.py b/examples/lic_demo.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 # example showing how to use Line Integral Convolution to visualize a vector
 # flow field (from Hurricane Earl).  Produces something akin to streamlines.
 # Requires vectorplot scikit (http://scikits.appspot.com/vectorplot).
diff --git a/examples/make_inset.py b/examples/make_inset.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 from mpl_toolkits.axes_grid1.inset_locator import inset_axes
 import matplotlib.pyplot as plt
diff --git a/examples/maskoceans.py b/examples/maskoceans.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap, shiftgrid, maskoceans, interp
 import numpy as np 
 import matplotlib.pyplot as plt
diff --git a/examples/nsper_demo.py b/examples/nsper_demo.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 import numpy as np
 import matplotlib.pyplot as plt
@@ -32,7 +34,7 @@ def get_input(prompt):
 
 fig = plt.figure()
 m1 = Basemap(projection='nsper',lon_0=lon_0,lat_0=lat_0,satellite_height=h,resolution=None)
-ax = fig.add_axes([0.1,0.1,0.8,0.8],axisbg='k')
+ax = fig.add_axes([0.1,0.1,0.8,0.8], facecolor='k')
 # plot just upper right quadrant (coordinates determined from global map).
 m = Basemap(projection='nsper',lon_0=lon_0,lat_0=lat_0,satellite_height=h,resolution='l',llcrnrx=0.,llcrnry=0.,urcrnrx=m1.urcrnrx/2.,urcrnry=m1.urcrnry/2.)
 m.drawcoastlines()
diff --git a/examples/nytolondon.py b/examples/nytolondon.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 # example demonstrating how to draw a great circle on a map.
 from mpl_toolkits.basemap import Basemap
 import numpy as np
diff --git a/examples/ortho_demo.py b/examples/ortho_demo.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/panelplot.py b/examples/panelplot.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 from matplotlib import rcParams
 from matplotlib.ticker import MultipleLocator
diff --git a/examples/plot_tissot.py b/examples/plot_tissot.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 import numpy as np
 import sys
 import matplotlib.pyplot as plt
diff --git a/examples/plotcities.py b/examples/plotcities.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from matplotlib.mlab import prctile_rank
 import matplotlib.pyplot as plt
 from mpl_toolkits.basemap import Basemap as Basemap
diff --git a/examples/plothighsandlows.py b/examples/plothighsandlows.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 """
 plot H's and L's on a sea-level pressure map
 (uses scipy.ndimage.filters and netcdf4-python)
diff --git a/examples/ploticos.py b/examples/ploticos.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 import matplotlib.pyplot as plt
 import numpy as np
diff --git a/examples/plotmap.py b/examples/plotmap.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 # make plot of etopo bathymetry/topography data on
 # lambert conformal conic map projection, drawing coastlines, state and
 # country boundaries, and parallels/meridians.
diff --git a/examples/plotmap_masked.py b/examples/plotmap_masked.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 # make plot of etopo bathymetry/topography data on
 # lambert conformal conic map projection, drawing coastlines, state and
 # country boundaries, and parallels/meridians.
diff --git a/examples/plotmap_oo.py b/examples/plotmap_oo.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 # make plot of etopo bathymetry/topography data on
 # lambert conformal conic map projection, drawing coastlines, state and
 # country boundaries, and parallels/meridians.
diff --git a/examples/plotmap_shaded.py b/examples/plotmap_shaded.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 # make shaded relief plot of etopo bathymetry/topography data on
 # lambert conformal conic map projection.
 
diff --git a/examples/plotozone.py b/examples/plotozone.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 # make plot of ozone concentration data on
 # lambert conformal conic map projection, drawing coastlines, state and
 # country boundaries, and parallels/meridians.
@@ -48,7 +50,7 @@
 
 # add an axes.
 ax = fig.add_axes([0.1,0.1,0.8,0.8])
-ax.set_axis_bgcolor('lightgrey')
+ax.set_facecolor('lightgrey')
 # associate this axes with the Basemap instance.
 m.ax = ax
 
diff --git a/examples/plotprecip.py b/examples/plotprecip.py
@@ -1,4 +1,5 @@
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap, cm
 from netCDF4 import Dataset as NetCDFFile
 import numpy as np
diff --git a/examples/plotsst.py b/examples/plotsst.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 from netCDF4 import Dataset, date2index
 import numpy as np
diff --git a/examples/polarmaps.py b/examples/polarmaps.py
@@ -1,4 +1,5 @@
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
 # make plots of etopo bathymetry/topography data on
 # various map projections, drawing coastlines, state and
 # country boundaries, filling continents and drawing
diff --git a/examples/quiver_demo.py b/examples/quiver_demo.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/randompoints.py b/examples/randompoints.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 import numpy as np
 import matplotlib.pyplot as plt
 from matplotlib.colors import rgb2hex
diff --git a/examples/run_all.py b/examples/run_all.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 import glob, os, sys
 test_files = glob.glob('*.py')
 test_files.remove('run_all.py')
diff --git a/examples/save_background.py b/examples/save_background.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 import matplotlib, sys
 matplotlib.use('Agg')
 from mpl_toolkits.basemap import Basemap
diff --git a/examples/setwh.py b/examples/setwh.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 # examples of using the 'width' and 'height' keywords
 # to the Basemap constructor.
 
diff --git a/examples/shiftdata.py b/examples/shiftdata.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 import mpl_toolkits.basemap as bm
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/show_colormaps.py b/examples/show_colormaps.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 import numpy as np
 import matplotlib.pyplot as plt
 from mpl_toolkits.basemap import cm
diff --git a/examples/simpletest.py b/examples/simpletest.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 from mpl_toolkits.basemap import Basemap
 import numpy as np
 import matplotlib.pyplot as plt
diff --git a/examples/simpletest_oo.py b/examples/simpletest_oo.py
@@ -1,4 +1,5 @@
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
 ######################################
 # pyplot-free version of simpletest.py
 ######################################
diff --git a/examples/streamplot_demo.py b/examples/streamplot_demo.py
@@ -1,3 +1,5 @@
+from __future__ import (absolute_import, division, print_function)
+
 # example showing how to use streamlines to visualize a vector
 # flow field (from Hurricane Earl).  
 # Requires matplotlib 1.1.1 or newer.
@@ -37,7 +39,7 @@
 m.drawmeridians(np.arange(-120,-60,2),labels=[0,0,0,1])
 m.drawparallels(np.arange(0,30,2),labels=[1,0,0,0])
 
-m.streamplot(x,y,udat,vdat,color=speed,linewidth=2,density=2,cmap=plt.cm.spectral)
+m.streamplot(x,y,udat,vdat,color=speed,linewidth=2,density=2,cmap=plt.cm.Spectral)
 m.colorbar()
 
 plt.title('Hurricane Rita flow field visualized with streamlines',\
diff --git a/examples/test.py b/examples/test.py
@@ -1,4 +1,5 @@
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
 # exercise all the projections by plotting
 # etopo bathymetry/topography over them, plus
 # drawing coastlines, state and
@@ -377,7 +378,7 @@
             llcrnrx = 137, urcrnrx = 222.5, resolution = 'l')
 m.drawcoastlines()
 ny,nx = lons.shape
-m.contourf(lons[ny/2:,:],lats[ny/2:,:],topodat[ny/2:,:],50,cmap=cmap,extend='both',latlon=True)
+m.contourf(lons[ny//2:,:],lats[ny//2:,:],topodat[ny//2:,:],50,cmap=cmap,extend='both',latlon=True)
 m.drawmeridians(np.arange(-180,180,20),labels=[1,1,1,1])
 m.drawparallels(np.arange(20,80,20))
 m.colorbar()
diff --git a/examples/test_rotpole.py b/examples/test_rotpole.py
@@ -1,4 +1,5 @@
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
 from netCDF4 import Dataset
 from mpl_toolkits.basemap import Basemap
 import numpy as np
diff --git a/examples/testarcgis.py b/examples/testarcgis.py
diff --git a/examples/testgdal.py b/examples/testgdal.py
diff --git a/examples/testwmsimage.py b/examples/testwmsimage.py
diff --git a/examples/utmtest.py b/examples/utmtest.py
diff --git a/examples/warpimage.py b/examples/warpimage.py
diff --git a/examples/wiki_example.py b/examples/wiki_example.py
diff --git a/requirements-dev.txt b/requirements-dev.txt

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import (absolute_import, division, print_function)`
	`2`	`+`
`1`	`3`	`from __future__ import unicode_literals`
`2`	`4`	`"""`
`3`	`5`	`AllSkyMap is a subclass of Basemap, specialized for handling common plotting`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import (absolute_import, division, print_function)`
	`2`	`+`
`1`	`3`	`# example using matplotlib.animation to create a movie`
`2`	`4`	`# reads data over http - needs an active internet connection.`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import (absolute_import, division, print_function)`
	`2`	`+`
`1`	`3`	`from mpl_toolkits.basemap import Basemap`
`2`	`4`	`import numpy as np`
`3`	`5`	`import matplotlib.pyplot as plt`