AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change the use of pylint to optionally use pylint3

Browse Source 
Pylint when installed as a distro package can be installed as pylint3, whilst as
a PEP egg, it can be installed as pylint.

This commit changes the scripts to first use pylint if installed, and optionally
look for pylint3 if not installed. This is to allow a preference for the PEP
version over the distro version, assuming the PEP one is more likely to be
the correct one.

Signed-off-by: Simon Butcher <simon.butcher@arm.com>
This commit is contained in:
Simon Butcher 2020-03-16 11:30:46 +00:00
parent 21d1cbccda
commit e30d03e4f4
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/output_env.sh
View File

@ -105,7 +105,16 @@ echo
print_version "python" "--version" "" "head -n 1"
echo
print_version "pylint3" "--version" "" "sed /^.*config/d" "grep pylint"
# Find the installed version of Pylint. Installed as a distro package this can
# be pylint3 and as a PEP egg, pylint. In test scripts We prefer pylint over
# pylint3
if type pylint >/dev/null 2>/dev/null; then
print_version "pylint" "--version" "" "sed /^.*config/d" "grep pylint"
elif type pylint3 >/dev/null 2>/dev/null; then
print_version "pylint3" "--version" "" "sed /^.*config/d" "grep pylint"
else
echo " * pylint or pylint3: Not found."
fi
echo
: ${OPENSSL:=openssl}

8
tests/scripts/all.sh
View File

@ -1595,7 +1595,13 @@ component_test_zeroize () {
}
support_check_python_files () {
type pylint3 >/dev/null 2>/dev/null
# Find the installed version of Pylint. Installed as a distro package this can
# be pylint3 and as a PEP egg, pylint.
if type pylint >/dev/null 2>/dev/null || type pylint3 >/dev/null 2>/dev/null; then
true;
else
false;
fi
}
component_check_python_files () {
msg "Lint: Python scripts"

13
tests/scripts/check-python-files.sh
View File

@ -9,4 +9,15 @@
# Run 'pylint' on Python files for programming errors and helps enforcing
# PEP8 coding standards.
pylint3 -j 2 scripts/*.py tests/scripts/*.py
# Find the installed version of Pylint. Installed as a distro package this can
# be pylint3 and as a PEP egg, pylint. We prefer pylint over pylint3
if type pylint >/dev/null 2>/dev/null; then
PYLINT=pylint
elif type pylint3 >/dev/null 2>/dev/null; then
PYLINT=pylint3
else
echo 'Pylint was not found.'
exit 1
fi
$PYLINT -j 2 scripts/*.py tests/scripts/*.py