Skip to content

Commit 4ccbfb8

Browse files
Apply Sourcery suggestions and fix typos
1 parent 2911be8 commit 4ccbfb8

File tree

18 files changed

+629
-36
lines changed

18 files changed

+629
-36
lines changed

src/zarr/abc/metadata.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ def to_dict(self) -> dict[str, JSON]:
2828
value = getattr(self, key)
2929
if isinstance(value, Metadata):
3030
out_dict[field.name] = getattr(self, field.name).to_dict()
31-
elif isinstance(value, str):
32-
out_dict[key] = value
3331
elif isinstance(value, Sequence):
3432
out_dict[key] = tuple(v.to_dict() if isinstance(v, Metadata) else v for v in value)
3533
else:

src/zarr/codecs/sharding.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class _ShardIndex(NamedTuple):
115115

116116
@property
117117
def chunks_per_shard(self) -> ChunkCoords:
118-
result = tuple(self.offsets_and_lengths.shape[0:-1])
118+
result = tuple(self.offsets_and_lengths.shape[:-1])
119119
# The cast is required until https://github.com/numpy/numpy/pull/27211 is merged
120120
return cast("ChunkCoords", result)
121121

@@ -421,8 +421,8 @@ def validate(
421421
)
422422
if not isinstance(chunk_grid, RegularChunkGrid):
423423
raise TypeError("Sharding is only compatible with regular chunk grids.")
424-
if not all(
425-
s % c == 0
424+
if any(
425+
s % c != 0
426426
for s, c in zip(
427427
chunk_grid.chunk_shape,
428428
self.chunk_shape,

src/zarr/core/array.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ async def _create(
660660
overwrite=overwrite,
661661
)
662662
else:
663-
raise ValueError(f"Insupported zarr_format. Got: {zarr_format}")
663+
raise ValueError(f"Unsupported zarr_format. Got: {zarr_format}")
664664

665665
if data is not None:
666666
# insert user-provided data

src/zarr/core/buffer/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def check_item_key_is_1d_contiguous(key: Any) -> None:
115115
raise TypeError(
116116
f"Item key has incorrect type (expected slice, got {key.__class__.__name__})"
117117
)
118-
if not (key.step is None or key.step == 1):
118+
if key.step is not None and key.step != 1:
119119
raise ValueError("slice must be contiguous")
120120

121121

src/zarr/core/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def parse_shapelike(data: int | Iterable[int]) -> tuple[int, ...]:
152152
if not all(isinstance(v, int) for v in data_tuple):
153153
msg = f"Expected an iterable of integers. Got {data} instead."
154154
raise TypeError(msg)
155-
if not all(v > -1 for v in data_tuple):
155+
if any(v < 0 for v in data_tuple):
156156
msg = f"Expected all values to be non-negative. Got {data} instead."
157157
raise ValueError(msg)
158158
return data_tuple

src/zarr/core/indexing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ def replace_ellipsis(selection: Any, shape: ChunkCoords) -> SelectionNormalized:
436436
selection = ensure_tuple(selection)
437437

438438
# count number of ellipsis present
439-
n_ellipsis = sum(1 for i in selection if i is Ellipsis)
439+
n_ellipsis = selection.count(Ellipsis)
440440

441441
if n_ellipsis > 1:
442442
# more than 1 is an error

src/zarr/core/metadata/v2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,11 +266,11 @@ def parse_filters(data: object) -> tuple[numcodecs.abc.Codec, ...] | None:
266266
"""
267267
Parse a potential tuple of filters
268268
"""
269-
out: list[numcodecs.abc.Codec] = []
270269

271270
if data is None:
272271
return data
273272
if isinstance(data, Iterable):
273+
out: list[numcodecs.abc.Codec] = []
274274
for idx, val in enumerate(data):
275275
if isinstance(val, numcodecs.abc.Codec):
276276
out.append(val)

0 commit comments

Comments
 (0)