Skip to content

Commit 9372c69

Browse files
committed
resolve flake8 conflicts
1 parent 32e44c3 commit 9372c69

File tree

4 files changed

+23
-25
lines changed

4 files changed

+23
-25
lines changed

pandas/core/groupby/groupby.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -2300,14 +2300,14 @@ def levels(self):
23002300
def names(self):
23012301
# GH 19029
23022302
# add suffix to level name in case they contain duplicates (GH 19029):
2303-
orig_names = [ping.name for ping in self.groupings]
2304-
# if no names were assigned return the original names
2303+
orig_names = [ping.name for ping in self.groupings]
2304+
# if no names were assigned return the original names
23052305
if all(x is None for x in orig_names):
23062306
return orig_names
23072307
# in case duplicates are contained rename all of them
23082308
if len(set(orig_names)) < len(orig_names):
2309-
orig_names = [''.join([str(x),str(i)])
2310-
for i,x in enumerate(orig_names)]
2309+
orig_names = [''.join([str(x), str(i)])
2310+
for i, x in enumerate(orig_names)]
23112311

23122312
return orig_names
23132313

pandas/tests/groupby/test_categorical.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -559,14 +559,12 @@ def test_as_index():
559559
tm.assert_frame_equal(result, expected)
560560

561561
# GH 19029: conflicitng names should not raise a value error anymore
562-
raised=False
562+
raised = False
563563
try:
564564
df.groupby(['cat', s.rename('cat')], observed=True).sum()
565565
except ValueError as e:
566566
raised = True
567-
assert raised == False
568-
569-
567+
assert raised is False
570568

571569
# is original index dropped?
572570
group_columns = ['cat', 'A']

pandas/tests/groupby/test_groupby.py

+10-11
Original file line numberDiff line numberDiff line change
@@ -1677,9 +1677,9 @@ def test_tuple_correct_keyerror():
16771677

16781678

16791679
def test_dup_index_names():
1680-
# duplicated index names in groupby operations should be renamed (GH 19029):
1681-
df = pd.DataFrame(data={'date': list(pd.date_range('5.1.2018', '5.3.2018')),
1682-
'vals': list(range(3))})
1680+
# dup. index names in groupby operations should be renamed (GH 19029):
1681+
df = pd.DataFrame({'date': list(pd.date_range('5.1.2018', '5.3.2018')),
1682+
'vals': list(range(3))})
16831683

16841684
mi = pd.MultiIndex.from_product([[5], [1, 2, 3]], names=['date0', 'date1'])
16851685
expected = pd.Series(data=list(range(3)), index=mi, name='vals')
@@ -1690,27 +1690,26 @@ def test_dup_index_names():
16901690
except ValueError as e:
16911691
failed = True
16921692

1693-
assert failed == False
1693+
assert failed is False
16941694

1695-
tm.assert_series_equal(result,expected)
1695+
tm.assert_series_equal(result, expected)
16961696

16971697

16981698
def test_empty_index_names():
16991699
# don't rename frames in case no names were assigned (GH 19029)
1700-
df = pd.DataFrame(data={'date': list(pd.date_range('5.1.2018', '5.3.2018')),
1701-
'vals': list(range(3))})
1700+
df = pd.DataFrame({'date': list(pd.date_range('5.1.2018', '5.3.2018')),
1701+
'vals': list(range(3))})
17021702

17031703
mi = pd.MultiIndex.from_product([[5], [1, 2, 3]])
17041704
expected = pd.Series(data=list(range(3)), index=mi, name='vals')
17051705

17061706
failed = False
17071707
try:
17081708
result = df.groupby([df.date.dt.month.rename(None),
1709-
df.date.dt.day.rename(None)])['vals'].sum()
1709+
df.date.dt.day.rename(None)])['vals'].sum()
17101710
except ValueError as e:
17111711
failed = True
17121712

1713-
assert failed == False
1714-
1715-
tm.assert_series_equal(result,expected)
1713+
assert failed is False
17161714

1715+
tm.assert_series_equal(result, expected)

pandas/tests/reshape/test_pivot.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1709,16 +1709,17 @@ def test_crosstab_dup_index_names(self):
17091709
s = pd.Series(range(3), name='foo')
17101710
failed = False
17111711
try:
1712-
result=pd.crosstab(s,s)
1712+
result = pd.crosstab(s, s)
17131713
except ValueError as e:
17141714
failed = True
17151715

1716-
assert failed == False
1716+
assert failed is False
17171717

1718-
s0 = pd.Series(range(3),name='foo0')
1719-
s1 = pd.Series(range(3),name='foo1')
1720-
expected = pd.DataFrame(data=np.diag(np.ones(3,dtype='int64')), index=s0, columns=s1)
1721-
tm.assert_frame_equal(result,expected)
1718+
s0 = pd.Series(range(3), name='foo0')
1719+
s1 = pd.Series(range(3), name='foo1')
1720+
expected = pd.DataFrame(np.diag(np.ones(3, dtype='int64')),
1721+
index=s0, columns=s1)
1722+
tm.assert_frame_equal(result, expected)
17221723

17231724
@pytest.mark.parametrize("names", [['a', ('b', 'c')],
17241725
[('a', 'b'), 'c']])

0 commit comments

Comments
 (0)