Fix travis build (#126)

* Fix travis build

* This isn't required anymore

3 files changed, 1 insertions, 19 deletions

diff --git a/.travis/install.sh b/.travis/install.sh
index 551241c..8cc3c97 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -3,15 +3,7 @@
 set -e
 set -x
 
-install_pyenv () {
-    git clone https://github.com/yyuu/pyenv.git ~/.pyenv
-    PYENV_ROOT="$HOME/.pyenv"
-    PATH="$PYENV_ROOT/bin:$PATH"
-    eval "$(pyenv init -)"
-}
-
 if [[ "$(uname -s)" == 'Darwin' ]]; then
-    install_pyenv
     case "${TOXENV}" in
         py27)
             curl -O https://bootstrap.pypa.io/get-pip.py
@@ -25,11 +17,6 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
     pyenv rehash
     python -m pip install --user virtualenv
 else
-    if [[ "${TOXENV}" == "pypy" ]]; then
-        install_pyenv
-        pyenv install pypy-2.6.0
-        pyenv global pypy-2.6.0
-    fi
     pip install virtualenv
 fi
 
diff --git a/.travis/run.sh b/.travis/run.sh
index 0611797..7d6cfe2 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -11,11 +11,6 @@ init_pyenv () {
 
 if [[ "$(uname -s)" == "Darwin" ]]; then
     init_pyenv
-else
-    if [[ "${TOXENV}" == "pypy" ]]; then
-        init_pyenv
-        pyenv global pypy-2.6.0
-    fi
 fi
 
 source ~/.venv/bin/activate
diff --git a/tox.ini b/tox.ini
index e49cc17..3fb82a9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,7 @@ commands =
     flake8 .
 
 [testenv:py3pep8]
-basepython = python3.3
+basepython = python3
 deps =
     flake8
     flake8-import-order