CI: Rename yamllint config file

[releng/global-jjb.git] / shell / python-tools-install.sh

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index bf1cf8e..e0e4eec 100644 (file)
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -29,7 +29,7 @@ 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
@@ -45,30 +45,20 @@ 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
-    # 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"
     # 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