From 7c8ed9e306c4e83d7bba80e782794d4055851512 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Mon, 14 Aug 2017 23:25:01 -0400
Subject: Get our travis from pypy (#3865)

* Get our travis from pypy

* doh
---
 .travis.yml        |  9 ++++++---
 .travis/install.sh | 12 ------------
 tox.ini            |  8 ++++++++
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 79631b8c..4bf00538 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,9 +29,12 @@ matrix:
           env: TOXENV=py35
         - python: 3.6
           env: TOXENV=py36
-        - env: TOXENV=pypy PYPY_VERSION=pypy2-5.3
-        - env: TOXENV=pypy PYPY_VERSION=pypy2.7-5.8.0
-        - env: TOXENV=pypy-nocoverage PYPY_VERSION=pypy3.5-5.8.0
+        - python: pypy-5.3
+          env: TOXENV=pypy
+        - python: pypy2.7-5.8.0
+          env: TOXENV=pypy
+        - python: pypy3.5-5.8.0
+          env: TOXENV=pypy3-nocoverage
         - python: 2.7
           env: TOXENV=py27 OPENSSL=1.1.0f
         - python: 3.5
diff --git a/.travis/install.sh b/.travis/install.sh
index ecdecea4..e65030f1 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -54,18 +54,6 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
     pyenv rehash
     python -m pip install --user virtualenv
 else
-    # temporary pyenv installation to get latest pypy until the travis
-    # container infra is upgraded
-    if [[ "${TOXENV}" = pypy* ]]; then
-        rm -rf ~/.pyenv
-        git clone https://github.com/pyenv/pyenv ~/.pyenv
-        PYENV_ROOT="$HOME/.pyenv"
-        PATH="$PYENV_ROOT/bin:$PATH"
-        eval "$(pyenv init -)"
-        pyenv install "$PYPY_VERSION"
-        pyenv global "$PYPY_VERSION"
-    fi
-
     # download, compile, and install if it's not already present via travis
     # cache
     if [ -n "${OPENSSL}" ]; then
diff --git a/tox.ini b/tox.ini
index 89bcaae3..777e9b89 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,6 +26,14 @@ commands =
     pip list
     pytest --capture=no --strict {posargs}
 
+# This target disables coverage on pypy because of performance problems with
+# coverage.py on pypy.
+[testenv:pypy3-nocoverage]
+basepython = pypy3
+commands =
+    pip list
+    pytest --capture=no --strict {posargs}
+
 [testenv:docs]
 extras =
     docstest
-- 
cgit v1.2.3