X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-analyses%2Fpylint.sh;h=a4b38b0e675cc575c8eb73583a4130cbe50042b1;hb=74f6c1ca5425e0fa09844d21f4582514ff38efcf;hp=fb10d465276764c3331ee0f220a0cb0e712005b3;hpb=57928d1311643884bafb05e308ff01e84b626d2a;p=lttng-ci.git

diff --git a/scripts/lttng-analyses/pylint.sh b/scripts/lttng-analyses/pylint.sh
index fb10d46..a4b38b0 100755
--- a/scripts/lttng-analyses/pylint.sh
+++ b/scripts/lttng-analyses/pylint.sh
@@ -1,6 +1,6 @@
-#!/bin/bash -exu
+#!/bin/bash
 #
-# Copyright (C) 2015 - Michael Jeanson <mjeanson@efficios.com>
+# Copyright (C) 2020 Michael Jeanson <mjeanson@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,15 +15,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+set -exu
+
 SRCDIR="src/lttng-analyses"
 
 PYTHON3="python3"
-P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
+P3_VERSION=$($PYTHON3 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
 
 BABELTRACE_DIR=$WORKSPACE/deps/babeltrace/build
 
 export LD_LIBRARY_PATH="$BABELTRACE_DIR/lib"
-export PYTHONPATH="$BABELTRACE_DIR/lib/python${P3_VERSION}/dist-packages/"
+export PYTHONPATH="$BABELTRACE_DIR/lib/python${P3_VERSION}/site-packages/"
 
 PYENV_HOME=$WORKSPACE/.pyenv/
 
@@ -35,15 +37,14 @@ fi
 # Create virtualenv and install necessary packages
 virtualenv --system-site-packages -p $PYTHON3 "$PYENV_HOME"
 
-set +u
+set +ux
+# shellcheck disable=SC1090
 . "$PYENV_HOME/bin/activate"
-set -u
+set -ux
 
 pip install --quiet pylint
-pip install --quiet pep8
 
-cd "$SRCDIR"
 
-pep8 lttnganalyses | tee "$WORKSPACE/pep8.out"
+cd "$SRCDIR"
 
 pylint -f parseable --ignore="_version.py" --disable=C0111 lttnganalyses | tee "$WORKSPACE/pylint.out"