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

Revert "Merge branch 'release_3.0.0' into devel"

Browse Source 
This reverts commit 3cedfe6c679e5b289bd0a27defb6198d063ba8e8.
This commit is contained in:
Matthew Jones
2016-07-07 12:40:10 -04:00
parent 22437f80ed
commit 6b73fb2c27
321 changed files with 8400 additions and 8261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -258,9 +258,7 @@ virtualenv_ansible:
mkdir $(VENV_BASE); \
fi; \
if [ ! -d "$(VENV_BASE)/ansible" ]; then \
virtualenv --system-site-packages --setuptools $(VENV_BASE)/ansible && \
$(VENV_BASE)/ansible/bin/pip install -I setuptools==23.0.0 && \
$(VENV_BASE)/ansible/bin/pip install -I pip==8.1.1; \
virtualenv --system-site-packages $(VENV_BASE)/ansible; \
fi; \
fi
@@ -270,17 +268,17 @@ virtualenv_tower:
mkdir $(VENV_BASE); \
fi; \
if [ ! -d "$(VENV_BASE)/tower" ]; then \
virtualenv --system-site-packages --setuptools $(VENV_BASE)/tower && \
$(VENV_BASE)/tower/bin/pip install -I setuptools==23.0.0 && \
$(VENV_BASE)/tower/bin/pip install -I pip==8.1.1; \
virtualenv --system-site-packages $(VENV_BASE)/tower; \
fi; \
fi
requirements_ansible: virtualenv_ansible
if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/ansible/bin/activate; \
$(VENV_BASE)/ansible/bin/pip install -U pip==8.1.1; \
$(VENV_BASE)/ansible/bin/pip install -r requirements/requirements_ansible.txt ;\
else \
pip install -U pip==8.1.1; \
pip install -r requirements/requirements_ansible.txt ; \
fi
@@ -288,8 +286,10 @@ requirements_ansible: virtualenv_ansible
requirements_tower: virtualenv_tower
if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/tower/bin/activate; \
$(VENV_BASE)/tower/bin/pip install -U pip==8.1.1; \
$(VENV_BASE)/tower/bin/pip install -r requirements/requirements.txt ;\
else \
pip install -U pip==8.1.1; \
pip install -r requirements/requirements.txt ; \
fi