diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2021-08-12 18:36:02 -0400 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2021-08-13 15:57:21 +0000 |
| commit | d170681b24724c522adaf1e2f4f0e1f3289dbf82 (patch) | |
| tree | 07b818dde94aa45f2d50da86f5eea5af8659413b /docs/scripts | |
| parent | 078d258034cef5b4ca74d9deb37b2684cc77d060 (diff) | |
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>
Diffstat (limited to 'docs/scripts')
| -rwxr-xr-x | docs/scripts/sphinx-make.sh | 20 |
1 files changed, 4 insertions, 16 deletions
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` |