From 3f7d3711ef188e99024c95454343ed5881e26c5d Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 18 Feb 2015 10:52:38 +0100 Subject: [PATCH] New pep8 version added a warning W503 which we will ignore --- .travis.yml | 2 +- doc/development/setup.rst | 4 ++-- src/setup.cfg | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2c002cb8c..21d647d2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ install: - pip install -q -r src/requirements.txt before_script: - cd src - - flake8 --ignore=E123,E128,F403,F401,N802,C901 . + - flake8 --ignore=E123,E128,F403,F401,N802,C901,W503 . - python manage.py check - python manage.py validate script: diff --git a/doc/development/setup.rst b/doc/development/setup.rst index cab44254e..346b3150e 100644 --- a/doc/development/setup.rst +++ b/doc/development/setup.rst @@ -73,7 +73,7 @@ to check for syntax, style and other errors. The ``flake8`` command by default i stricter than what we really enforce, but we do enforce that all commits produce no output from:: - flake8 --ignore=E123,E128,F403,F401,N802 . + flake8 --ignore=E123,E128,F403,F401,N802,W503 . It is therefore a good idea to put this command into your git hook ``.git/hooks/pre-commit``, for example:: @@ -81,7 +81,7 @@ for example:: #!/bin/sh cd $GIT_DIR/../src source ../env/bin/activate - flake8 --ignore=E123,E128,F403,F401,N802 . + flake8 --ignore=E123,E128,F403,F401,N802,W503 . diff --git a/src/setup.cfg b/src/setup.cfg index 1cba0ef5c..44ecb03c6 100644 --- a/src/setup.cfg +++ b/src/setup.cfg @@ -1,5 +1,5 @@ [flake8] -ignore = E128,N802 +ignore = E128,N802,W503 max-line-length = 160 exclude = migrations,.ropeproject,static max-complexity = 16