X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpython-tools-install.sh;h=7abaed9e51bdaa422e31e9ea470804258c6724b7;hb=refs%2Ftags%2Fv0.65.1;hp=bf1cf8eb9bacdb7df690c6ffe12ad0060c68355c;hpb=e29b25d20f31f96778cdc849e3ffb706bae02920;p=releng%2Fglobal-jjb.git

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index bf1cf8eb..7abaed9e 100644
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -23,13 +23,12 @@ if [[ ! -f /tmp/pre-build-complete ]]; then
 
     echo "Generating Requirements File"
     cat << 'EOF' > "$requirements_file"
-lftools[openstack]
 python-heatclient
 python-openstackclient
 python-magnumclient
 kubernetes
 niet~=1.4.2
-tox>=3.7.0 # Tox 3.7 or greater is necessary for parallel mode support
+cryptography<3.4
 yq
 
 # PINNED INDIRECT DEPENDENCIES
@@ -43,32 +42,24 @@ EOF
 
     #Python 3.5 in Ubuntu 16.04 workaround
     if [[ -f /etc/lsb-release ]]; then
-       # shellcheck disable=SC1091
-       source /etc/lsb-release
-       if [[ $DISTRIB_RELEASE == "16.04" ]]; then
-         echo "WARNING: Python projects should move to Ubuntu 18.04 to continue receiving support"
-         echo "zipp==1.1.0" >> "$requirements_file"
-       fi
+        # shellcheck disable=SC1091
+        source /etc/lsb-release
+        if [[ $DISTRIB_RELEASE == "16.04" && $DISTRIB_ID == "Ubuntu" ]]; then
+            echo "WARNING: Python projects should move to Ubuntu 18.04 to continue receiving support"
+            echo "zipp==1.1.0" >> "$requirements_file"
+        fi
     fi
-    # Use `python -m pip` to upgrade to the latest pip into user site-packages
+
     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"
+    python3 -m pip install --user --quiet --no-warn-script-location --upgrade lftools[openstack]
+    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