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: v16.1.0~279^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5cb9d5458745046aaea58cf4af50579925fbb1d0;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>
---

diff --git a/admin/build-doc b/admin/build-doc
index 863639c0e42..b58c349c0ac 100755
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -54,17 +54,11 @@ if [ ! -e $vdir ]; then
     virtualenv --python=python3 $vdir
 fi
 
-# be compatible with pip shipped by distro older v20.2
-if $vdir/bin/pip --use-feature=2020-resolver >/dev/null 2>&1 ; then
-    PIP_INSTALL="$vdir/bin/pip install --use-feature=2020-resolver"
-else
-    PIP_INSTALL="$vdir/bin/pip install"
-fi
-$PIP_INSTALL --quiet --upgrade pip setuptools
-$PIP_INSTALL --quiet \
-             -r $TOPDIR/admin/doc-requirements.txt \
-             -r $TOPDIR/admin/doc-python-common-requirements.txt
-BUILD_DOC=1 $PIP_INSTALL --quiet \
+$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
+BUILD_DOC=1 $vdir/bin/pip install --quiet \
          -r $TOPDIR/admin/doc-pybind.txt
 
 install -d -m0755 \
@@ -111,7 +105,7 @@ for target in $sphinx_targets; do
                                    $TOPDIR/doc $TOPDIR/build-doc/output/$target
             ;;
         livehtml)
-            $PIP_INSTALL --quiet sphinx-autobuild
+            $vdir/bin/pip install --quiet sphinx-autobuild
             $vdir/bin/sphinx-autobuild --re-ignore '.*\.dot' "$@" \
                                        $TOPDIR/doc $TOPDIR/build-doc/output/html
             ;;