Cleanup some stuff. Use latest pypy.

.travis.yml

@@ -9,26 +9,31 @@ env:
 
     - TOXENV=2.6-cover,coveralls,codecov
     - TOXENV=2.6-nocov
-
     - TOXENV=2.7-cover,coveralls,codecov
     - TOXENV=2.7-nocov
-
     - TOXENV=3.3-cover,coveralls,codecov
     - TOXENV=3.3-nocov
-
     - TOXENV=3.4-cover,coveralls,codecov
     - TOXENV=3.4-nocov
-
     - TOXENV=3.5-cover,coveralls,codecov
     - TOXENV=3.5-nocov
-
     - TOXENV=pypy-cover,coveralls,codecov
     - TOXENV=pypy-nocov
 
 before_install:
   - python --version
   - uname -a
   - lsb_release -a
+  - |
+    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-2.6.1
+        pyenv global pypy-2.6.1
+    fi
+    pip install virtualenv
 install:
   - pip install tox
   - virtualenv --version
@@ -44,4 +49,3 @@ notifications:
   email:
     on_success: never
     on_failure: always
-

ci/templates/.travis.yml

@@ -16,6 +16,16 @@ before_install:
   - python --version
   - uname -a
   - lsb_release -a
+  - |
+    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-2.6.1
+        pyenv global pypy-2.6.1
+    fi
+    pip install virtualenv
 install:
   - pip install tox
   - virtualenv --version

tox.ini

@@ -17,6 +17,7 @@ basepython =
     3.4: {env:TOXPYTHON:python3.4}
     3.5: {env:TOXPYTHON:python3.5}
     {clean,check,report,extension-coveralls,coveralls,codecov}: python3.4
+    bootstrap: python
 setenv =
     PYTHONPATH={toxinidir}/tests
     PYTHONUNBUFFERED=yes