Merge pull request #269 from blueyed/xenial

ci: Travis: dist=xenial
pytest-dev · Mar 9, 2019 · a0d0565 · a0d0565
2 parents 5c6058c + 54fb1b3
commit a0d0565
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 72 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
+dist: xenial
 language: python
-sudo: false
-cache: pip
+cache: false
 env:
   global:
     - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
@@ -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:

diff --git a/ci/templates/.travis.yml b/ci/templates/.travis.yml
@@ -1,6 +1,6 @@
+dist: xenial
 language: python
-sudo: false
-cache: pip
+cache: false
 env:
   global:
     - LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
@@ -11,11 +11,13 @@ env:
 matrix:
   include:
 {%- for env in tox_environments %}{{ '' }}
-    - python: '{{ env.split("-")[0] if env.startswith("pypy") else "{0[2]}.{0[3]}".format(env) }}'
-{% if env.startswith('py37') %}
-      dist: xenial
-      sudo: required
-{% endif %}
+    {% if env.startswith("pypy-") %}
+    - python: 'pypy2.7-6.0'
+    {% elif env.startswith("pypy3-") %}
+    - python: 'pypy3.5-6.0'
+    {% else %}
+    - python: '{{ "{0[2]}.{0[3]}".format(env) }}'
+    {% endif %}
       env:
         - TOXENV={{ env }}{% if 'cover' in env %},report,coveralls,codecov{% endif -%}
 {%- endfor %}{{ '' }}
@@ -29,27 +31,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:

diff --git a/tox.ini b/tox.ini
@@ -8,15 +8,6 @@ envlist =
 
 [testenv]
 extras = testing
-basepython =
-    pypy: {env:TOXPYTHON:pypy}
-    pypy3: {env:TOXPYTHON:pypy3}
-    {py27,docs}: {env:TOXPYTHON:python2.7}
-    py34: {env:TOXPYTHON:python3.4}
-    py35: {env:TOXPYTHON:python3.5}
-    py36: {env:TOXPYTHON:python3.6}
-    py37: {env:TOXPYTHON:python3.7}
-    {clean,check,report,extension-coveralls,coveralls,spell}: python3.4
 setenv =
     PYTHONUNBUFFERED=yes
 passenv =