Resolve merge conflicts

Author: lbdreyer

docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-25_transpose_cell_measures.txt

@@ -417,7 +417,7 @@ def convert_units(self, unit):
         if self.units.is_unknown():
             raise iris.exceptions.UnitConversionError(
                 'Cannot convert from unknown units. '
-                'The "coord.units" attribute may be set directly.')
+                'The ".units" attribute may be set directly.')
 
         # Set up a delayed conversion for use if either values or bounds (if
         # present) are lazy.
@@ -636,11 +636,10 @@ def __init__(self, data, standard_name=None, long_name=None,
     def _data(self):
         return self._values
 
-    @property.setter
+    @_data.setter
     def _data(self, data):
         self._values_setter(values=data)
 
-
     def lazy_data(self):
         """
         Return a lazy array representing the ancillary variable's data.
@@ -1133,7 +1132,7 @@ def contains_point(self, point):
 
 class Coord(_DimensionalMetadata):
     """
-    Abstract superclass for coordinates.
+    Superclass for coordinates.
 
     """
     def __init__(self, points, standard_name=None, long_name=None,
@@ -2135,21 +2134,6 @@ def _xml_id_extra(self, unique_value):
         return unique_value
 
 
-class AuxCoord(Coord):
-    """
-    A CF auxiliary coordinate.
-    .. note::
-        There are currently no specific properties of :class:`AuxCoord`,
-        everything is inherited from :class:`Coord`.
-    """
-    # Logically, :class:`Coord` is an abstract class and all actual coords must
-    # be members of some concrete subclass, i.e. an :class:`AuxCoord` or
-    # a :class:`DimCoord`.
-    # So we retain :class:`AuxCoord` as a distinct concrete subclass.
-    # This provides clarity, backwards compatibility, and so we can add
-    # AuxCoord-specific code if needed in future.
-
-
 class DimCoord(Coord):
     """
     A coordinate that is 1D, numeric, and strictly monotonic.
@@ -2416,6 +2400,24 @@ def xml_element(self, doc):
         return element
 
 
+class AuxCoord(Coord):
+    """
+    A CF auxiliary coordinate.
+
+    .. note::
+
+        There are currently no specific properties of :class:`AuxCoord`,
+        everything is inherited from :class:`Coord`.
+
+    """
+    # Logically, :class:`Coord` is an abstract class and all actual coords must
+    # be members of some concrete subclass, i.e. an :class:`AuxCoord` or
+    # a :class:`DimCoord`.
+    # So we retain :class:`AuxCoord` as a distinct concrete subclass.
+    # This provides clarity, backwards compatibility, and so we can add
+    # AuxCoord-specific code if needed in future.
+
+
 class CellMethod(iris.util._OrderedHashable):
     """
     Represents a sub-cell pre-processing operation.

…eature_2019-Sep-09_cf_ancillary_data.txt …eature_2019-Oct-14_cf_ancillary_data.txtdocs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-09_cf_ancillary_data.txt renamed to docs/iris/src/whatsnew/contributions_3.0.0/newfeature_2019-Oct-14_cf_ancillary_data.txt docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-09_cf_ancillary_data.txt renamed to docs/iris/src/whatsnew/contributions_3.0.0/newfeature_2019-Oct-14_cf_ancillary_data.txt

@@ -0,0 +1,39 @@
+# (C) British Crown Copyright 2019, Met Office
+#
+# This file is part of Iris.
+#
+# Iris is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Iris is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with Iris.  If not, see <http://www.gnu.org/licenses/>.
+"""Unit tests for the :class:`iris.coords.AncillaryVariable` class."""
+
+# Import iris.tests first so that some things can be initialised before
+# importing anything else.
+import iris.tests as tests
+
+import numpy as np
+
+from iris.coords import AncillaryVariable
+
+
+class Test(tests.IrisTest):
+    def setUp(self):
+        self.values = np.array((2, 3, 5, 8))
+        self.measure = AncillaryVariable(
+            self.values, units='1',
+            standard_name='status_flag',
+            long_name='location of bad data',
+            var_name='status_flag',
+            attributes={'notes': 'Additional data mask'})
+
+    def test_data_values(self):
+        self.assertEqual(self.measure.data, self.values)

lib/iris/coords.py

@@ -1905,6 +1905,14 @@ def test_cell_measures(self):
         self.assertEqual(self.cube._cell_measures_and_dims,
                          [(area_cm, (2, 0))])
 
+    def test_ancillary_variables(self):
+        ancill_var = AncillaryVariable(data=np.arange(8).reshape(2, 4),
+                                       long_name='instrument error')
+        self.cube.add_ancillary_variable(ancill_var, (1, 2))
+        self.cube.transpose()
+        self.assertEqual(self.cube._ancillary_variables_and_dims,
+                         [(ancill_var, (2, 1))])
+
 
 class Test_convert_units(tests.IrisTest):
     def test_convert_unknown_units(self):