Pin Dask to avoid 0.18.2 bug with masked arrays. (SciTools#3127)

* Put orca_util routines in subpackage of iris.test.stock, to get existing iris.tests.unit.plot.test_2d_coords working.

* Disable broken misused testcode in test_gridcell_angles.

* Ditch test_gridcell_angles, none of it is functional.

* Further style fixes.

* Skip tests using iris-test-data, for Travis TEST_MINIMAL phases.

* Codestyle fix (though this code obsolete anyway).

* Fix unused imports.

* Made-up test cube replaces use of iris-test-data.

* Renamed keyword; improved docstring.

* Change 'co' to 'coord' for clarity.

* Review changes.

Author: pp-mo

lib/iris/analysis/_grid_angles.py

@@ -92,7 +92,7 @@ def _angle(p, q, r):
     if old_style:
         mid_lons = np.deg2rad(q[0])
 
-        pr =  _3d_xyz_from_latlon(r[0], r[1]) - _3d_xyz_from_latlon(p[0], p[1])
+        pr = _3d_xyz_from_latlon(r[0], r[1]) - _3d_xyz_from_latlon(p[0], p[1])
         pr_norm = np.sqrt(np.sum(pr**2, axis=0))
         pr_top = pr[1] * np.cos(mid_lons) - pr[0] * np.sin(mid_lons)
 
@@ -124,7 +124,7 @@ def _angle(p, q, r):
                                                  lmb_hatvec_y,
                                                  lmb_hatvec_z)])
 
-        pr =  _3d_xyz_from_latlon(r[0], r[1]) - _3d_xyz_from_latlon(p[0], p[1])
+        pr = _3d_xyz_from_latlon(r[0], r[1]) - _3d_xyz_from_latlon(p[0], p[1])
 
         # Dot products to form true-northward / true-eastward projections.
         pr_cmpt_e = np.sum(pr * lmb_hatvec, axis=0)
@@ -141,7 +141,7 @@ def _angle(p, q, r):
         rtol = 1.e-3
         check = np.allclose(mag_rot, mag_orig, rtol=rtol)
         if not check:
-            print (mag_rot, mag_orig)
+            print(mag_rot, mag_orig)
             assert np.allclose(mag_rot, mag_orig, rtol=rtol)
 
     return psi

lib/iris/coords.py

@@ -1071,7 +1071,7 @@ def is_contiguous(self, rtol=1e-05, atol=1e-08):
                                          rtol=rtol, atol=atol)
             elif self.ndim == 2:
                 contiguous, _, _ = _discontiguity_in_2d_bounds(self.bounds,
-                                                             abs_tol=atol)
+                                                               abs_tol=atol)
         else:
             contiguous = False
         return contiguous

lib/iris/plot.py

@@ -334,7 +334,7 @@ def _draw_2d_from_bounds(draw_method_name, cube, *args, **kwargs):
         plot_defn = _get_plot_defn(cube, mode, ndims=2)
 
     twodim_contig_atol = kwargs.pop('two_dim_coord_contiguity_atol',
-                                     1e-4)
+                                    1e-4)
     for coord in plot_defn.coords:
         if hasattr(coord, 'has_bounds'):
             if coord.ndim == 2 and coord.has_bounds():

lib/iris/tests/stock.py lib/iris/tests/stock/__init__.pylib/iris/tests/stock.py renamed to lib/iris/tests/stock/__init__.py

@@ -36,7 +36,8 @@
 from iris.coords import DimCoord, AuxCoord
 import iris.tests as tests
 from iris.coord_systems import GeogCS, RotatedGeogCS
-
+from ._stock_2d_latlons import (sample_2d_latlons,
+                                make_bounds_discontiguous_at_point)
 
 def lat_lon_cube():
     """