Merge "Improve python-tools-install.sh alpine compat"

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 578923c..bf1cf8e 100644 (file)
--- 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 0434b3a..78716b0 100644 (file)
--- 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