From d55622b9eb387b5675fbd00a9b87f05449e85166 Mon Sep 17 00:00:00 2001 From: Aric Gardner Date: Fri, 27 Sep 2019 12:11:03 -0400 Subject: [PATCH] Fix rtd verify for lftools lftools docs build runs literal lftools commands these commands are only avaliable if the current patchset is installed. this part is a bit of a hacke, suggestions welcome. also, if anyone knows how this ever worked before, id love to know. Also, install tox so that path has python 3 version of tox first in path. Signed-off-by: Aric Gardner Change-Id: Ic3f9bd788db851bec815e86d57a1788e7eae945a --- shell/rtd-verify.sh | 5 +++++ shell/tox-install.sh | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/shell/rtd-verify.sh b/shell/rtd-verify.sh index 810a87cb..86254a10 100644 --- a/shell/rtd-verify.sh +++ b/shell/rtd-verify.sh @@ -30,6 +30,11 @@ fi git fetch origin "$GERRIT_REFSPEC" && git checkout FETCH_HEAD git submodule update +if [[ $JOB_NAME == "lf-infra-lftools-rtd-verify-any" ]]; then + # Install patchset lftools + python3 -m pip install --user -e . +fi + echo "---> Generating docs" cd "$WORKSPACE" tox -edocs diff --git a/shell/tox-install.sh b/shell/tox-install.sh index 3734a7f4..83097f98 100644 --- a/shell/tox-install.sh +++ b/shell/tox-install.sh @@ -18,9 +18,9 @@ set -eux -o pipefail if [[ $PYTHON == "python2" ]]; then - $PYTHON -m pip install --user --quiet --upgrade tox-pyenv more-itertools~=5.0.0 + $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv more-itertools~=5.0.0 else - $PYTHON -m pip install --user --quiet --upgrade tox-pyenv + $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv fi -- 2.16.6