Skip to content

Commit 25bb1c8

Browse files
committed
testing
1 parent b375b6e commit 25bb1c8

File tree

8 files changed

+18
-6
lines changed

8 files changed

+18
-6
lines changed

named_arrays/_functions/functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@ def __setitem__(
10171017
item_inputs[ax] = item_outputs[ax] = item_ax
10181018
else:
10191019
raise TypeError(
1020-
f"`item` must be an instance of `{dict.__name__}`, or `{na.AbstractFunctionArray.__name__}`, "
1020+
f"`item` must be an instance of `bool`, `{dict.__name__}`, or `{na.AbstractFunctionArray.__name__}`, "
10211021
f"got `{type(item)}`"
10221022
)
10231023

named_arrays/_functions/tests/test_functions.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ def test_interp_linear_identity(
194194

195195
with pytest.raises(NotImplementedError):
196196
array.interp_linear(array.indices)
197+
197198
@pytest.mark.parametrize(
198199
argnames='item',
199200
argvalues=[
@@ -206,6 +207,7 @@ def test_interp_linear_identity(
206207
outputs=na.ScalarArrayRange(0, 2, axis='y'),
207208
)
208209
),
210+
True,
209211
na.ScalarLinearSpace(0, 1, axis='y', num=_num_y) > 0.5,
210212
na.FunctionArray(
211213
inputs=na.ScalarLinearSpace(0, 1, axis='y', num=_num_y),
@@ -225,9 +227,6 @@ def test_interp_linear_identity(
225227
)
226228
],
227229
)
228-
229-
230-
231230
def test__getitem__(
232231
self,
233232
array: na.AbstractFunctionArray,
@@ -947,6 +946,7 @@ class TestFunctionArray(
947946
dict(y=slice(None)),
948947
dict(y=na.ScalarArrayRange(0, _num_y, axis='y')),
949948
dict(x=na.ScalarArrayRange(0, _num_x, axis='x'), y=na.ScalarArrayRange(0, _num_y, axis='y')),
949+
True,
950950
na.FunctionArray(
951951
inputs=na.ScalarLinearSpace(0, 1, axis='y', num=_num_y),
952952
outputs=na.ScalarArray.ones(shape=dict(y=_num_y), dtype=bool),

named_arrays/_scalars/scalars.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,6 +1086,12 @@ def __setitem__(
10861086

10871087
self.ndarray_aligned(axes_self)[tuple(index)] = value
10881088

1089+
else:
1090+
raise TypeError(
1091+
f"`item` must be an instance of `bool`, `{na.AbstractArray.__name__}`, or {dict.__name__}, "
1092+
f"got `{type(item)}`"
1093+
)
1094+
10891095

10901096
@dataclasses.dataclass(eq=False, repr=False)
10911097
class AbstractImplicitScalarArray(

named_arrays/_scalars/tests/test_scalars.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,7 @@ def test_change_axis_index(self, array: na.ScalarArray, index: int):
425425
dict(y=0),
426426
dict(y=slice(0,1)),
427427
dict(y=na.ScalarArray(np.array([0, 1]), axes=('y', ))),
428+
True,
428429
na.ScalarLinearSpace(0, 1, axis='y', num=_num_y) > 0.5,
429430
]
430431
)
@@ -1319,6 +1320,7 @@ class TestScalarArray(
13191320
dict(y=slice(None)),
13201321
dict(y=na.ScalarArrayRange(0, _num_y, axis='y')),
13211322
dict(x=na.ScalarArrayRange(0, _num_x, axis='x'), y=na.ScalarArrayRange(0, _num_y, axis='y')),
1323+
True,
13221324
na.ScalarArray.ones(shape=dict(y=_num_y), dtype=bool),
13231325
],
13241326
)

named_arrays/_scalars/uncertainties/tests/test_uncertainties.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ def test_shape_distribution(self, array: na.AbstractUncertainScalarArray):
114114
)
115115
)
116116
),
117+
True,
117118
na.ScalarLinearSpace(0, 1, axis='y', num=_num_y) > 0.5,
118119
na.UncertainScalarArray(
119120
nominal=na.ScalarLinearSpace(0, 1, axis='y', num=_num_y),
@@ -795,6 +796,7 @@ class TestUncertainScalarArray(
795796
dict(y=slice(None)),
796797
dict(y=na.ScalarArrayRange(0, _num_y, axis='y')),
797798
dict(x=na.ScalarArrayRange(0, _num_x, axis='x'), y=na.ScalarArrayRange(0, _num_y, axis='y')),
799+
True,
798800
na.ScalarArray.ones(shape=dict(y=_num_y), dtype=bool),
799801
],
800802
)

named_arrays/_scalars/uncertainties/uncertainties.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ def __setitem__(
703703

704704
else:
705705
raise TypeError(
706-
f"`item` must be an instance of `{na.AbstractArray.__name__}` or {dict.__name__}, "
706+
f"`item` must be an instance of `bool`, `{na.AbstractArray.__name__}`, or {dict.__name__}, "
707707
f"got `{type(item)}`"
708708
)
709709

named_arrays/_vectors/cartesian/tests/test_vectors_cartesian_2d.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ def _cartesian2d_items() -> list[na.AbstractArray | dict[str, int, slice, na.Abs
108108
)
109109
)
110110
),
111+
True,
111112
na.ScalarLinearSpace(0, 1, axis='y', num=_num_y) > 0.5,
112113
na.UniformUncertainScalarArray(
113114
nominal=na.ScalarLinearSpace(0, 1, axis='y', num=_num_y),
@@ -259,6 +260,7 @@ class TestCartesian2dVectorArray(
259260
y=na.ScalarArrayRange(0, _num_y, axis='y'),
260261
)
261262
),
263+
True,
262264
na.ScalarArray.ones(shape=dict(y=_num_y), dtype=bool),
263265
np.ones_like(na.Cartesian2dVectorArray(), dtype=bool, shape=dict(y=_num_y)),
264266
],

named_arrays/_vectors/vectors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ def __setitem__(
668668

669669
else:
670670
raise TypeError(
671-
f"`item` must be an instance of `{na.AbstractArray.__name__}` or {dict.__name__}, "
671+
f"`item` must be an instance of `bool`, `{na.AbstractArray.__name__}`, or {dict.__name__}, "
672672
f"got `{type(item)}`"
673673
)
674674

0 commit comments

Comments
 (0)