diff --git a/docs/pip-requirements.txt b/docs/pip-requirements.txt index 7436121..bf70685 100644 --- a/docs/pip-requirements.txt +++ b/docs/pip-requirements.txt @@ -1,6 +1,14 @@ Django==1.5.1 South==0.8.1 +astroid==1.0.0 +coverage==3.6 distribute==0.6.34 django-dajax==0.9.2 django-dajaxice==0.5.5 +django-jenkins==0.14.1 +jslint==0.6.0 +logilab-common==0.60.0 +pep8==1.4.6 +pyflakes==0.7.3 +pylint==1.0.0 wsgiref==0.1.2 diff --git a/settings.py b/settings.py index e66eae6..a099a8c 100644 --- a/settings.py +++ b/settings.py @@ -136,6 +136,7 @@ INSTALLED_APPS = ( 'south', 'dajaxice', 'dajax', + 'django_jenkins', ) # A sample logging configuration. The only tangible logging @@ -171,6 +172,18 @@ LOGGING = { #The replace XMLHttpRequest interferes with other scripts, so do not replace it DAJAXICE_XMLHTTPREQUEST_JS_IMPORT = False +JENKINS_TASKS = ( + 'django_jenkins.tasks.with_coverage', + #'django_jenkins.tasks.django_tests', # select one django or + 'django_jenkins.tasks.dir_tests', # directory tests discovery + 'django_jenkins.tasks.run_pep8', + 'django_jenkins.tasks.run_pyflakes', + 'django_jenkins.tasks.run_jshint', + 'django_jenkins.tasks.run_csslint', + 'django_jenkins.tasks.run_sloccount', +) + + # Custom config settings MODEL_DIRS = ( # put model directories here, separated by commas. If there are