Skip to content

REF: collect+parametrize reorder_levels tests #32373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 2, 2020
Merged

REF: collect+parametrize reorder_levels tests #32373

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f646265
test_reorder_levels
jbrockmendel Feb 27, 2020
8f93384
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Feb 27, 2020
440498c
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Feb 27, 2020
84076d5
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Feb 27, 2020
29e593e
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Feb 28, 2020
f1f25e4
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Feb 28, 2020
108521b
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Feb 29, 2020
777d82f
REF: collect+parametrize reorder_levels tests
jbrockmendel Feb 29, 2020
9d6dff9
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Feb 29, 2020
831558e
Merge branch 'master' of https://github.com/pandas-dev/pandas into ts…
jbrockmendel Mar 2, 2020
4f0975e
use fixture
jbrockmendel Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 0 additions & 38 deletions pandas/tests/frame/test_alter_axes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,44 +689,6 @@ def test_rename_axis_mapper(self):
with pytest.raises(TypeError, match="bogus"):
df.rename_axis(bogus=None)

def test_reorder_levels(self):
index = MultiIndex(
levels=[["bar"], ["one", "two", "three"], [0, 1]],
codes=[[0, 0, 0, 0, 0, 0], [0, 1, 2, 0, 1, 2], [0, 1, 0, 1, 0, 1]],
names=["L0", "L1", "L2"],
)
df = DataFrame({"A": np.arange(6), "B": np.arange(6)}, index=index)

# no change, position
result = df.reorder_levels([0, 1, 2])
tm.assert_frame_equal(df, result)

# no change, labels
result = df.reorder_levels(["L0", "L1", "L2"])
tm.assert_frame_equal(df, result)

# rotate, position
result = df.reorder_levels([1, 2, 0])
e_idx = MultiIndex(
levels=[["one", "two", "three"], [0, 1], ["bar"]],
codes=[[0, 1, 2, 0, 1, 2], [0, 1, 0, 1, 0, 1], [0, 0, 0, 0, 0, 0]],
names=["L1", "L2", "L0"],
)
expected = DataFrame({"A": np.arange(6), "B": np.arange(6)}, index=e_idx)
tm.assert_frame_equal(result, expected)

result = df.reorder_levels([0, 0, 0])
e_idx = MultiIndex(
levels=[["bar"], ["bar"], ["bar"]],
codes=[[0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0]],
names=["L0", "L0", "L0"],
)
expected = DataFrame({"A": np.arange(6), "B": np.arange(6)}, index=e_idx)
tm.assert_frame_equal(result, expected)

result = df.reorder_levels(["L0", "L0", "L0"])
tm.assert_frame_equal(result, expected)

def test_set_index_names(self):
df = tm.makeDataFrame()
df.index.name = "name"
Expand Down
76 changes: 76 additions & 0 deletions pandas/tests/generic/methods/test_reorder_levels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
import numpy as np
import pytest

from pandas import DataFrame, MultiIndex, Series
import pandas._testing as tm


class TestReorderLevels:
@pytest.mark.parametrize("klass", [Series, DataFrame])
def test_reorder_levels(self, klass):
index = MultiIndex(
levels=[["bar"], ["one", "two", "three"], [0, 1]],
codes=[[0, 0, 0, 0, 0, 0], [0, 1, 2, 0, 1, 2], [0, 1, 0, 1, 0, 1]],
names=["L0", "L1", "L2"],
)
df = DataFrame({"A": np.arange(6), "B": np.arange(6)}, index=index)
obj = df if klass is DataFrame else df["A"]

# no change, position
result = obj.reorder_levels([0, 1, 2])
tm.assert_equal(obj, result)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if this is going to happen a lot with these changes, should maybe consider a solution that can maintain the correct assertion helper.

either in the parameterisation as "klass, helper" or create a fixture something like

@fixture()
def assert_klass_equal(klass):
    if isinstance(klass, DataFrame):
      return tm.assert_frame_equal
    elif isinstance(klass, Series):
      return tm.assert_series_equal
   else:
      assert False

(code not tested!)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might make sense to add as a kwarg to tm.assert_equal

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, that sounds good as well. could be follow-up


# no change, labels
result = obj.reorder_levels(["L0", "L1", "L2"])
tm.assert_equal(obj, result)

# rotate, position
result = obj.reorder_levels([1, 2, 0])
e_idx = MultiIndex(
levels=[["one", "two", "three"], [0, 1], ["bar"]],
codes=[[0, 1, 2, 0, 1, 2], [0, 1, 0, 1, 0, 1], [0, 0, 0, 0, 0, 0]],
names=["L1", "L2", "L0"],
)
expected = DataFrame({"A": np.arange(6), "B": np.arange(6)}, index=e_idx)
expected = expected if klass is DataFrame else expected["A"]
tm.assert_equal(result, expected)

result = obj.reorder_levels([0, 0, 0])
e_idx = MultiIndex(
levels=[["bar"], ["bar"], ["bar"]],
codes=[[0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0]],
names=["L0", "L0", "L0"],
)
expected = DataFrame({"A": np.arange(6), "B": np.arange(6)}, index=e_idx)
expected = expected if klass is DataFrame else expected["A"]
tm.assert_equal(result, expected)

result = obj.reorder_levels(["L0", "L0", "L0"])
tm.assert_equal(result, expected)

def test_reorder_levels_swaplevel_equivalence(self):

ymd = tm.makeTimeDataFrame(100)
mi = MultiIndex.from_arrays(
[ymd.index.year, ymd.index.month, ymd.index.day],
names=["year", "month", "day"],
)
ymd.index = mi

result = ymd.reorder_levels(["month", "day", "year"])
expected = ymd.swaplevel(0, 1).swaplevel(1, 2)
tm.assert_frame_equal(result, expected)

result = ymd["A"].reorder_levels(["month", "day", "year"])
expected = ymd["A"].swaplevel(0, 1).swaplevel(1, 2)
tm.assert_series_equal(result, expected)

result = ymd.T.reorder_levels(["month", "day", "year"], axis=1)
expected = ymd.T.swaplevel(0, 1, axis=1).swaplevel(1, 2, axis=1)
tm.assert_frame_equal(result, expected)

with pytest.raises(TypeError, match="hierarchical axis"):
ymd.reorder_levels([1, 2], axis=1)

with pytest.raises(IndexError, match="Too many levels"):
ymd.index.reorder_levels([1, 2, 3])
26 changes: 0 additions & 26 deletions pandas/tests/series/test_alter_axes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,32 +54,6 @@ def test_set_index_makes_timeseries(self):
s.index = idx
assert s.index.is_all_dates

def test_reorder_levels(self):
index = MultiIndex(
levels=[["bar"], ["one", "two", "three"], [0, 1]],
codes=[[0, 0, 0, 0, 0, 0], [0, 1, 2, 0, 1, 2], [0, 1, 0, 1, 0, 1]],
names=["L0", "L1", "L2"],
)
s = Series(np.arange(6), index=index)

# no change, position
result = s.reorder_levels([0, 1, 2])
tm.assert_series_equal(s, result)

# no change, labels
result = s.reorder_levels(["L0", "L1", "L2"])
tm.assert_series_equal(s, result)

# rotate, position
result = s.reorder_levels([1, 2, 0])
e_idx = MultiIndex(
levels=[["one", "two", "three"], [0, 1], ["bar"]],
codes=[[0, 1, 2, 0, 1, 2], [0, 1, 0, 1, 0, 1], [0, 0, 0, 0, 0, 0]],
names=["L1", "L2", "L0"],
)
expected = Series(np.arange(6), index=e_idx)
tm.assert_series_equal(result, expected)

def test_rename_axis_mapper(self):
# GH 19978
mi = MultiIndex.from_product([["a", "b", "c"], [1, 2]], names=["ll", "nn"])
Expand Down
19 changes: 0 additions & 19 deletions pandas/tests/test_multilevel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,25 +939,6 @@ def test_swaplevel(self):
with pytest.raises(TypeError, match=msg):
DataFrame(range(3)).swaplevel()

def test_reorder_levels(self):
result = self.ymd.reorder_levels(["month", "day", "year"])
expected = self.ymd.swaplevel(0, 1).swaplevel(1, 2)
tm.assert_frame_equal(result, expected)

result = self.ymd["A"].reorder_levels(["month", "day", "year"])
expected = self.ymd["A"].swaplevel(0, 1).swaplevel(1, 2)
tm.assert_series_equal(result, expected)

result = self.ymd.T.reorder_levels(["month", "day", "year"], axis=1)
expected = self.ymd.T.swaplevel(0, 1, axis=1).swaplevel(1, 2, axis=1)
tm.assert_frame_equal(result, expected)

with pytest.raises(TypeError, match="hierarchical axis"):
self.ymd.reorder_levels([1, 2], axis=1)

with pytest.raises(IndexError, match="Too many levels"):
self.ymd.index.reorder_levels([1, 2, 3])

def test_insert_index(self):
df = self.ymd[:5].T
df[2000, 1, 10] = df[2000, 1, 7]
Expand Down