Merge pull request #961 from xjrc/features/flake8-improvements

Enhancement Proposal: Exempt '@when' Functions from Style Redefinition Errors

1 files changed, 10 insertions, 2 deletions

diff --git a/share/spack/qa/run-flake8 b/share/spack/qa/run-flake8
index 722c7fcba6..44eb0167fb 100755
--- a/share/spack/qa/run-flake8
+++ b/share/spack/qa/run-flake8
@@ -20,10 +20,18 @@ 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.
+# Add approved style exemptions to the changed packages.
 for file in $changed; do
     if [[ $file = *package.py ]]; then
-        perl -i~ -pe 's/^(\s*url\s*=.*)$/\1  # NOQA: ignore=E501/' $file;
+        cp "$file" "$file~"
+
+        # Exempt lines with urls and descriptions from overlong line errors.
+        perl -i -pe 's/^(\s*url\s*=.*)$/\1  # NOQA: ignore=E501/' $file
+        perl -i -pe 's/^(\s*version\(.*\).*)$/\1  # NOQA: ignore=E501/' $file
+        perl -i -pe 's/^(\s*variant\(.*\).*)$/\1  # NOQA: ignore=E501/' $file
+
+        # Exempt '@when' decorated functions from redefinition errors.
+        perl -i -pe 's/^(\s*\@when\(.*\).*)$/\1  # NOQA: ignore=F811/' $file
     fi
 done