From: Kefu Chai <kchai@redhat.com>
Date: Mon, 6 Jul 2020 11:11:39 +0000 (+0800)
Subject: admin: move python-common deps out of doc-requirements.txt
X-Git-Tag: v15.2.9~129^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a3684dcf5709d4aa078a53bcebbcc5dca029630e;p=ceph.git

admin: move python-common deps out of doc-requirements.txt

to address the build failure of

python -m pip install --exists-action=w --no-cache-dir -r admin/doc-requirements.txt
ERROR: ../src/python-common is not a valid editable requirement. It should either be a path to a local project or a VCS URL (beginning with svn+, git+, hg+, or bzr+).

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

diff --git a/admin/build-doc b/admin/build-doc
index 289a2a68871..aa990ac7111 100755
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -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
+$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 \
diff --git a/admin/doc-python-common-requirements.txt b/admin/doc-python-common-requirements.txt
new file mode 100644
index 00000000000..8cd8ec78c99
--- /dev/null
+++ b/admin/doc-python-common-requirements.txt
@@ -0,0 +1,3 @@
+pcpp
+Jinja2
+-e../src/python-common