From b32d0b880c670474dd6807f4b334668d119bb621 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 3 Sep 2020 08:57:05 -0700 Subject: [PATCH] Revert "Install older setuptools in puppet apply jobs" This reverts commit be802b319abf740e161d08e1f5a5a8c997c0278c. A 50.1.0 release of setuptools has been made which reverts the breaking behavior. Change-Id: Ic32afc1466556eed9aaf3869974d85d5f779375f --- tools/prep-apply.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/prep-apply.sh b/tools/prep-apply.sh index fa5ac9fb0e..1f523ed585 100644 --- a/tools/prep-apply.sh +++ b/tools/prep-apply.sh @@ -41,8 +41,6 @@ declare -A INTEGRATION_MODULES source $MODULE_ENV_FILE python3 -m virtualenv -p python3 --system-site-packages /tmp/apply-ansible-env -# Work around the fact that setuptools~=50 is broken -/tmp/apply-ansible-env/bin/pip install -U 'setuptools<50' /tmp/apply-ansible-env/bin/pip install ansible # Install puppet ansible_root=$(mktemp -d)