Skip to content

Backport PR #38209 on branch 1.1.x (CI/TST: fix CI with numpy dev for changed error message / dev version) #38231

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

Merged
Show file tree
Hide file tree
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
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)