From 43058e0a6c862f9dae9a9ccafe3ab6013e2e0091 Mon Sep 17 00:00:00 2001 From: Aric Gardner Date: Wed, 9 Sep 2020 12:02:15 -0400 Subject: [PATCH] Remove tox from python-tools-install. If users need a system pip install of tox they can include tox-install. However, unless they need pyenv I would suggest they use lf-env. Order of system pip install of tox matters, whichever one is installed most recently is the one that is going to be called. removing tox from python tools install allows the install of tox in tox-install to not be skipped, and in this way we can ensure that the py3 version is the once most recently installed Issue-Id: RELENG-3189 Signed-off-by: Aric Gardner Change-Id: Ie904f42821f6598a389854e8876448237cfac3dd --- shell/python-tools-install.sh | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh index bf1cf8eb..bf9b12ee 100644 --- a/shell/python-tools-install.sh +++ b/shell/python-tools-install.sh @@ -29,7 +29,6 @@ python-openstackclient python-magnumclient kubernetes niet~=1.4.2 -tox>=3.7.0 # Tox 3.7 or greater is necessary for parallel mode support yq # PINNED INDIRECT DEPENDENCIES @@ -50,25 +49,23 @@ EOF echo "zipp==1.1.0" >> "$requirements_file" fi fi - # Use `python -m pip` to upgrade to the latest pip into user site-packages + + #Project may still want to use system py27 + #pip and setuptools must be updated for py27 to work. + 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 + 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" # 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 -- 2.16.6