Add flake8 to CI, too

diff --git a/.flake8 b/.flake8
index cf36923c2f4fe5bd71c3c66667e25f5cef0a938f..71d8a46d0571d768c073fbdbab4970ba87ebea9b 100644 (file)
--- a/.flake8
+++ b/.flake8
@@ -4,5 +4,5 @@
 [flake8]
 ignore = E266, E501
 max-line-length = 80
 [flake8]
 ignore = E266, E501
 max-line-length = 80

-max-complexity = 12
+max-complexity = 15

 select = B,C,E,F,W,T4,B9
 select = B,C,E,F,W,T4,B9

diff --git a/.travis.yml b/.travis.yml
index 804b39d7f0c1ab7fcd672679e3a124dcf27adefa..8e880192334daf34b3b5f01fdf11802d3ee6066c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,12 @@ sudo: false
 language: python
 cache: pip
 before_script:
 language: python
 cache: pip
 before_script:

-- pip install mypy
+- pip install flake8 flake8-bugbear mypy

 - pip install -e .
 script:
 - python setup.py test
 - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then mypy black.py tests/test_black.py; fi
 - pip install -e .
 script:
 - python setup.py test
 - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then mypy black.py tests/test_black.py; fi

+- if [[ $TRAVIS_PYTHON_VERSION == '3.6-dev' ]]; then flake8 black.py tests/test_black.py; fi

 notifications:
   on_success: change
   on_failure: always
 notifications:
   on_success: change
   on_failure: always

diff --git a/black.py b/black.py
index 6b347bae3cfce89ac328f21518860233650235e3..48ba0a266cc7c5354f87ec30c13600aed8528599 100644 (file)
--- a/black.py
+++ b/black.py
@@ -807,7 +807,7 @@ BRACKETS = OPENING_BRACKETS | CLOSING_BRACKETS
 ALWAYS_NO_SPACE = CLOSING_BRACKETS | {token.COMMA, token.COLON, STANDALONE_COMMENT}
 
 
 ALWAYS_NO_SPACE = CLOSING_BRACKETS | {token.COMMA, token.COLON, STANDALONE_COMMENT}
 
 

-def whitespace(leaf: Leaf) -> str:
+def whitespace(leaf: Leaf) -> str:  # noqa C901

     """Return whitespace prefix if needed for the given `leaf`."""
     NO = ''
     SPACE = ' '
     """Return whitespace prefix if needed for the given `leaf`."""
     NO = ''
     SPACE = ' '