From 611958e01e51451c8ce99b9003fd4e9c1a365fa7 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Mon, 5 Oct 2015 12:21:11 -0500 Subject: [PATCH] Updates the lint check to ignore templates This change is needed because some python files being checked by the flake8 check will have jinja2 expressions within them which will cause flake syntax failures. Change-Id: Id9291c2c1c9ab2632f5fd9b94e13fa4eb62eb05e Signed-off-by: Kevin Carter --- scripts/gate-check-lint.sh | 6 ++++-- tox.ini | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/gate-check-lint.sh b/scripts/gate-check-lint.sh index 4b394e7a5c..457b502fd9 100755 --- a/scripts/gate-check-lint.sh +++ b/scripts/gate-check-lint.sh @@ -38,8 +38,10 @@ fi # Ignores the following rules due to how ansible modules work in general # F403 'from ansible.module_utils.basic import *' used; unable to detect undefined names # H303 No wildcard (*) import. -flake8 --ignore=F403,H303 $(grep -rln -e '^#!/usr/bin/env python' -e '^#!/bin/python' -e '^#!/usr/bin/python' * ) - +# NOTE: +# Template files are skipped because they are python executables potentially with Jinja2 +# expressions and the jinja2 causes a flake8 failures. +flake8 --ignore=F403,H303 $(grep -rln -e '^#!/usr/bin/env python' -e '^#!/bin/python' -e '^#!/usr/bin/python' * | grep -v 'templates/') # Create keys if they don't already exist. ssh_key_create diff --git a/tox.ini b/tox.ini index fa049a21f6..2f2b138e51 100644 --- a/tox.ini +++ b/tox.ini @@ -30,10 +30,12 @@ commands = --exclude-dir '.*' \ --exclude-dir '*.egg' \ --exclude-dir '*.egg-info' \ + --exclude-dir '*templates' \ --exclude 'tox.ini' \ --exclude '*.sh' \ {toxinidir} | xargs flake8 --verbose" + [flake8] # Ignores the following rules due to how ansible modules work in general # F403 'from ansible.module_utils.basic import *' used; unable to detect undefined names