Merge branch 'nixio-annotation-types'

* nixio-annotation-types:
  [test-nixio] Test different types of Neo annotations
  [nixio] Handle datetime annotations

Author: achilleas-k

neo/io/nixio.py

@@ -56,6 +56,7 @@
     string_types = str
 
 EMPTYANNOTATION = "EMPTYLIST"
+DATETIMEANNOTATION = "DATETIME"
 ARRAYANNOTATION = "ARRAYANNOTATION"
 MIN_NIX_VER = Version("1.5.0")
 
@@ -1162,7 +1163,8 @@ def _write_property(self, section, name, v):
                 section.create_property(name, v.magnitude.item())
             section.props[name].unit = str(v.dimensionality)
         elif isinstance(v, datetime):
-            section.create_property(name, calculate_timestamp(v))
+            prop = section.create_property(name, calculate_timestamp(v))
+            prop.definition = DATETIMEANNOTATION
         elif isinstance(v, string_types):
             if len(v):
                 section.create_property(name, v)
@@ -1201,8 +1203,7 @@ def _write_property(self, section, name, v):
                     values.append(item)
             section.create_property(name, values)
             section.props[name].unit = unit
-            if definition:
-                section.props[name].definition = definition
+            section.props[name].definition = definition
         elif type(v).__module__ == "numpy":
             section.create_property(name, v.item())
         else:
@@ -1242,6 +1243,8 @@ def _nix_attr_to_neo(nix_obj):
                         neo_attrs['array_annotations'][prop.name] = values
                     else:
                         neo_attrs['array_annotations'] = {prop.name: values}
+                elif prop.definition == DATETIMEANNOTATION:
+                    values = datetime.fromtimestamp(values)
                 else:
                     neo_attrs[prop.name] = values
         # since the 'neo_name' NIX property becomes the actual object's name,

neo/test/iotest/test_nixio.py

@@ -17,7 +17,7 @@
     from collections.abc import Iterable
 except ImportError:
     from collections import Iterable
-from datetime import datetime
+from datetime import date, time, datetime
 
 from tempfile import mkdtemp
 
@@ -1446,6 +1446,30 @@ def generate_complete_block():
 
             self.write_and_compare([block_lazy])
 
+    def test_annotation_types(self):
+        annotations = {
+            "somedate": self.rdate(),
+            "now": datetime.now(),
+            "today": date.today(),
+            "sometime": time(13, 37, 42),
+            "somequantity": self.rquant(10, pq.ms),
+            "somestring": self.rsentence(3),
+            "somebytes": bytes(self.rsentence(4), "utf8"),
+            "npfloat": np.float(10),
+            "nparray": np.array([1, 2, 400]),
+            "emptystr": "",
+        }
+        wblock = Block("annotation_block", **annotations)
+        self.writer.write_block(wblock)
+        rblock = self.writer.read_block(neoname="annotation_block")
+        for k in annotations:
+            orig = annotations[k]
+            readval = rblock.annotations[k]
+            if isinstance(orig, np.ndarray):
+                np.testing.assert_almost_equal(orig, readval)
+            else:
+                self.assertEqual(annotations[k], rblock.annotations[k])
+
 
 @unittest.skipUnless(HAVE_NIX, "Requires NIX")
 class NixIOReadTest(NixIOTest):