Remove deprecated modules: iris.unit, iris.proxy and iris.fileformats.pp_packing

.travis.yml

@@ -83,7 +83,6 @@ install:
     fi
 
 # prepare iris build directory
-  - python setup.py --with-unpack build_ext --include-dirs=${PREFIX}/include --library-dirs=${PREFIX}/lib
   - if [[ $TEST_TARGET -ne 'coding' ]]; then
       IRIS=$(ls -d1 build/lib*/iris);
       mkdir $IRIS/etc;
@@ -107,8 +106,8 @@ install:
     fi
 
 # iris
-  - python setup.py --quiet --with-unpack build
-  - python setup.py --quiet --with-unpack install
+  - python setup.py --quiet build
+  - python setup.py --quiet install
 
 script:
   - if [[ $TEST_TARGET == 'default' ]]; then

lib/iris/fileformats/pp.py

@@ -39,8 +39,7 @@
 import netcdftime
 
 from iris._deprecation import warn_deprecated
-from iris._lazy_data import (array_masked_to_nans, as_concrete_data,
-                             as_lazy_data, is_lazy_data)
+from iris._lazy_data import as_concrete_data, as_lazy_data, is_lazy_data
 import iris.config
 import iris.fileformats.rules
 import iris.fileformats.pp_rules
@@ -52,11 +51,6 @@
 except ImportError:
     mo_pack = None
 
-try:
-    from iris.fileformats import _old_pp_packing as pp_packing
-except ImportError:
-    pp_packing = None
-
 
 __all__ = ['load', 'save', 'load_cubes', 'PPField',
            'reset_load_rules', 'add_save_rules',
@@ -934,13 +928,6 @@ def _data_bytes_to_shaped_array(data_bytes, lbpack, boundary_packing,
                 decompress_wgdos = mo_pack.decompress_wgdos
             except AttributeError:
                 decompress_wgdos = mo_pack.unpack_wgdos
-        elif pp_packing is not None:
-            msg = 'iris.fileformats.pp_packing has been ' \
-                  'deprecated and will be removed in a future release. ' \
-                  'Install mo_pack to make use of the new unpacking ' \
-                  'functionality.'
-            warn_deprecated(msg)
-            decompress_wgdos = pp_packing.wgdos_unpack
         else:
             msg = 'Unpacking PP fields with LBPACK of {} ' \
                   'requires mo_pack to be installed'.format(lbpack.n1)
@@ -949,13 +936,6 @@ def _data_bytes_to_shaped_array(data_bytes, lbpack, boundary_packing,
     elif lbpack.n1 == 4:
         if mo_pack is not None and hasattr(mo_pack, 'decompress_rle'):
             decompress_rle = mo_pack.decompress_rle
-        elif pp_packing is not None:
-            msg = 'iris.fileformats.pp_packing has been ' \
-                  'deprecated and will be removed in a future release. ' \
-                  'Install/upgrade mo_pack to make use of the new unpacking ' \
-                  'functionality.'
-            warn_deprecated(msg)
-            decompress_rle = pp_packing.rle_decode
         else:
             msg = 'Unpacking PP fields with LBPACK of {} ' \
                   'requires mo_pack to be installed'.format(lbpack.n1)

lib/iris/tests/experimental/regrid/test_regrid_conservative_via_esmpy.py

@@ -36,8 +36,6 @@
 # Import ESMF if installed, else fail quietly + disable all the tests.
 try:
     import ESMF
-    # Check it *is* the real module, and not an iris.proxy FakeModule.
-    ESMF.Manager
 except ImportError as AttributeError:
     ESMF = None
 skip_esmf = unittest.skipIf(

lib/iris/tests/experimental/ugrid/test_ugrid.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.
 #
@@ -29,8 +29,6 @@
 # Import pyugrid if installed, else fail quietly + disable all the tests.
 try:
     import pyugrid
-    # Check it *is* the real module, and not an iris.proxy FakeModule.
-    pyugrid.ugrid
 except (ImportError, AttributeError):
     pyugrid = None
 skip_pyugrid = unittest.skipIf(