Fix the pypy setup.

3 files changed, 41 insertions, 22 deletions

diff --git a/.travis.yml b/.travis.yml
index bb101f2..c91785b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,33 +35,33 @@ before_install:
   - python --version
   - uname -a
   - lsb_release -a
+install:
+  - pip install -U tox virtualenv
+  - virtualenv --version
+  - easy_install --version
+  - pip --version
+  - tox --version
   - |
     set -ex
     if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then
         (cd $HOME
-         wget https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.7-linux_x86_64-portable.tar.bz2
-         tar -jxvf pypy-5.7-linux_x86_64-portable.tar.bz2)
-        echo 'Setting up aliases...'
-        export PATH=$HOME/pypy-5.7-linux_x86_64-portable/bin/:$PATH
-        echo 'Setting up pip...'
-        pypy-5.7-linux_x86_64-portable/bin/pypy -m ensurepip
+         wget https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.7.1-linux_x86_64-portable.tar.bz2
+         tar xf pypy-5.7.1-linux_x86_64-portable.tar.bz2
+         pypy-5.7.1-linux_x86_64-portable/bin/pypy -m ensurepip
+         pypy-5.7.1-linux_x86_64-portable/bin/pypy -m pip install -U virtualenv)
+        export PATH=$HOME/pypy-5.7.1-linux_x86_64-portable/bin/:$PATH
+        export TOXPYTHON=$HOME/pypy-5.7.1-linux_x86_64-portable/bin/pypy
     fi
     if [[ $TRAVIS_PYTHON_VERSION == 'pypy3' ]]; then
         (cd $HOME
-         wget https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3.5-5.7-beta-linux_x86_64-portable.tar.bz2
-         tar -jxvf pypy3.5-5.7-beta-linux_x86_64-portable.tar.bz2)
-        echo 'Setting up aliases...'
-        export PATH=$HOME/pypy3.5-5.7-beta-linux_x86_64-portable/bin/:$PATH
-        echo 'Setting up pip...'
-        pypy3.5-5.7-beta-linux_x86_64-portable/bin/pypy -m ensurepip
+         wget https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3.5-5.7.1-beta-linux_x86_64-portable.tar.bz2
+         tar xf pypy3.5-5.7.1-beta-linux_x86_64-portable.tar.bz2
+         pypy3.5-5.7.1-beta-linux_x86_64-portable/bin/pypy3 -m ensurepip
+         pypy3.5-5.7.1-beta-linux_x86_64-portable/bin/pypy3 -m pip install -U virtualenv)
+        export PATH=$HOME/pypy3.5-5.7.1-beta-linux_x86_64-portable/bin/:$PATH
+        export TOXPYTHON=$HOME/pypy3.5-5.7.1-beta-linux_x86_64-portable/bin/pypy3
     fi
     set +x
-install:
-  - pip install tox
-  - virtualenv --version
-  - easy_install --version
-  - pip --version
-  - tox --version
 script:
   - tox -v
 after_failure:
diff --git a/ci/templates/.travis.yml b/ci/templates/.travis.yml
index 4056383..751558d 100644
--- a/ci/templates/.travis.yml
+++ b/ci/templates/.travis.yml
@@ -19,14 +19,33 @@ before_install:
   - python --version
   - uname -a
   - lsb_release -a
-  - "if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then deactivate && wget https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.7-linux_x86_64-portable.tar.bz2 && tar -jxvf pypy-5.7-linux_x86_64-portable.tar.bz2 && echo 'Setting up aliases...' && export PATH=$HOME/pypy-5.7-linux_x86_64-portable/bin/:$PATH && ln -s ~/pypy-5.7-linux_x86_64-portable/bin/pypy ~/bin/python && echo 'Setting up pip...' && pypy-5.7-linux_x86_64-portable/bin/pypy -m ensurepip ; fi"
-  - "if [[ $TRAVIS_PYTHON_VERSION == 'pypy3' ]]; then deactivate && wget https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3.5-5.7-beta-linux_x86_64-portable.tar.bz2 && tar -jxvf pypy3.5-5.7-beta-linux_x86_64-portable.tar.bz2 && echo 'Setting up aliases...' && export PATH=$HOME/pypy3.5-5.7-beta-linux_x86_64-portable/bin/:$PATH && ln -s ~/pypy3.5-5.7-beta-linux_x86_64-portable/bin/pypy3.3 ~/bin/python && echo 'Setting up pip...' && pypy3.5-5.7-beta-linux_x86_64-portable/bin/pypy -m ensurepip && ln -s ~/pypy3.5-5.7-beta-linux_x86_64-portable/bin/pip3.5 ~/bin/pip ; fi"
 install:
-  - pip install tox
+  - pip install -U tox virtualenv
   - virtualenv --version
   - easy_install --version
   - pip --version
   - tox --version
+  - |
+    set -ex
+    if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then
+        (cd $HOME
+         wget https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.7.1-linux_x86_64-portable.tar.bz2
+         tar xf pypy-5.7.1-linux_x86_64-portable.tar.bz2
+         pypy-5.7.1-linux_x86_64-portable/bin/pypy -m ensurepip
+         pypy-5.7.1-linux_x86_64-portable/bin/pypy -m pip install -U virtualenv)
+        export PATH=$HOME/pypy-5.7.1-linux_x86_64-portable/bin/:$PATH
+        export TOXPYTHON=$HOME/pypy-5.7.1-linux_x86_64-portable/bin/pypy
+    fi
+    if [[ $TRAVIS_PYTHON_VERSION == 'pypy3' ]]; then
+        (cd $HOME
+         wget https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3.5-5.7.1-beta-linux_x86_64-portable.tar.bz2
+         tar xf pypy3.5-5.7.1-beta-linux_x86_64-portable.tar.bz2
+         pypy3.5-5.7.1-beta-linux_x86_64-portable/bin/pypy3 -m ensurepip
+         pypy3.5-5.7.1-beta-linux_x86_64-portable/bin/pypy3 -m pip install -U virtualenv)
+        export PATH=$HOME/pypy3.5-5.7.1-beta-linux_x86_64-portable/bin/:$PATH
+        export TOXPYTHON=$HOME/pypy3.5-5.7.1-beta-linux_x86_64-portable/bin/pypy3
+    fi
+    set +x
 script:
   - tox -v
 after_failure:
diff --git a/tox.ini b/tox.ini
index b80f1a9..7f0c1de 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ basepython =
     py34: {env:TOXPYTHON:python3.4}
     py35: {env:TOXPYTHON:python3.5}
     py36: {env:TOXPYTHON:python3.6}
-    {bootstrap,clean,check,report,coveralls,codecov}: python3
+    {bootstrap,clean,check,report,coveralls,codecov}: {env:TOXPYTHON:python3}
 setenv =
     PYTHONPATH={toxinidir}/tests
     PYTHONUNBUFFERED=yes