Backport PR pandas-dev#38209: CI/TST: fix CI with numpy dev for changed error message / dev version (pandas-dev#38231)

meeseeksmachine · jorisvandenbossche · web-flow · commit ee1828847b7e · 2020-12-02T11:38:40.000Z
Co-authored-by: Joris Van den Bossche &lt;jorisvandenbossche@gmail.com&gt;
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)

Original file line number	Diff line number	Diff line change
`@@ -369,8 +369,7 @@ def test_2d_to_1d_assignment_raises():`
`369`	`369`
`370`	`370`	`msg = "\|".join(`
`371`	`371`	`[`
`372`		`- r"shape mismatch: value array of shape \(2,2\) could not be "`
`373`		`- r"broadcast to indexing result of shape \(2,\)",`
	`372`	`+ r"shape mismatch: value array of shape \(2,2\)",`
`374`	`373`	`r"cannot reshape array of size 4 into shape \(2,\)",`
`375`	`374`	`]`
`376`	`375`	`)`