Merge branch 'main' into io

Author: d-v-b

.gitignore

@@ -77,3 +77,5 @@ zarr/version.py
 #doesnotexist
 #test_sync*
 data/*
+
+.DS_Store

.pre-commit-config.yaml

@@ -17,7 +17,6 @@ repos:
     rev: 22.12.0
     hooks:
     - id: black
-      language_version: python3.8
   - repo: https://github.com/codespell-project/codespell
     rev: v2.2.5
     hooks:

docs/conf.py

@@ -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__

docs/release.rst

@@ -21,8 +21,14 @@ Unreleased
 Maintenance
 ~~~~~~~~~~~
 
-    * Change occurrence of io.open() into open().
-      By :user:`Dimitri Papadopoulos Orfanos <DimitriPapadopoulos>` :issue:`1421`.
+* Change occurrence of ``io.open()`` into ``open()``.
+  By :user:`Dimitri Papadopoulos Orfanos <DimitriPapadopoulos>` :issue:`1421`.
+
+* 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`.
 
 .. _release_2.16.1:
 

docs/spec.rst

@@ -4,7 +4,7 @@ Specifications
 ==============
 
 .. toctree::
-    :maxdepth: 3
+    :maxdepth: 1
 
     spec/v3
     spec/v2

docs/spec/v1.rst

@@ -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

docs/spec/v2.rst

@@ -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

docs/spec/v3.rst

@@ -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/.

requirements_dev_minimal.txt

@@ -5,4 +5,4 @@ numcodecs==0.11.0
 msgpack-python==0.5.6
 setuptools-scm==7.1.0
 # test requirements
-pytest==7.3.2
+pytest==7.4.0

zarr/tests/test_storage.py

@@ -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):