From: Kefu Chai <kchai@redhat.com>
Date: Wed, 23 Sep 2020 14:26:50 +0000 (+0800)
Subject: bootstrap: use pip --use-feature=2020-resolver
X-Git-Tag: 1.1.0~45^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1563%2Fhead;p=teuthology.git

bootstrap: use pip --use-feature=2020-resolver

follow the suggestion from pip

ERROR: After October 2020 you may experience errors when installing or updating packages. This is because pip will change the way that it resolves dependency conflicts.

We recommend you use --use-feature=2020-resolver to test your packages with the new resolver before it becomes the default.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/bootstrap b/bootstrap
index ee5f93256..b2bae3cd8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -157,13 +157,13 @@ fi
 
 
 # Upgrade pip first
-./$VENV/bin/pip install --upgrade pip
+./$VENV/bin/pip install --use-feature=2020-resolver --upgrade pip
 
 # Ensure setuptools is installed
-./$VENV/bin/pip install setuptools --upgrade
+./$VENV/bin/pip install --use-feature=2020-resolver setuptools --upgrade
 
 # Install all requirements
-./$VENV/bin/pip install --upgrade -r requirements.txt
+./$VENV/bin/pip install --use-feature=2020-resolver --upgrade -r requirements.txt
 
 # Check to make sure requirements are met
 ./$VENV/bin/pip check