From ac9fcdb63e46e519c0ead4f45795733781fd7f72 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Mon, 31 Jul 2017 11:37:29 -0400 Subject: [PATCH] Bump setuptools version This addresses a bug I was seeing when running `pip download setuptools --no-binary=:all:`. --- 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 944aea9b5f..1114fd8bbf 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ virtualenv_ansible: if [ ! -d "$(VENV_BASE)/ansible" ]; then \ 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==36.0.1 && \ $(VENV_BASE)/ansible/bin/pip install $(PIP_OPTIONS) --ignore-installed pip==9.0.1; \ fi; \ fi @@ -150,7 +150,7 @@ virtualenv_awx: if [ ! -d "$(VENV_BASE)/awx" ]; then \ 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 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; \ fi; \ fi diff --git a/requirements/requirements.in b/requirements/requirements.in index 4357ee14ca..1cbecb4779 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -53,4 +53,4 @@ twisted==16.6.0 uWSGI==2.0.14 xmltodict==0.11.0 pip==9.0.1 -setuptools==35.0.2 +setuptools==36.0.1 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 49574ec96f..865542d7f0 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -187,4 +187,4 @@ zope.interface==4.4.2 # via twisted # The following packages are considered to be unsafe in a requirements file: pip==9.0.1 -setuptools==35.0.2 +setuptools==36.0.1 diff --git a/requirements/requirements_ansible.in b/requirements/requirements_ansible.in index cb6e87e047..3e17a968e4 100644 --- a/requirements/requirements_ansible.in +++ b/requirements/requirements_ansible.in @@ -11,5 +11,5 @@ pyvmomi==6.5 pywinrm[kerberos]==0.2.2 secretstorage==2.3.1 shade==1.20.0 -setuptools==35.0.2 +setuptools==36.0.1 pip==9.0.1 diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index 3fb7751d66..f31c02928c 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -121,4 +121,4 @@ xmltodict==0.11.0 # via pywinrm # The following packages are considered to be unsafe in a requirements file: pip==9.0.1 -setuptools==35.0.2 +setuptools==36.0.1