diff --git a/Makefile b/Makefile index 19dd74150c..1739c1631b 100644 --- a/Makefile +++ b/Makefile @@ -148,7 +148,7 @@ socketservice: $(PYTHON) manage.py run_socketio_service pep8: - pep8 -r --ignore=E501,E221,W291,W391,E302,E251,E203,W293,E231,E303,E201,E225,E261,E241 --exclude awx/lib/site-packages awx/ + pep8 -r awx/ pyflakes: pyflakes awx/ @@ -175,7 +175,7 @@ test_tox: # Run unit tests to produce output for Jenkins. test_jenkins: - $(PYTHON) manage.py jenkins -v2 + $(PYTHON) manage.py jenkins -v2 --csslint-exclude "*.min.css" --jslint-exclude "*.min.js" package.json: sed -e 's/%NAME%/$(NAME)/;s/%VERSION%/$(VERSION)/' packaging/grunt/package.template > $@ diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 724f08e9a2..239ee91784 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -3,6 +3,7 @@ import os import sys +import glob from datetime import timedelta # Update this module's local settings from the global settings module. @@ -496,3 +497,18 @@ LOGGING = { }, } } + +if 'django_jenkins' in INSTALLED_APPS: + JENKINS_TASKS = ( + 'django_jenkins.tasks.with_coverage', + 'django_jenkins.tasks.run_pylint', + 'django_jenkins.tasks.run_pep8', + 'django_jenkins.tasks.run_pyflakes', + 'django_jenkins.tasks.run_jshint', + 'django_jenkins.tasks.run_csslint', + ) + PEP8_RCFILE = "setup.cfg" + CSSLINT_CHECKED_FILES = [os.path.join(BASE_DIR, 'ui/static/less')] + JSHINT_CHECKED_FILES = [os.path.join(BASE_DIR, 'ui/static/js'), + os.path.join(BASE_DIR, 'ui/static/lib/ansible'),] + diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000000..8afe3f6cc0 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,3 @@ +[pep8] +ignore=E501,E221,W291,W391,E302,E251,E203,W293,E231,E303,E201,E225,E261,E241 +exclude=awx/lib/site-packages