From c6660ecfcb6e5c0cb540900a251a2ee8d64bc9fd Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 3 Sep 2020 09:19:11 -0700
Subject: [PATCH] Revert "Pin setuptools<50 in our image venvs"

This reverts commit 6f992efbc51e743a320be4d468b9b8d911797b58.

Setuptools 50.1.0 has been released which reverts the breaking behavior.
https://review.opendev.org/#/c/749766/ tests that these fixes work in
other venvs that exhibited the same problems. That change looks happy so
I think this revert is ready to go.

Change-Id: I31b62be4f85f40f4d99e463cd961dec0a3542f47
---
 .../elements/infra-package-needs/install.d/40-install-bindep   | 3 ---
 nodepool/elements/infra-package-needs/install.d/40-install-tox | 3 ---
 nodepool/elements/nodepool-base/install.d/91-venv-os-testr     | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/nodepool/elements/infra-package-needs/install.d/40-install-bindep b/nodepool/elements/infra-package-needs/install.d/40-install-bindep
index 760acd2e9d..67a86dc2d9 100755
--- a/nodepool/elements/infra-package-needs/install.d/40-install-bindep
+++ b/nodepool/elements/infra-package-needs/install.d/40-install-bindep
@@ -23,7 +23,4 @@ fi
 set -e
 
 python3 -m venv /usr/bindep-env
-# We do this first to ensure working setuptools is present when bindep
-# is installed.
-/usr/bindep-env/bin/pip install -U 'setuptools<50'
 /usr/bindep-env/bin/pip install bindep
diff --git a/nodepool/elements/infra-package-needs/install.d/40-install-tox b/nodepool/elements/infra-package-needs/install.d/40-install-tox
index 5977a66e13..d5c3b09d92 100755
--- a/nodepool/elements/infra-package-needs/install.d/40-install-tox
+++ b/nodepool/elements/infra-package-needs/install.d/40-install-tox
@@ -23,7 +23,4 @@ fi
 set -e
 
 python3 -m venv /usr/tox-env
-# We do this first to ensure working setuptools is present when tox
-# is installed.
-/usr/tox-env/bin/pip install -U 'setuptools<50'
 /usr/tox-env/bin/pip install tox
diff --git a/nodepool/elements/nodepool-base/install.d/91-venv-os-testr b/nodepool/elements/nodepool-base/install.d/91-venv-os-testr
index b2a2344eb9..ea96003c98 100755
--- a/nodepool/elements/nodepool-base/install.d/91-venv-os-testr
+++ b/nodepool/elements/nodepool-base/install.d/91-venv-os-testr
@@ -19,7 +19,4 @@ fi
 set -e
 
 python3 -m venv /usr/os-testr-env
-# We do this first to ensure working setuptools is present when os-testr
-# is installed.
-/usr/os-testr-env/bin/pip install -U 'setuptools<50'
 /usr/os-testr-env/bin/pip install os-testr