Skip to content

Commit d78dd70

Browse files
jmarrecjmarrec
committed
Fixed line too long
`git diff upstream/master | flake8 --diff now passes`
1 parent 7d04536 commit d78dd70

File tree

2 files changed

+86
-61
lines changed

2 files changed

+86
-61
lines changed

‎pandas/formats/style.py

+17-12
Original file line numberDiff line numberDiff line change
@@ -893,10 +893,12 @@ def _bar_center_zero(s, color, width):
893893

894894
base = 'width: 10em; height: 80%;'
895895

896-
attrs_neg = (base + 'background: linear-gradient(90deg, transparent 0%, transparent {w}%, {c} {w}%, '
896+
attrs_neg = (base + 'background: linear-gradient(90deg, transparent 0%'
897+
', transparent {w}%, {c} {w}%, '
897898
'{c} 50%, transparent 50%)')
898899

899-
attrs_pos = (base + 'background: linear-gradient(90deg, transparent 0%, transparent 50%, {c} 50%, {c} {w}%, '
900+
attrs_pos = (base + 'background: linear-gradient(90deg, transparent 0%'
901+
', transparent 50%, {c} 50%, {c} {w}%, '
900902
'transparent {w}%)')
901903

902904
return [attrs_pos.format(c=color[1], w=(50 + x)) if x >= 0
@@ -936,17 +938,20 @@ def _bar_center_mid(s, color, width):
936938

937939
base = 'width: 10em; height: 80%;'
938940

939-
attrs_neg = (base + 'background: linear-gradient(90deg, transparent 0%, transparent {w}%, {c} {w}%, '
941+
attrs_neg = (base + 'background: linear-gradient(90deg, transparent 0%'
942+
', transparent {w}%, {c} {w}%, '
940943
'{c} {zero}%, transparent {zero}%)')
941944

942-
attrs_pos = (base + 'background: linear-gradient(90deg, transparent 0%, transparent {zero}%, {c} {zero}%, {c} {w}%, '
945+
attrs_pos = (base + 'background: linear-gradient(90deg, transparent 0%'
946+
', transparent {zero}%, {c} {zero}%, {c} {w}%, '
943947
'transparent {w}%)')
944948

945-
return [attrs_pos.format(c=color[1], zero=zero, w=x) if x > zero
949+
return [attrs_pos.format(c=color[1], zero=zero, w=x) if x > zero
946950
else attrs_neg.format(c=color[0], zero=zero, w=x)
947951
for x in normed]
948952

949-
def bar(self, subset=None, align='left', axis=0, color='#d65f5f', width=100):
953+
def bar(self, subset=None, align='left', axis=0,
954+
color='#d65f5f', width=100):
950955
"""
951956
Color the background ``color`` proptional to the values in each column.
952957
Excludes non-numeric data by default.
@@ -958,9 +963,9 @@ def bar(self, subset=None, align='left', axis=0, color='#d65f5f', width=100):
958963
a valid slice for ``data`` to limit the style application to
959964
axis: int
960965
color: str (for align='left') or 2-tuple/list (for align='zero', 'mid')
961-
If a str is passed, the color is the same for both
966+
If a str is passed, the color is the same for both
962967
negative and positive numbers. If 2-tuple/list is used, the
963-
first element is the color_negative and the second is the
968+
first element is the color_negative and the second is the
964969
color_positive (eg: ['d65f5f', '5fba7d'])
965970
width: float
966971
A number between 0 or 100. The largest value will cover ``width``
@@ -987,11 +992,11 @@ def bar(self, subset=None, align='left', axis=0, color='#d65f5f', width=100):
987992
self.apply(self._bar_left, subset=subset, axis=axis, color=color,
988993
width=width)
989994
elif align == 'zero':
990-
self.apply(self._bar_center_zero, subset=subset, axis=axis, color=color,
991-
width=width)
995+
self.apply(self._bar_center_zero, subset=subset, axis=axis,
996+
color=color, width=width)
992997
elif align == 'mid':
993-
self.apply(self._bar_center_mid, subset=subset, axis=axis, color=color,
994-
width=width)
998+
self.apply(self._bar_center_mid, subset=subset, axis=axis,
999+
color=color, width=width)
9951000
return self
9961001

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

‎pandas/tests/formats/test_style.py

+69-49
Original file line numberDiff line numberDiff line change
@@ -375,18 +375,24 @@ def test_bar_align_zero_pos_and_neg(self):
375375
result = df.style.bar(align='zero', color=[
376376
'#d65f5f', '#5fba7d'], width=90)._compute().ctx
377377

378-
expected = {(0, 0): ['width: 10em',
379-
' height: 80%',
380-
'background: linear-gradient(90deg, transparent 0%, transparent 45.0%, #d65f5f 45.0%, #d65f5f 50%, transparent 50%)'],
381-
(1, 0): ['width: 10em',
382-
' height: 80%',
383-
'background: linear-gradient(90deg, transparent 0%, transparent 50%, #5fba7d 50%, #5fba7d 50.0%, transparent 50.0%)'],
384-
(2, 0): ['width: 10em',
385-
' height: 80%',
386-
'background: linear-gradient(90deg, transparent 0%, transparent 50%, #5fba7d 50%, #5fba7d 60.0%, transparent 60.0%)'],
387-
(3, 0): ['width: 10em',
388-
' height: 80%',
389-
'background: linear-gradient(90deg, transparent 0%, transparent 50%, #5fba7d 50%, #5fba7d 95.0%, transparent 95.0%)']}
378+
expected = {(0, 0): ['width: 10em', ' height: 80%',
379+
'background: linear-gradient(90deg, '
380+
'transparent 0%, transparent 45.0%, '
381+
'#d65f5f 45.0%, #d65f5f 50%, '
382+
'transparent 50%)'],
383+
(1, 0): ['width: 10em', ' height: 80%',
384+
'background: linear-gradient(90deg, '
385+
'transparent 0%, transparent 50%, '
386+
'#5fba7d 50%, #5fba7d 50.0%, '
387+
'transparent 50.0%)'],
388+
(2, 0): ['width: 10em', ' height: 80%',
389+
'background: linear-gradient(90deg, '
390+
'transparent 0%, transparent 50%, #5fba7d 50%, '
391+
'#5fba7d 60.0%, transparent 60.0%)'],
392+
(3, 0): ['width: 10em', ' height: 80%',
393+
'background: linear-gradient(90deg, '
394+
'transparent 0%, transparent 50%, #5fba7d 50%, '
395+
'#5fba7d 95.0%, transparent 95.0%)']}
390396
self.assertEqual(result, expected)
391397

392398
def test_bar_align_mid_pos_and_neg(self):
@@ -395,18 +401,24 @@ def test_bar_align_mid_pos_and_neg(self):
395401
result = df.style.bar(align='mid', color=[
396402
'#d65f5f', '#5fba7d'])._compute().ctx
397403

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

411423
self.assertEqual(result, expected)
412424

@@ -416,18 +428,22 @@ def test_bar_align_mid_all_pos(self):
416428
result = df.style.bar(align='mid', color=[
417429
'#d65f5f', '#5fba7d'])._compute().ctx
418430

419-
expected = {(0, 0): ['width: 10em',
420-
' height: 80%',
421-
'background: linear-gradient(90deg, transparent 0%, transparent 0%, #5fba7d 0%, #5fba7d 10.0%, transparent 10.0%)'],
422-
(1, 0): ['width: 10em',
423-
' height: 80%',
424-
'background: linear-gradient(90deg, transparent 0%, transparent 0%, #5fba7d 0%, #5fba7d 20.0%, transparent 20.0%)'],
425-
(2, 0): ['width: 10em',
426-
' height: 80%',
427-
'background: linear-gradient(90deg, transparent 0%, transparent 0%, #5fba7d 0%, #5fba7d 50.0%, transparent 50.0%)'],
428-
(3, 0): ['width: 10em',
429-
' height: 80%',
430-
'background: linear-gradient(90deg, transparent 0%, transparent 0%, #5fba7d 0%, #5fba7d 100.0%, transparent 100.0%)']}
431+
expected = {(0, 0): ['width: 10em', ' height: 80%',
432+
'background: linear-gradient(90deg, '
433+
'transparent 0%, transparent 0%, #5fba7d 0%, '
434+
'#5fba7d 10.0%, transparent 10.0%)'],
435+
(1, 0): ['width: 10em', ' height: 80%',
436+
'background: linear-gradient(90deg, '
437+
'transparent 0%, transparent 0%, #5fba7d 0%, '
438+
'#5fba7d 20.0%, transparent 20.0%)'],
439+
(2, 0): ['width: 10em', ' height: 80%',
440+
'background: linear-gradient(90deg, '
441+
'transparent 0%, transparent 0%, #5fba7d 0%, '
442+
'#5fba7d 50.0%, transparent 50.0%)'],
443+
(3, 0): ['width: 10em', ' height: 80%',
444+
'background: linear-gradient(90deg, '
445+
'transparent 0%, transparent 0%, #5fba7d 0%, '
446+
'#5fba7d 100.0%, transparent 100.0%)']}
431447

432448
self.assertEqual(result, expected)
433449

@@ -437,19 +453,23 @@ def test_bar_align_mid_all_neg(self):
437453
result = df.style.bar(align='mid', color=[
438454
'#d65f5f', '#5fba7d'])._compute().ctx
439455

440-
expected = {(0, 0): ['width: 10em',
441-
' height: 80%',
442-
'background: linear-gradient(90deg, transparent 0%, transparent 0.0%, #d65f5f 0.0%, #d65f5f 100%, transparent 100%)'],
443-
(1, 0): ['width: 10em',
444-
' height: 80%',
445-
'background: linear-gradient(90deg, transparent 0%, transparent 40.0%, #d65f5f 40.0%, #d65f5f 100%, transparent 100%)'],
446-
(2, 0): ['width: 10em',
447-
' height: 80%',
448-
'background: linear-gradient(90deg, transparent 0%, transparent 70.0%, #d65f5f 70.0%, #d65f5f 100%, transparent 100%)'],
449-
(3, 0): ['width: 10em',
450-
' height: 80%',
451-
'background: linear-gradient(90deg, transparent 0%, transparent 80.0%, #d65f5f 80.0%, #d65f5f 100%, transparent 100%)']}
452-
456+
expected = {(0, 0): ['width: 10em', ' height: 80%',
457+
'background: linear-gradient(90deg, '
458+
'transparent 0%, transparent 0.0%, '
459+
'#d65f5f 0.0%, #d65f5f 100%, transparent 100%)'],
460+
(1, 0): ['width: 10em', ' height: 80%',
461+
'background: linear-gradient(90deg, '
462+
'transparent 0%, transparent 40.0%, '
463+
'#d65f5f 40.0%, #d65f5f 100%, '
464+
'transparent 100%)'],
465+
(2, 0): ['width: 10em', ' height: 80%',
466+
'background: linear-gradient(90deg, '
467+
'transparent 0%, transparent 70.0%, '
468+
'#d65f5f 70.0%, #d65f5f 100%, transparent 100%)'],
469+
(3, 0): ['width: 10em', ' height: 80%',
470+
'background: linear-gradient(90deg, '
471+
'transparent 0%, transparent 80.0%, '
472+
'#d65f5f 80.0%, #d65f5f 100%, transparent 100%)']}
453473
self.assertEqual(result, expected)
454474

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

0 commit comments

Comments
 (0)