From 1e4393f74d2ebc95ab6c47b92fa38c8a5c494db9 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Sat, 6 Aug 2016 19:45:11 -0700
Subject: [PATCH] Improved travis tests

---
 .travis.yml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d83f3d92..101d479b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,15 +5,25 @@ python:
 - 3.4
 - 3.5
 - pypy
-cache:
-  directories:
-  - .cache/pip/
-  - $HOME/.cache/pip
+cache: pip
+before_install:
+  - |
+      if [ "$TRAVIS_PYTHON_VERSION" = "pypy" ]; then
+        export PYENV_ROOT="$HOME/.pyenv"
+        if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
+          cd "$PYENV_ROOT" && git pull
+        else
+          rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT"
+        fi
+        export PYPY_VERSION="4.0.1"
+        "$PYENV_ROOT/bin/pyenv" install "pypy-$PYPY_VERSION"
+        virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
+        source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
+      fi
 install:
 - |
   if [ "$TEST_TYPE" = build ]; then
     pip install pytest pytest-cov coveralls six
-    pip install psycopg2 > /dev/null 2>&1
     pip install -e .
     python setup.py develop
   elif [ "$TEST_TYPE" = lint ]; then