gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Kefu Chai 2020-12-12 15:19:40 +08:00
parent 6fb4aff5ad
commit 5cb9d54587
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
admin/build-doc
View File

@ -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
;;