Skip to content

Commit

Permalink
Backport PR pandas-dev#38209: CI/TST: fix CI with numpy dev for chang…
Browse files Browse the repository at this point in the history
…ed error message / dev version
  • Loading branch information
jorisvandenbossche authored and meeseeksmachine committed Dec 2, 2020
1 parent 993557b commit 3ab4b88
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions pandas/tests/series/indexing/test_indexing.py
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,7 @@ def test_2d_to_1d_assignment_raises():

msg = "|".join(
[
r"shape mismatch: value array of shape \(2,2\) could not be "
r"broadcast to indexing result of shape \(2,\)",
r"shape mismatch: value array of shape \(2,2\)",
r"cannot reshape array of size 4 into shape \(2,\)",
]
)
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/util/test_show_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def test_show_versions(capsys):
assert re.search(r"commit\s*:\s[0-9a-f]{40}\n", result)

# check required dependency
assert re.search(r"numpy\s*:\s([0-9\.\+a-f]|dev)+\n", result)
assert re.search(r"numpy\s*:\s([0-9\.\+a-f\_]|dev)+\n", result)

# check optional dependency
assert re.search(r"pyarrow\s*:\s([0-9\.]+|None)\n", result)

0 comments on commit 3ab4b88

Please sign in to comment.