From: Aric Gardner Date: Thu, 23 Jan 2020 12:17:41 +0000 (-0500) Subject: Revert "remove --user" X-Git-Tag: v0.50.0~3 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F02%2F62902%2F1;p=releng%2Fglobal-jjb.git Revert "remove --user" Revert "remove --user now that pip is 20.0.x" This reverts commit 8a2651316c6c2f121a32d1121dd3ff7dc0e8ac24. Signed-off-by: Aric Gardner Change-Id: If462b4d6ad672c044f0e8fb78f9d36211562e24d --- diff --git a/shell/check-info-votes.sh b/shell/check-info-votes.sh index fb489afd..32384be4 100644 --- a/shell/check-info-votes.sh +++ b/shell/check-info-votes.sh @@ -36,10 +36,10 @@ if [ -d "/opt/pyenv" ]; then export PYENV_VERSION="3.6.4" fi -$pip install niet -$pip install lftools -$pip install lftools[nexus] -$pip install jsonschema +$pip install --user niet +$pip install --user lftools +$pip install --user lftools[nexus] +$pip install --user jsonschema echo "Checking votes:" lftools infofile check-votes INFO.yaml "$GERRIT_URL" "$ref" > gerrit_comment.txt diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh index 7988c319..e27d64ed 100644 --- a/shell/python-tools-install.sh +++ b/shell/python-tools-install.sh @@ -35,9 +35,9 @@ EOF # Use `python -m pip` to ensure we are using pip from user venv python3 -m venv ~/.local - python3 -m pip install --quiet --upgrade pip - python3 -m pip install --quiet --no-warn-script-location --upgrade setuptools - python3 -m pip install --quiet --no-warn-script-location --upgrade --upgrade-strategy eager -r "$requirements_file" + python3 -m pip install --user --quiet --upgrade pip + python3 -m pip install --user --quiet --no-warn-script-location --upgrade setuptools + python3 -m pip install --user --quiet --no-warn-script-location --upgrade --upgrade-strategy eager -r "$requirements_file" rm -rf "$requirements_file" touch /tmp/pre-build-complete fi diff --git a/shell/rtd-verify.sh b/shell/rtd-verify.sh index ea3aca7e..86254a10 100644 --- a/shell/rtd-verify.sh +++ b/shell/rtd-verify.sh @@ -32,7 +32,7 @@ git submodule update if [[ $JOB_NAME == "lf-infra-lftools-rtd-verify-any" ]]; then # Install patchset lftools - python3 -m pip install -e . + python3 -m pip install --user -e . fi echo "---> Generating docs" diff --git a/shell/tox-install.sh b/shell/tox-install.sh index d88c5082..f8472cc9 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 --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0 + $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0 else - $PYTHON -m pip install --quiet --upgrade tox tox-pyenv virtualenv + $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv fi