Further removals.

Author: pelson

lib/iris/fileformats/__init__.py

@@ -72,8 +72,8 @@
 #
 def _load_grib(*args, **kwargs):
     if igrib is None:
-        raise RuntimeError('Unable to load GRIB file - the ECMWF '
-                           '`gribapi` package is not installed.')
+        raise RuntimeError('Unable to load GRIB file - '
+                           '`iris_grib` is not installed.')
     return igrib.load_cubes(*args, **kwargs)
 
 

lib/iris/tests/__init__.py

@@ -1117,7 +1117,7 @@ class MyPlotTests(test.GraphicsTest):
     return skip(fn)
 
 
-skip_grib = unittest.skipIf(not GRIB_AVAILABLE, 'Test(s) require "gribapi", '
+skip_grib = unittest.skipIf(not GRIB_AVAILABLE, 'Test(s) require "iris_grib", '
                                                 'which is not available.')
 
 

lib/iris/tests/integration/format_interop/test_pp_grib.py

@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2014 - 2015, Met Office
+# (C) British Crown Copyright 2014 - 2017, Met Office
 #
 # This file is part of Iris.
 #
@@ -25,9 +25,6 @@
 
 import iris
 
-if tests.GRIB_AVAILABLE:
-    import gribapi
-
 
 @tests.skip_grib
 class TestBoundedTime(tests.IrisTest):

lib/iris/tests/integration/test_pickle.py

@@ -26,31 +26,6 @@
 import six.moves.cPickle as pickle
 
 import iris
-if tests.GRIB_AVAILABLE:
-    import gribapi
-    from iris.fileformats.grib.message import GribMessage
-
-
-@tests.skip_data
-@tests.skip_grib
-class TestGribMessage(tests.IrisTest):
-    def test(self):
-        # Check that a GribMessage pickles without errors.
-        path = tests.get_data_path(('GRIB', 'fp_units', 'hours.grib2'))
-        messages = GribMessage.messages_from_filename(path)
-        message = next(messages)
-        with self.temp_filename('.pkl') as filename:
-            with open(filename, 'wb') as f:
-                pickle.dump(message, f)
-
-    def test_data(self):
-        # Check that GribMessage.data pickles without errors.
-        path = tests.get_data_path(('GRIB', 'fp_units', 'hours.grib2'))
-        messages = GribMessage.messages_from_filename(path)
-        message = next(messages)
-        with self.temp_filename('.pkl') as filename:
-            with open(filename, 'wb') as f:
-                pickle.dump(message.data, f)
 
 
 class Common(object):

lib/iris/tests/results/system/supported_filetype_.grib2.cml

@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2010 - 2016, Met Office
+# (C) British Crown Copyright 2010 - 2017, Met Office
 #
 # This file is part of Iris.
 #
@@ -552,9 +552,3 @@ def realistic_4d_w_missing_data():
                           aux_coords_and_dims=[(forecast_period, 0)],
                           attributes={'source':'Iris test case'})
     return cube
-
-
-def global_grib2():
-    path = tests.get_data_path(('GRIB', 'global_t', 'global.grib2'))
-    cube = iris.load_cube(path)
-    return cube

lib/iris/tests/results/unit/fileformats/grib/load_cubes/load_cubes/reduced_raw.cml

@@ -309,8 +309,7 @@ def test_license_headers(self):
                             'docs/iris/src/developers_guide/gitwash_dumper.py',
                             'docs/iris/build/*',
                             'lib/iris/analysis/_scipy_interpolate.py',
-                            'lib/iris/fileformats/_pyke_rules/*',
-                            'lib/iris/fileformats/grib/_grib_cf_map.py')
+                            'lib/iris/fileformats/_pyke_rules/*',)
 
         try:
             last_change_by_fname = self.last_change_by_fname()

lib/iris/tests/results/uri_callback/grib_global.cml

@@ -55,7 +55,6 @@ def test_decode_uri(self):
 
 
 class TestFileFormatPicker(tests.IrisTest):
-    @tests.skip_grib
     def test_known_formats(self):
         self.assertString(str(iff.FORMAT_AGENT),
                           tests.get_result_path(('file_load',