From aa205517366205dd017d0801bd0cfe104e742c1a Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Sat, 17 Mar 2018 23:55:41 -0400 Subject: [PATCH] Ensure setuptools is updated Similar to pip, we should ensure that setuptools is updated as well. pip 9.0.2 appears to break without setuptools also being updated. Change-Id: I3b66140a1a5b292a6e44e955b31ddd62cdc6ed03 Signed-off-by: Thanh Ha --- shell/gerrit-fetch-dependencies.sh | 2 +- shell/jjb-install.sh | 2 +- shell/lftools-install.sh | 2 +- shell/node-install.sh | 2 +- shell/pip-install.sh | 2 +- shell/tox-install.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/shell/gerrit-fetch-dependencies.sh b/shell/gerrit-fetch-dependencies.sh index 55c0cf1c..d7f830b3 100644 --- a/shell/gerrit-fetch-dependencies.sh +++ b/shell/gerrit-fetch-dependencies.sh @@ -30,7 +30,7 @@ set +u # Allow unbound variables for virtualenv virtualenv --quiet "/tmp/v/git-review" # shellcheck source=/tmp/v/git-review/bin/activate disable=SC1091 source "/tmp/v/git-review/bin/activate" -pip install --quiet --upgrade pip +pip install --quiet --upgrade pip setuptools pip install --quiet --upgrade git-review set -u # End git-review workaround diff --git a/shell/jjb-install.sh b/shell/jjb-install.sh index 48af507a..728261c4 100644 --- a/shell/jjb-install.sh +++ b/shell/jjb-install.sh @@ -17,7 +17,7 @@ set -e -o pipefail virtualenv "/tmp/v/jjb" # shellcheck source=/tmp/v/jjb/bin/activate disable=SC1091 source "/tmp/v/jjb/bin/activate" -pip install --quiet --upgrade pip +pip install --quiet --upgrade pip setuptools pip install --quiet --upgrade pipdeptree pip install --quiet --upgrade "jenkins-job-builder==$JJB_VERSION" diff --git a/shell/lftools-install.sh b/shell/lftools-install.sh index bdf380fc..c13086a7 100644 --- a/shell/lftools-install.sh +++ b/shell/lftools-install.sh @@ -50,7 +50,7 @@ set -e -o pipefail virtualenv --quiet "/tmp/v/lftools" # shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091 source "/tmp/v/lftools/bin/activate" -pip install --quiet --upgrade pip +pip install --quiet --upgrade pip setuptools case $LFTOOLS_MODE in gerrit) diff --git a/shell/node-install.sh b/shell/node-install.sh index cec2f333..43aa7b40 100644 --- a/shell/node-install.sh +++ b/shell/node-install.sh @@ -17,7 +17,7 @@ set -e -o pipefail virtualenv --quiet "/tmp/v/python" # shellcheck source=/tmp/v/node/bin/activate disable=SC1091 source "/tmp/v/python/bin/activate" -pip install --quiet --upgrade pip +pip install --quiet --upgrade pip setuptools pip install --quiet --upgrade pipdeptree pip install --quiet --upgrade nodeenv diff --git a/shell/pip-install.sh b/shell/pip-install.sh index b2aacfe8..c75005d4 100644 --- a/shell/pip-install.sh +++ b/shell/pip-install.sh @@ -24,7 +24,7 @@ set -e -o pipefail virtualenv "/tmp/v/${PIP_PACKAGES%% *}" # shellcheck source=/tmp/v/venv/bin/activate disable=SC1091 source "/tmp/v/${PIP_PACKAGES%% *}/bin/activate" -pip install --quiet --upgrade pip +pip install --quiet --upgrade pip setuptools pip install --quiet --upgrade pipdeptree # PIP_PACKAGES needs to be passed through as a space separated list of packages diff --git a/shell/tox-install.sh b/shell/tox-install.sh index 652043bd..254defeb 100644 --- a/shell/tox-install.sh +++ b/shell/tox-install.sh @@ -17,7 +17,7 @@ set -e -o pipefail virtualenv --quiet -p "$PYTHON_VERSION" "/tmp/v/tox" # shellcheck source=/tmp/v/tox/bin/activate disable=SC1091 source "/tmp/v/tox/bin/activate" -pip install --quiet --upgrade pip +pip install --quiet --upgrade pip setuptools pip install --quiet --upgrade pipdeptree pip install --quiet --upgrade argparse detox tox tox-pyenv -- 2.16.6