Apply ruff/Pylint preview rule PLR6201

PLR6201 Use a set literal when testing for membership

Author: DimitriPapadopoulos

src/zarr/core/chunk_key_encodings.py

@@ -18,7 +18,7 @@
 
 
 def parse_separator(data: JSON) -> SeparatorLiteral:
-    if data not in (".", "/"):
+    if data not in {".", "/"}:
         raise ValueError(f"Expected an '.' or '/' separator. Got {data} instead.")
     return cast("SeparatorLiteral", data)
 

src/zarr/core/common.py

@@ -157,7 +157,7 @@ def parse_fill_value(data: Any) -> Any:
 
 
 def parse_order(data: Any) -> Literal["C", "F"]:
-    if data in ("C", "F"):
+    if data in {"C", "F"}:
         return cast("Literal['C', 'F']", data)
     raise ValueError(f"Expected one of ('C', 'F'), got {data} instead.")
 

src/zarr/core/config.py

@@ -133,7 +133,7 @@ def enable_gpu(self) -> ConfigSet:
 
 
 def parse_indexing_order(data: Any) -> Literal["C", "F"]:
-    if data in ("C", "F"):
+    if data in {"C", "F"}:
         return cast("Literal['C', 'F']", data)
     msg = f"Expected one of ('C', 'F'), got {data} instead."
     raise ValueError(msg)

src/zarr/core/group.py

@@ -81,15 +81,15 @@
 
 def parse_zarr_format(data: Any) -> ZarrFormat:
     """Parse the zarr_format field from metadata."""
-    if data in (2, 3):
+    if data in {2, 3}:
         return cast("ZarrFormat", data)
     msg = f"Invalid zarr_format. Expected one of 2 or 3. Got {data}."
     raise ValueError(msg)
 
 
 def parse_node_type(data: Any) -> NodeType:
     """Parse the node_type field from metadata."""
-    if data in ("array", "group"):
+    if data in {"array", "group"}:
         return cast("Literal['array', 'group']", data)
     raise MetadataValidationError("node_type", "array or group", data)
 
@@ -402,7 +402,7 @@ def __init__(
     @classmethod
     def from_dict(cls, data: dict[str, Any]) -> GroupMetadata:
         data = dict(data)
-        assert data.pop("node_type", None) in ("group", None)
+        assert data.pop("node_type", None) in {"group", None}
         consolidated_metadata = data.pop("consolidated_metadata", None)
         if consolidated_metadata:
             data["consolidated_metadata"] = ConsolidatedMetadata.from_dict(consolidated_metadata)

src/zarr/core/indexing.py

@@ -77,7 +77,7 @@ def err_too_many_indices(selection: Any, shape: ChunkCoords) -> None:
 
 
 def _zarr_array_to_int_or_bool_array(arr: Array) -> npt.NDArray[np.intp] | npt.NDArray[np.bool_]:
-    if arr.dtype.kind in ("i", "b"):
+    if arr.dtype.kind in {"i", "b"}:
         return np.asarray(arr)
     else:
         raise IndexError(
@@ -184,7 +184,7 @@ def is_integer(x: Any) -> TypeGuard[int]:
 
 def is_bool(x: Any) -> TypeGuard[bool | np.bool_]:
     """True if x is a boolean (both pure Python or NumPy)."""
-    return type(x) in [bool, np.bool_]
+    return type(x) in {bool, np.bool_}
 
 
 def is_integer_list(x: Any) -> TypeGuard[list[int]]:
@@ -422,7 +422,7 @@ def __iter__(self) -> Iterator[ChunkDimProjection]:
             dim_out_sel = slice(dim_out_offset, dim_out_offset + dim_chunk_nitems)
 
             is_complete_chunk = (
-                dim_chunk_sel_start == 0 and (self.stop >= dim_limit) and self.step in [1, None]
+                dim_chunk_sel_start == 0 and (self.stop >= dim_limit) and self.step in {1, None}
             )
             yield ChunkDimProjection(dim_chunk_ix, dim_chunk_sel, dim_out_sel, is_complete_chunk)
 

src/zarr/core/metadata/v3.py

@@ -527,7 +527,7 @@ def parse_fill_value(
     np_dtype = cast("np.dtype[Any]", data_type.to_numpy())
 
     if isinstance(fill_value, Sequence) and not isinstance(fill_value, str):
-        if data_type in (DataType.complex64, DataType.complex128):
+        if data_type in {DataType.complex64, DataType.complex128}:
             if len(fill_value) == 2:
                 decoded_fill_value = tuple(
                     SPECIAL_FLOATS_ENCODED.get(value, value) for value in fill_value
@@ -557,7 +557,7 @@ def parse_fill_value(
         raise ValueError(f"fill value {fill_value!r} is not valid for dtype {data_type}") from e
     # Check if the value is still representable by the dtype
     if (fill_value == "NaN" and np.isnan(casted_value)) or (
-        fill_value in ["Infinity", "-Infinity"] and not np.isfinite(casted_value)
+        fill_value in {"Infinity", "-Infinity"} and not np.isfinite(casted_value)
     ):
         pass
     elif np_dtype.kind == "f":

src/zarr/storage/_common.py

@@ -291,7 +291,7 @@ async def make_store_path(
     if isinstance(store_like, StorePath):
         result = store_like / path_normalized
     else:
-        assert mode in (None, "r", "r+", "a", "w", "w-")
+        assert mode in {None, "r", "r+", "a", "w", "w-"}
         # if mode 'r' was provided, we'll open any new stores as read-only
         _read_only = mode == "r"
         if isinstance(store_like, Store):

src/zarr/testing/strategies.py

@@ -100,12 +100,12 @@ def clear_store(x: Store) -> Store:
 )
 node_names = (
     st.text(zarr_key_chars, min_size=1)
-    .filter(lambda t: t not in (".", "..") and not t.startswith("__"))
+    .filter(lambda t: t not in {".", ".."} and not t.startswith("__"))
     .filter(lambda name: name.lower() != "zarr.json")
 )
 short_node_names = (
     st.text(zarr_key_chars, max_size=3, min_size=1)
-    .filter(lambda t: t not in (".", "..") and not t.startswith("__"))
+    .filter(lambda t: t not in {".", ".."} and not t.startswith("__"))
     .filter(lambda name: name.lower() != "zarr.json")
 )
 array_names = node_names

tests/test_api.py

@@ -1141,7 +1141,7 @@ async def test_open_falls_back_to_open_group_async(zarr_format: ZarrFormat) -> N
 def test_open_modes_creates_group(tmp_path: pathlib.Path, mode: str) -> None:
     # https://github.com/zarr-developers/zarr-python/issues/2490
     zarr_dir = tmp_path / f"mode-{mode}-test.zarr"
-    if mode in ["r", "r+"]:
+    if mode in {"r", "r+"}:
         # Expect FileNotFoundError to be raised if 'r' or 'r+' mode
         with pytest.raises(FileNotFoundError):
             zarr.open(store=zarr_dir, mode=mode)

tests/test_array.py

@@ -1683,7 +1683,7 @@ def _index_array(arr: Array, index: Any) -> Any:
         pytest.param(
             "fork",
             marks=pytest.mark.skipif(
-                sys.platform in ("win32", "darwin"), reason="fork not supported on Windows or OSX"
+                sys.platform in {"win32", "darwin"}, reason="fork not supported on Windows or OSX"
             ),
         ),
         "spawn",