Make mypy unconditional

Running mypy was optional for a transition period when it wasn't installed
on the CI. Now that it is, make it mandatory, to avoid silently skipping an
expected check if mypy doesn't work for some reason.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2022-02-28 16:06:36 +01:00
parent f70ccb0038
commit df57835a76

View File

@ -17,7 +17,7 @@
# Purpose: check Python files for potential programming errors or maintenance # Purpose: check Python files for potential programming errors or maintenance
# hurdles. Run pylint to detect some potential mistakes and enforce PEP8 # hurdles. Run pylint to detect some potential mistakes and enforce PEP8
# coding standards. If available, run mypy to perform static type checking. # coding standards. Run mypy to perform static type checking.
# We'll keep going on errors and report the status at the end. # We'll keep going on errors and report the status at the end.
ret=0 ret=0
@ -72,12 +72,9 @@ $PYTHON -m pylint -j 2 scripts/mbedtls_dev/*.py scripts/*.py tests/scripts/*.py
ret=1 ret=1
} }
# Check types if mypy is available
if can_mypy; then
echo echo
echo 'Running mypy ...' echo 'Running mypy ...'
$PYTHON -m mypy scripts/*.py tests/scripts/*.py || $PYTHON -m mypy scripts/*.py tests/scripts/*.py ||
ret=1 ret=1
fi
exit $ret exit $ret