]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
admin: pass --use-feature=2020-resolver to pip 37859/head
authorKefu Chai <kchai@redhat.com>
Thu, 24 Sep 2020 11:39:42 +0000 (19:39 +0800)
committerNathan Cutler <ncutler@suse.com>
Tue, 27 Oct 2020 09:44:45 +0000 (10:44 +0100)
to silence the warning like

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.

Fixes: https://tracker.ceph.com/issues/47636
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit bc00a8feb0d2f4ddf14401e2b551fddff622d1de)

admin/build-doc

index aa990ac7111a29e7c97fc0da0c9b48c802fec887..aa8baae6c34d5a86a611704d860c9a997e3e7660 100755 (executable)
@@ -59,7 +59,7 @@ cd build-doc
 if [ ! -e $vdir ]; then
     virtualenv --python=python3 $vdir
 fi
-$vdir/bin/pip install --quiet -r $TOPDIR/admin/doc-requirements.txt -r $TOPDIR/admin/doc-python-common-requirements.txt
+$vdir/bin/pip install --use-feature=2020-resolver --quiet -r $TOPDIR/admin/doc-requirements.txt -r $TOPDIR/admin/doc-python-common-requirements.txt
 
 install -d -m0755 \
     $TOPDIR/build-doc/output/html \