From 893d5d795a631e1f93dbd2eb56e31351c62b4b92 Mon Sep 17 00:00:00 2001 From: Cosimo Lupo Date: Mon, 11 Apr 2016 01:52:49 +0100 Subject: [PATCH] travis/run.sh: simplify --- .travis/run.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis/run.sh b/.travis/run.sh index 42d0378ea..2a6562743 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -3,14 +3,11 @@ set -e set -x -if [[ "$(uname -s)" == "Darwin" ]]; then +if [[ "$(uname -s)" == "Darwin" || "${TOXENV}" == "pypy" ]]; then + PYENV_ROOT="$HOME/.pyenv" + PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" -else - if [[ "${TOXENV}" == "pypy" ]]; then - PYENV_ROOT="$HOME/.pyenv" - PATH="$PYENV_ROOT/bin:$PATH" - eval "$(pyenv init -)" - fi fi + source ~/.venv/bin/activate tox