Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues with test_normalize_skip_axes #187

Merged
merged 1 commit into from
Aug 23, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ndindex/shapetools.py
Original file line number Diff line number Diff line change
@@ -482,13 +482,15 @@ def normalize_skip_axes(shapes, skip_axes):
raise ValueError("skip_axes must be empty if there are no shapes")

new_skip_axes = []
err = None
for shape in shapes:
s = tuple(sorted(ndindex(i).reduce(len(shape), negative_int=True, axiserror=True).raw for i in skip_axes))
if len(s) != len(set(s)):
err = ValueError(f"skip_axes {skip_axes} are not unique for shape {shape}")
# For testing
err.skip_axes = skip_axes
err.shape = shape
raise err
new_skip_axes.append(s)
if err:
raise err
return new_skip_axes
7 changes: 3 additions & 4 deletions ndindex/tests/test_shapetools.py
Original file line number Diff line number Diff line change
@@ -496,6 +496,8 @@ def test_asshape():
raises(TypeError, lambda: asshape(np.int64(1), allow_int=False))
raises(IndexError, lambda: asshape((2, 3), 3))

@example([(0,), ()], (0, 0))
@example([(0, 1), (0,), ()], [(-1,), (0,), ()])
@example([(5,)], (10,))
@example([], [])
@example([()], [])
@@ -521,13 +523,11 @@ def test_normalize_skip_axes(shapes, skip_axes):
raises(AxisError, lambda: normalize_skip_axes(shapes, skip_axes))
return
_skip_axes = [(skip_axes,)]*len(shapes)
skip_len = 1
elif isinstance(skip_axes, tuple):
if not all(-min_dim <= s < min_dim for s in skip_axes):
raises(AxisError, lambda: normalize_skip_axes(shapes, skip_axes))
return
_skip_axes = [skip_axes]*len(shapes)
skip_len = len(skip_axes)
elif not skip_axes:
# empty list will be interpreted as a single skip_axes tuple
assert normalize_skip_axes(shapes, skip_axes) == [()]*len(shapes)
@@ -537,7 +537,6 @@ def test_normalize_skip_axes(shapes, skip_axes):
raises(ValueError, lambda: normalize_skip_axes(shapes, skip_axes))
return
_skip_axes = skip_axes
skip_len = len(skip_axes[0])

try:
res = normalize_skip_axes(shapes, skip_axes)
@@ -566,7 +565,7 @@ def test_normalize_skip_axes(shapes, skip_axes):

assert len(res) == len(shapes)
for shape, new_skip_axes in zip(shapes, res):
assert len(new_skip_axes) == len(set(new_skip_axes)) == skip_len
assert len(new_skip_axes) == len(set(new_skip_axes))
assert new_skip_axes == tuple(sorted(new_skip_axes))
for i in new_skip_axes:
assert i < 0