From a2acf4d61fd67e17f2fdf4f70c6128440daaf262 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 12 Dec 2019 14:58:10 -0500 Subject: [PATCH] Back off setuptools version due to allow_hosts option error --- Makefile | 4 ++-- requirements/requirements.in | 2 +- requirements/requirements.txt | 2 +- requirements/requirements_ansible.in | 2 +- requirements/requirements_ansible.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 128ad63939..39d9c984de 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ virtualenv_ansible: fi; \ if [ ! -d "$(VENV_BASE)/ansible" ]; then \ 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 fi; \ # TODO: re-enable system site packages fi @@ -149,7 +149,7 @@ virtualenv_ansible_py3: fi; \ if [ ! -d "$(VENV_BASE)/ansible" ]; then \ $(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 fi; \ # TODO: re-enable system site packages fi diff --git a/requirements/requirements.in b/requirements/requirements.in index 86ea6385f5..cdf586e518 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -45,4 +45,4 @@ twilio uWSGI uwsgitop pip==19.3.1 # see UPGRADE BLOCKERs -setuptools==42.0.1 # see UPGRADE BLOCKERs +setuptools==41.6.0 # see UPGRADE BLOCKERs diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 129fc169b0..e7efbccaea 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -128,5 +128,5 @@ zope.interface==4.7.1 # via twisted # The following packages are considered to be unsafe in a requirements file: pip==19.3.1 -setuptools==42.0.1 +setuptools==41.6.0 wheel==0.33.6 diff --git a/requirements/requirements_ansible.in b/requirements/requirements_ansible.in index dcd948fc7b..2214efea44 100644 --- a/requirements/requirements_ansible.in +++ b/requirements/requirements_ansible.in @@ -54,7 +54,7 @@ pycurl==7.43.0.1 # higher versions will not install without SSL backend speci # AWX usage psutil==5.4.3 # same as AWX requirement pip==19.3.1 # see upgrade blockers -setuptools==42.0.1 # see upgrade blockers +setuptools==41.6.0 # see upgrade blockers # VMware pyvmomi==6.7.3 # WinRM diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index 3a1775183b..f06fa16ade 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -116,5 +116,5 @@ xmltodict==0.12.0 # via pywinrm # The following packages are considered to be unsafe in a requirements file: pip==19.3.1 -setuptools==42.0.1 +setuptools==41.6.0 wheel==0.33.6