Skip to content

Commit b8cd5e8

Browse files
Backport PR #36864: CI: Update error message for np_dev (#36886)
Co-authored-by: Daniel Saxton <[email protected]>
1 parent 2ea3fc8 commit b8cd5e8

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

pandas/tests/series/indexing/test_indexing.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -367,14 +367,17 @@ def test_2d_to_1d_assignment_raises():
367367
x = np.random.randn(2, 2)
368368
y = pd.Series(range(2))
369369

370-
msg = (
371-
r"shape mismatch: value array of shape \(2,2\) could not be "
372-
r"broadcast to indexing result of shape \(2,\)"
370+
msg = "|".join(
371+
[
372+
r"shape mismatch: value array of shape \(2,2\) could not be "
373+
r"broadcast to indexing result of shape \(2,\)",
374+
r"cannot reshape array of size 4 into shape \(2,\)",
375+
]
373376
)
374377
with pytest.raises(ValueError, match=msg):
375378
y.loc[range(2)] = x
376379

377-
msg = r"could not broadcast input array from shape \(2,2\) into shape \(2\)"
380+
msg = r"could not broadcast input array from shape \(2,2\) into shape \(2,?\)"
378381
with pytest.raises(ValueError, match=msg):
379382
y.loc[:] = x
380383

0 commit comments

Comments
 (0)