CI/TST: fix CI with numpy dev for changed error message / dev version (#38209)

jorisvandenbossche · web-flow · commit 2a115d5d750c · 2020-12-01T21:37:59.000+01:00
diff --git a/pandas/tests/series/indexing/test_indexing.py b/pandas/tests/series/indexing/test_indexing.py
@@ -309,8 +309,7 @@ def test_loc_setitem_2d_to_1d_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
`@@ -309,8 +309,7 @@ def test_loc_setitem_2d_to_1d_raises():`
`309`	`309`
`310`	`310`	`msg = "\|".join(`
`311`	`311`	`[`
`312`		`- r"shape mismatch: value array of shape \(2,2\) could not be "`
`313`		`- r"broadcast to indexing result of shape \(2,\)",`
	`312`	`+ r"shape mismatch: value array of shape \(2,2\)",`
`314`	`313`	`r"cannot reshape array of size 4 into shape \(2,\)",`
`315`	`314`	`]`
`316`	`315`	`)`