Merge branch 'master' into fsspec

Author: Martin Durant

README.md

@@ -68,6 +68,15 @@
 		</a>
 	</td>
 </tr>
+<tr>
+	<td>Citation</td>
+	<td>
+		<a href="https://doi.org/10.5281/zenodo.3773450">
+			<img src="https://zenodo.org/badge/DOI/10.5281/zenodo.3773450.svg" alt="DOI">
+		</a>
+	</td>
+</tr>
+
 </table>
 
 ## What is it?

docs/release.rst

@@ -1,6 +1,19 @@
 Release notes
 =============
 
+
+Next release
+------------
+
+* Fix minor bug in `N5Store`. 
+  By :user:`gsakkis`, :issue:`550`.
+* Improve error message in Jupyter when trying to use the ``ipytree`` widget
+  without ``ipytree`` installed.
+  By :user:`Zain Patel <mzjp2>; :issue:`537`
+* Explicitly close stores during testing.
+  By :user:`Elliott Sales de Andrade <QuLogic>`; :issue:`442`
+
+
 .. _release_2.4.0:
 
 2.4.0

setup.py

@@ -24,14 +24,15 @@
     use_scm_version={
         'version_scheme': 'guess-next-dev',
         'local_scheme': 'dirty-tag',
-        'write_to': 'zarr/version.py'
+        'write_to': 'zarr/version.py',
     },
     setup_requires=[
         'setuptools>=38.6.0',
-        'setuptools-scm>1.5.4'
+        'setuptools-scm>1.5.4',
     ],
     extras_require={
         'jupyter': [
+            'notebook',
             'ipytree',
         ],
     },

zarr/n5.py

@@ -175,9 +175,9 @@ def __contains__(self, key):
             # array if attributes contain 'dimensions'
             return 'dimensions' in self._load_n5_attrs(key)
 
-        elif key.endswith(zarr_attrs_key):  # pragma: no cover
+        elif key.endswith(zarr_attrs_key):
 
-            key = key.replace(zarr_array_meta_key, n5_attrs_key)
+            key = key.replace(zarr_attrs_key, n5_attrs_key)
             return self._contains_attrs(key)
 
         elif is_chunk_key(key):