Skip to content

Commit 871d0a6

Browse files
authored
Merge branch 'main' into fix-resize-dimension-separator
2 parents 4a21fbe + 5eb737b commit 871d0a6

File tree

8 files changed

+15
-10
lines changed

8 files changed

+15
-10
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,5 @@ zarr/version.py
7777
#doesnotexist
7878
#test_sync*
7979
data/*
80+
81+
.DS_Store

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
# General information about the project.
7070
project = "zarr"
71-
copyright = "2022, Zarr Developers"
71+
copyright = "2023, Zarr Developers"
7272
author = "Zarr Developers"
7373

7474
version = zarr.__version__

docs/release.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ Maintenance
2424
* Preserve ``dimension_separator`` when resizing arrays.
2525
By :user:`Ziwen Liu <ziw-liu>` :issue:`1533`.
2626

27+
* Initialise some sets in tests with set literals instead of list literals.
28+
By :user:`Dimitri Papadopoulos Orfanos <DimitriPapadopoulos>` :issue:`1534`.
29+
2730
* Allow ``black`` code formatter to be run with any Python version.
2831
By :user:`David Stansby <dstansby>` :issue:`1549`.
2932

docs/spec.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Specifications
44
==============
55

66
.. toctree::
7-
:maxdepth: 3
7+
:maxdepth: 1
88

99
spec/v3
1010
spec/v2

docs/spec/v1.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.. _spec_v1:
22

3-
Zarr storage specification version 1
3+
Zarr Storage Specification Version 1
44
====================================
55

66
This document provides a technical specification of the protocol and

docs/spec/v2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.. _spec_v2:
22

3-
Zarr storage specification version 2
3+
Zarr Storage Specification Version 2
44
====================================
55

66
This document provides a technical specification of the protocol and format

docs/spec/v3.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _spec_v3:
22

3-
Zarr storage specification version 3 (under development)
4-
========================================================
3+
Zarr Storage Specification Version 3
4+
=======================================================
55

6-
The v3 specification has been migrated to its own website,
6+
The V3 Specification has been migrated to its website
77
https://zarr-specs.readthedocs.io/.

zarr/tests/test_storage.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,9 +1166,9 @@ def test_deep_ndim(self):
11661166
if self.version == 2:
11671167
assert set(store.listdir()) == {".zgroup", "bar"}
11681168
else:
1169-
assert set(store.listdir()) == set(["data", "meta", "zarr.json"])
1170-
assert set(store.listdir("meta/root/" + path)) == set(["bar", "bar.group.json"])
1171-
assert set(store.listdir("data/root/" + path)) == set(["bar"])
1169+
assert set(store.listdir()) == {"data", "meta", "zarr.json"}
1170+
assert set(store.listdir("meta/root/" + path)) == {"bar", "bar.group.json"}
1171+
assert set(store.listdir("data/root/" + path)) == {"bar"}
11721172
assert foo["bar"]["baz"][(0, 0, 0)] == 1
11731173

11741174
def test_not_fsspec(self):

0 commit comments

Comments
 (0)