From: Kefu Chai <kchai@redhat.com>
Date: Tue, 19 Jan 2021 12:12:22 +0000 (+0800)
Subject: tools/setup-virtualenv.sh: do not pass --use-feature=2020-resolver to pip
X-Git-Tag: v16.2.0~230^2~20
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=958f76f4d19a28617275fcc4531f55281dc1476a;p=ceph.git

tools/setup-virtualenv.sh: do not pass --use-feature=2020-resolver to pip

pip use the new resolver by default now. so no need to pass this option
to it anymore.

This reverts commit fa9e2bfd4b3648f08ed3a88ce737d432ab97cce1.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit cb2de05a39b28342fdf44688cd0d1c3e424a02ff)
---

diff --git a/src/tools/setup-virtualenv.sh b/src/tools/setup-virtualenv.sh
index f799784b4514..af945e2c5a46 100755
--- a/src/tools/setup-virtualenv.sh
+++ b/src/tools/setup-virtualenv.sh
@@ -66,17 +66,9 @@ else
     DISABLE_PIP_VERSION_CHECK=
 fi
 
-if pip --help | grep -q use-feature; then
-    USE_FEATURE=--use-feature=2020-resolver
-else
-    USE_FEATURE=
-fi
-
 # older versions of pip will not install wrap_console scripts
 # when using wheel packages
-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install \
-    $USE_FEATURE \
-    --upgrade 'pip >= 6.1'
+pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install --upgrade 'pip >= 6.1'
 
 if pip --help | grep -q disable-pip-version-check; then
     DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check
@@ -88,10 +80,7 @@ if test -d wheelhouse ; then
     export NO_INDEX=--no-index
 fi
 
-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install \
-    $USE_FEATURE \
-    $NO_INDEX \
-    --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
+pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1'
 
 require_files=$(ls *requirements*.txt 2>/dev/null) || true
 constraint_files=$(ls *constraints*.txt 2>/dev/null) || true
@@ -102,8 +91,6 @@ if test "$require"; then
     if ! test -f $md5 || ! md5sum -c wheelhouse/md5 > /dev/null; then
         NO_INDEX=''
     fi
-    pip --exists-action i $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install \
-        $USE_FEATURE \
-        $NO_INDEX \
-        --find-links=file://$(pwd)/wheelhouse $require $constraint
+    pip --exists-action i $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX \
+      --find-links=file://$(pwd)/wheelhouse $require $constraint 
 fi