From d24d7a792ed1c6df37ccff8cbfc33fada3c346c1 Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sun, 16 Apr 2017 15:12:55 -0700
Subject: [PATCH] Remove tox workaround for Travis CI

No longer necessary.
---
 .travis.yml        |  9 +++------
 .travis/install.sh | 17 -----------------
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100755 .travis/install.sh

diff --git a/.travis.yml b/.travis.yml
index cdb66351..99a66aa1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,11 +19,8 @@ matrix:
     - python: 3.5
       env: TOXENV=py35
     - python: pypy
-      env: TOXENV=pypy PYPY_VERSION=5.1
+      env: TOXENV=pypy
 
-install:
-    - ./.travis/install.sh
+install: pip install tox
 
-script:
-  - source ~/.venv/bin/activate
-  - tox
+script: tox
diff --git a/.travis/install.sh b/.travis/install.sh
deleted file mode 100755
index b04904a9..00000000
--- a/.travis/install.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# temporary pyenv installation to get latest pypy until the travis
-# container infra is upgraded
-if [[ "${TOXENV}" = pypy* ]]; then
-    git clone https://github.com/yyuu/pyenv.git ~/.pyenv
-    PYENV_ROOT="$HOME/.pyenv"
-    PATH="$PYENV_ROOT/bin:$PATH"
-    eval "$(pyenv init -)"
-    pyenv install "pypy-$PYPY_VERSION"
-    pyenv global "pypy-$PYPY_VERSION"
-
-    pyenv rehash
-fi
-
-pip install --upgrade virtualenv
-virtualenv ~/.venv
-source ~/.venv/bin/activate
-pip install --upgrade tox