From: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date: Wed, 16 Mar 2016 19:00:56 +0000 (+0000)
Subject: Merge "docs: use venv"
X-Git-Tag: colorado.1.0~612
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=da3bc3668fa4cef4e5f616caf3f35e73df35e3bf;hp=-c;p=releng.git

Merge "docs: use venv"
---

da3bc3668fa4cef4e5f616caf3f35e73df35e3bf
diff --combined utils/docs-build.sh
index 4d95836d5,f188a07cd..48037db2e
--- a/utils/docs-build.sh
+++ b/utils/docs-build.sh
@@@ -14,6 -14,7 +14,7 @@@ INDEX_RST=${INDEX_RST:-index.rst
  BUILD_DIR=${BUILD_DIR:-docs_build}
  OUTPUT_DIR=${OUTPUT_DIR:-docs_output}
  SRC_DIR=${SRC_DIR:-$BUILD_DIR/_src}
+ VENV_DIR=${VENV_DIR:-$BUILD_DIR/_venv}
  RELENG_DIR=${RELENG_DIR:-releng}
  GERRIT_COMMENT=${GERRIT_COMMENT:-}
  
@@@ -41,17 -42,13 +42,13 @@@ revision="$(git rev-parse --short HEAD)
  rev_full="$(git rev-parse HEAD)"
  version="$(git describe --abbrev=0 2> /dev/null || echo draft) ($revision)"
  project="$(basename $(git rev-parse --show-toplevel))"
 -html_notes="\n    Revision: $rev_full\n\n    Build date: |today|"
 +html_notes="    Revision: $rev_full\n    Build date: $(date -u +'%Y-%m-%d')"
  default_conf='releng/docs/etc/conf.py'
  opnfv_logo='releng/docs/etc/opnfv-logo.png'
  
  function check_rst_doc() {
      _src="$1"
  
-     if ! which doc8 > /dev/null ; then
-         echo "Error: 'doc8' not found. Exec 'sudo pip install doc8' first."
-         exit 1
-     fi
      # Note: This check may fail in many jobs for building project docs, since
      #       the old sample has lines more than 120. We ignore failures on this
      #       check right now, but these have to be fixed before OPNFV B release.
@@@ -140,6 -137,15 +137,15 @@@ f
  
  prepare_src_files
  
+ if ! which virtualenv > /dev/null ; then
+     echo "Error: 'virtualenv' not found. Exec 'sudo pip install virtualenv' first."
+     exit 1
+ fi
+ 
+ virtualenv "$VENV_DIR"
+ source "$VENV_DIR/bin/activate"
+ pip install -r "$RELENG_DIR/docs/etc/requirements.txt"
+ 
  find $DOCS_DIR -name $INDEX_RST -printf '%h\n' | while read dir
  do
      name=$(generate_name $dir)
@@@ -224,3 -230,5 +230,5 @@@
      fi
  
  done
+ 
+ deactivate