Apply ruff/flake8-simplify rule SIM118

SIM118 Use `key in dict` instead of `key in dict.keys()`

Author: DimitriPapadopoulos

src/zarr/codecs/sharding.py

@@ -80,9 +80,9 @@ async def get(
         self, prototype: BufferPrototype, byte_range: ByteRangeRequest | None = None
     ) -> Buffer | None:
         assert byte_range is None, "byte_range is not supported within shards"
-        assert (
-            prototype == default_buffer_prototype()
-        ), f"prototype is not supported within shards currently. diff: {prototype} != {default_buffer_prototype()}"
+        assert prototype == default_buffer_prototype(), (
+            f"prototype is not supported within shards currently. diff: {prototype} != {default_buffer_prototype()}"
+        )
         return self.shard_dict.get(self.chunk_coords)
 
 
@@ -152,9 +152,9 @@ def is_dense(self, chunk_byte_length: int) -> bool:
         )
 
         # Are all non-empty offsets unique?
-        if len(
-            {offset for offset, _ in sorted_offsets_and_lengths if offset != MAX_UINT_64}
-        ) != len(sorted_offsets_and_lengths):
+        if len({
+            offset for offset, _ in sorted_offsets_and_lengths if offset != MAX_UINT_64
+        }) != len(sorted_offsets_and_lengths):
             return False
 
         return all(

src/zarr/core/array.py

@@ -1048,14 +1048,12 @@ async def _save_metadata(self, metadata: ArrayMetadata, ensure_parents: bool = F
             parents = _build_parents(self)
 
             for parent in parents:
-                awaitables.extend(
-                    [
-                        (parent.store_path / key).set_if_not_exists(value)
-                        for key, value in parent.metadata.to_buffer_dict(
-                            default_buffer_prototype()
-                        ).items()
-                    ]
-                )
+                awaitables.extend([
+                    (parent.store_path / key).set_if_not_exists(value)
+                    for key, value in parent.metadata.to_buffer_dict(
+                        default_buffer_prototype()
+                    ).items()
+                ])
 
         await gather(*awaitables)
 

src/zarr/core/codec_pipeline.py

@@ -235,12 +235,10 @@ async def read_batch(
         drop_axes: tuple[int, ...] = (),
     ) -> None:
         if self.supports_partial_decode:
-            chunk_array_batch = await self.decode_partial_batch(
-                [
-                    (byte_getter, chunk_selection, chunk_spec)
-                    for byte_getter, chunk_spec, chunk_selection, _ in batch_info
-                ]
-            )
+            chunk_array_batch = await self.decode_partial_batch([
+                (byte_getter, chunk_selection, chunk_spec)
+                for byte_getter, chunk_spec, chunk_selection, _ in batch_info
+            ])
             for chunk_array, (_, chunk_spec, _, out_selection) in zip(
                 chunk_array_batch, batch_info, strict=False
             ):

src/zarr/core/group.py

@@ -463,9 +463,9 @@ async def open(
             if use_consolidated or use_consolidated is None:
                 paths.append(store_path / consolidated_key)
 
-            zgroup_bytes, zattrs_bytes, *rest = await asyncio.gather(
-                *[path.get() for path in paths]
-            )
+            zgroup_bytes, zattrs_bytes, *rest = await asyncio.gather(*[
+                path.get() for path in paths
+            ])
             if zgroup_bytes is None:
                 raise FileNotFoundError(store_path)
 
@@ -768,14 +768,12 @@ async def _save_metadata(self, ensure_parents: bool = False) -> None:
         if ensure_parents:
             parents = _build_parents(self)
             for parent in parents:
-                awaitables.extend(
-                    [
-                        (parent.store_path / key).set_if_not_exists(value)
-                        for key, value in parent.metadata.to_buffer_dict(
-                            default_buffer_prototype()
-                        ).items()
-                    ]
-                )
+                awaitables.extend([
+                    (parent.store_path / key).set_if_not_exists(value)
+                    for key, value in parent.metadata.to_buffer_dict(
+                        default_buffer_prototype()
+                    ).items()
+                ])
 
         await asyncio.gather(*awaitables)
 
@@ -1225,7 +1223,7 @@ def _members_consolidated(
 
         # we kind of just want the top-level keys.
         if consolidated_metadata is not None:
-            for key in consolidated_metadata.metadata.keys():
+            for key in consolidated_metadata.metadata:
                 obj = self._getitem_consolidated(
                     self.store_path, key, prefix=self.name
                 )  # Metadata -> Group/Array

src/zarr/core/indexing.py

@@ -289,9 +289,9 @@ def is_pure_orthogonal_indexing(selection: Selection, ndim: int) -> TypeGuard[Or
 def get_chunk_shape(chunk_grid: ChunkGrid) -> ChunkCoords:
     from zarr.core.chunk_grids import RegularChunkGrid
 
-    assert isinstance(
-        chunk_grid, RegularChunkGrid
-    ), "Only regular chunk grid is supported, currently."
+    assert isinstance(chunk_grid, RegularChunkGrid), (
+        "Only regular chunk grid is supported, currently."
+    )
     return chunk_grid.chunk_shape
 
 

src/zarr/core/metadata/v3.py

@@ -299,9 +299,9 @@ def ndim(self) -> int:
     def get_chunk_spec(
         self, _chunk_coords: ChunkCoords, order: MemoryOrder, prototype: BufferPrototype
     ) -> ArraySpec:
-        assert isinstance(
-            self.chunk_grid, RegularChunkGrid
-        ), "Currently, only regular chunk grid is supported"
+        assert isinstance(self.chunk_grid, RegularChunkGrid), (
+            "Currently, only regular chunk grid is supported"
+        )
         return ArraySpec(
             shape=self.chunk_grid.chunk_shape,
             dtype=self.dtype,

src/zarr/testing/strategies.py

@@ -94,9 +94,9 @@ def np_array_and_chunks(
     # We want this strategy to shrink towards arrays with smaller number of chunks
     # 1. st.integers() shrinks towards smaller values. So we use that to generate number of chunks
     numchunks = draw(
-        st.tuples(
-            *[st.integers(min_value=0 if size == 0 else 1, max_value=size) for size in array.shape]
-        )
+        st.tuples(*[
+            st.integers(min_value=0 if size == 0 else 1, max_value=size) for size in array.shape
+        ])
     )
     # 2. and now generate the chunks tuple
     chunks = tuple(

tests/test_api.py

@@ -154,7 +154,7 @@ def test_save(store: Store, n_args: int, n_kwargs: int) -> None:
         assert isinstance(group, Group)
         for array in group.array_values():
             assert_array_equal(array[:], data)
-        for k in kwargs.keys():
+        for k in kwargs:
             assert k in group
         assert group.nmembers() == n_args + n_kwargs
 

tests/test_codec_entrypoints.py

@@ -40,11 +40,9 @@ def test_entrypoint_pipeline() -> None:
 @pytest.mark.usefixtures("set_path")
 @pytest.mark.parametrize("buffer_name", ["TestEntrypointBuffer", "TestEntrypointGroup.Buffer"])
 def test_entrypoint_buffer(buffer_name: str) -> None:
-    config.set(
-        {
-            "buffer": "package_with_entrypoint." + buffer_name,
-            "ndbuffer": "package_with_entrypoint.TestEntrypointNDBuffer",
-        }
-    )
+    config.set({
+        "buffer": "package_with_entrypoint." + buffer_name,
+        "ndbuffer": "package_with_entrypoint.TestEntrypointNDBuffer",
+    })
     assert zarr.registry.get_buffer_class().__qualname__ == buffer_name
     assert zarr.registry.get_ndbuffer_class().__name__ == "TestEntrypointNDBuffer"

tests/test_group.py

@@ -541,13 +541,11 @@ def test_group_child_iterators(store: Store, zarr_format: ZarrFormat, consolidat
         object.__setattr__(
             expected_group_values[0].metadata,
             "consolidated_metadata",
-            ConsolidatedMetadata.from_dict(
-                {
-                    "kind": "inline",
-                    "metadata": metadata,
-                    "must_understand": False,
-                }
-            ),
+            ConsolidatedMetadata.from_dict({
+                "kind": "inline",
+                "metadata": metadata,
+                "must_understand": False,
+            }),
         )
         object.__setattr__(
             expected_group_values[1].metadata,