diff options
author | Gregory Becker <becker33@llnl.gov> | 2016-05-11 15:26:09 -0700 |
---|---|---|
committer | Gregory Becker <becker33@llnl.gov> | 2016-05-11 15:26:09 -0700 |
commit | 2e1810e3a714ae857636d0e8f5b9b7eed350877a (patch) | |
tree | a3aa6633067f44b75e7a455c49c2bd000922cece /share | |
parent | 566fec401521b32a0759977fc43116d8ef07b6fb (diff) | |
parent | 9cf5404bb75daf914dcf086872e3044ce79800c7 (diff) | |
download | spack-2e1810e3a714ae857636d0e8f5b9b7eed350877a.tar.gz spack-2e1810e3a714ae857636d0e8f5b9b7eed350877a.tar.bz2 spack-2e1810e3a714ae857636d0e8f5b9b7eed350877a.tar.xz spack-2e1810e3a714ae857636d0e8f5b9b7eed350877a.zip |
re-merging develop
Diffstat (limited to 'share')
-rwxr-xr-x | share/spack/qa/run-flake8 | 55 | ||||
-rwxr-xr-x | share/spack/setup-env.sh | 6 |
2 files changed, 58 insertions, 3 deletions
diff --git a/share/spack/qa/run-flake8 b/share/spack/qa/run-flake8 new file mode 100755 index 0000000000..722c7fcba6 --- /dev/null +++ b/share/spack/qa/run-flake8 @@ -0,0 +1,55 @@ +#!/bin/bash +# +# This script runs source code style checks on Spack. +# +# It should be executed from the top-level directory of the repo, +# e.g.: +# +# share/spack/qa/run-flake8 +# +# To run it, you'll need to have the Python flake8 installed locally. +# +PYTHONPATH=./lib/spack:$PYTHONPATH + +flake8="$(which flake8)" +if [[ ! $flake8 ]]; then + echo "ERROR: flake8 is required to run this script." + exit 1 +fi + +# Check if changed files are flake8 conformant [framework] +changed=$(git diff --name-only develop... | grep '.py$') + +# Exempt url lines in changed packages from overlong line errors. +for file in $changed; do + if [[ $file = *package.py ]]; then + perl -i~ -pe 's/^(\s*url\s*=.*)$/\1 # NOQA: ignore=E501/' $file; + fi +done + +return_code=0 +if [[ $changed ]]; then + echo ======================================================= + echo flake8: running flake8 code checks on spack. + echo + echo Modified files: + echo $changed | perl -pe 's/^/ /;s/ +/\n /g' + echo ======================================================= + if flake8 --format pylint $changed; then + echo "Flake8 checks were clean." + else + echo "Flake8 found errors." + return_code=1 + fi +else + echo No core framework files modified. +fi + +# Restore original package files after modifying them. +for file in $changed; do + if [[ $file = *package.py ]]; then + mv "${file}~" "${file}" + fi +done + +exit $return_code diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index 11a4c0a70c..dba6f1eff4 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -41,7 +41,7 @@ # commands. This allows the user to use packages without knowing all # their installation details. # -# e.g., rather than requring a full spec for libelf, the user can type: +# e.g., rather than requiring a full spec for libelf, the user can type: # # spack use libelf # @@ -113,11 +113,11 @@ function spack { unuse $_sp_module_args $_sp_full_spec fi ;; "load") - if _sp_full_spec=$(command spack $_sp_flags module find dotkit $_sp_spec); then + if _sp_full_spec=$(command spack $_sp_flags module find tcl $_sp_spec); then module load $_sp_module_args $_sp_full_spec fi ;; "unload") - if _sp_full_spec=$(command spack $_sp_flags module find dotkit $_sp_spec); then + if _sp_full_spec=$(command spack $_sp_flags module find tcl $_sp_spec); then module unload $_sp_module_args $_sp_full_spec fi ;; esac |