From d4ae08646d1c1192e5806be2f81b1748f520fd39 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 14 Jul 2017 10:15:41 +0100 Subject: [PATCH] Update setuptools to 36.2.0 Due to [1] the downgrade of setuptools is not possible, so this patch is updating setuptools to the current version as a stop-gap until a fix is released. [1] https://github.com/pypa/setuptools/issues/1086 Change-Id: I9f529082fd646e58a6365ec7994f2c87fc9dfb8e --- global-requirement-pins.txt | 2 +- group_vars/all/pip.yml | 2 +- scripts/scripts-library.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt index 4c078d0a47..cbd4c8026c 100644 --- a/global-requirement-pins.txt +++ b/global-requirement-pins.txt @@ -10,5 +10,5 @@ ### These pins are updated through the sources-branch-updater script ### ### pip==9.0.1 -setuptools==33.1.1 +setuptools==36.2.0 wheel==0.29.0 diff --git a/group_vars/all/pip.yml b/group_vars/all/pip.yml index 39a3aa5711..03bd271762 100644 --- a/group_vars/all/pip.yml +++ b/group_vars/all/pip.yml @@ -19,7 +19,7 @@ pip_install_package_state: "{{ package_state }}" # These pins are updated through the sources-branch-updater script pip_packages: - pip==9.0.1 - - setuptools==33.1.1 + - setuptools==36.2.0 - wheel==0.29.0 pip_links: diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh index edc9d8c8ea..5edf34e7ec 100755 --- a/scripts/scripts-library.sh +++ b/scripts/scripts-library.sh @@ -20,7 +20,7 @@ LINE='----------------------------------------------------------------------' MAX_RETRIES=${MAX_RETRIES:-5} ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:--e gather_facts=False} STARTTIME="${STARTTIME:-$(date +%s)}" -PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==33.1.1 wheel==0.29.0 '} +PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==36.2.0 wheel==0.29.0 '} COMMAND_LOGS=${COMMAND_LOGS:-"/openstack/log/ansible_cmd_logs"} # The default SSHD configuration has MaxSessions = 10. If a deployer changes