From 672dbe151393b81f072db1bd2ac18f0d303eef58 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Fri, 22 Jan 2021 16:53:10 +0000
Subject: [PATCH] limit pip to < 21.0 for python 3.5

---
 bootstrap-salt.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 52b1ace..c269b32 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2719,8 +2719,13 @@ EOM
 )
     if ! ${_py_exe} -c "$CHECK_PIP_VERSION_SCRIPT"; then
         # Upgrade pip to at least 1.2 which is when we can start using "python -m pip"
-        echodebug "Running '${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} pip>=${_MINIMUM_PIP_VERSION}'"
-        ${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} -v "pip>=${_MINIMUM_PIP_VERSION}"
+        if [ "${_py_version}" = "3.5" ]; then
+          echodebug "Running '${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} pip>=${_MINIMUM_PIP_VERSION},<21.0'"
+          ${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} -v "pip>=${_MINIMUM_PIP_VERSION},<21.0"
+        else
+          echodebug "Running '${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} pip>=${_MINIMUM_PIP_VERSION}'"
+          ${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} -v "pip>=${_MINIMUM_PIP_VERSION}"
+        fi
         sleep 1
         echodebug "PATH: ${PATH}"
         _pip_cmd="pip${_py_version}"