Merge branch 'master' into fix_consolidate_metadata_read_only_store

Author: Joe Hamman

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.21.4
+numpy==1.21.5

requirements_dev_optional.txt

@@ -19,5 +19,6 @@ pytest-cov==3.0.0
 pytest-doctestplus==0.11.2
 pytest-timeout==2.0.2
 h5py==3.6.0
-fsspec[s3]==2021.11.1
+fsspec==2021.11.1
+s3fs==2021.11.1
 moto[server]>=1.3.14

zarr/tests/test_storage.py

@@ -1156,8 +1156,8 @@ def s3(request):
     pytest.importorskip("moto")
 
     port = 5555
-    endpoint_uri = 'http://127.0.0.1:%s/' % port
-    proc = subprocess.Popen(shlex.split("moto_server s3 -p %s" % port),
+    endpoint_uri = 'http://127.0.0.1:%d/' % port
+    proc = subprocess.Popen(shlex.split("moto_server s3 -p %d" % port),
                             stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL)
 
     timeout = 5