Skip to content

Commit 524a9ab

Browse files
jmarrecjmarrec
committed
Fixed line too long
`git diff upstream/master | flake8 --diff now passes`
1 parent d1eafbb commit 524a9ab

File tree

2 files changed

+86
-61
lines changed

2 files changed

+86
-61
lines changed

‎pandas/formats/style.py‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -898,10 +898,12 @@ def _bar_center_zero(s, color, width):
898898

899899
base = 'width: 10em; height: 80%;'
900900

901-
attrs_neg = (base + 'background: linear-gradient(90deg, transparent 0%, transparent {w}%, {c} {w}%, '
901+
attrs_neg = (base + 'background: linear-gradient(90deg, transparent 0%'
902+
', transparent {w}%, {c} {w}%, '
902903
'{c} 50%, transparent 50%)')
903904

904-
attrs_pos = (base + 'background: linear-gradient(90deg, transparent 0%, transparent 50%, {c} 50%, {c} {w}%, '
905+
attrs_pos = (base + 'background: linear-gradient(90deg, transparent 0%'
906+
', transparent 50%, {c} 50%, {c} {w}%, '
905907
'transparent {w}%)')
906908

907909
return [attrs_pos.format(c=color[1], w=(50 + x)) if x >= 0
@@ -941,17 +943,20 @@ def _bar_center_mid(s, color, width):
941943

942944
base = 'width: 10em; height: 80%;'
943945

944-
attrs_neg = (base + 'background: linear-gradient(90deg, transparent 0%, transparent {w}%, {c} {w}%, '
946+
attrs_neg = (base + 'background: linear-gradient(90deg, transparent 0%'
947+
', transparent {w}%, {c} {w}%, '
945948
'{c} {zero}%, transparent {zero}%)')
946949

947-
attrs_pos = (base + 'background: linear-gradient(90deg, transparent 0%, transparent {zero}%, {c} {zero}%, {c} {w}%, '
950+
attrs_pos = (base + 'background: linear-gradient(90deg, transparent 0%'
951+
', transparent {zero}%, {c} {zero}%, {c} {w}%, '
948952
'transparent {w}%)')
949953

950-
return [attrs_pos.format(c=color[1], zero=zero, w=x) if x > zero
954+
return [attrs_pos.format(c=color[1], zero=zero, w=x) if x > zero
951955
else attrs_neg.format(c=color[0], zero=zero, w=x)
952956
for x in normed]
953957

954-
def bar(self, subset=None, align='left', axis=0, color='#d65f5f', width=100):
958+
def bar(self, subset=None, align='left', axis=0,
959+
color='#d65f5f', width=100):
955960
"""
956961
Color the background ``color`` proptional to the values in each column.
957962
Excludes non-numeric data by default.
@@ -963,9 +968,9 @@ def bar(self, subset=None, align='left', axis=0, color='#d65f5f', width=100):
963968
a valid slice for ``data`` to limit the style application to
964969
axis: int
965970
color: str (for align='left') or 2-tuple/list (for align='zero', 'mid')
966-
If a str is passed, the color is the same for both
971+
If a str is passed, the color is the same for both
967972
negative and positive numbers. If 2-tuple/list is used, the
968-
first element is the color_negative and the second is the
973+
first element is the color_negative and the second is the
969974
color_positive (eg: ['d65f5f', '5fba7d'])
970975
width: float
971976
A number between 0 or 100. The largest value will cover ``width``
@@ -992,11 +997,11 @@ def bar(self, subset=None, align='left', axis=0, color='#d65f5f', width=100):
992997
self.apply(self._bar_left, subset=subset, axis=axis, color=color,
993998
width=width)
994999
elif align == 'zero':
995-
self.apply(self._bar_center_zero, subset=subset, axis=axis, color=color,
996-
width=width)
1000+
self.apply(self._bar_center_zero, subset=subset, axis=axis,
1001+
color=color, width=width)
9971002
elif align == 'mid':
998-
self.apply(self._bar_center_mid, subset=subset, axis=axis, color=color,
999-
width=width)
1003+
self.apply(self._bar_center_mid, subset=subset, axis=axis,
1004+
color=color, width=width)
10001005
return self
10011006

10021007
def highlight_max(self, subset=None, color='yellow', axis=0):

‎pandas/tests/formats/test_style.py‎

Lines changed: 69 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -354,18 +354,24 @@ def test_bar_align_zero_pos_and_neg(self):
354354
result = df.style.bar(align='zero', color=[
355355
'#d65f5f', '#5fba7d'], width=90)._compute().ctx
356356

357-
expected = {(0, 0): ['width: 10em',
358-
' height: 80%',
359-
'background: linear-gradient(90deg, transparent 0%, transparent 45.0%, #d65f5f 45.0%, #d65f5f 50%, transparent 50%)'],
360-
(1, 0): ['width: 10em',
361-
' height: 80%',
362-
'background: linear-gradient(90deg, transparent 0%, transparent 50%, #5fba7d 50%, #5fba7d 50.0%, transparent 50.0%)'],
363-
(2, 0): ['width: 10em',
364-
' height: 80%',
365-
'background: linear-gradient(90deg, transparent 0%, transparent 50%, #5fba7d 50%, #5fba7d 60.0%, transparent 60.0%)'],
366-
(3, 0): ['width: 10em',
367-
' height: 80%',
368-
'background: linear-gradient(90deg, transparent 0%, transparent 50%, #5fba7d 50%, #5fba7d 95.0%, transparent 95.0%)']}
357+
expected = {(0, 0): ['width: 10em', ' height: 80%',
358+
'background: linear-gradient(90deg, '
359+
'transparent 0%, transparent 45.0%, '
360+
'#d65f5f 45.0%, #d65f5f 50%, '
361+
'transparent 50%)'],
362+
(1, 0): ['width: 10em', ' height: 80%',
363+
'background: linear-gradient(90deg, '
364+
'transparent 0%, transparent 50%, '
365+
'#5fba7d 50%, #5fba7d 50.0%, '
366+
'transparent 50.0%)'],
367+
(2, 0): ['width: 10em', ' height: 80%',
368+
'background: linear-gradient(90deg, '
369+
'transparent 0%, transparent 50%, #5fba7d 50%, '
370+
'#5fba7d 60.0%, transparent 60.0%)'],
371+
(3, 0): ['width: 10em', ' height: 80%',
372+
'background: linear-gradient(90deg, '
373+
'transparent 0%, transparent 50%, #5fba7d 50%, '
374+
'#5fba7d 95.0%, transparent 95.0%)']}
369375
self.assertEqual(result, expected)
370376

371377
def test_bar_align_mid_pos_and_neg(self):
@@ -374,18 +380,24 @@ def test_bar_align_mid_pos_and_neg(self):
374380
result = df.style.bar(align='mid', color=[
375381
'#d65f5f', '#5fba7d'])._compute().ctx
376382

377-
expected = {(0, 0): ['width: 10em',
378-
' height: 80%',
379-
'background: linear-gradient(90deg, transparent 0%, transparent 0.0%, #d65f5f 0.0%, #d65f5f 10.0%, transparent 10.0%)'],
380-
(1, 0): ['width: 10em',
381-
' height: 80%',
382-
'background: linear-gradient(90deg, transparent 0%, transparent 10.0%, #d65f5f 10.0%, #d65f5f 10.0%, transparent 10.0%)'],
383-
(2, 0): ['width: 10em',
384-
' height: 80%',
385-
'background: linear-gradient(90deg, transparent 0%, transparent 10.0%, #5fba7d 10.0%, #5fba7d 30.0%, transparent 30.0%)'],
386-
(3, 0): ['width: 10em',
387-
' height: 80%',
388-
'background: linear-gradient(90deg, transparent 0%, transparent 10.0%, #5fba7d 10.0%, #5fba7d 100.0%, transparent 100.0%)']}
383+
expected = {(0, 0): ['width: 10em', ' height: 80%',
384+
'background: linear-gradient(90deg, '
385+
'transparent 0%, transparent 0.0%, #d65f5f 0.0%, '
386+
'#d65f5f 10.0%, transparent 10.0%)'],
387+
(1, 0): ['width: 10em', ' height: 80%',
388+
'background: linear-gradient(90deg, '
389+
'transparent 0%, transparent 10.0%, '
390+
'#d65f5f 10.0%, #d65f5f 10.0%, '
391+
'transparent 10.0%)'],
392+
(2, 0): ['width: 10em', ' height: 80%',
393+
'background: linear-gradient(90deg, '
394+
'transparent 0%, transparent 10.0%, #5fba7d 10.0%'
395+
', #5fba7d 30.0%, transparent 30.0%)'],
396+
(3, 0): ['width: 10em', ' height: 80%',
397+
'background: linear-gradient(90deg, '
398+
'transparent 0%, transparent 10.0%, '
399+
'#5fba7d 10.0%, #5fba7d 100.0%, '
400+
'transparent 100.0%)']}
389401

390402
self.assertEqual(result, expected)
391403

@@ -395,18 +407,22 @@ def test_bar_align_mid_all_pos(self):
395407
result = df.style.bar(align='mid', color=[
396408
'#d65f5f', '#5fba7d'])._compute().ctx
397409

398-
expected = {(0, 0): ['width: 10em',
399-
' height: 80%',
400-
'background: linear-gradient(90deg, transparent 0%, transparent 0%, #5fba7d 0%, #5fba7d 10.0%, transparent 10.0%)'],
401-
(1, 0): ['width: 10em',
402-
' height: 80%',
403-
'background: linear-gradient(90deg, transparent 0%, transparent 0%, #5fba7d 0%, #5fba7d 20.0%, transparent 20.0%)'],
404-
(2, 0): ['width: 10em',
405-
' height: 80%',
406-
'background: linear-gradient(90deg, transparent 0%, transparent 0%, #5fba7d 0%, #5fba7d 50.0%, transparent 50.0%)'],
407-
(3, 0): ['width: 10em',
408-
' height: 80%',
409-
'background: linear-gradient(90deg, transparent 0%, transparent 0%, #5fba7d 0%, #5fba7d 100.0%, transparent 100.0%)']}
410+
expected = {(0, 0): ['width: 10em', ' height: 80%',
411+
'background: linear-gradient(90deg, '
412+
'transparent 0%, transparent 0%, #5fba7d 0%, '
413+
'#5fba7d 10.0%, transparent 10.0%)'],
414+
(1, 0): ['width: 10em', ' height: 80%',
415+
'background: linear-gradient(90deg, '
416+
'transparent 0%, transparent 0%, #5fba7d 0%, '
417+
'#5fba7d 20.0%, transparent 20.0%)'],
418+
(2, 0): ['width: 10em', ' height: 80%',
419+
'background: linear-gradient(90deg, '
420+
'transparent 0%, transparent 0%, #5fba7d 0%, '
421+
'#5fba7d 50.0%, transparent 50.0%)'],
422+
(3, 0): ['width: 10em', ' height: 80%',
423+
'background: linear-gradient(90deg, '
424+
'transparent 0%, transparent 0%, #5fba7d 0%, '
425+
'#5fba7d 100.0%, transparent 100.0%)']}
410426

411427
self.assertEqual(result, expected)
412428

@@ -416,19 +432,23 @@ def test_bar_align_mid_all_neg(self):
416432
result = df.style.bar(align='mid', color=[
417433
'#d65f5f', '#5fba7d'])._compute().ctx
418434

419-
expected = {(0, 0): ['width: 10em',
420-
' height: 80%',
421-
'background: linear-gradient(90deg, transparent 0%, transparent 0.0%, #d65f5f 0.0%, #d65f5f 100%, transparent 100%)'],
422-
(1, 0): ['width: 10em',
423-
' height: 80%',
424-
'background: linear-gradient(90deg, transparent 0%, transparent 40.0%, #d65f5f 40.0%, #d65f5f 100%, transparent 100%)'],
425-
(2, 0): ['width: 10em',
426-
' height: 80%',
427-
'background: linear-gradient(90deg, transparent 0%, transparent 70.0%, #d65f5f 70.0%, #d65f5f 100%, transparent 100%)'],
428-
(3, 0): ['width: 10em',
429-
' height: 80%',
430-
'background: linear-gradient(90deg, transparent 0%, transparent 80.0%, #d65f5f 80.0%, #d65f5f 100%, transparent 100%)']}
431-
435+
expected = {(0, 0): ['width: 10em', ' height: 80%',
436+
'background: linear-gradient(90deg, '
437+
'transparent 0%, transparent 0.0%, '
438+
'#d65f5f 0.0%, #d65f5f 100%, transparent 100%)'],
439+
(1, 0): ['width: 10em', ' height: 80%',
440+
'background: linear-gradient(90deg, '
441+
'transparent 0%, transparent 40.0%, '
442+
'#d65f5f 40.0%, #d65f5f 100%, '
443+
'transparent 100%)'],
444+
(2, 0): ['width: 10em', ' height: 80%',
445+
'background: linear-gradient(90deg, '
446+
'transparent 0%, transparent 70.0%, '
447+
'#d65f5f 70.0%, #d65f5f 100%, transparent 100%)'],
448+
(3, 0): ['width: 10em', ' height: 80%',
449+
'background: linear-gradient(90deg, '
450+
'transparent 0%, transparent 80.0%, '
451+
'#d65f5f 80.0%, #d65f5f 100%, transparent 100%)']}
432452
self.assertEqual(result, expected)
433453

434454
def test_highlight_null(self, null_color='red'):

0 commit comments

Comments
 (0)