Skip to content

Commit

Permalink
PR feedbck, fix python_bin
Browse files Browse the repository at this point in the history
  • Loading branch information
Jacob Beck authored and nchammas committed Feb 13, 2020
1 parent 488b331 commit 440b9ba
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 21 deletions.
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 3 additions & 21 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 440b9ba

Please sign in to comment.