Updated tests for cf_units 2

INSTALL

@@ -90,7 +90,7 @@ netcdf4-python (http://netcdf4-python.googlecode.com/)
     thread-safe build of HDF5 to avoid segmentation faults when using
     lazy evaluation.)
 
-cf_units v1.0 or later (https://github.com/SciTools/cf_units)
+cf_units v2.0 or later (https://github.com/SciTools/cf_units)
     CF data units handling, using udunits.
 
 setuptools v36.0 or later (http://pypi.python.org/pypi/setuptools/)

docs/iris/src/whatsnew/contributions_2.1/newfeature_2018-May-22_cf_units_2.txt

@@ -0,0 +1,4 @@
+Iris updated its cf_units dependency to cf_units v2. cf_units 2 is almost entirely backwards compatible,
+although the ability to preserve some alias calendars has been removed. For this reason, it is possible
+that NetCDF load of a variable with a "standard" calendar will result in a saved NetCDF of a "gregorian"
+calendar.

lib/iris/fileformats/nimrod_load_rules.py

@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2010 - 2016, Met Office
+# (C) British Crown Copyright 2010 - 2018, Met Office
 #
 # This file is part of Iris.
 #
@@ -40,7 +40,7 @@
 NIMROD_DEFAULT = -32767.0
 
 TIME_UNIT = cf_units.Unit('hours since 1970-01-01 00:00:00',
-                          calendar=cf_units.CALENDAR_STANDARD)
+                          calendar=cf_units.CALENDAR_GREGORIAN)
 
 
 FIELD_CODES = {73: "orography"}

lib/iris/tests/results/netcdf/netcdf_lcc.cml

@@ -88,7 +88,7 @@
 		[273.0, 303.0],
 		[304.0, 333.0],
 		[334.0, 364.0]]" id="1c4a69ce" long_name="time" points="[15.0, 44.5, 74.0, 104.5, 135.0, 165.5, 196.0,
-		227.0, 257.5, 288.0, 318.5, 349.0]" shape="(12,)" standard_name="time" units="Unit('days since 2010-01-01 12:00:00', calendar='standard')" value_type="float64" var_name="time"/>
+		227.0, 257.5, 288.0, 318.5, 349.0]" shape="(12,)" standard_name="time" units="Unit('days since 2010-01-01 12:00:00', calendar='gregorian')" value_type="float64" var_name="time"/>
       </coord>
     </coords>
     <cellMethods>

lib/iris/tests/results/nimrod/load_2flds.cml

@@ -10,7 +10,7 @@
     </attributes>
     <coords>
       <coord>
-        <dimCoord id="9c8bdf81" points="[355014.0]" shape="(1,)" standard_name="forecast_reference_time" units="Unit('hours since 1970-01-01 00:00:00', calendar='standard')" value_type="float64"/>
+        <dimCoord id="9c8bdf81" points="[355014.0]" shape="(1,)" standard_name="forecast_reference_time" units="Unit('hours since 1970-01-01 00:00:00', calendar='gregorian')" value_type="float64"/>
       </coord>
       <coord>
         <dimCoord id="a2cbc1ea" points="[9999.0]" shape="(1,)" standard_name="height" units="Unit('m')" value_type="float32">
@@ -32,7 +32,7 @@
         </dimCoord>
       </coord>
       <coord datadims="[0]">
-        <dimCoord id="cb784457" points="[355017.0, 363777.0]" shape="(2,)" standard_name="time" units="Unit('hours since 1970-01-01 00:00:00', calendar='standard')" value_type="float64"/>
+        <dimCoord id="cb784457" points="[355017.0, 363777.0]" shape="(2,)" standard_name="time" units="Unit('hours since 1970-01-01 00:00:00', calendar='gregorian')" value_type="float64"/>
       </coord>
     </coords>
     <cellMethods/>

lib/iris/tests/results/nimrod/period_of_interest.cml

@@ -3,7 +3,7 @@
   <cube dtype="int64" units="unknown">
     <coords>
       <coord>
-        <dimCoord bounds="[[379973.0, 379974.0]]" id="cb784457" points="[379974.0]" shape="(1,)" standard_name="time" units="Unit('hours since 1970-01-01 00:00:00', calendar='standard')" value_type="float64"/>
+        <dimCoord bounds="[[379973.0, 379974.0]]" id="cb784457" points="[379974.0]" shape="(1,)" standard_name="time" units="Unit('hours since 1970-01-01 00:00:00', calendar='gregorian')" value_type="float64"/>
       </coord>
     </coords>
     <cellMethods/>

lib/iris/tests/test_coding_standards.py

@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2013 - 2017, Met Office
+# (C) British Crown Copyright 2013 - 2018, Met Office
 #
 # This file is part of Iris.
 #
@@ -123,7 +123,6 @@ class StandardReportWithExclusions(pep8.StandardReport):
         '*/iris/tests/test_pp_to_cube.py',
         '*/iris/tests/test_quickplot.py',
         '*/iris/tests/test_std_names.py',
-        '*/iris/tests/test_unit.py',
         '*/iris/tests/test_uri_callback.py',
         '*/iris/tests/test_util.py']
 

lib/iris/tests/test_pandas.py

@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2013 - 2017, Met Office
+# (C) British Crown Copyright 2013 - 2018, Met Office
 #
 # This file is part of Iris.
 #
@@ -101,18 +101,22 @@ def test_time_360(self):
         time_coord = DimCoord([0, 100.1, 200.2, 300.3, 400.4],
                               long_name="time", units=time_unit)
         cube.add_dim_coord(time_coord, 0)
-        if netCDF4.__version__ > '1.2.4':
+        # TODO Remove this if statement as we move to cftime
+        if cf_units.__version__ > '1':
+            import cftime
+            expected_index = [cftime.Datetime360Day(2000, 1, 1, 0, 0),
+                              cftime.Datetime360Day(2000, 4, 11, 2, 24),
+                              cftime.Datetime360Day(2000, 7, 21, 4, 48),
+                              cftime.Datetime360Day(2000, 11, 1, 7, 12),
+                              cftime.Datetime360Day(2001, 2, 11, 9, 36)]
+
+        else:
             expected_index = [netcdftime.Datetime360Day(2000, 1, 1, 0, 0),
                               netcdftime.Datetime360Day(2000, 4, 11, 2, 24),
                               netcdftime.Datetime360Day(2000, 7, 21, 4, 48),
                               netcdftime.Datetime360Day(2000, 11, 1, 7, 12),
                               netcdftime.Datetime360Day(2001, 2, 11, 9, 36)]
-        else:
-            expected_index = [netcdftime.datetime(2000, 1, 1, 0, 0),
-                              netcdftime.datetime(2000, 4, 11, 2, 24),
-                              netcdftime.datetime(2000, 7, 21, 4, 48),
-                              netcdftime.datetime(2000, 11, 1, 7, 12),
-                              netcdftime.datetime(2001, 2, 11, 9, 36)]
+
         series = iris.pandas.as_series(cube)
         self.assertArrayEqual(series, cube.data)
         self.assertArrayEqual(series.index, expected_index)
@@ -244,12 +248,16 @@ def test_time_360(self):
         time_coord = DimCoord([100.1, 200.2], long_name="time",
                               units=time_unit)
         cube.add_dim_coord(time_coord, 0)
-        if netCDF4.__version__ > '1.2.4':
+        # TODO: Remove this if statement once we move to exclusive cftime.
+        if cf_units.__version__ > '1':
+            # cf_units depends upon cftime, so we can safely assume we
+            # have it.
+            import cftime
+            expected_index = [cftime.Datetime360Day(2000, 4, 11, 2, 24),
+                              cftime.Datetime360Day(2000, 7, 21, 4, 48)]
+        else:
             expected_index = [netcdftime.Datetime360Day(2000, 4, 11, 2, 24),
                               netcdftime.Datetime360Day(2000, 7, 21, 4, 48)]
-        else:
-            expected_index = [netcdftime.datetime(2000, 4, 11, 2, 24),
-                              netcdftime.datetime(2000, 7, 21, 4, 48)]
         expected_columns = [0, 1, 2, 3, 4]
         data_frame = iris.pandas.as_data_frame(cube)
         self.assertArrayEqual(data_frame, cube.data)