Merge pull request #16 from RazerM/isort

Add isort to CI

Author: RazerM

ci/travis.sh

@@ -53,8 +53,11 @@ fi
 
 pip install -U pip setuptools wheel
 
+python setup.py sdist --formats=zip
+pip install dist/*.zip
+
 if [ "$CHECK_FORMATTING" = "1" ]; then
-    pip install yapf==${YAPF_VERSION}
+    pip install yapf==${YAPF_VERSION} isort
     if ! yapf -rpd setup.py src tests; then
         cat <<EOF
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -67,6 +70,27 @@ Formatting problems were found (listed above). To fix them, run
 
 in your local checkout.
 
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+EOF
+        exit 1
+    fi
+
+    # required for isort to order test imports correctly
+    pip install -Ur test-requirements.txt
+
+    if ! isort --recursive --check-only --diff . ; then
+        cat <<EOF
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+Formatting problems were found (listed above). To fix them, run
+
+   pip install isort
+   isort --recursive .
+
+in your local checkout.
+
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 EOF
@@ -75,9 +99,6 @@ EOF
     exit 0
 fi
 
-python setup.py sdist --formats=zip
-pip install dist/*.zip
-
 if [ "$CHECK_DOCS" = "1" ]; then
     pip install -Ur ci/rtd-requirements.txt
     cd docs

setup.cfg

@@ -1,2 +1,9 @@
 [bdist_wheel]
-universal=1
+universal = 1
+
+[isort]
+multi_line_output = 4
+skip = ./build, ./docs
+not_skip = __init__.py
+# ci/travis.sh installs outcome normally, so isort assumes it's third party
+known_first_party = outcome

setup.py

@@ -3,7 +3,7 @@
 
 from io import open
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 version = dict()
 

src/outcome/__init__.py

@@ -2,10 +2,11 @@
 """Top-level package for outcome."""
 from __future__ import absolute_import, division, print_function
 
-from ._version import __version__
-
 import sys
 
+from ._util import AlreadyUsedError, fixup_module_metadata
+from ._version import __version__
+
 if sys.version_info >= (3, 5):
     from ._async import Error, Outcome, Value, acapture, capture
     __all__ = (
@@ -15,6 +16,5 @@
     from ._sync import Error, Outcome, Value, capture
     __all__ = ('Error', 'Outcome', 'Value', 'capture', 'AlreadyUsedError')
 
-from ._util import fixup_module_metadata, AlreadyUsedError
 fixup_module_metadata(__name__, globals())
 del fixup_module_metadata

src/outcome/_async.py

@@ -1,10 +1,9 @@
 import abc
 
-from ._sync import (
-    Error as ErrorBase, Outcome as OutcomeBase, Value as ValueBase
-)
+from ._sync import Error as ErrorBase
+from ._sync import Outcome as OutcomeBase
+from ._sync import Value as ValueBase
 
-from ._util import AlreadyUsedError
 __all__ = ['Error', 'Outcome', 'Value', 'acapture', 'capture']
 
 

src/outcome/_sync.py

@@ -2,6 +2,7 @@
 from __future__ import absolute_import, division, print_function
 
 import abc
+
 import attr
 
 from ._util import ABC, AlreadyUsedError

src/outcome/_util.py

@@ -2,7 +2,6 @@
 from __future__ import absolute_import, division, print_function
 
 import abc
-
 import sys
 
 

tests/test_async.py

@@ -5,7 +5,7 @@
 from async_generator import async_generator, yield_
 
 import outcome
-from outcome import Error, Value, AlreadyUsedError
+from outcome import AlreadyUsedError, Error, Value
 
 pytestmark = pytest.mark.trio
 

tests/test_sync.py

@@ -1,11 +1,12 @@
 # coding: utf-8
 from __future__ import absolute_import, division, print_function
+
 import sys
 
 import pytest
 
 import outcome
-from outcome import Error, Value, AlreadyUsedError
+from outcome import AlreadyUsedError, Error, Value
 
 
 def test_Outcome():