From 88c70731327ad4b18c65e9288f5ecdb34a3eb315 Mon Sep 17 00:00:00 2001 From: John McGuigan Date: Thu, 8 Oct 2020 14:56:24 -0400 Subject: [PATCH 1/3] Fix test_unstack The test was failing if the ExtensionDtype had an na_value that wasn't equivalent to nan --- pandas/tests/extension/base/reshaping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/extension/base/reshaping.py b/pandas/tests/extension/base/reshaping.py index 3774e018a8e51..e7364b9c948b7 100644 --- a/pandas/tests/extension/base/reshaping.py +++ b/pandas/tests/extension/base/reshaping.py @@ -316,7 +316,7 @@ def test_unstack(self, data, index, obj): alt = df.unstack(level=level).droplevel(0, axis=1) self.assert_frame_equal(result, alt) - expected = ser.astype(object).unstack(level=level) + expected = ser.astype(object).unstack(level=level, fill_value=data.dtype.na_value) result = result.astype(object) self.assert_frame_equal(result, expected) From c179f85ea0ae40ea3570f04fe651b43933bdf746 Mon Sep 17 00:00:00 2001 From: John McGuigan Date: Thu, 8 Oct 2020 15:01:01 -0400 Subject: [PATCH 2/3] Fix line length --- pandas/tests/extension/base/reshaping.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandas/tests/extension/base/reshaping.py b/pandas/tests/extension/base/reshaping.py index e7364b9c948b7..9221aa785035a 100644 --- a/pandas/tests/extension/base/reshaping.py +++ b/pandas/tests/extension/base/reshaping.py @@ -316,7 +316,8 @@ def test_unstack(self, data, index, obj): alt = df.unstack(level=level).droplevel(0, axis=1) self.assert_frame_equal(result, alt) - expected = ser.astype(object).unstack(level=level, fill_value=data.dtype.na_value) + expected = ser.astype(object).unstack(level=level, + fill_value=data.dtype.na_value) result = result.astype(object) self.assert_frame_equal(result, expected) From 3a3b5d5f88db5a3bcce28228fd7cc6f9deef22f9 Mon Sep 17 00:00:00 2001 From: John McGuigan Date: Thu, 8 Oct 2020 15:23:52 -0400 Subject: [PATCH 3/3] Fix formatting --- pandas/tests/extension/base/reshaping.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pandas/tests/extension/base/reshaping.py b/pandas/tests/extension/base/reshaping.py index 9221aa785035a..7be50c5f8c305 100644 --- a/pandas/tests/extension/base/reshaping.py +++ b/pandas/tests/extension/base/reshaping.py @@ -316,8 +316,9 @@ def test_unstack(self, data, index, obj): alt = df.unstack(level=level).droplevel(0, axis=1) self.assert_frame_equal(result, alt) - expected = ser.astype(object).unstack(level=level, - fill_value=data.dtype.na_value) + expected = ser.astype(object).unstack( + level=level, fill_value=data.dtype.na_value + ) result = result.astype(object) self.assert_frame_equal(result, expected)