From 2399be2ca1402a7d1043089c3c57d623d9bfc064 Mon Sep 17 00:00:00 2001 From: Aric Gardner Date: Wed, 2 Sep 2020 20:02:57 -0400 Subject: [PATCH] workaround for bad tox on centos builders system tox is py2.7 needs updated pip and setuptools. this needs to be fixed in packer. tox is py3 on my machine tox --version on builders shows imported from /usr/lib/python2.7 should be imported from /usr/lib/python3.6 also as tox is called from python2 and needs the zipp package Signed-off-by: Aric Gardner Change-Id: I1f7230a8483ae3c33a574056492fb283d3f8eac2 --- shell/python-tools-install.sh | 11 +++++++++++ shell/tox-install.sh | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh index adcca1c5..d5a8f058 100644 --- a/shell/python-tools-install.sh +++ b/shell/python-tools-install.sh @@ -56,8 +56,19 @@ EOF 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 + + #workaround + #system tox is py2.7 needs updated pip and setuptools. + #this needs to be fixed in packer. tox is py3 on my machine + python -m pip install --user --quiet --upgrade pip + python -m pip install --user --quiet --no-warn-script-location --upgrade setuptools + python --version + python -m pip --version + python -m pip freeze + rm -rf "$requirements_file" touch /tmp/pre-build-complete fi diff --git a/shell/tox-install.sh b/shell/tox-install.sh index 0434b3a2..78716b05 100644 --- a/shell/tox-install.sh +++ b/shell/tox-install.sh @@ -28,7 +28,7 @@ if [[ -f /etc/lsb-release ]]; then fi if [[ $done != "True" ]]; then - python -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0 + python -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv zipp more-itertools~=5.0.0 python3 -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv fi -- 2.16.6