Enforce ruff/tryceratops rules (TRY) (#2054)

* Apply ruff/tryceratops rule TRY004

TRY004 Prefer `TypeError` exception for invalid type

* Apply ruff/tryceratops rule TRY201

TRY201 Use `raise` without specifying exception name

* Apply ruff/tryceratops rule TRY300

TRY300 Consider moving this statement to an `else` block

* Enforce ruff/tryceratops rules (TRY)

---------

Co-authored-by: David Stansby <[email protected]>

Author: DimitriPapadopoulos

pyproject.toml

@@ -182,9 +182,11 @@ extend-select = [
     "UP",  # pyupgrade
     "RSE",
     "RUF",
+    "TRY", # tryceratops
 ]
 ignore = [
     "RUF005",
+    "TRY003",
 ]
 
 [tool.mypy]

src/zarr/api/asynchronous.py

@@ -66,7 +66,7 @@ def _like_args(a: ArrayLike, kwargs: dict[str, Any]) -> dict[str, Any]:
         if isinstance(a.metadata, ArrayV3Metadata):
             new["codecs"] = a.metadata.codecs
         else:
-            raise ValueError(f"Unsupported zarr format: {a.metadata.zarr_format}")
+            raise TypeError(f"Unsupported zarr format: {a.metadata.zarr_format}")
     else:
         # TODO: set default values compressor/codecs
         # to do this, we may need to evaluate if this is a v2 or v3 array
@@ -862,7 +862,7 @@ async def open_array(
 
     try:
         return await AsyncArray.open(store_path, zarr_format=zarr_format)
-    except FileNotFoundError as e:
+    except FileNotFoundError:
         if store_path.store.mode.create:
             return await create(
                 store=store_path,
@@ -871,7 +871,7 @@ async def open_array(
                 overwrite=store_path.store.mode.overwrite,
                 **kwargs,
             )
-        raise e
+        raise
 
 
 async def open_like(a: ArrayLike, path: str, **kwargs: Any) -> AsyncArray:

src/zarr/array.py

@@ -87,7 +87,7 @@ def create_codec_pipeline(metadata: ArrayV2Metadata | ArrayV3Metadata) -> CodecP
             [V2Filters(metadata.filters or []), V2Compressor(metadata.compressor)]
         )
     else:
-        raise AssertionError
+        raise TypeError
 
 
 @dataclass(frozen=True)
@@ -394,7 +394,7 @@ def chunks(self) -> ChunkCoords:
         if isinstance(self.metadata.chunk_grid, RegularChunkGrid):
             return self.metadata.chunk_grid.chunk_shape
         else:
-            raise ValueError(
+            raise TypeError(
                 f"chunk attribute is only available for RegularChunkGrid, this array has a {self.metadata.chunk_grid}"
             )
 

src/zarr/codecs/pipeline.py

@@ -492,7 +492,7 @@ def codecs_from_list(
                     "must be preceded by another ArrayArrayCodec. "
                     f"Got {type(prev_codec)} instead."
                 )
-                raise ValueError(msg)
+                raise TypeError(msg)
             array_array += (cur_codec,)
 
         elif isinstance(cur_codec, ArrayBytesCodec):
@@ -501,7 +501,7 @@ def codecs_from_list(
                     f"Invalid codec order. ArrayBytes codec {cur_codec}"
                     f" must be preceded by an ArrayArrayCodec. Got {type(prev_codec)} instead."
                 )
-                raise ValueError(msg)
+                raise TypeError(msg)
 
             if array_bytes_maybe is not None:
                 msg = (
@@ -521,7 +521,7 @@ def codecs_from_list(
                 )
             bytes_bytes += (cur_codec,)
         else:
-            raise AssertionError
+            raise TypeError
 
     if array_bytes_maybe is None:
         raise ValueError("Required ArrayBytesCodec was not found.")

src/zarr/codecs/sharding.py

@@ -387,7 +387,7 @@ def validate(self, *, shape: ChunkCoords, dtype: np.dtype[Any], chunk_grid: Chun
                 "The shard's `chunk_shape` and array's `shape` need to have the same number of dimensions."
             )
         if not isinstance(chunk_grid, RegularChunkGrid):
-            raise ValueError("Sharding is only compatible with regular chunk grids.")
+            raise TypeError("Sharding is only compatible with regular chunk grids.")
         if not all(
             s % c == 0
             for s, c in zip(

src/zarr/group.py

@@ -467,9 +467,10 @@ async def contains(self, member: str) -> bool:
         # TODO: this can be made more efficient.
         try:
             await self.getitem(member)
-            return True
         except KeyError:
             return False
+        else:
+            return True
 
     # todo: decide if this method should be separate from `groups`
     async def group_keys(self) -> AsyncGenerator[str, None]:

src/zarr/store/core.py

@@ -251,9 +251,10 @@ async def contains_group(store_path: StorePath, zarr_format: ZarrFormat) -> bool
                 extant_meta_json = json.loads(extant_meta_bytes.to_bytes())
                 # we avoid constructing a full metadata document here in the name of speed.
                 result: bool = extant_meta_json["node_type"] == "group"
-                return result
             except (ValueError, KeyError):
                 return False
+            else:
+                return result
     elif zarr_format == 2:
         return await (store_path / ZGROUP_JSON).exists()
     msg = f"Invalid zarr_format provided. Got {zarr_format}, expected 2 or 3"  # type: ignore[unreachable]

src/zarr/store/local.py

@@ -87,9 +87,10 @@ async def clear(self) -> None:
     async def empty(self) -> bool:
         try:
             subpaths = os.listdir(self.root)
-            return not subpaths
         except FileNotFoundError:
             return True
+        else:
+            return not subpaths
 
     def __str__(self) -> str:
         return f"file://{self.root}"

src/zarr/store/remote.py

@@ -118,7 +118,6 @@ async def get(
                     else self._fs._cat_file(path)
                 )
             )
-            return value
 
         except self.allowed_exceptions:
             return None
@@ -127,6 +126,8 @@ async def get(
                 # this is an s3-specific condition we probably don't want to leak
                 return prototype.buffer.from_bytes(b"")
             raise
+        else:
+            return value
 
     async def set(
         self,

tests/v3/test_codecs/test_codecs.py

@@ -382,7 +382,7 @@ def test_invalid_metadata(store: Store) -> None:
             fill_value=0,
         )
     spath2 = StorePath(store, "invalid_endian")
-    with pytest.raises(ValueError):
+    with pytest.raises(TypeError):
         Array.create(
             spath2,
             shape=(16, 16),