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

Fix RPM builds

Browse Source 
The version of setuptools bundled with virtualenv is broken. This fixes things for both online and offline pip installs.
This commit is contained in:
Shane McDonald
2017-05-11 14:26:52 -04:00
parent 44c1935590
commit dfdf59bcf5
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -267,7 +267,9 @@ virtualenv_ansible:
mkdir $(VENV_BASE); \ mkdir $(VENV_BASE); \
fi; \ fi; \
if [ ! -d "$(VENV_BASE)/ansible" ]; then \ if [ ! -d "$(VENV_BASE)/ansible" ]; then \
virtualenv --system-site-packages --setuptools $(VENV_BASE)/ansible && \ pip install $(PIP_OPTIONS) --ignore-installed -U virtualenv && \
virtualenv --system-site-packages $(VENV_BASE)/ansible && \
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed six packaging appdirs && \
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed setuptools==35.0.2 && \ $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed setuptools==35.0.2 && \
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==9.0.1; \ $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==9.0.1; \
fi; \ fi; \
@@ -279,7 +281,9 @@ virtualenv_tower:
mkdir $(VENV_BASE); \ mkdir $(VENV_BASE); \
fi; \ fi; \
if [ ! -d "$(VENV_BASE)/tower" ]; then \ if [ ! -d "$(VENV_BASE)/tower" ]; then \
virtualenv --system-site-packages --setuptools $(VENV_BASE)/tower && \ pip install $(PIP_OPTIONS) --ignore-installed -U virtualenv && \
virtualenv --system-site-packages $(VENV_BASE)/tower && \
$(VENV_BASE)/tower/bin/pip install $(PIP_OPTIONS) --ignore-installed six packaging appdirs && \
$(VENV_BASE)/tower/bin/pip install $(PIP_OPTIONS) --ignore-installed setuptools==35.0.2 && \ $(VENV_BASE)/tower/bin/pip install $(PIP_OPTIONS) --ignore-installed setuptools==35.0.2 && \
$(VENV_BASE)/tower/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==9.0.1; \ $(VENV_BASE)/tower/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==9.0.1; \
fi; \ fi; \

1
requirements/requirements_setup_requires.txt
View File

@@ -3,3 +3,4 @@ setuptools_scm>=1.15.0
vcversioner>=2.16.0.0 vcversioner>=2.16.0.0
pytest-runner pytest-runner
isort isort
virtualenv