Backport PR #38209: CI/TST: fix CI with numpy dev for changed error m…

…essage / dev version (#38231) Co-authored-by: Joris Van den Bossche <jorisvandenbossche@gmail.com>
pandas-dev · Dec 2, 2020 · ee18288 · ee18288
1 parent 8846913
commit ee18288
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pandas/tests/series/indexing/test_indexing.py b/pandas/tests/series/indexing/test_indexing.py
@@ -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,\)",
         ]
     )

diff --git a/pandas/tests/util/test_show_versions.py b/pandas/tests/util/test_show_versions.py
@@ -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)