Fix CI for isort 5

Author: RazerM

ci/travis.sh

@@ -45,7 +45,7 @@ python setup.py sdist --formats=zip
 pip install dist/*.zip
 
 if [ "$CHECK_FORMATTING" = "1" ]; then
-    pip install yapf==${YAPF_VERSION} isort
+    pip install yapf==${YAPF_VERSION} isort>=5
     if ! yapf -rpd setup.py src tests; then
         cat <<EOF
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -67,15 +67,15 @@ EOF
     # required for isort to order test imports correctly
     pip install -Ur test-requirements.txt
 
-    if ! isort --recursive --check-only --diff . ; then
+    if ! isort --check-only --diff . ; then
         cat <<EOF
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 Formatting problems were found (listed above). To fix them, run
 
    pip install isort
-   isort --recursive .
+   isort .
 
 in your local checkout.
 

setup.cfg

@@ -4,7 +4,6 @@ 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