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"
+ BASH_FILES="fd-commit jenkins-build docs/update.sh completion/bash-completion buildserver/provision-*"
+ RB_FILES="buildserver/cookbooks/*/recipes/*.rb buildserver/Vagrantfile"
else
# if actually committing right now, then only run on the files
# that are going to be committed at this moment
RB_FILES=
for f in $files; do
+ test -e $f || continue
case $f in
*.py)
PY_FILES+=" $f"
done
fi
-# In the default configuration, the checks E123, E133, E226, E241 and E242 are
-# ignored because they are not rules unanimously accepted
-# On top of those, we ignore:
+# We ignore the following PEP8 warnings
+# * E123: closing bracket does not match indentation of opening bracket's line
+# - Broken if multiple indentation levels start on a single line
# * E501: line too long (82 > 79 characters)
# - Recommended for readability but not enforced
# - Some lines are awkward to wrap around a char limit
# * W503: line break before binary operator
-# - It's quite new
# - Quite pedantic
-PEP8_IGNORE="E123,E133,E226,E241,E242,E501,W503"
+PEP8_IGNORE="E123,E501,W503"
err() {
echo ERROR: "$@"
exit 1
}
+warn() {
+ echo WARNING: "$@"
+}
+
cmd_exists() {
command -v $1 1>/dev/null
}
-if cmd_exists pyflakes-python2; then
- PYFLAKES=pyflakes-python2
-elif cmd_exists pyflakes; then
- PYFLAKES=pyflakes
-else
- err "pyflakes is not installed!"
-fi
+find_command() {
+ local name=$1
+ for suff in "3" "-python3" ""; do
+ cmd=${1}${suff}
+ if cmd_exists $cmd; then
+ echo $cmd
+ return 0
+ fi
+ done
+ warn "$1 is not installed, using dummy placeholder!"
+ echo -n echo
+}
-if cmd_exists pep8-python2; then
- PEP8=pep8-python2
-elif cmd_exists pep8; then
- PEP8=pep8
-else
- err "pep8 is not installed!"
-fi
+PYFLAKES=$(find_command pyflakes)
+PEP8=$(find_command pep8)
if [ "$PY_FILES $PY_TEST_FILES" != " " ]; then
if ! $PYFLAKES $PY_FILES $PY_TEST_FILES; then