diff --git a/Makefile b/Makefile index 77dd8753e9..396926d779 100644 --- a/Makefile +++ b/Makefile @@ -96,14 +96,10 @@ requirements_jenkins: fi $(MAKE) requirements @if [ "$(VIRTUAL_ENV)" ]; then \ - (cd requirements && pip install -r jenkins.txt); \ - (cd requirements && pip install -U pyflakes pep8 pylint); \ - (cd requirements && pip install -U pycrypto); \ + (cd requirements && pip install -U -r jenkins.txt); \ $(PYTHON) fix_virtualenv_setuptools.py; \ else \ - (cd requirements && sudo pip install -r jenkins.txt); \ - (cd requirements && sudo pip install -U pyflakes pep8 pylint); \ - (cd requirements && sudo pip install -U pycrypto); \ + (cd requirements && sudo pip install -U -r jenkins.txt); \ fi npm install -g csslint jshint diff --git a/requirements/dev.txt b/requirements/dev.txt index ba628f543a..052555f80a 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -29,7 +29,7 @@ Django>=1.6.7,<1.7 django-debug-toolbar django-devserver>0.7 unittest2 -django-jenkins<0.15 +django-jenkins ipython # You may also need to install the following extra packages using the OS diff --git a/requirements/dev_local.txt b/requirements/dev_local.txt index 73d4b5a522..4c04dd1d38 100644 --- a/requirements/dev_local.txt +++ b/requirements/dev_local.txt @@ -84,11 +84,13 @@ logilab-common-0.61.0.tar.gz astroid-1.0.1.tar.gz # Needed by django-jenkins: coverage-3.7.1.tar.gz -pylint-1.1.0.tar.gz +pylint-1.3.1.zip +pep8-1.5.7.tar.gz +pyflakes-0.8.1.tar.gz # Remaining dev-only packages: django-debug-toolbar-1.1.tar.gz django-devserver-0.8.0.tar.gz -django-jenkins-0.14.1.tar.gz +django-jenkins-0.16.3.tar.gz ipython-1.2.1.tar.gz # You may also need to install the following extra packages using the OS diff --git a/requirements/django-jenkins-0.16.3.tar.gz b/requirements/django-jenkins-0.16.3.tar.gz new file mode 100644 index 0000000000..ea0ee98409 Binary files /dev/null and b/requirements/django-jenkins-0.16.3.tar.gz differ diff --git a/requirements/jenkins.txt b/requirements/jenkins.txt index 18f70c0596..ccc34716bd 100644 --- a/requirements/jenkins.txt +++ b/requirements/jenkins.txt @@ -1,12 +1,8 @@ # PIP requirements for running Tower unittests in jenkins. # Install using "pip --no-index -r jenkins.txt". -django-jenkins ansible -coverage pyzmq python-memcached -pyflakes -pep8 -pylint python-ldap +pycrypto diff --git a/requirements/pep8-1.5.7.tar.gz b/requirements/pep8-1.5.7.tar.gz new file mode 100644 index 0000000000..cdfd693d66 Binary files /dev/null and b/requirements/pep8-1.5.7.tar.gz differ diff --git a/requirements/pyflakes-0.8.1.tar.gz b/requirements/pyflakes-0.8.1.tar.gz new file mode 100644 index 0000000000..a34e15dd47 Binary files /dev/null and b/requirements/pyflakes-0.8.1.tar.gz differ diff --git a/requirements/pylint-1.3.1.zip b/requirements/pylint-1.3.1.zip new file mode 100644 index 0000000000..a27bfb3f0a Binary files /dev/null and b/requirements/pylint-1.3.1.zip differ