Merge pull request #651 from joshmoore/n5-attrs

Author: Carreau

zarr/n5.py

@@ -304,13 +304,18 @@ def invert_chunk_coords(key):
 def group_metadata_to_n5(group_metadata):
     '''Convert group metadata from zarr to N5 format.'''
     del group_metadata['zarr_format']
+    # TODO: This should only exist at the top-level
     group_metadata['n5'] = '2.0.0'
     return group_metadata
 
 
 def group_metadata_to_zarr(group_metadata):
     '''Convert group metadata from N5 to zarr format.'''
-    del group_metadata['n5']
+    try:
+        group_metadata.pop('n5')
+    except KeyError:
+        # This only exists at the top level
+        pass
     group_metadata['zarr_format'] = ZARR_FORMAT
     return group_metadata
 

zarr/tests/test_creation.py

@@ -252,6 +252,24 @@ def test_open_array():
     assert (10,) == z.chunks
     assert_array_equal(np.full(100, fill_value=42), z[:])
 
+    store = 'data/group.n5'
+    z = open_group(store, mode='w')
+    i = z.create_group('inner')
+    a = i.zeros("array", shape=100, chunks=10)
+    a[:] = 42
+
+    # Edit inner/attributes.json to not include "n5"
+    with open('data/group.n5/inner/attributes.json', 'w') as o:
+        o.write("{}")
+
+    # Re-open
+    a = open_group(store)["inner"]["array"]
+    assert isinstance(a, Array)
+    assert isinstance(z.store, N5Store)
+    assert (100,) == a.shape
+    assert (10,) == a.chunks
+    assert_array_equal(np.full(100, fill_value=42), a[:])
+
 
 def test_empty_like():