Skip to content

Commit

Permalink
Merge branch 'main' into fix-resize-dimension-separator
Browse files Browse the repository at this point in the history
  • Loading branch information
d-v-b authored Oct 26, 2023
2 parents 4a21fbe + 5eb737b commit 871d0a6
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,5 @@ zarr/version.py
#doesnotexist
#test_sync*
data/*

.DS_Store
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

# General information about the project.
project = "zarr"
copyright = "2022, Zarr Developers"
copyright = "2023, Zarr Developers"
author = "Zarr Developers"

version = zarr.__version__
Expand Down
3 changes: 3 additions & 0 deletions docs/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ Maintenance
* Preserve ``dimension_separator`` when resizing arrays.
By :user:`Ziwen Liu <ziw-liu>` :issue:`1533`.

* Initialise some sets in tests with set literals instead of list literals.
By :user:`Dimitri Papadopoulos Orfanos <DimitriPapadopoulos>` :issue:`1534`.

* Allow ``black`` code formatter to be run with any Python version.
By :user:`David Stansby <dstansby>` :issue:`1549`.

Expand Down
2 changes: 1 addition & 1 deletion docs/spec.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Specifications
==============

.. toctree::
:maxdepth: 3
:maxdepth: 1

spec/v3
spec/v2
Expand Down
2 changes: 1 addition & 1 deletion docs/spec/v1.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.. _spec_v1:

Zarr storage specification version 1
Zarr Storage Specification Version 1
====================================

This document provides a technical specification of the protocol and
Expand Down
2 changes: 1 addition & 1 deletion docs/spec/v2.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.. _spec_v2:

Zarr storage specification version 2
Zarr Storage Specification Version 2
====================================

This document provides a technical specification of the protocol and format
Expand Down
6 changes: 3 additions & 3 deletions docs/spec/v3.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. _spec_v3:

Zarr storage specification version 3 (under development)
========================================================
Zarr Storage Specification Version 3
=======================================================

The v3 specification has been migrated to its own website,
The V3 Specification has been migrated to its website
https://zarr-specs.readthedocs.io/.
6 changes: 3 additions & 3 deletions zarr/tests/test_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -1166,9 +1166,9 @@ def test_deep_ndim(self):
if self.version == 2:
assert set(store.listdir()) == {".zgroup", "bar"}
else:
assert set(store.listdir()) == set(["data", "meta", "zarr.json"])
assert set(store.listdir("meta/root/" + path)) == set(["bar", "bar.group.json"])
assert set(store.listdir("data/root/" + path)) == set(["bar"])
assert set(store.listdir()) == {"data", "meta", "zarr.json"}
assert set(store.listdir("meta/root/" + path)) == {"bar", "bar.group.json"}
assert set(store.listdir("data/root/" + path)) == {"bar"}
assert foo["bar"]["baz"][(0, 0, 0)] == 1

def test_not_fsspec(self):
Expand Down

0 comments on commit 871d0a6

Please sign in to comment.