fixup! ci: Travis: dist=xenial

blueyed · Mar 9, 2019 · bc4b09d · bc4b09d
1 parent f37cebc
commit bc4b09d
Showing 1 changed file with 6 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -47,36 +47,30 @@ matrix:
       env:
         - TOXENV=py36-t41-c45
     - python: '3.7'
-      dist: xenial
-      sudo: required
       env:
         - TOXENV=py37-t310-c45
     - python: '3.7'
-      dist: xenial
-      sudo: required
       env:
         - TOXENV=py37-t40-c45
     - python: '3.7'
-      dist: xenial
-      sudo: required
       env:
         - TOXENV=py37-t41-c45
-    - python: 'pypy'
+    - python: 'pypy2.7-6.0'
       env:
         - TOXENV=pypy-t310-c45
-    - python: 'pypy'
+    - python: 'pypy2.7-6.0'
       env:
         - TOXENV=pypy-t40-c45
-    - python: 'pypy'
+    - python: 'pypy2.7-6.0'
       env:
         - TOXENV=pypy-t41-c45
-    - python: 'pypy3'
+    - python: 'pypy3.5-6.0'
       env:
         - TOXENV=pypy3-t310-c45
-    - python: 'pypy3'
+    - python: 'pypy3.5-6.0'
       env:
         - TOXENV=pypy3-t40-c45
-    - python: 'pypy3'
+    - python: 'pypy3.5-6.0'
       env:
         - TOXENV=pypy3-t41-c45
 before_install:
@@ -89,27 +83,6 @@ install:
   - easy_install --version
   - pip --version
   - tox --version
-  - |
-    set -ex
-    if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then
-        (cd $HOME
-         wget https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-linux64.tar.bz2
-         tar xf pypy2-*.tar.bz2
-         pypy2-*/bin/pypy -m ensurepip
-         pypy2-*/bin/pypy -m pip install -U virtualenv)
-        export PATH=$(echo $HOME/pypy2-*/bin):$PATH
-        export TOXPYTHON=$(echo $HOME/pypy2-*/bin/pypy)
-    fi
-    if [[ $TRAVIS_PYTHON_VERSION == 'pypy3' ]]; then
-        (cd $HOME
-         wget https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-linux64.tar.bz2
-         tar xf pypy3-*.tar.bz2
-         pypy3-*/bin/pypy3 -m ensurepip
-         pypy3-*/bin/pypy3 -m pip install -U virtualenv)
-        export PATH=$(echo $HOME/pypy3-*/bin):$PATH
-        export TOXPYTHON=$(echo $HOME/pypy3-*/bin/pypy3)
-    fi
-    set +x
 script:
   - tox -v
 after_failure: