mirror of
https://github.com/ansible/awx.git
synced 2024-10-31 23:51:09 +03:00
Merge pull request #4136 from Spredzy/revert_makefile
Revert "Makefile: align pip and setuptools bump" Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
commit
38aedcdd48
4
Makefile
4
Makefile
@ -124,8 +124,8 @@ virtualenv_ansible:
|
|||||||
if [ ! -d "$(VENV_BASE)/ansible" ]; then \
|
if [ ! -d "$(VENV_BASE)/ansible" ]; then \
|
||||||
virtualenv -p python --system-site-packages $(VENV_BASE)/ansible && \
|
virtualenv -p python --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 six packaging appdirs && \
|
||||||
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed setuptools==41.0.1 && \
|
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed setuptools==36.0.1 && \
|
||||||
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==19.1.1; \
|
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==9.0.1; \
|
||||||
fi; \
|
fi; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user