lint: Include pep8 checks in pre-commit hook.

This commit is contained in:
Tim Abbott
2017-02-07 13:19:43 -08:00
parent 20096dfe0d
commit d98c19ca98
2 changed files with 4 additions and 2 deletions

View File

@@ -136,6 +136,8 @@ def check_pep8(files):
# Fixing these would probably reduce readability in most cases. # Fixing these would probably reduce readability in most cases.
'E731', 'E731',
] ]
if len(files) == 0:
return False
pep8 = subprocess.Popen( pep8 = subprocess.Popen(
['pycodestyle'] + files + ['--ignore={rules}'.format(rules=','.join(ignored_rules))], ['pycodestyle'] + files + ['--ignore={rules}'.format(rules=','.join(ignored_rules))],
stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True) stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)

View File

@@ -10,10 +10,10 @@
# will automatically be run through `vagrant ssh`. # will automatically be run through `vagrant ssh`.
if [ -z "$VIRTUAL_ENV" ] && `which vagrant > /dev/null` && [ -e .vagrant ]; then if [ -z "$VIRTUAL_ENV" ] && `which vagrant > /dev/null` && [ -e .vagrant ]; then
vcmd='/srv/zulip/tools/lint-all --force $(cd /srv/zulip && git diff --cached --name-only --diff-filter=ACM) || true' vcmd='/srv/zulip/tools/lint-all --pep8 --force $(cd /srv/zulip && git diff --cached --name-only --diff-filter=ACM) || true'
echo "Running lint-all using vagrant..." echo "Running lint-all using vagrant..."
vagrant ssh -c "$vcmd" vagrant ssh -c "$vcmd"
else else
./tools/lint-all --force $(git diff --cached --name-only --diff-filter=ACM) || true ./tools/lint-all --pep8 --force $(git diff --cached --name-only --diff-filter=ACM) || true
fi fi
exit 0 exit 0