Merge branch 'main' into fix/runtime-order

Author: d-v-b

pyproject.toml

@@ -214,6 +214,7 @@ extend-select = [
     "B",    # flake8-bugbear
     "C4",   # flake8-comprehensions
     "FLY",  # flynt
+    "FURB", # refurb
     "G",    # flake8-logging-format
     "I",    # isort
     "ISC",  # flake8-implicit-str-concat
@@ -329,4 +330,15 @@ ignore = [
 
 [tool.numpydoc_validation]
 # See https://numpydoc.readthedocs.io/en/latest/validation.html#built-in-validation-checks for list of checks
-checks = ["GL06", "GL07", "GL10", "PR03", "PR05", "PR06"]
+checks = [
+    "GL06",
+    "GL07",
+    "GL09",
+    "GL10",
+    "SS02",
+    "SS04",
+    "PR02",
+    "PR03",
+    "PR05",
+    "PR06",
+]

src/zarr/abc/codec.py

@@ -85,7 +85,7 @@ def evolve_from_array_spec(self, array_spec: ArraySpec) -> Self:
 
         Parameters
         ----------
-        chunk_spec : ArraySpec
+        array_spec : ArraySpec
 
         Returns
         -------
@@ -99,11 +99,11 @@ def validate(self, *, shape: ChunkCoords, dtype: np.dtype[Any], chunk_grid: Chun
 
         Parameters
         ----------
-        shape: ChunkCoords
+        shape : ChunkCoords
             The array shape
-        dtype: np.dtype[Any]
+        dtype : np.dtype[Any]
             The array data type
-        chunk_grid: ChunkGrid
+        chunk_grid : ChunkGrid
             The array chunk grid
         """
         ...
@@ -292,11 +292,11 @@ def validate(self, *, shape: ChunkCoords, dtype: np.dtype[Any], chunk_grid: Chun
 
         Parameters
         ----------
-        shape: ChunkCoords
+        shape : ChunkCoords
             The array shape
-        dtype: np.dtype[Any]
+        dtype : np.dtype[Any]
             The array data type
-        chunk_grid: ChunkGrid
+        chunk_grid : ChunkGrid
             The array chunk grid
         """
         ...
@@ -308,7 +308,7 @@ def compute_encoded_size(self, byte_length: int, array_spec: ArraySpec) -> int:
 
         Parameters
         ----------
-        input_byte_length : int
+        byte_length : int
         array_spec : ArraySpec
 
         Returns
@@ -327,7 +327,7 @@ async def decode(
 
         Parameters
         ----------
-        chunks_and_specs : Iterable[tuple[Buffer | None, ArraySpec]]
+        chunk_bytes_and_specs : Iterable[tuple[Buffer | None, ArraySpec]]
             Ordered set of encoded chunks with their accompanying chunk spec.
 
         Returns
@@ -346,7 +346,7 @@ async def encode(
 
         Parameters
         ----------
-        chunks_and_specs : Iterable[tuple[NDBuffer | None, ArraySpec]]
+        chunk_arrays_and_specs : Iterable[tuple[NDBuffer | None, ArraySpec]]
             Ordered set of to-be-encoded chunks with their accompanying chunk spec.
 
         Returns

src/zarr/abc/store.py

@@ -2,6 +2,7 @@
 
 from abc import ABC, abstractmethod
 from asyncio import gather
+from itertools import starmap
 from typing import TYPE_CHECKING, NamedTuple, Protocol, runtime_checkable
 
 if TYPE_CHECKING:
@@ -162,7 +163,7 @@ def with_mode(self, mode: AccessModeLiteral) -> Self:
 
         Parameters
         ----------
-        mode: AccessModeLiteral
+        mode : AccessModeLiteral
             The new mode to use.
 
         Returns
@@ -282,7 +283,7 @@ async def _set_many(self, values: Iterable[tuple[str, Buffer]]) -> None:
         """
         Insert multiple (key, value) pairs into storage.
         """
-        await gather(*(self.set(key, value) for key, value in values))
+        await gather(*starmap(self.set, values))
         return
 
     @property

src/zarr/api/asynchronous.py

@@ -68,7 +68,7 @@
 
 
 def _get_shape_chunks(a: ArrayLike | Any) -> tuple[ChunkCoords | None, ChunkCoords | None]:
-    """helper function to get the shape and chunks from an array-like object"""
+    """Helper function to get the shape and chunks from an array-like object"""
     shape = None
     chunks = None
 
@@ -86,7 +86,7 @@ def _get_shape_chunks(a: ArrayLike | Any) -> tuple[ChunkCoords | None, ChunkCoor
 
 
 def _like_args(a: ArrayLike, kwargs: dict[str, Any]) -> dict[str, Any]:
-    """set default values for shape and chunks if they are not present in the array-like object"""
+    """Set default values for shape and chunks if they are not present in the array-like object"""
 
     new = kwargs.copy()
 
@@ -121,7 +121,7 @@ def _like_args(a: ArrayLike, kwargs: dict[str, Any]) -> dict[str, Any]:
 def _handle_zarr_version_or_format(
     *, zarr_version: ZarrFormat | None, zarr_format: ZarrFormat | None
 ) -> ZarrFormat | None:
-    """handle the deprecated zarr_version kwarg and return zarr_format"""
+    """Handle the deprecated zarr_version kwarg and return zarr_format"""
     if zarr_format is not None and zarr_version is not None and zarr_format != zarr_version:
         raise ValueError(
             f"zarr_format {zarr_format} does not match zarr_version {zarr_version}, please only set one"
@@ -135,7 +135,7 @@ def _handle_zarr_version_or_format(
 
 
 def _default_zarr_version() -> ZarrFormat:
-    """return the default zarr_version"""
+    """Return the default zarr_version"""
     return cast(ZarrFormat, int(config.get("default_zarr_version", 3)))
 
 
@@ -152,9 +152,9 @@ async def consolidate_metadata(
 
     Parameters
     ----------
-    store: StoreLike
+    store : StoreLike
         The store-like object whose metadata you wish to consolidate.
-    path: str, optional
+    path : str, optional
         A path to a group in the store to consolidate at. Only children
         below that group will be consolidated.
 
@@ -341,13 +341,13 @@ async def save(
     ----------
     store : Store or str
         Store or path to directory in file system or name of zip file.
-    args : ndarray
+    *args : ndarray
         NumPy arrays with data to save.
     zarr_format : {2, 3, None}, optional
         The zarr format to use when saving.
     path : str or None, optional
         The path within the group where the arrays will be saved.
-    kwargs
+    **kwargs
         NumPy arrays with data to save.
     """
     zarr_format = _handle_zarr_version_or_format(zarr_version=zarr_version, zarr_format=zarr_format)
@@ -386,7 +386,7 @@ async def save_array(
     storage_options : dict
         If using an fsspec URL to create the store, these will be passed to
         the backend implementation. Ignored otherwise.
-    kwargs
+    **kwargs
         Passed through to :func:`create`, e.g., compressor.
     """
     zarr_format = (
@@ -423,7 +423,7 @@ async def save_group(
     ----------
     store : Store or str
         Store or path to directory in file system or name of zip file.
-    args : ndarray
+    *args : ndarray
         NumPy arrays with data to save.
     zarr_format : {2, 3, None}, optional
         The zarr format to use when saving.
@@ -432,7 +432,7 @@ async def save_group(
     storage_options : dict
         If using an fsspec URL to create the store, these will be passed to
         the backend implementation. Ignored otherwise.
-    kwargs
+    **kwargs
         NumPy arrays with data to save.
     """
     zarr_format = (
@@ -479,7 +479,7 @@ async def array(
     ----------
     data : array_like
         The data to fill the array with.
-    kwargs
+    **kwargs
         Passed through to :func:`create`.
 
     Returns

src/zarr/core/array.py

@@ -3,6 +3,7 @@
 import json
 from asyncio import gather
 from dataclasses import dataclass, field, replace
+from itertools import starmap
 from logging import getLogger
 from typing import TYPE_CHECKING, Any, Generic, Literal, cast, overload
 
@@ -184,8 +185,6 @@ class AsyncArray(Generic[T_ArrayMetadata]):
         The metadata of the array.
     store_path : StorePath
         The path to the Zarr store.
-    codec_pipeline : CodecPipeline, optional
-        The codec pipeline used for encoding and decoding chunks, by default None.
     order : {'C', 'F'}, optional
         The order of the array data in memory, by default None.
 
@@ -816,7 +815,7 @@ def cdata_shape(self) -> ChunkCoords:
         Tuple[int]
             The shape of the chunk grid for this array.
         """
-        return tuple(ceildiv(s, c) for s, c in zip(self.shape, self.chunks, strict=False))
+        return tuple(starmap(ceildiv, zip(self.shape, self.chunks, strict=False)))
 
     @property
     def nchunks(self) -> int:
@@ -855,9 +854,9 @@ def _iter_chunk_coords(
 
         Parameters
         ----------
-        origin: Sequence[int] | None, default=None
+        origin : Sequence[int] | None, default=None
             The origin of the selection relative to the array's chunk grid.
-        selection_shape: Sequence[int] | None, default=None
+        selection_shape : Sequence[int] | None, default=None
             The shape of the selection in chunk grid coordinates.
 
         Yields
@@ -876,9 +875,9 @@ def _iter_chunk_keys(
 
         Parameters
         ----------
-        origin: Sequence[int] | None, default=None
+        origin : Sequence[int] | None, default=None
             The origin of the selection relative to the array's chunk grid.
-        selection_shape: Sequence[int] | None, default=None
+        selection_shape : Sequence[int] | None, default=None
             The shape of the selection in chunk grid coordinates.
 
         Yields
@@ -899,9 +898,9 @@ def _iter_chunk_regions(
 
         Parameters
         ----------
-        origin: Sequence[int] | None, default=None
+        origin : Sequence[int] | None, default=None
             The origin of the selection relative to the array's chunk grid.
-        selection_shape: Sequence[int] | None, default=None
+        selection_shape : Sequence[int] | None, default=None
             The shape of the selection in chunk grid coordinates.
 
         Yields
@@ -1149,17 +1148,7 @@ async def info(self) -> None:
 
 @dataclass(frozen=True)
 class Array:
-    """Instantiate an array from an initialized store.
-
-    Parameters
-    ----------
-    store : StoreLike
-        The array store that has already been initialized.
-    shape : ChunkCoords
-        The shape of the array.
-    dtype : npt.DTypeLike
-        The dtype of the array.
-    """
+    """Instantiate an array from an initialized store."""
 
     _async_array: AsyncArray[ArrayV3Metadata] | AsyncArray[ArrayV2Metadata]
 
@@ -1395,7 +1384,7 @@ def cdata_shape(self) -> ChunkCoords:
         """
         The shape of the chunk grid for this array.
         """
-        return tuple(ceildiv(s, c) for s, c in zip(self.shape, self.chunks, strict=False))
+        return tuple(starmap(ceildiv, zip(self.shape, self.chunks, strict=False)))
 
     @property
     def nchunks(self) -> int:
@@ -1417,9 +1406,9 @@ def _iter_chunk_coords(
 
         Parameters
         ----------
-        origin: Sequence[int] | None, default=None
+        origin : Sequence[int] | None, default=None
             The origin of the selection relative to the array's chunk grid.
-        selection_shape: Sequence[int] | None, default=None
+        selection_shape : Sequence[int] | None, default=None
             The shape of the selection in chunk grid coordinates.
 
         Yields
@@ -1454,9 +1443,9 @@ def _iter_chunk_keys(
 
         Parameters
         ----------
-        origin: Sequence[int] | None, default=None
+        origin : Sequence[int] | None, default=None
             The origin of the selection relative to the array's chunk grid.
-        selection_shape: Sequence[int] | None, default=None
+        selection_shape : Sequence[int] | None, default=None
             The shape of the selection in chunk grid coordinates.
 
         Yields
@@ -1476,9 +1465,9 @@ def _iter_chunk_regions(
 
         Parameters
         ----------
-        origin: Sequence[int] | None, default=None
+        origin : Sequence[int] | None, default=None
             The origin of the selection relative to the array's chunk grid.
-        selection_shape: Sequence[int] | None, default=None
+        selection_shape : Sequence[int] | None, default=None
             The shape of the selection in chunk grid coordinates.
 
         Yields
@@ -2229,7 +2218,7 @@ def get_mask_selection(
 
         Parameters
         ----------
-        selection : ndarray, bool
+        mask : ndarray, bool
             A Boolean array of the same shape as the array against which the selection is
             being made.
         out : NDBuffer, optional
@@ -2312,7 +2301,7 @@ def set_mask_selection(
 
         Parameters
         ----------
-        selection : ndarray, bool
+        mask : ndarray, bool
             A Boolean array of the same shape as the array against which the selection is
             being made.
         value : npt.ArrayLike

src/zarr/core/buffer/core.py

@@ -308,7 +308,7 @@ class NDBuffer:
 
     Parameters
     ----------
-    ndarray_like
+    array : ndarray_like
         ndarray-like object that is convertible to a regular Numpy array.
     """
 

src/zarr/core/buffer/cpu.py

@@ -138,7 +138,7 @@ class NDBuffer(core.NDBuffer):
 
     Parameters
     ----------
-    ndarray_like
+    array
         ndarray-like object that is convertible to a regular Numpy array.
     """
 

src/zarr/core/buffer/gpu.py

@@ -132,7 +132,7 @@ class NDBuffer(core.NDBuffer):
 
     Parameters
     ----------
-    ndarray_like
+    array
         ndarray-like object that is convertible to a regular Numpy array.
     """