Merge branch 'main' into remove-release-banner

Author: aryannikhil

src/zarr/storage/_obstore.py

@@ -16,7 +16,7 @@
 from zarr.core.config import config
 
 if TYPE_CHECKING:
-    from collections.abc import AsyncGenerator, Coroutine, Iterable
+    from collections.abc import AsyncGenerator, Coroutine, Iterable, Sequence
     from typing import Any
 
     from obstore import ListResult, ListStream, ObjectMeta, OffsetRange, SuffixRange
@@ -216,14 +216,14 @@ def list(self) -> AsyncGenerator[str, None]:
         # docstring inherited
         import obstore as obs
 
-        objects: ListStream[list[ObjectMeta]] = obs.list(self.store)
+        objects: ListStream[Sequence[ObjectMeta]] = obs.list(self.store)
         return _transform_list(objects)
 
     def list_prefix(self, prefix: str) -> AsyncGenerator[str, None]:
         # docstring inherited
         import obstore as obs
 
-        objects: ListStream[list[ObjectMeta]] = obs.list(self.store, prefix=prefix)
+        objects: ListStream[Sequence[ObjectMeta]] = obs.list(self.store, prefix=prefix)
         return _transform_list(objects)
 
     def list_dir(self, prefix: str) -> AsyncGenerator[str, None]:
@@ -235,7 +235,7 @@ def list_dir(self, prefix: str) -> AsyncGenerator[str, None]:
 
 
 async def _transform_list(
-    list_stream: ListStream[list[ObjectMeta]],
+    list_stream: ListStream[Sequence[ObjectMeta]],
 ) -> AsyncGenerator[str, None]:
     """
     Transform the result of list into an async generator of paths.
@@ -246,7 +246,8 @@ async def _transform_list(
 
 
 async def _transform_list_dir(
-    list_result_coroutine: Coroutine[Any, Any, ListResult[list[ObjectMeta]]], prefix: str
+    list_result_coroutine: Coroutine[Any, Any, ListResult[Sequence[ObjectMeta]]],
+    prefix: str,
 ) -> AsyncGenerator[str, None]:
     """
     Transform the result of list_with_delimiter into an async generator of paths.

src/zarr/testing/stateful.py

@@ -343,9 +343,10 @@ def delete_array_using_del(self, data: DataObject) -> None:
     @precondition(lambda self: len(self.all_groups) >= 2)  # fixme don't delete root
     @rule(data=st.data())
     def delete_group_using_del(self, data: DataObject) -> None:
-        group_path = data.draw(
-            st.sampled_from(sorted(self.all_groups)), label="Group deletion target"
-        )
+        # ensure that we don't include the root group in the list of member names that we try
+        # to delete
+        member_names = tuple(filter(lambda v: "/" in v, sorted(self.all_groups)))
+        group_path = data.draw(st.sampled_from(member_names), label="Group deletion target")
         prefix, group_name = split_prefix_name(group_path)
         note(f"Deleting group '{group_path=!r}', {prefix=!r}, {group_name=!r} using delete")
         members = zarr.open_group(store=self.model, path=group_path).members(max_depth=None)

src/zarr/testing/strategies.py

@@ -256,15 +256,13 @@ def arrays(
         arrays = numpy_arrays(shapes=shapes)
     nparray = draw(arrays, label="array data")
     chunk_shape = draw(chunk_shapes(shape=nparray.shape), label="chunk shape")
-    extra_kwargs = {}
+    dim_names: None | list[str | None] = None
     if zarr_format == 3 and all(c > 0 for c in chunk_shape):
         shard_shape = draw(
             st.none() | shard_shapes(shape=nparray.shape, chunk_shape=chunk_shape),
             label="shard shape",
         )
-        extra_kwargs["dimension_names"] = draw(
-            dimension_names(ndim=nparray.ndim), label="dimension names"
-        )
+        dim_names = draw(dimension_names(ndim=nparray.ndim), label="dimension names")
     else:
         shard_shape = None
     # test that None works too.
@@ -285,7 +283,7 @@ def arrays(
         attributes=attributes,
         # compressor=compressor,  # FIXME
         fill_value=fill_value,
-        **extra_kwargs,
+        dimension_names=dim_names,
     )
 
     assert isinstance(a, Array)