X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fbabeltrace%2Fpylint.sh;h=35b287f08d2da3651f24261c634221f7d37caf96;hb=e5d878d85c554b4c82c617a1b6b3b238b5a4a45e;hp=4a7e38aa1363034edb67f29b276d5a72d19daef7;hpb=2fa717701e8c4448daa69ad3db0ad3e1a78e68a0;p=lttng-ci.git

diff --git a/scripts/babeltrace/pylint.sh b/scripts/babeltrace/pylint.sh
index 4a7e38a..35b287f 100755
--- a/scripts/babeltrace/pylint.sh
+++ b/scripts/babeltrace/pylint.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -exu
 #
-# Copyright (C) 2015 - Michael Jeanson <mjeanson@efficios.com>
+# Copyright (C) 2019 Michael Jeanson <mjeanson@efficios.com>
+# Copyright (C) 2019 Francis Deslauriers <francis.deslauriers@efficios.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,26 +16,30 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-BABELTRACE_DIR="deps/babeltrace/build"
-BINDINGS_DIR="$BABELTRACE_DIR/lib/python3.4/dist-packages/babeltrace"
+PYTHON3=python3
 
 PYENV_HOME="$WORKSPACE/.pyenv/"
 
 # Delete previously built virtualenv
-if [ -d $PYENV_HOME ]; then
-    rm -rf $PYENV_HOME
+if [ -d "$PYENV_HOME" ]; then
+    rm -rf "$PYENV_HOME"
 fi
 
 # Create virtualenv and install necessary packages
-virtualenv --system-site-packages -p python3 $PYENV_HOME
+virtualenv --system-site-packages -p ${PYTHON3} "$PYENV_HOME"
 
-set +u
-. $PYENV_HOME/bin/activate
-set -u
+set +ux
+. "$PYENV_HOME/bin/activate"
+set -ux
 
-pip install --quiet pylint
-pip install --quiet pep8
+pip install --quiet black
+pip install --quiet flake8
 
-pep8 --exclude="nativebt.py" $BINDINGS_DIR | tee pep8.out
+exit_code=0
 
-pylint -f parseable --ignore="nativebt.py" $BINDINGS_DIR | tee pylint.out
+cd src/babeltrace
+
+black --diff --check . | tee ../../black.out || exit_code=1
+flake8 | tee ../../flake8.out || exit_code=1
+
+exit $exit_code