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

Bump setuptools version

Browse Source 
This addresses a bug I was seeing when running `pip download setuptools --no-binary=:all:`.
This commit is contained in:
Shane McDonald
2017-07-31 11:37:29 -04:00
parent 27cc4542ed
commit ac9fcdb63e
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -137,7 +137,7 @@ virtualenv_ansible:
if [ ! -d "$(VENV_BASE)/ansible" ]; then \ if [ ! -d "$(VENV_BASE)/ansible" ]; then \
virtualenv --system-site-packages $(VENV_BASE)/ansible && \ 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 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==36.0.1 && \
$(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; \
fi fi
@@ -150,7 +150,7 @@ virtualenv_awx:
if [ ! -d "$(VENV_BASE)/awx" ]; then \ if [ ! -d "$(VENV_BASE)/awx" ]; then \
virtualenv --system-site-packages $(VENV_BASE)/awx && \ virtualenv --system-site-packages $(VENV_BASE)/awx && \
$(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --ignore-installed six packaging appdirs && \ $(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --ignore-installed six packaging appdirs && \
$(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --ignore-installed setuptools==35.0.2 && \ $(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --ignore-installed setuptools==36.0.1 && \
$(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==9.0.1; \ $(VENV_BASE)/awx/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==9.0.1; \
fi; \ fi; \
fi fi

2
requirements/requirements.in
View File

@@ -53,4 +53,4 @@ twisted==16.6.0
uWSGI==2.0.14 uWSGI==2.0.14
xmltodict==0.11.0 xmltodict==0.11.0
pip==9.0.1 pip==9.0.1
setuptools==35.0.2 setuptools==36.0.1

2
requirements/requirements.txt
View File

@@ -187,4 +187,4 @@ zope.interface==4.4.2 # via twisted
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
pip==9.0.1 pip==9.0.1
setuptools==35.0.2 setuptools==36.0.1

2
requirements/requirements_ansible.in
View File

@@ -11,5 +11,5 @@ pyvmomi==6.5
pywinrm[kerberos]==0.2.2 pywinrm[kerberos]==0.2.2
secretstorage==2.3.1 secretstorage==2.3.1
shade==1.20.0 shade==1.20.0
setuptools==35.0.2 setuptools==36.0.1
pip==9.0.1 pip==9.0.1

2
requirements/requirements_ansible.txt
View File

@@ -121,4 +121,4 @@ xmltodict==0.11.0 # via pywinrm
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
pip==9.0.1 pip==9.0.1
setuptools==35.0.2 setuptools==36.0.1