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

Back off setuptools version due to allow_hosts option error

Browse Source
This commit is contained in:
AlanCoding
2019-12-12 14:58:10 -05:00
parent 3dc8c789fb
commit a2acf4d61f
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:
fi; \ fi; \
if [ ! -d "$(VENV_BASE)/ansible" ]; then \ if [ ! -d "$(VENV_BASE)/ansible" ]; then \
virtualenv -p python $(VENV_BASE)/ansible && \ virtualenv -p python $(VENV_BASE)/ansible && \
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) pip==19.3.1 setuptools==42.0.1 wheel==0.33.6 && \ $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) pip==19.3.1 setuptools==41.6.0 wheel==0.33.6 && \
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) flit poetry twine; \ # undeclared setup_requires $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) flit poetry twine; \ # undeclared setup_requires
fi; \ # TODO: re-enable system site packages fi; \ # TODO: re-enable system site packages
fi fi
@@ -149,7 +149,7 @@ virtualenv_ansible_py3:
fi; \ fi; \
if [ ! -d "$(VENV_BASE)/ansible" ]; then \ if [ ! -d "$(VENV_BASE)/ansible" ]; then \
$(PYTHON) -m venv $(VENV_BASE)/ansible && \ $(PYTHON) -m venv $(VENV_BASE)/ansible && \
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) pip==19.3.1 setuptools==42.0.1 wheel==0.33.6 && \ $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) pip==19.3.1 setuptools==41.6.0 wheel==0.33.6 && \
$(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) flit poetry twine; \ # undeclared setup_requires $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) flit poetry twine; \ # undeclared setup_requires
fi; \ # TODO: re-enable system site packages fi; \ # TODO: re-enable system site packages
fi fi

2
requirements/requirements.in
View File

@@ -45,4 +45,4 @@ twilio
uWSGI uWSGI
uwsgitop uwsgitop
pip==19.3.1 # see UPGRADE BLOCKERs pip==19.3.1 # see UPGRADE BLOCKERs
setuptools==42.0.1 # see UPGRADE BLOCKERs setuptools==41.6.0 # see UPGRADE BLOCKERs

2
requirements/requirements.txt
View File

@@ -128,5 +128,5 @@ zope.interface==4.7.1 # 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==19.3.1 pip==19.3.1
setuptools==42.0.1 setuptools==41.6.0
wheel==0.33.6 wheel==0.33.6

2
requirements/requirements_ansible.in
View File

@@ -54,7 +54,7 @@ pycurl==7.43.0.1 # higher versions will not install without SSL backend speci
# AWX usage # AWX usage
psutil==5.4.3 # same as AWX requirement psutil==5.4.3 # same as AWX requirement
pip==19.3.1 # see upgrade blockers pip==19.3.1 # see upgrade blockers
setuptools==42.0.1 # see upgrade blockers setuptools==41.6.0 # see upgrade blockers
# VMware # VMware
pyvmomi==6.7.3 pyvmomi==6.7.3
# WinRM # WinRM

2
requirements/requirements_ansible.txt
View File

@@ -116,5 +116,5 @@ xmltodict==0.12.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==19.3.1 pip==19.3.1
setuptools==42.0.1 setuptools==41.6.0
wheel==0.33.6 wheel==0.33.6