Remove iris-grib dependency from Iris tests.

.travis.yml

@@ -100,12 +100,10 @@ install:
 
   - python setup.py --quiet install
 
-  # TODO : remove when iris doesn't do an integration test requiring iris-grib.
-  # test against the latest version of python-eccodes.
-  # Conda-forge versioning is out of order (0.9.* is later than 2.12.*).
+  # Docs builds and examples tests also need grib, for gallery examples.
   - >
-    if [[ "${TEST_MINIMAL}" != true ]]; then
-        conda install --quiet -n ${ENV_NAME} python-eccodes">=0.9.1, <2";
+    if [[ "${TEST_TARGET}" == 'docstest' || "${TEST_TARGET}" == 'example' ]]; then
+        conda install --quiet -n ${ENV_NAME} python-eccodes;
         conda install --quiet -n ${ENV_NAME} --no-deps iris-grib;
     fi
 

docs/iris/example_tests/test_polar_stereo.py

@@ -15,7 +15,6 @@
 )
 
 
-@tests.skip_grib
 class TestPolarStereo(tests.GraphicsTest):
     """Test the polar_stereo example code."""
 

docs/iris/src/conf.py

@@ -140,7 +140,6 @@
 
 intersphinx_mapping = {
     "cartopy": ("http://scitools.org.uk/cartopy/docs/latest/", None),
-    "iris-grib": ("http://iris-grib.readthedocs.io/en/latest/", None),
     "matplotlib": ("http://matplotlib.org/", None),
     "numpy": ("http://docs.scipy.org/doc/numpy/", None),
     "python": ("http://docs.python.org/2.7", None),

docs/iris/src/userguide/saving_iris_cubes.rst

@@ -6,8 +6,8 @@ Saving Iris cubes
 
 Iris supports the saving of cubes and cube lists to:
 
-* CF netCDF (1.5)
-* GRIB (edition 2)
+* CF netCDF (version 1.6)
+* GRIB edition 2  (if `iris-grib  <https://github.com/SciTools/iris-grib>`_ is installed)
 * Met Office PP
 
 
@@ -57,7 +57,6 @@ The :py:func:`iris.save` function passes all other keywords through to the saver
 See 
 
 * :py:func:`iris.fileformats.netcdf.save`
-* :py:func:`iris.fileformats.grib.save_grib2`
 * :py:func:`iris.fileformats.pp.save`
 
 for more details on supported arguments for the individual savers.
@@ -70,14 +69,14 @@ When saving to GRIB or PP, the save process may be intercepted between the trans
 For example, a GRIB2 message with a particular known long_name may need to be saved to a specific parameter code and type of statistical process.  This can be achieved by::
 
         def tweaked_messages(cube):
-            for cube, grib_message in iris.fileformats.grib.as_pairs(cube):
+            for cube, grib_message in iris_grib.save_pairs_from_cube(cube):
                 # post process the GRIB2 message, prior to saving
                 if cube.name() == 'carefully_customised_precipitation_amount':
                     gribapi.grib_set_long(grib_message, "typeOfStatisticalProcess", 1)
                     gribapi.grib_set_long(grib_message, "parameterCategory", 1)
                     gribapi.grib_set_long(grib_message, "parameterNumber", 1)
                 yield grib_message
-        iris.fileformats.grib.save_messages(tweaked_messages(cubes[0]), '/tmp/agrib2.grib2')
+        iris_grib.save_messages(tweaked_messages(cubes[0]), '/tmp/agrib2.grib2')
 
 Similarly a PP field may need to be written out with a specific value for LBEXP.  This can be achieved by::
 

lib/iris/tests/__init__.py

@@ -76,13 +76,6 @@
 else:
     GDAL_AVAILABLE = True
 
-try:
-    from iris_grib.message import GribMessage
-
-    GRIB_AVAILABLE = True
-except ImportError:
-    GRIB_AVAILABLE = False
-
 try:
     import iris_sample_data  # noqa
 except ImportError:
@@ -1181,12 +1174,6 @@ class MyPlotTests(test.GraphicsTest):
     return skip(fn)
 
 
-skip_grib = unittest.skipIf(
-    not GRIB_AVAILABLE,
-    'Test(s) require "iris-grib" package, ' "which is not available.",
-)
-
-
 skip_sample_data = unittest.skipIf(
     not SAMPLE_DATA_AVAILABLE,
     ('Test(s) require "iris-sample-data", ' "which is not available."),