Merge branch 'main' into refactor/store-mode

Author: jhamman

src/zarr/core/indexing.py

@@ -68,7 +68,7 @@ class VindexInvalidSelectionError(IndexError):
     _msg = (
         "unsupported selection type for vectorized indexing; only "
         "coordinate selection (tuple of integer arrays) and mask selection "
-        "(single Boolean array) are supported; got {0!r}"
+        "(single Boolean array) are supported; got {!r}"
     )
 
 

src/zarr/errors.py

@@ -9,17 +9,17 @@ def __init__(self, *args: Any) -> None:
 
 
 class ContainsGroupError(_BaseZarrError):
-    _msg = "A group exists in store {0!r} at path {1!r}."
+    _msg = "A group exists in store {!r} at path {!r}."
 
 
 class ContainsArrayError(_BaseZarrError):
-    _msg = "An array exists in store {0!r} at path {1!r}."
+    _msg = "An array exists in store {!r} at path {!r}."
 
 
 class ContainsArrayAndGroupError(_BaseZarrError):
     _msg = (
         "Array and group metadata documents (.zarray and .zgroup) were both found in store "
-        "{0!r} at path {1!r}."
+        "{!r} at path {!r}. "
         "Only one of these files may be present in a given directory / prefix. "
         "Remove the .zarray file, or the .zgroup file, or both."
     )

src/zarr/storage/common.py

@@ -206,7 +206,7 @@ def __str__(self) -> str:
         return _dereference_path(str(self.store), self.path)
 
     def __repr__(self) -> str:
-        return f"StorePath({self.store.__class__.__name__}, {str(self)!r})"
+        return f"StorePath({self.store.__class__.__name__}, '{self}')"
 
     def __eq__(self, other: object) -> bool:
         """

src/zarr/storage/local.py

@@ -116,7 +116,7 @@ def __str__(self) -> str:
         return f"file://{self.root.as_posix()}"
 
     def __repr__(self) -> str:
-        return f"LocalStore({str(self)!r})"
+        return f"LocalStore('{self}')"
 
     def __eq__(self, other: object) -> bool:
         return isinstance(other, type(self)) and self.root == other.root

src/zarr/storage/memory.py

@@ -62,7 +62,7 @@ def __str__(self) -> str:
         return f"memory://{id(self._store_dict)}"
 
     def __repr__(self) -> str:
-        return f"MemoryStore({str(self)!r})"
+        return f"MemoryStore('{self}')"
 
     def __eq__(self, other: object) -> bool:
         return (
@@ -203,7 +203,7 @@ def __str__(self) -> str:
         return f"gpumemory://{id(self._store_dict)}"
 
     def __repr__(self) -> str:
-        return f"GpuMemoryStore({str(self)!r})"
+        return f"GpuMemoryStore('{self}')"
 
     @classmethod
     def from_dict(cls, store_dict: MutableMapping[str, Buffer]) -> Self:

src/zarr/storage/zip.py

@@ -129,7 +129,7 @@ def __str__(self) -> str:
         return f"zip://{self.path}"
 
     def __repr__(self) -> str:
-        return f"ZipStore({str(self)!r})"
+        return f"ZipStore('{self}')"
 
     def __eq__(self, other: object) -> bool:
         return isinstance(other, type(self)) and self.path == other.path