Vector plots 2

.travis.yml

@@ -31,6 +31,15 @@ install:
     export IRIS_TEST_DATA_REF="2f3a6bcf25f81bd152b3d66223394074c9069a96";
     export IRIS_TEST_DATA_SUFFIX=$(echo "${IRIS_TEST_DATA_REF}" | sed "s/^v//");
 
+  # Cut short doctest phase under Python 2 : now only supports Python 3
+  # SEE : https://github.com/SciTools/iris/pull/3134
+  # ------------
+  - >
+    if [[ $TEST_TARGET == 'doctest' && ${TRAVIS_PYTHON_VERSION} != 3* ]]; then
+        echo "DOCTEST phase only valid in Python 3 : ABORTING during 'install'."
+        exit 0
+    fi
+
   # Install miniconda
   # -----------------
   - >

docs/iris/src/_templates/index.html

@@ -134,7 +134,7 @@
         <span class="linkdescr">extra information on specific technical issues</span></p>
     </li>
     <li>
-        <p class="biglink"><a class="biglink" href="whatsnew/2.1.html">What's new in Iris 2.1?</a><br/>
+        <p class="biglink"><a class="biglink" href="whatsnew/2.2.html">What's new in Iris 2.2?</a><br/>
         <span class="linkdescr">recent changes in Iris's capabilities</span></p>
     </li>
 	</ul>

docs/iris/src/_templates/layout.html

@@ -37,7 +37,7 @@
     </a>
     <div class="strapline">
       <h1>
-          Iris <span class="version">v2.1</span>
+          Iris <span class="version">v2.2</span>
       </h1>
       <p>
          A powerful, format-agnostic, community-driven Python library for analysing and

docs/iris/src/userguide/interpolation_and_regridding.rst

@@ -5,6 +5,8 @@
 
   import numpy as np
   import iris
+  import warnings
+  warnings.simplefilter('ignore')
 
 =================================
 Cube interpolation and regridding
@@ -137,10 +139,9 @@ This cube has a "hybrid-height" vertical coordinate system, meaning that the ver
 coordinate is unevenly spaced in altitude:
 
    >>> print(column.coord('altitude').points)
-   [418.6983642578125 434.57049560546875 456.79278564453125 485.3664855957031
-    520.2932739257812 561.5751953125 609.2144775390625 663.214111328125
-    723.5769653320312 790.306640625 863.4072265625 942.88232421875
-    1028.737060546875 1120.9764404296875 1219.6051025390625]
+   [ 418.69836  434.5705   456.7928   485.3665   520.2933   561.5752
+     609.2145   663.2141   723.57697  790.30664  863.4072   942.8823
+    1028.737   1120.9764  1219.6051 ]
 
 We could regularise the vertical coordinate by defining 10 equally spaced altitude
 sample points between 400 and 1250 and interpolating our vertical coordinate onto
@@ -184,9 +185,8 @@ For example, to mask values that lie beyond the range of the original data:
    >>> scheme = iris.analysis.Linear(extrapolation_mode='mask')
    >>> new_column = column.interpolate(sample_points, scheme)
    >>> print(new_column.coord('altitude').points)
-   [nan 494.44451904296875 588.888916015625 683.333251953125 777.77783203125
-    872.2222290039062 966.666748046875 1061.111083984375 1155.555419921875
-    nan]
+   [       nan  494.44452  588.8889   683.33325  777.77783  872.2222
+     966.66675 1061.1111  1155.5554         nan]
 
 
 .. _caching_an_interpolator:

docs/iris/src/whatsnew/2.2.rst

@@ -0,0 +1,36 @@
+What's New in Iris 2.2.0
+************************
+
+:Release: 2.2.0a0
+:Date:
+
+
+This document explains the new/changed features of Iris in the alpha release
+of version 2.2.0
+(:doc:`View all changes <index>`).
+
+
+Iris 2.2.0 Features
+===================
+.. _showcase:
+
+.. admonition:: 2-Dimensional Coordinate Plotting
+
+  The iris plot functions :func:`~iris.plot.pcolor` and
+  :func:`~iris.plot.pcolormesh` now accommodate the plotting of 2-dimensional
+  coordinates as well as 1-dimensional coordinates.
+
+  To enable this feature, each coordinate passed in for plotting will be
+  automatically checked for contiguity.  Coordinate bounds must either be
+  contiguous, or the cube's data must be masked at the discontiguities in
+  order to avoid plotting errors.
+
+  The iris plot functions :func:`iris.plot.quiver` and
+  :func:`iris.plot.streamplot` have been added, and these also work with
+  2-dimensional plot coordinates.
+
+.. admonition:: 2-Dimensional Grid Vectors
+
+  The iris functions :func:`iris.analysis.cartography.gridcell_angles` and
+  :func:`iris.analysis.cartography.rotate_grid_vectors` have been added,
+  allowing you to convert gridcell-oriented vectors to true-North/East ones.

docs/iris/src/whatsnew/index.rst

@@ -9,6 +9,7 @@ Iris versions.
 .. toctree::
    :maxdepth: 2
 
+   2.2.rst
    2.1.rst
    2.0.rst
    1.13.rst

lib/iris/__init__.py

@@ -121,7 +121,7 @@ def callback(cube, field, filename):
 
 
 # Iris revision.
-__version__ = '2.2.0dev0'
+__version__ = '2.2.0a0'
 
 # Restrict the names imported when using "from iris import *"
 __all__ = ['load', 'load_cube', 'load_cubes', 'load_raw',