X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpython-tools-install.sh;h=e0e4eec1da425e6a712496339f9edfe32a93e360;hb=9f21fb18814ba6529040eb7152cc6e1f579e1505;hp=bf9b12eeace2a8668cf70186f29b96eac64bcf5e;hpb=53065905f076834d00bfa542c2feeb8553ac177e;p=releng%2Fglobal-jjb.git

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index bf9b12ee..e0e4eec1 100644
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -29,6 +29,7 @@ python-openstackclient
 python-magnumclient
 kubernetes
 niet~=1.4.2
+cryptography<3.4
 yq
 
 # PINNED INDIRECT DEPENDENCIES
@@ -44,20 +45,12 @@ EOF
     if [[ -f /etc/lsb-release ]]; then
        # shellcheck disable=SC1091
        source /etc/lsb-release
-       if [[ $DISTRIB_RELEASE == "16.04" ]]; then
+       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
 
-    #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"