Skip to content

Commit 1e13713

Browse files
committed
TST: Fix existing tests for groupby
1 parent 0dc0239 commit 1e13713

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

pandas/tests/groupby/test_groupby.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -1795,8 +1795,8 @@ def test_groupby_level(self):
17951795
frame = self.mframe
17961796
deleveled = frame.reset_index()
17971797

1798-
result0 = frame.groupby(level=0).sum()
1799-
result1 = frame.groupby(level=1).sum()
1798+
result0 = frame.groupby(level=0, sort=False).sum()
1799+
result1 = frame.groupby(level=1, sort=False).sum()
18001800

18011801
expected0 = frame.groupby(deleveled['first'].values).sum()
18021802
expected1 = frame.groupby(deleveled['second'].values).sum()
@@ -1813,15 +1813,15 @@ def test_groupby_level(self):
18131813
assert result1.index.name == frame.index.names[1]
18141814

18151815
# groupby level name
1816-
result0 = frame.groupby(level='first').sum()
1817-
result1 = frame.groupby(level='second').sum()
1816+
result0 = frame.groupby(level='first', sort=False).sum()
1817+
result1 = frame.groupby(level='second', sort=False).sum()
18181818
assert_frame_equal(result0, expected0)
18191819
assert_frame_equal(result1, expected1)
18201820

18211821
# axis=1
18221822

1823-
result0 = frame.T.groupby(level=0, axis=1).sum()
1824-
result1 = frame.T.groupby(level=1, axis=1).sum()
1823+
result0 = frame.T.groupby(level=0, axis=1, sort=False).sum()
1824+
result1 = frame.T.groupby(level=1, axis=1, sort=False).sum()
18251825
assert_frame_equal(result0, expected0.T)
18261826
assert_frame_equal(result1, expected1.T)
18271827

@@ -1843,7 +1843,7 @@ def test_groupby_level_with_nas(self):
18431843
# factorizing doesn't confuse things
18441844
s = Series(np.arange(8.), index=index)
18451845
result = s.groupby(level=0).sum()
1846-
expected = Series([22., 6.], index=[1, 0])
1846+
expected = Series([6., 22.], index=[0, 1])
18471847
assert_series_equal(result, expected)
18481848

18491849
index = MultiIndex(levels=[[1, 0], [0, 1, 2, 3]],
@@ -1853,7 +1853,7 @@ def test_groupby_level_with_nas(self):
18531853
# factorizing doesn't confuse things
18541854
s = Series(np.arange(8.), index=index)
18551855
result = s.groupby(level=0).sum()
1856-
expected = Series([18., 6.], index=[1, 0])
1856+
expected = Series([6., 18.], index=[0.0, 1.0])
18571857
assert_series_equal(result, expected)
18581858

18591859
def test_groupby_level_apply(self):
@@ -1937,7 +1937,7 @@ def test_groupby_complex(self):
19371937
assert_series_equal(result, expected)
19381938

19391939
def test_level_preserve_order(self):
1940-
grouped = self.mframe.groupby(level=0)
1940+
grouped = self.mframe.groupby(level=0, sort=False)
19411941
exp_labels = np.array([0, 0, 0, 1, 1, 2, 2, 3, 3, 3], np.intp)
19421942
assert_almost_equal(grouped.grouper.labels[0], exp_labels)
19431943

pandas/tests/groupby/test_whitelist.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,13 @@ def test_regression_whitelist_methods(raw_frame, op, level, axis, skipna):
188188
frame = raw_frame.T
189189

190190
if op in AGG_FUNCTIONS_WITH_SKIPNA:
191-
grouped = frame.groupby(level=level, axis=axis)
191+
grouped = frame.groupby(level=level, axis=axis, sort=False)
192192
result = getattr(grouped, op)(skipna=skipna)
193193
expected = getattr(frame, op)(level=level, axis=axis,
194194
skipna=skipna)
195195
tm.assert_frame_equal(result, expected)
196196
else:
197-
grouped = frame.groupby(level=level, axis=axis)
197+
grouped = frame.groupby(level=level, axis=axis, sort=False)
198198
result = getattr(grouped, op)()
199199
expected = getattr(frame, op)(level=level, axis=axis)
200200
tm.assert_frame_equal(result, expected)

pandas/tests/test_multilevel.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,7 @@ def test_count(self):
13951395
def test_series_group_min_max(self):
13961396
for op, level, skipna in cart_product(self.AGG_FUNCTIONS, lrange(2),
13971397
[False, True]):
1398-
grouped = self.series.groupby(level=level)
1398+
grouped = self.series.groupby(level=level, sort=False)
13991399
aggf = lambda x: getattr(x, op)(skipna=skipna)
14001400
# skipna=True
14011401
leftside = grouped.agg(aggf)
@@ -1415,7 +1415,7 @@ def test_frame_group_ops(self):
14151415
else:
14161416
frame = self.frame.T
14171417

1418-
grouped = frame.groupby(level=level, axis=axis)
1418+
grouped = frame.groupby(level=level, axis=axis, sort=False)
14191419

14201420
pieces = []
14211421

0 commit comments

Comments
 (0)