From d170681b24724c522adaf1e2f4f0e1f3289dbf82 Mon Sep 17 00:00:00 2001
From: Dave Wallace <dwallacelf@gmail.com>
Date: Thu, 12 Aug 2021 18:36:02 -0400
Subject: tests docs: upgrade python packages

- Upgrade python package requirements for test & docs
- Clean up docs generation warnings
- Consolidate python requirements for docs in test
  requirements specs.
- Upgrade pip

Type: make

Change-Id: I74a3924b43ed93d15b32ec9f6fc41ed1ba95b69b
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
---
 docs/scripts/sphinx-make.sh | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'docs/scripts')

diff --git a/docs/scripts/sphinx-make.sh b/docs/scripts/sphinx-make.sh
index b00fb228ca7..e4fb572df97 100755
--- a/docs/scripts/sphinx-make.sh
+++ b/docs/scripts/sphinx-make.sh
@@ -12,30 +12,18 @@ fi
 # Get the OS
 OS_ID=$(grep '^ID=' /etc/os-release  | cut -f2- -d= | sed -e 's/\"//g')
 OS_VERSION=$(grep '^VERSION_ID=' /etc/os-release  | cut -f2- -d= | sed -e 's/\"//g')
+PIP_VERSION=$(grep 'PIP_VERSION=' $WS_ROOT/test/Makefile | cut -d'=' -f2)
 
 if [ "$1" == "venv" ]
 then
-    # We need to install the venv package on new systems
-    if [ "$OS_ID" == "ubuntu" ]
-    then
-	sudo apt-get install $CONFIRM python3-venv
-    fi
-    if [ "$OS_ID" == "centos" ]
-    then
-	if [ "$OS_VERSION" == "8" ]
-	then
-	    sudo yum install $CONFIRM python3-virtualenv
-	else
-	    sudo yum install $CONFIRM python3-venv
-	fi
-    fi
 
     # Install the virtual environment
     $PYTHON_INTERP -m venv $VENV_DIR
     source $VENV_DIR/bin/activate;
-    $PYTHON_INTERP -m pip install wheel==0.34.2
-    $PYTHON_INTERP -m pip install -r $DOCS_DIR/etc/requirements.txt
+    $PYTHON_INTERP -m pip install pip==$PIP_VERSION
+    $PYTHON_INTERP -m pip install -r $WS_ROOT/test/requirements-3.txt
 else
+    [ -n "$(declare -f deactivate)" ] && deactivate
     source $VENV_DIR/bin/activate;
     VERSION=`source $WS_ROOT/src/scripts/version`
     TM=`TZ=GMT date`
-- 
cgit 1.2.3-korg