commit 24979fb90a82f8bfa6d136701cab2dc99ab263bd
author Jon Dufresne <jon.dufresne@gmail.com> Sun Apr 16 15:12:55 2017 -0700
committer Ian Stapleton Cordasco <graffatcolmingov@gmail.com> Mon Aug 07 19:42:48 2017 -0500
tree 7dde6ca41bb73bbb86d478d501dce003a41c1949
parent 2ed99483f1890fd27dbe0c651a981062d68d0bc6

Remove tox workaround for Travis CI

No longer necessary.

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index ff71948..c01b079 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,11 +19,8 @@
     - python: 3.6
       env: TOXENV=py36
     - 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

.travis/install.sh

diff --git a/.travis/install.sh b/.travis/install.sh
deleted file mode 100755
index b04904a..0000000
--- 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