From f87b17139b7838e99ca87c8a1e3c687f0a45c7d2 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 1 Sep 2015 20:10:01 +0200 Subject: [PATCH] pep8: on *.TestCase, skip "E402 module level import not at top of file" The tests use a little hack in order to cleanly import the fdroidserver package locally like a regular package. pep8 doesn't see that, so this changes the pep8 to skip E402 on *.TestCase --- hooks/pre-commit | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hooks/pre-commit b/hooks/pre-commit index 891ad19b..4cc15059 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -6,7 +6,8 @@ # Redirect output to stderr. exec 1>&2 -PY_FILES="fdroid makebuildserver setup.py examples/*.py buildserver/*.py fdroidserver/*.py tests/*.TestCase" +PY_FILES="fdroid makebuildserver setup.py examples/*.py buildserver/*.py fdroidserver/*.py" +PY_TEST_FILES="tests/*.TestCase" SH_FILES="hooks/pre-commit" BASH_FILES="fd-commit jenkins-build docs/update.sh completion/bash-completion" RB_FILES="buildserver/cookbooks/*/recipes/*.rb" @@ -48,7 +49,7 @@ else err "pep8 is not installed!" fi -if ! $PYFLAKES $PY_FILES; then +if ! $PYFLAKES $PY_FILES $PY_TEST_FILES; then err "pyflakes tests failed!" fi @@ -56,6 +57,13 @@ if ! $PEP8 --ignore=$PEP8_IGNORE $PY_FILES; then err "pep8 tests failed!" fi +# The tests use a little hack in order to cleanly import the fdroidserver +# package locally like a regular package. pep8 doesn't see that, so this +# makes pep8 skip E402 on the test files that need that hack. +if ! $PEP8 --ignore=$PEP8_IGNORE,E402 $PY_TEST_FILES; then + err "pep8 tests failed!" +fi + for f in $SH_FILES; do if ! dash -n $f; then -- 2.30.2