Skip to content

Commit ba09ed5

Browse files
authored
Merge branch 'master' into v3-store-part1
2 parents 8783f44 + 5f7e2b6 commit ba09ed5

5 files changed

Lines changed: 22 additions & 4 deletions

File tree

‎.deepsource.toml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version = 1
2+
3+
test_patterns = ["zarr/tests/test_*.py"]
4+
5+
[[analyzers]]
6+
name = "python"
7+
enabled = true
8+
9+
[analyzers.meta]
10+
runtime_version = "3.x.x"

‎.lgtm.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Config for LGTM.com static code analysis
2+
# https://lgtm.com/projects/g/zarr-developers/zarr-python
3+
4+
extraction:
5+
python:
6+
python_setup:
7+
version: 3

‎requirements_dev_numpy.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Break this out into a separate file to allow testing against
22
# different versions of numpy. This file should pin to the latest
33
# numpy version.
4-
numpy==1.21.4
4+
numpy==1.21.5

‎requirements_dev_optional.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ pytest-cov==3.0.0
1919
pytest-doctestplus==0.11.2
2020
pytest-timeout==2.0.2
2121
h5py==3.6.0
22-
fsspec[s3]==2021.11.1
22+
fsspec==2021.11.1
23+
s3fs==2021.11.1
2324
moto[server]>=1.3.14

‎zarr/tests/test_storage.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,8 +1160,8 @@ def s3(request):
11601160
pytest.importorskip("moto")
11611161

11621162
port = 5555
1163-
endpoint_uri = 'http://127.0.0.1:%s/' % port
1164-
proc = subprocess.Popen(shlex.split("moto_server s3 -p %s" % port),
1163+
endpoint_uri = 'http://127.0.0.1:%d/' % port
1164+
proc = subprocess.Popen(shlex.split("moto_server s3 -p %d" % port),
11651165
stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL)
11661166

11671167
timeout = 5

0 commit comments

Comments
 (0)