From f37cebc93b2b5c074ce05d1db973db30a4baa202 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 8 Mar 2019 03:30:46 +0100 Subject: [PATCH 1/5] ci: Travis: dist=xenial --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c59bac4c..7a94ca2f 100644 --- 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 From bc4b09dccddae01ca9514a9bc2e5d8fdcc7d362d Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 8 Mar 2019 03:50:29 +0100 Subject: [PATCH 2/5] fixup! ci: Travis: dist=xenial --- .travis.yml | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a94ca2f..d279ea3e 100644 --- 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: From e1dee615eafe1e5e08ec3f4e52508aa99f333b8f Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 8 Mar 2019 12:37:36 +0100 Subject: [PATCH 3/5] =?UTF-8?q?tox:=20do=20not=20force=20py34=20with=20che?= =?UTF-8?q?ck/clean/=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index 8b15169f..9c836562 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,6 @@ basepython = 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 = PYTHONPATH={toxinidir}/tests PYTHONUNBUFFERED=yes From aeab348aa937534e4fdedcb51be68e4bd98b9c40 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 8 Mar 2019 12:37:59 +0100 Subject: [PATCH 4/5] tox: do not set basepython at all Tox handles this good by itself. --- tox.ini | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tox.ini b/tox.ini index 9c836562..6cd01909 100644 --- a/tox.ini +++ b/tox.ini @@ -8,14 +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} setenv = PYTHONPATH={toxinidir}/tests PYTHONUNBUFFERED=yes From 54fb1b36b82b3aafbbfddd3f829adf436ea66875 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 8 Mar 2019 12:57:28 +0100 Subject: [PATCH 5/5] adjust ci/templates/.travis.yml --- ci/templates/.travis.yml | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/ci/templates/.travis.yml b/ci/templates/.travis.yml index 60674e0d..950d68e9 100644 --- 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: