From 29208c52916e4ec980def8482aa66d9ed88a208c Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Thu, 23 Jan 2020 19:25:57 -0500 Subject: [PATCH] Show python and pip versions in log Extend shell scripts that invoke pip freeze to show python and pip versions also. Change-Id: I75fff4d379a7cbd27aa867c2cae4f2fd2dde2c31 Signed-off-by: Lott, Christopher (cl778h) --- releasenotes/notes/python-pip-versions-8435879c369a9d9c.yaml | 5 +++++ shell/jjb-install.sh | 4 +++- shell/node-install.sh | 4 +++- shell/python-tools-install.sh | 2 ++ shell/tox-install.sh | 5 +++-- 5 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/python-pip-versions-8435879c369a9d9c.yaml diff --git a/releasenotes/notes/python-pip-versions-8435879c369a9d9c.yaml b/releasenotes/notes/python-pip-versions-8435879c369a9d9c.yaml new file mode 100644 index 00000000..97b36337 --- /dev/null +++ b/releasenotes/notes/python-pip-versions-8435879c369a9d9c.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Extend shell scripts that invoke pip freeze to show + python and pip versions also diff --git a/shell/jjb-install.sh b/shell/jjb-install.sh index baaa5d70..d0c0e4a4 100644 --- a/shell/jjb-install.sh +++ b/shell/jjb-install.sh @@ -24,5 +24,7 @@ echo "JJB_VENV=$JJB_VENV" > "$WORKSPACE/.jjb.properties" source "$JJB_VENV/bin/activate" python -m pip install --quiet --upgrade "jenkins-job-builder==$JJB_VERSION" -echo "----> pip freeze" +# installs are silent, show version details in log +python --version +pip --version pip freeze diff --git a/shell/node-install.sh b/shell/node-install.sh index da6cfe43..7200ea35 100644 --- a/shell/node-install.sh +++ b/shell/node-install.sh @@ -20,5 +20,7 @@ source "/tmp/v/python/bin/activate" pip install --quiet --upgrade "pip==9.0.3" setuptools pip install --quiet --upgrade nodeenv -echo "----> pip freeze" +# installs are silent, show version details in log +python --version +pip --version pip freeze diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh index 2b2b0f80..3a852d34 100644 --- a/shell/python-tools-install.sh +++ b/shell/python-tools-install.sh @@ -38,6 +38,8 @@ EOF 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" # installs are silent, show version details in log + python3 --version + python3 -m pip --version python3 -m pip freeze rm -rf "$requirements_file" touch /tmp/pre-build-complete diff --git a/shell/tox-install.sh b/shell/tox-install.sh index f8472cc9..cc815ccd 100644 --- a/shell/tox-install.sh +++ b/shell/tox-install.sh @@ -16,12 +16,13 @@ set -eux -o pipefail # Tox version is pulled in through detox to mitigate version conflict - if [[ $PYTHON == "python2" ]]; then $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0 else $PYTHON -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv fi - +# installs are silent, show version details in log +$PYTHON --version +$PYTHON -m pip --version $PYTHON -m pip freeze -- 2.16.6