From: Kefu Chai <kchai@redhat.com>
Date: Sat, 12 Dec 2020 07:19:40 +0000 (+0800)
Subject: admin/build-doc: stop passing --use-feature=2020-resolver to pip
X-Git-Tag: v15.2.13~13^2~18^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79ea6f9d619462cbbf89b356e60688e6acaa7026;p=ceph.git

admin/build-doc: stop passing --use-feature=2020-resolver to pip

to silence the warning of

WARNING: --use-feature=2020-resolver no longer has any effect, since it is now the default dependency resolver in pip. This will become an error in pip 21.0.

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

Conflicts:
	admin/build-doc: trivial resolution
---

diff --git a/admin/build-doc b/admin/build-doc
index aa8baae6c34..c38208e8439 100755
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -59,7 +59,11 @@ cd build-doc
 if [ ! -e $vdir ]; then
     virtualenv --python=python3 $vdir
 fi
-$vdir/bin/pip install --use-feature=2020-resolver --quiet -r $TOPDIR/admin/doc-requirements.txt -r $TOPDIR/admin/doc-python-common-requirements.txt
+
+$vdir/bin/pip install --quiet --upgrade pip setuptools
+$vdir/bin/pip install --quiet \
+              -r $TOPDIR/admin/doc-requirements.txt \
+              -r $TOPDIR/admin/doc-python-common-requirements.txt
 
 install -d -m0755 \
     $TOPDIR/build-doc/output/html \