From: Sage Weil <sage@redhat.com>
Date: Mon, 16 Dec 2019 23:21:30 +0000 (-0600)
Subject: admin/build-doc: do not use system site-packages
X-Git-Tag: v15.1.0~461^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=92595f3f9d0733511d7e3ff5b137139633f97d85;p=ceph-ci.git

admin/build-doc: do not use system site-packages

Don't use site-packages, since the host might have the same version, and
it won't have the ditaa and breathe.

Require Cython to make the venv sufficient.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/admin/build-doc b/admin/build-doc
index 0c2a3a70f15..9c9a3c8d70a 100755
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 cd "$(dirname "$0")"
 cd ..
@@ -58,7 +58,7 @@ cd build-doc
 [ -z "$vdir" ] && vdir="$TOPDIR/build-doc/virtualenv"
 
 if [ ! -e $vdir ]; then
-    virtualenv --python=python3 --system-site-packages $vdir
+    virtualenv --python=python3 $vdir
 fi
 $vdir/bin/pip install --quiet -r $TOPDIR/admin/doc-requirements.txt
 
@@ -159,3 +159,5 @@ mkdir $JAVA_OUTDIR
 
 # Copy JavaDocs to target directory
 cp -a $JAVADIR/doc/* $JAVA_OUTDIR/
+
+echo "SUCCESS"
diff --git a/admin/doc-requirements.txt b/admin/doc-requirements.txt
index 0af3bde9220..4a951d844e7 100644
--- a/admin/doc-requirements.txt
+++ b/admin/doc-requirements.txt
@@ -2,3 +2,4 @@ Sphinx == 2.1.2
 git+https://github.com/ceph/sphinx-ditaa.git@py3#egg=sphinx-ditaa
 breathe == 4.13.1
 pyyaml >= 5.1.2
+Cython