Build: setuptools-related fix (#455)

(cherry picked from commit d1fcd0d)

Author: rafie

Dockerfile

@@ -31,7 +31,7 @@ COPY --from=redis /usr/local/ /usr/local/
 COPY ./opt/ opt/
 COPY ./test/test_requirements.txt test/
 
-RUN ./opt/readies/bin/getpy3
+RUN PIP=1 FORCE=1 ./opt/readies/bin/getpy3
 RUN ./opt/system-setup.py
 
 ARG DEPS_ARGS=""

Dockerfile.gpu

@@ -36,7 +36,7 @@ COPY --from=redis /usr/local/ /usr/local/
 COPY ./opt/ opt/
 COPY ./test/test_requirements.txt test/
 
-RUN ./opt/readies/bin/getpy3
+RUN PIP=1 FORCE=1 ./opt/readies/bin/getpy3
 RUN ./opt/system-setup.py
 
 ARG DEPS_ARGS=""

Dockerfile.gpu-test

@@ -29,8 +29,7 @@ COPY --from=redis /usr/local/ /usr/local/
 COPY ./opt/ opt/
 COPY ./test/test_requirements.txt test/
 
-RUN PIP=19.3.1 ./opt/readies/bin/getpy3
-RUN python3 -m pip install virtualenv
+RUN PIP=1 VENV=1 FORCE=1 ./opt/readies/bin/getpy3
 
 RUN set -e ;\
 	python3 -m virtualenv venv --system-site-packages ;\

opt/readies

@@ -19,15 +19,16 @@ def common_first(self):
         self.install_downloaders()
         self.setup_pip()
         self.pip_install("wheel virtualenv")
-        self.pip_install("setuptools --upgrade")
+        # if self.osnick == 'xenial': 
+        #     self.pip_install("setuptools --upgrade")
+        #     self.pip_install("-IU --force-reinstall setuptools")
 
         if self.os == 'linux':
             self.install("ca-certificates")
         self.install("git unzip wget patchelf")
         self.install("coreutils") # for realpath
 
     def debian_compat(self):
-        self.pip_install("-IU --force-reinstall setuptools")
         self.install("gawk")
         self.install("build-essential cmake")
         self.install("python3-regex")