Skip to content

Commit 48b41c3

Browse files
committed
lint with new features from updated linters
1 parent e689ee5 commit 48b41c3

File tree

3 files changed

+25
-12
lines changed

3 files changed

+25
-12
lines changed

src/mdio/api/accessor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ def _data_group(self) -> zarr.Group:
377377
def __getitem__(self, item: int | tuple) -> npt.ArrayLike | da.Array | tuple:
378378
"""Data getter."""
379379
if self._return_metadata is True:
380-
if type(item) == int or type(item) == slice:
380+
if isinstance(item, int) or isinstance(item, slice):
381381
meta_index = item
382382
elif len(item) == len(self.shape):
383383
meta_index = tuple(dim for dim in item[:-1])

src/mdio/segy/helpers_segy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def create_zarr_hierarchy(store: FSStore, overwrite: bool) -> Group:
2929
root_group.create_group(name="metadata", overwrite=overwrite)
3030
except ContainsGroupError as e:
3131
msg = (
32-
f"An MDIO file with data already exists at '{store.path}'. "
32+
f"An MDIO file with data already exists at {store.path}. "
3333
"If this is intentional, please specify 'overwrite=True'."
3434
)
3535
raise MDIOAlreadyExistsError(msg) from e

tests/unit/test_segy_grid_overrides.py

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def mock_streamer_headers() -> dict[str, npt.NDArray]:
6969
class TestAutoGridOverrides:
7070
"""Check grid overrides works with auto indexing."""
7171

72-
def test_duplicates(self, mock_streamer_headers: npt.NDArray) -> None:
72+
def test_duplicates(self, mock_streamer_headers: dict[str, npt.NDArray]) -> None:
7373
"""Test the HasDuplicates Grid Override command."""
7474
index_names = ("shot", "cable")
7575
grid_overrides = {"HasDuplicates": True}
@@ -94,7 +94,7 @@ def test_duplicates(self, mock_streamer_headers: npt.NDArray) -> None:
9494
assert_array_equal(dims[1].coords, CABLES)
9595
assert_array_equal(dims[2].coords, RECEIVERS)
9696

97-
def test_non_binned(self, mock_streamer_headers: npt.NDArray) -> None:
97+
def test_non_binned(self, mock_streamer_headers: dict[str, npt.NDArray]) -> None:
9898
"""Test the NonBinned Grid Override command."""
9999
index_names = ("shot", "cable")
100100
grid_overrides = {"NonBinned": True, "chunksize": 4}
@@ -123,7 +123,7 @@ def test_non_binned(self, mock_streamer_headers: npt.NDArray) -> None:
123123
class TestStreamerGridOverrides:
124124
"""Check grid overrides for shot data with streamer acquisition."""
125125

126-
def test_channel_wrap(self, mock_streamer_headers: npt.NDArray) -> None:
126+
def test_channel_wrap(self, mock_streamer_headers: dict[str, npt.NDArray]) -> None:
127127
"""Test the ChannelWrap command."""
128128
index_names = ("shot", "cable", "channel")
129129
grid_overrides = {"ChannelWrap": True, "ChannelsPerCable": len(RECEIVERS)}
@@ -141,7 +141,10 @@ def test_channel_wrap(self, mock_streamer_headers: npt.NDArray) -> None:
141141
assert_array_equal(dims[1].coords, CABLES)
142142
assert_array_equal(dims[2].coords, RECEIVERS)
143143

144-
def test_calculate_cable(self, mock_streamer_headers: npt.NDArray) -> None:
144+
def test_calculate_cable(
145+
self,
146+
mock_streamer_headers: dict[str, npt.NDArray],
147+
) -> None:
145148
"""Test the CalculateCable command."""
146149
index_names = ("shot", "cable", "channel")
147150
grid_overrides = {"CalculateCable": True, "ChannelsPerCable": len(RECEIVERS)}
@@ -165,7 +168,10 @@ def test_calculate_cable(self, mock_streamer_headers: npt.NDArray) -> None:
165168
assert_array_equal(dims[1].coords, cables)
166169
assert_array_equal(dims[2].coords, channels)
167170

168-
def test_wrap_and_calc_cable(self, mock_streamer_headers: npt.NDArray) -> None:
171+
def test_wrap_and_calc_cable(
172+
self,
173+
mock_streamer_headers: dict[str, npt.NDArray],
174+
) -> None:
169175
"""Test the combined ChannelWrap and CalculateCable commands."""
170176
index_names = ("shot", "cable", "channel")
171177
grid_overrides = {
@@ -189,7 +195,7 @@ def test_wrap_and_calc_cable(self, mock_streamer_headers: npt.NDArray) -> None:
189195
assert_array_equal(dims[1].coords, cables)
190196
assert_array_equal(dims[2].coords, RECEIVERS)
191197

192-
def test_missing_param(self, mock_streamer_headers: npt.NDArray) -> None:
198+
def test_missing_param(self, mock_streamer_headers: dict[str, npt.NDArray]) -> None:
193199
"""Test missing parameters for the commands."""
194200
index_names = ("shot", "cable", "channel")
195201
chunksize = None
@@ -205,20 +211,27 @@ def test_missing_param(self, mock_streamer_headers: npt.NDArray) -> None:
205211
mock_streamer_headers, index_names, {"CalculateCable": True}, chunksize
206212
)
207213

208-
def test_incompatible_overrides(self, mock_streamer_headers: npt.NDArray) -> None:
214+
def test_incompatible_overrides(
215+
self,
216+
mock_streamer_headers: dict[str, npt.NDArray],
217+
) -> None:
209218
"""Test commands that can't be run together."""
210219
index_names = ("shot", "cable", "channel")
211220
chunksize = None
212221
overrider = GridOverrider()
222+
223+
grid_overrides = {"ChannelWrap": True, "AutoChannelWrap": True}
213224
with pytest.raises(GridOverrideIncompatibleError):
214-
grid_overrides = {"ChannelWrap": True, "AutoChannelWrap": True}
215225
overrider.run(mock_streamer_headers, index_names, grid_overrides, chunksize)
216226

227+
grid_overrides = {"CalculateCable": True, "AutoChannelWrap": True}
217228
with pytest.raises(GridOverrideIncompatibleError):
218-
grid_overrides = {"CalculateCable": True, "AutoChannelWrap": True}
219229
overrider.run(mock_streamer_headers, index_names, grid_overrides, chunksize)
220230

221-
def test_unknown_override(self, mock_streamer_headers: npt.NDArray) -> None:
231+
def test_unknown_override(
232+
self,
233+
mock_streamer_headers: dict[str, npt.NDArray],
234+
) -> None:
222235
"""Test exception if user provides a command that's not allowed."""
223236
index_names = ("shot", "cable", "channel")
224237
chunksize = None

0 commit comments

Comments
 (0)