From f9c8e400b1ae1437affdfff27c8bed1d2c7855aa Mon Sep 17 00:00:00 2001 From: James Laska Date: Thu, 2 Oct 2014 15:19:33 -0400 Subject: [PATCH] Update dev_local.txt with django-debug-toolbar-1.1 Correct jenkins requirements install order --- Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d822c88de8..77dd8753e9 100644 --- a/Makefile +++ b/Makefile @@ -86,11 +86,19 @@ requirements_pypi: # Install third-party requirements needed for running unittests in jenkins # (using locally downloaded packages). -requirements_jenkins: requirements +requirements_jenkins: @if [ "$(VIRTUAL_ENV)" ]; then \ - (cd requirements && pip install -U -r jenkins.txt); \ + (cd requirements && pip install --no-index distribute-0.7.3.zip || true); \ + (cd requirements && pip install --no-index pip-1.5.4.tar.gz || true); \ + else \ + (cd requirements && sudo pip install --no-index distribute-0.7.3.zip || true); \ + (cd requirements && sudo pip install --no-index pip-1.5.4.tar.gz || true); \ + 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 pycrypto); \ $(PYTHON) fix_virtualenv_setuptools.py; \ else \ (cd requirements && sudo pip install -r jenkins.txt); \