External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-17 03:00:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

Update dev_local.txt with django-debug-toolbar-1.1

Browse Source 
Correct jenkins requirements install order
This commit is contained in:
James Laska
2014-10-02 15:19:33 -04:00
parent 2846f8c530
commit f9c8e400b1
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@@ -86,11 +86,19 @@ requirements_pypi:
# Install third-party requirements needed for running unittests in jenkins # Install third-party requirements needed for running unittests in jenkins
# (using locally downloaded packages). # (using locally downloaded packages).
requirements_jenkins: requirements requirements_jenkins:
@if [ "$(VIRTUAL_ENV)" ]; then \ @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 pyflakes pep8 pylint); \
(cd requirements && pip install -U pycrypto ); \ (cd requirements && pip install -U pycrypto); \
$(PYTHON) fix_virtualenv_setuptools.py; \ $(PYTHON) fix_virtualenv_setuptools.py; \
else \ else \
(cd requirements && sudo pip install -r jenkins.txt); \ (cd requirements && sudo pip install -r jenkins.txt); \