From 6620243f1a15206872dd2c73057ee785844c079b Mon Sep 17 00:00:00 2001 From: Ming Li Date: Mon, 15 Oct 2018 22:39:16 +0100 Subject: [PATCH 1/4] check name --- pandas/tests/test_multilevel.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/tests/test_multilevel.py b/pandas/tests/test_multilevel.py index 0dbbe60283cac..46eee82859f38 100644 --- a/pandas/tests/test_multilevel.py +++ b/pandas/tests/test_multilevel.py @@ -740,6 +740,7 @@ def test_delevel_infer_dtype(self): def test_reset_index_with_drop(self): deleveled = self.ymd.reset_index(drop=True) assert len(deleveled.columns) == len(self.ymd.columns) + assert deleveled.index.name == self.ymd.index.name deleveled = self.series.reset_index() assert isinstance(deleveled, DataFrame) From 9dde8d3e4cfdb680608caf0de783c586ab169c40 Mon Sep 17 00:00:00 2001 From: Ming Li Date: Mon, 15 Oct 2018 22:42:00 +0100 Subject: [PATCH 2/4] add name checking for multilevel index reset --- pandas/tests/test_multilevel.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandas/tests/test_multilevel.py b/pandas/tests/test_multilevel.py index 46eee82859f38..882221bfce4aa 100644 --- a/pandas/tests/test_multilevel.py +++ b/pandas/tests/test_multilevel.py @@ -745,9 +745,11 @@ def test_reset_index_with_drop(self): deleveled = self.series.reset_index() assert isinstance(deleveled, DataFrame) assert len(deleveled.columns) == len(self.series.index.levels) + 1 + assert deleveled.index.name == self.series.index.name deleveled = self.series.reset_index(drop=True) assert isinstance(deleveled, Series) + assert deleveled.index.name == self.series.index.name def test_count_level(self): def _check_counts(frame, axis=0): From e0b92c1a731e9334efc38a7122e437dbbeff3452 Mon Sep 17 00:00:00 2001 From: Ming Li Date: Mon, 15 Oct 2018 23:13:27 +0100 Subject: [PATCH 3/4] add frame and series reset_index name checking --- pandas/tests/frame/test_alter_axes.py | 7 +++++++ pandas/tests/series/test_alter_axes.py | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/pandas/tests/frame/test_alter_axes.py b/pandas/tests/frame/test_alter_axes.py index 4e61c9c62266d..dce8cb9fdd069 100644 --- a/pandas/tests/frame/test_alter_axes.py +++ b/pandas/tests/frame/test_alter_axes.py @@ -744,6 +744,13 @@ def test_reset_index(self, float_frame): xp = xp.set_index(['B'], append=True) tm.assert_frame_equal(rs, xp, check_names=False) + def test_reset_index_name(self): + df = DataFrame([[1, 2, 3, 4], [5, 6, 7, 8]], + columns=['A', 'B', 'C', 'D'], + index=Index(range(2), name='x')) + assert df.reset_index().index.name == 'x' + assert df.reset_index(drop=True).index.name == 'x' + def test_reset_index_level(self): df = DataFrame([[1, 2, 3, 4], [5, 6, 7, 8]], columns=['A', 'B', 'C', 'D']) diff --git a/pandas/tests/series/test_alter_axes.py b/pandas/tests/series/test_alter_axes.py index c3e4cb8bc3abc..0b890bac60728 100644 --- a/pandas/tests/series/test_alter_axes.py +++ b/pandas/tests/series/test_alter_axes.py @@ -144,6 +144,11 @@ def test_reset_index(self): tm.assert_index_equal(rs.index, Index(index.get_level_values(1))) assert isinstance(rs, Series) + def test_reset_index_name(self): + s = Series([1, 2, 3], index=Index(range(3), name='x')) + assert s.reset_index().index.name == 'x' + assert s.reset_index(drop=True).index.name == 'x' + def test_reset_index_level(self): df = DataFrame([[1, 2, 3], [4, 5, 6]], columns=['A', 'B', 'C']) From 2cfd37ffcf2dd7e0f0f6117f816307692f2781b0 Mon Sep 17 00:00:00 2001 From: Ming Li Date: Thu, 18 Oct 2018 19:33:16 +0100 Subject: [PATCH 4/4] update tests to reflect expected behaviour --- pandas/tests/frame/test_alter_axes.py | 6 ++++-- pandas/tests/series/test_alter_axes.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pandas/tests/frame/test_alter_axes.py b/pandas/tests/frame/test_alter_axes.py index dce8cb9fdd069..3faf62b4ec28b 100644 --- a/pandas/tests/frame/test_alter_axes.py +++ b/pandas/tests/frame/test_alter_axes.py @@ -748,8 +748,10 @@ def test_reset_index_name(self): df = DataFrame([[1, 2, 3, 4], [5, 6, 7, 8]], columns=['A', 'B', 'C', 'D'], index=Index(range(2), name='x')) - assert df.reset_index().index.name == 'x' - assert df.reset_index(drop=True).index.name == 'x' + assert df.reset_index().index.name is None + assert df.reset_index(drop=True).index.name is None + df.reset_index(inplace=True) + assert df.index.name is None def test_reset_index_level(self): df = DataFrame([[1, 2, 3, 4], [5, 6, 7, 8]], diff --git a/pandas/tests/series/test_alter_axes.py b/pandas/tests/series/test_alter_axes.py index 0b890bac60728..7d4aa2d4df6fc 100644 --- a/pandas/tests/series/test_alter_axes.py +++ b/pandas/tests/series/test_alter_axes.py @@ -146,8 +146,8 @@ def test_reset_index(self): def test_reset_index_name(self): s = Series([1, 2, 3], index=Index(range(3), name='x')) - assert s.reset_index().index.name == 'x' - assert s.reset_index(drop=True).index.name == 'x' + assert s.reset_index().index.name is None + assert s.reset_index(drop=True).index.name is None def test_reset_index_level(self): df = DataFrame([[1, 2, 3], [4, 5, 6]],