pydata · shoyer · Jul 20, 2015 · Jun 26, 2015 · Jun 27, 2015 · Jun 29, 2015
diff --git a/.gitignore b/.gitignore
@@ -34,12 +34,14 @@ nosetests.xml
 .project
 .pydevproject
 
-# PyCharm
+# PyCharm and Vim
 .idea
+*.swp
 
 # xray specific
 doc/_build
 doc/generated
+doc/_static/*.png
 xray/version.py
 
 .ipynb_checkpoints
diff --git a/.travis.yml b/.travis.yml
@@ -11,15 +11,15 @@ matrix:
     env: UPDATE_ENV="conda install unittest2 pandas==0.15.0 h5py cython && pip install h5netcdf"
   # Test on Python 2.7 with and without netCDF4/scipy/cdat-lite
   - python: 2.7
-    env: UPDATE_ENV="conda install -c scitools cdat-lite h5py cython && pip install cyordereddict h5netcdf"
+    env: UPDATE_ENV="conda install -c scitools cdat-lite h5py cython matplotlib && pip install cyordereddict h5netcdf"
   - python: 2.7
     # nb. we have to remove scipy because conda install pandas brings it in:
     # https://github.com/ContinuumIO/anaconda-issues/issues/145
     env: UPDATE_ENV="conda remove scipy netCDF4 && conda install dask"
   - python: 3.3
     env: UPDATE_ENV="conda remove netCDF4"
   - python: 3.4
-    env: UPDATE_ENV="conda install -c pandas bottleneck h5py cython dask && pip install cyordereddict h5netcdf"
+    env: UPDATE_ENV="conda install -c pandas bottleneck h5py cython dask matplotlib && pip install cyordereddict h5netcdf"
   # don't require pydap tests to pass because the dap test server is unreliable
   - python: 2.7
     env: UPDATE_ENV="pip install pydap"

diff --git a/appveyor.yml b/appveyor.yml
@@ -26,7 +26,7 @@ install:
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
 
   # install xray and depenencies
-  - "conda install --yes --quiet pip nose numpy pandas scipy netCDF4"
+  - "conda install --yes --quiet pip nose numpy pandas scipy netCDF4 matplotlib"
   - "python setup.py install"
 
 build: false

diff --git a/doc/api.rst b/doc/api.rst
@@ -264,6 +264,7 @@ Comparisons
    DataArray.identical
    DataArray.broadcast_equals
 
+
 .. _api.ufuncs:
 
 Universal functions
@@ -384,3 +385,17 @@ arguments for the ``from_store`` and ``dump_to_store`` Dataset methods.
    backends.H5NetCDFStore
    backends.PydapDataStore
    backends.ScipyDataStore
+
+
+Plotting
+========
+
+.. autosummary::
+   :toctree: generated/
+
+   DataArray.plot
+   DataArray.plot_contourf
+   DataArray.plot_contour
+   DataArray.plot_hist
+   DataArray.plot_imshow
+   DataArray.plot_line
diff --git a/doc/computation.rst b/doc/computation.rst
@@ -46,6 +46,8 @@ Data arrays also implement many :py:class:`numpy.ndarray` methods:
     arr.round(2)
     arr.T
 
+.. _missing_values:
+
 Missing values
 ==============
 

diff --git a/doc/examples/atlantic_noise.png b/doc/examples/atlantic_noise.png
diff --git a/doc/examples/cartopy_atlantic.py b/doc/examples/cartopy_atlantic.py
@@ -0,0 +1,20 @@
+import xray
+import numpy as np
+import matplotlib.pyplot as plt
+import cartopy.crs as ccrs
+
+nlat = 15
+nlon = 5
+atlantic = xray.DataArray(np.random.randn(nlat, nlon),
+        coords = (np.linspace(50, 20, nlat), np.linspace(-60, -20, nlon)),
+        dims = ('latitude', 'longitude'))
+
+ax = plt.axes(projection=ccrs.PlateCarree())
+
+atlantic.plot(ax=ax)
+
+ax.set_ylim(0, 90)
+ax.set_xlim(-180, 30)
+ax.coastlines()
+
+plt.savefig('atlantic_noise.png')
diff --git a/doc/index.rst b/doc/index.rst
@@ -41,6 +41,7 @@ Documentation
    pandas
    io
    dask
+   plotting
    api
    faq
    whats-new

diff --git a/doc/installing.rst b/doc/installing.rst
@@ -34,6 +34,12 @@ For parallel computing
 
 - `dask.array <http://dask.pydata.org>`__: required for :ref:`dask`.
 
+For plotting
+~~~~~~~~~~~~
+
+- `matplotlib <http://matplotlib.org/>`__: required for :ref:`plotting`.
+
+
 Instructions
 ------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,7 @@ Documentation @@
        pandas
        io
        dask
+       plotting
        api
        faq
        whats-new
@@ Expand Down @@