From 440b9ba2dfc9d5f61a49fc636e5f12975ffcdf97 Mon Sep 17 00:00:00 2001
From: Jacob Beck <jake@fishtownanalytics.com>
Date: Thu, 13 Feb 2020 11:52:34 -0700
Subject: [PATCH] PR feedbck, fix python_bin

---
 .circleci/config.yml |  2 ++
 Dockerfile           | 24 +++---------------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fbdbe95b4f8..6280476fe5c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,6 +15,8 @@ jobs:
       - run:
           name: Build wheels
           command: |
+            python3.8 -m venv "${PYTHON_ENV}"
+            export PYTHON_BIN="${PYTHON_ENV}/bin/python"
             $PYTHON_BIN -m pip install -U pip setuptools
             $PYTHON_BIN -m pip install -r requirements.txt
             $PYTHON_BIN -m pip install -r dev_requirements.txt
diff --git a/Dockerfile b/Dockerfile
index 17cc3515913..de6f705c4cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,27 +22,9 @@ RUN mkdir /home/tox && chown dbt_test_user /home/tox
 WORKDIR /usr/app
 VOLUME /usr/app
 
-RUN pip3 install tox wheel
-
-RUN python2.7 -m pip install virtualenv wheel && \
-    python2.7 -m virtualenv /home/tox/venv2.7 && \
-    /home/tox/venv2.7/bin/python -m pip install -U pip tox && \
-    chown -R dbt_test_user /home/tox/venv2.7
-
-RUN python3.6 -m pip install -U pip wheel && \
-    python3.6 -m venv /home/tox/venv3.6 && \
-    /home/tox/venv3.6/bin/python -m pip install -U pip tox && \
-    chown -R dbt_test_user /home/tox/venv3.6
-
-RUN python3.7 -m pip install -U pip wheel && \
-    python3.7 -m venv /home/tox/venv3.7 && \
-    /home/tox/venv3.7/bin/python -m pip install -U pip tox && \
-    chown -R dbt_test_user /home/tox/venv3.7
-
-RUN python3.8 -m pip install -U pip wheel && \
-    python3.8 -m venv /home/tox/venv3.8 && \
-    /home/tox/venv3.8/bin/python -m pip install -U pip tox && \
-    chown -R dbt_test_user /home/tox/venv3.8
+RUN pip3 install -U "tox==3.14.4" wheel "six>=1.14.0,<1.15.0" "virtualenv==20.0.3" setuptools
+# tox fails if the 'python' interpreter (python2) doesn't have `tox` installed
+RUN pip install -U "tox==3.14.4" "six>=1.14.0,<1.15.0" "virtualenv==20.0.3" setuptools
 
 USER dbt_test_user