docs: Fix build on fresh ubuntu 18.04

Type: docs
Signed-off-by: John DeNisco <jdenisco@cisco.com>
Change-Id: If842c92183a9cf4b5a9773dced3298005b327e1a

diff --git a/docs/etc/requirements.txt b/docs/etc/requirements.txt
index 3c49148..bbbe2c2 100644 (file)
--- a/docs/etc/requirements.txt
+++ b/docs/etc/requirements.txt
@@ -5,30 +5,30 @@ certifi==2019.11.28
 chardet==3.0.4
 commonmark==0.9.1
 docutils==0.16
-idna==2.8
+idna==2.9
 imagesize==1.2.0
 importlib-metadata==1.5.0
-Jinja2==2.10.3
+Jinja2==2.11.1
 jsonschema==3.2.0
 MarkupSafe==1.1.1
-packaging==20.0
+packaging==20.3
 pyaml==20.3.1
-Pygments==2.5.2
+Pygments==2.6.1
 pyparsing==2.4.6
 pyrsistent==0.15.7
 pytz==2019.3
-PyYAML==5.3
+PyYAML==5.3.1
 recommonmark==0.6.0
-requests==2.22.0
+requests==2.23.0
 six==1.14.0
 snowballstemmer==2.0.0
-Sphinx==2.3.1
+Sphinx==2.4.4
 sphinx-rtd-theme==0.4.3
-sphinxcontrib-applehelp==1.0.1
-sphinxcontrib-devhelp==1.0.1
-sphinxcontrib-htmlhelp==1.0.2
+sphinxcontrib-applehelp==1.0.2
+sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-htmlhelp==1.0.3
 sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-qthelp==1.0.2
-sphinxcontrib-serializinghtml==1.1.3
+sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-serializinghtml==1.1.4
 urllib3==1.25.8
 zipp==3.1.0

diff --git a/docs/scripts/sphinx-make.sh b/docs/scripts/sphinx-make.sh
index 3dca88c..36596f2 100755 (executable)
--- a/docs/scripts/sphinx-make.sh
+++ b/docs/scripts/sphinx-make.sh
@@ -2,10 +2,19 @@
 
 if [ "$1" == "venv" ]
 then
-    python3 -m pip install --user virtualenv
+    OS_ID=$(grep '^ID=' /etc/os-release  | cut -f2- -d= | sed -e 's/\"//g')
+    if [ "$OS_ID" == "ubuntu" ]
+    then
+       sudo apt-get install -y python3-pip
+    fi
+    if [ "$OS_ID" == "centos" ]
+    then
+       sudo yum install -y python3-pip
+    fi
+    pip3 install --user virtualenv
     python3 -m virtualenv $VENV_DIR
     source $VENV_DIR/bin/activate;
-    python3 -m pip install -r $DOCS_DIR/etc/requirements.txt
+    pip3 install -r $DOCS_DIR/etc/requirements.txt
 else
     source $VENV_DIR/bin/activate;
     VERSION=`source $WS_ROOT/src/scripts/version`