Merge branch 'master' into fsspec_w

Author: Martin Durant

requirements_dev_numpy.txt

@@ -1,4 +1,4 @@
 # Break this out into a separate file to allow testing against
 # different versions of numpy. This file should pin to the latest
 # numpy version.
-numpy==1.17.2; python_version > '3.0'
+numpy==1.19.2; python_version >= '3.6'

zarr/tests/test_core.py

@@ -139,9 +139,6 @@ def test_nbytes_stored(self):
         except TypeError:
             pass
 
-        if hasattr(z.store, 'close'):
-            z.store.close()
-
     # noinspection PyStatementEffect
     def test_array_1d(self):
         a = np.arange(1050)

zarr/tests/test_hierarchy.py

@@ -2,7 +2,6 @@
 import os
 import pickle
 import shutil
-import sys
 import tempfile
 import textwrap
 import unittest
@@ -990,8 +989,7 @@ def test_context_manager(self):
 
         # Check that exiting the context manager closes the store,
         # and therefore the underlying ZipFile.
-        error = ValueError if sys.version_info >= (3, 6) else RuntimeError
-        with pytest.raises(error):
+        with pytest.raises(ValueError):
             store.zf.extractall()
 
 

zarr/tests/util.py

@@ -1,8 +1,6 @@
 import collections
-from distutils.version import LooseVersion
 from collections.abc import MutableMapping
 import os
-import sys
 
 import pytest
 
@@ -50,10 +48,8 @@ def skip_test_env_var(name):
 
 
 try:
-    if LooseVersion(sys.version) >= LooseVersion("3.6"):
-        import fsspec  # noqa: F401
-        have_fsspec = True
-    else:  # pragma: no cover
-        have_fsspec = False
+    import fsspec  # noqa: F401
+
+    have_fsspec = True
 except ImportError:  # pragma: no cover
     have_fsspec = False