From 4743f4c4ea59fc500982194de65013252a6cad35 Mon Sep 17 00:00:00 2001 From: Florian Mounier Date: Tue, 6 Feb 2018 14:31:13 +0100 Subject: [PATCH] Import sort order --- .isort.cfg | 3 ++- Makefile | 3 +++ demo/moulinrouge/tests.py | 1 - docs/ext/pygal_sphinx_directives.py | 3 +-- pygal/graph/graph.py | 9 +++------ pygal/graph/histogram.py | 3 +-- pygal/graph/line.py | 6 ++---- pygal/table.py | 1 - pygal/test/conftest.py | 3 +-- pygal/test/test_graph.py | 3 +-- pygal/test/test_line_log_none_max_solved.py | 1 + pygal/test/test_table.py | 3 +-- pygal/test/test_util.py | 3 +-- 13 files changed, 17 insertions(+), 25 deletions(-) diff --git a/.isort.cfg b/.isort.cfg index 79a6550..b1ba1bb 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -1,2 +1,3 @@ [settings] -multi_line_output=4 +multi_line_output=5 +default_section=THIRDPARTY diff --git a/Makefile b/Makefile index dd1b8d3..36a0f4a 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,9 @@ lint: $(PYTEST) --flake8 -m flake8 $(PROJECT_NAME) $(PYTEST) --isort -m isort $(PROJECT_NAME) +fix: + $(VENV)/bin/yapf -p -i pygal/**/*.py + check: $(PYTEST) $(PROJECT_NAME) $(PYTEST_ARGS) --cov-report= --cov=pygal diff --git a/demo/moulinrouge/tests.py b/demo/moulinrouge/tests.py index 1fca3c2..3817266 100644 --- a/demo/moulinrouge/tests.py +++ b/demo/moulinrouge/tests.py @@ -4,7 +4,6 @@ from datetime import date, datetime from random import choice, randint from flask import abort - from pygal import ( CHARTS_BY_NAME, XY, Bar, Box, Config, DateLine, DateTimeLine, Dot, Funnel, Gauge, Histogram, HorizontalBar, Line, Pie, Pyramid, Radar, SolidGauge, diff --git a/docs/ext/pygal_sphinx_directives.py b/docs/ext/pygal_sphinx_directives.py index 12a4c84..8dbd359 100644 --- a/docs/ext/pygal_sphinx_directives.py +++ b/docs/ext/pygal_sphinx_directives.py @@ -20,9 +20,8 @@ from traceback import format_exc, print_exc import docutils.core -from docutils.parsers.rst import Directive - import pygal +from docutils.parsers.rst import Directive from sphinx.directives.code import CodeBlock # Patch default style diff --git a/pygal/graph/graph.py b/pygal/graph/graph.py index 33aeb2e..65505b5 100644 --- a/pygal/graph/graph.py +++ b/pygal/graph/graph.py @@ -916,8 +916,7 @@ class Graph(PublicApi): def _compute_x_labels_major(self): if self.x_labels_major_every: self._x_labels_major = [ - self._x_labels[i][0] - for i in + self._x_labels[i][0] for i in range(0, len(self._x_labels), self.x_labels_major_every) ] @@ -964,8 +963,7 @@ class Graph(PublicApi): def _compute_y_labels_major(self): if self.y_labels_major_every: self._y_labels_major = [ - self._y_labels[i][1] - for i in + self._y_labels[i][1] for i in range(0, len(self._y_labels), self.y_labels_major_every) ] @@ -1037,8 +1035,7 @@ class Graph(PublicApi): """Check if there is any data""" return any([ len([ - v - for a in (s[0] if is_list_like(s) else [s]) + v for a in (s[0] if is_list_like(s) else [s]) for v in (a if is_list_like(a) else [a]) if v is not None ]) for s in self.raw_series ]) diff --git a/pygal/graph/histogram.py b/pygal/graph/histogram.py index 67dcf6d..268b723 100644 --- a/pygal/graph/histogram.py +++ b/pygal/graph/histogram.py @@ -49,8 +49,7 @@ class Histogram(Dual, Bar): def xvals(self): """All x values""" return [ - val - for serie in self.all_series for dval in serie.values + val for serie in self.all_series for dval in serie.values for val in dval[1:3] if val is not None ] diff --git a/pygal/graph/line.py b/pygal/graph/line.py index fa7a977..4d3e259 100644 --- a/pygal/graph/line.py +++ b/pygal/graph/line.py @@ -39,8 +39,7 @@ class Line(Graph): def _values(self): """Getter for series values (flattened)""" return [ - val[1] - for serie in self.series for val in + val[1] for serie in self.series for val in (serie.interpolated if self.interpolate else serie.points) if val[1] is not None and (not self.logarithmic or val[1] > 0) ] @@ -49,8 +48,7 @@ class Line(Graph): def _secondary_values(self): """Getter for secondary series values (flattened)""" return [ - val[1] - for serie in self.secondary_series for val in + val[1] for serie in self.secondary_series for val in (serie.interpolated if self.interpolate else serie.points) if val[1] is not None and (not self.logarithmic or val[1] > 0) ] diff --git a/pygal/table.py b/pygal/table.py index d58b807..a7c03dc 100644 --- a/pygal/table.py +++ b/pygal/table.py @@ -25,7 +25,6 @@ This class is used to render an html table from a chart data. import uuid from lxml.html import builder, tostring - from pygal.util import template diff --git a/pygal/test/conftest.py b/pygal/test/conftest.py index 9018e80..ea36010 100644 --- a/pygal/test/conftest.py +++ b/pygal/test/conftest.py @@ -20,9 +20,8 @@ import sys -import pytest - import pygal +import pytest from pygal.etree import etree from . import get_data diff --git a/pygal/test/test_graph.py b/pygal/test/test_graph.py index 0d0fd06..6127dc4 100644 --- a/pygal/test/test_graph.py +++ b/pygal/test/test_graph.py @@ -23,9 +23,8 @@ import os import sys import uuid -import pytest - import pygal +import pytest from pygal._compat import u from pygal.graph.map import BaseMap from pygal.test import make_data diff --git a/pygal/test/test_line_log_none_max_solved.py b/pygal/test/test_line_log_none_max_solved.py index 41e72f8..72b2577 100644 --- a/pygal/test/test_line_log_none_max_solved.py +++ b/pygal/test/test_line_log_none_max_solved.py @@ -4,6 +4,7 @@ # in the Log graph will be max or not (issue #309) from __future__ import division + from pygal import Line chart = Line(title='test', logarithmic=True) diff --git a/pygal/test/test_table.py b/pygal/test/test_table.py index 5ed31e7..07eed4c 100644 --- a/pygal/test/test_table.py +++ b/pygal/test/test_table.py @@ -18,9 +18,8 @@ # along with pygal. If not, see . """Box chart related tests""" -from pyquery import PyQuery as pq - from pygal import Pie +from pyquery import PyQuery as pq def test_pie_table(): diff --git a/pygal/test/test_util.py b/pygal/test/test_util.py index f22806b..275bab8 100644 --- a/pygal/test/test_util.py +++ b/pygal/test/test_util.py @@ -20,13 +20,12 @@ import sys -from pytest import raises - from pygal._compat import _ellipsis, u from pygal.util import ( _swap_curly, majorize, mergextend, minify_css, round_to_float, round_to_int, template, truncate ) +from pytest import raises def test_round_to_int():