From 52fd6cb6d6c950c7c9804ecb5676870786f0787c Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Tue, 1 Dec 2020 10:43:11 +0100 Subject: [PATCH 1/3] TST: fix CI with numpy dev for changed error message --- pandas/tests/series/indexing/test_indexing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/series/indexing/test_indexing.py b/pandas/tests/series/indexing/test_indexing.py index 3bb87a8346c78..b756ec8effbb9 100644 --- a/pandas/tests/series/indexing/test_indexing.py +++ b/pandas/tests/series/indexing/test_indexing.py @@ -309,7 +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"shape mismatch: value array of shape \(2,2\)" r"broadcast to indexing result of shape \(2,\)", r"cannot reshape array of size 4 into shape \(2,\)", ] From 99149845ef29f5148c87b58cd9bbec3d51490e21 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Tue, 1 Dec 2020 10:49:43 +0100 Subject: [PATCH 2/3] update for numpy's new dev version --- pandas/tests/util/test_show_versions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/util/test_show_versions.py b/pandas/tests/util/test_show_versions.py index fe5fc3e21d960..4ea3ebe5000ad 100644 --- 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) From 8554ebf64a5709cd8e6bdbb62bd5058def5fbd15 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Tue, 1 Dec 2020 13:50:39 +0100 Subject: [PATCH 3/3] fixup --- pandas/tests/series/indexing/test_indexing.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandas/tests/series/indexing/test_indexing.py b/pandas/tests/series/indexing/test_indexing.py index b756ec8effbb9..159b42621f970 100644 --- 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\)" - 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,\)", ] )