From 6e37208785e74e07e624742169fb0d8a1d75e9b4 Mon Sep 17 00:00:00 2001 From: Marius Gedminas Date: Sun, 6 Dec 2020 19:18:53 +0200 Subject: [PATCH] Set up isort in CI --- .github/workflows/build.yml | 1 + setup.cfg | 14 ++++++++++++++ setup.py | 3 ++- tests.py | 6 ++++-- testsuite.py | 8 ++++---- tox.ini | 5 +++++ 6 files changed, 30 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68160a7..eac0220 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,6 +75,7 @@ jobs: matrix: toxenv: - flake8 + - isort steps: - name: Git clone diff --git a/setup.cfg b/setup.cfg index 5a6ffe7..202adec 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,3 +13,17 @@ extend-ignore = E131 ignore-bad-ideas = .#emacsjunk.py snake.egg-info + +[isort] +# from X import ( +# a, +# b, +# ) +multi_line_output = 3 +include_trailing_comma = true +lines_after_imports = 2 +reverse_relative = true +default_section = THIRDPARTY +known_first_party = findimports +# known_third_party = pytest, ... +# skip = filename... diff --git a/setup.py b/setup.py index b020348..968e724 100755 --- a/setup.py +++ b/setup.py @@ -1,8 +1,9 @@ #!/usr/bin/env python import ast +import email.utils import os import re -import email.utils + from setuptools import setup diff --git a/tests.py b/tests.py index 53a9836..b59c387 100644 --- a/tests.py +++ b/tests.py @@ -1,12 +1,14 @@ import os import unittest + +import findimports + + try: from cStringIO import StringIO except ImportError: from io import StringIO -import findimports - here = os.path.dirname(__file__) diff --git a/testsuite.py b/testsuite.py index 99fe749..474f2e4 100755 --- a/testsuite.py +++ b/testsuite.py @@ -1,14 +1,14 @@ #!/usr/bin/python -import unittest import doctest +import glob +import linecache import os import re +import shutil import sys import tempfile -import shutil -import glob -import linecache +import unittest class RedirectToStdout(object): diff --git a/tox.ini b/tox.ini index 398dbe0..c0d8c8b 100644 --- a/tox.ini +++ b/tox.ini @@ -19,3 +19,8 @@ commands = deps = flake8 skip_install = true commands = flake8 findimports.py setup.py tests.py testsuite.py + +[testenv:isort] +deps = isort +skip_install = true +commands = isort {posargs: -c --diff findimports.py setup.py tests.py testsuite.py}