From f5a132ce754e9c022a1e19171d10aefd69e9355b Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 21 Nov 2017 12:29:19 +0200 Subject: [PATCH 1/3] Only test against a single recent pytest and coverage.py --- .travis.yml | 412 +--------------------------------------------------- tox.ini | 20 +-- 2 files changed, 3 insertions(+), 429 deletions(-) diff --git a/.travis.yml b/.travis.yml index 47afe5a0..d2a9529d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,433 +12,25 @@ matrix: include: - python: '2.6' env: - - TOXENV=py26-29-40 - - python: '2.6' - env: - - TOXENV=py26-29-41 - - python: '2.6' - env: - - TOXENV=py26-29-42 - - python: '2.6' - env: - - TOXENV=py26-29-43 - - python: '2.6' - env: - - TOXENV=py26-30-40 - - python: '2.6' - env: - - TOXENV=py26-30-41 - - python: '2.6' - env: - - TOXENV=py26-30-42 - - python: '2.6' - env: - - TOXENV=py26-30-43 - - python: '2.6' - env: - - TOXENV=py26-31-40 - - python: '2.6' - env: - - TOXENV=py26-31-41 - - python: '2.6' - env: - - TOXENV=py26-31-42 - - python: '2.6' - env: - - TOXENV=py26-31-43 - - python: '2.6' - env: - - TOXENV=py26-32-40 - - python: '2.6' - env: - - TOXENV=py26-32-41 - - python: '2.6' - env: - - TOXENV=py26-32-42 - - python: '2.6' - env: - - TOXENV=py26-32-43 - - python: '2.7' - env: - - TOXENV=py27-29-40 - - python: '2.7' - env: - - TOXENV=py27-29-41 - - python: '2.7' - env: - - TOXENV=py27-29-42 - - python: '2.7' - env: - - TOXENV=py27-29-43 - - python: '2.7' - env: - - TOXENV=py27-30-40 - - python: '2.7' - env: - - TOXENV=py27-30-41 - - python: '2.7' - env: - - TOXENV=py27-30-42 - - python: '2.7' - env: - - TOXENV=py27-30-43 - - python: '2.7' - env: - - TOXENV=py27-31-40 - - python: '2.7' - env: - - TOXENV=py27-31-41 - - python: '2.7' - env: - - TOXENV=py27-31-42 - - python: '2.7' - env: - - TOXENV=py27-31-43 - - python: '2.7' - env: - - TOXENV=py27-32-40 - - python: '2.7' - env: - - TOXENV=py27-32-41 - - python: '2.7' - env: - - TOXENV=py27-32-42 - - python: '2.7' - env: - - TOXENV=py27-32-43 - - python: '3.3' - env: - - TOXENV=py33-29-40 - - python: '3.3' - env: - - TOXENV=py33-29-41 - - python: '3.3' - env: - - TOXENV=py33-29-42 - - python: '3.3' - env: - - TOXENV=py33-29-43 - - python: '3.3' - env: - - TOXENV=py33-30-40 - - python: '3.3' - env: - - TOXENV=py33-30-41 - - python: '3.3' - env: - - TOXENV=py33-30-42 - - python: '3.3' - env: - - TOXENV=py33-30-43 - - python: '3.3' - env: - - TOXENV=py33-31-40 - - python: '3.3' - env: - - TOXENV=py33-31-41 - - python: '3.3' - env: - - TOXENV=py33-31-42 - - python: '3.3' - env: - - TOXENV=py33-31-43 - - python: '3.3' - env: - - TOXENV=py33-32-40 - - python: '3.3' - env: - - TOXENV=py33-32-41 - - python: '3.3' - env: - - TOXENV=py33-32-42 - - python: '3.3' - env: - - TOXENV=py33-32-43 - - python: '3.4' - env: - - TOXENV=py34-29-40 - - python: '3.4' - env: - - TOXENV=py34-29-41 - - python: '3.4' - env: - - TOXENV=py34-29-42 - - python: '3.4' - env: - - TOXENV=py34-29-43 - - python: '3.4' - env: - - TOXENV=py34-30-40 - - python: '3.4' - env: - - TOXENV=py34-30-41 - - python: '3.4' - env: - - TOXENV=py34-30-42 - - python: '3.4' - env: - - TOXENV=py34-30-43 - - python: '3.4' - env: - - TOXENV=py34-31-40 - - python: '3.4' - env: - - TOXENV=py34-31-41 - - python: '3.4' - env: - - TOXENV=py34-31-42 - - python: '3.4' - env: - - TOXENV=py34-31-43 - - python: '3.4' - env: - - TOXENV=py34-32-40 - - python: '3.4' - env: - - TOXENV=py34-32-41 - - python: '3.4' - env: - - TOXENV=py34-32-42 - - python: '3.4' - env: - - TOXENV=py34-32-43 - - python: '3.5' - env: - - TOXENV=py35-29-40 - - python: '3.5' - env: - - TOXENV=py35-29-41 - - python: '3.5' - env: - - TOXENV=py35-29-42 - - python: '3.5' - env: - - TOXENV=py35-29-43 - - python: '3.5' - env: - - TOXENV=py35-30-40 - - python: '3.5' - env: - - TOXENV=py35-30-41 - - python: '3.5' - env: - - TOXENV=py35-30-42 - - python: '3.5' - env: - - TOXENV=py35-30-43 - - python: '3.5' - env: - - TOXENV=py35-31-40 - - python: '3.5' - env: - - TOXENV=py35-31-41 - - python: '3.5' - env: - - TOXENV=py35-31-42 - - python: '3.5' - env: - - TOXENV=py35-31-43 - - python: '3.5' - env: - - TOXENV=py35-32-40 - - python: '3.5' - env: - - TOXENV=py35-32-41 - - python: '3.5' - env: - - TOXENV=py35-32-42 - - python: '3.5' - env: - - TOXENV=py35-32-43 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-29-40 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-29-41 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-29-42 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-29-43 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-30-40 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-30-41 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-30-42 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-30-43 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-31-40 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-31-41 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-31-42 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-31-43 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-32-40 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-32-41 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-32-42 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-32-43 - - python: '2.7' - env: - - TOXENV=py27-29-43 - - python: '2.7' - env: - - TOXENV=py27-29-44 - - python: '2.7' - env: - - TOXENV=py27-30-43 - - python: '2.7' - env: - - TOXENV=py27-30-44 - - python: '2.7' - env: - - TOXENV=py27-31-43 - - python: '2.7' - env: - - TOXENV=py27-31-44 - - python: '2.7' - env: - - TOXENV=py27-32-43 + - TOXENV=py26-32-44 - python: '2.7' env: - TOXENV=py27-32-44 - - python: '3.3' - env: - - TOXENV=py33-29-43 - - python: '3.3' - env: - - TOXENV=py33-29-44 - - python: '3.3' - env: - - TOXENV=py33-30-43 - - python: '3.3' - env: - - TOXENV=py33-30-44 - - python: '3.3' - env: - - TOXENV=py33-31-43 - - python: '3.3' - env: - - TOXENV=py33-31-44 - - python: '3.3' - env: - - TOXENV=py33-32-43 - python: '3.3' env: - TOXENV=py33-32-44 - - python: '3.4' - env: - - TOXENV=py34-29-43 - - python: '3.4' - env: - - TOXENV=py34-29-44 - - python: '3.4' - env: - - TOXENV=py34-30-43 - - python: '3.4' - env: - - TOXENV=py34-30-44 - - python: '3.4' - env: - - TOXENV=py34-31-43 - - python: '3.4' - env: - - TOXENV=py34-31-44 - - python: '3.4' - env: - - TOXENV=py34-32-43 - python: '3.4' env: - TOXENV=py34-32-44 - - python: '3.5' - env: - - TOXENV=py35-29-43 - - python: '3.5' - env: - - TOXENV=py35-29-44 - - python: '3.5' - env: - - TOXENV=py35-30-43 - - python: '3.5' - env: - - TOXENV=py35-30-44 - - python: '3.5' - env: - - TOXENV=py35-31-43 - - python: '3.5' - env: - - TOXENV=py35-31-44 - - python: '3.5' - env: - - TOXENV=py35-32-43 - python: '3.5' env: - TOXENV=py35-32-44 - - python: '3.6' - env: - - TOXENV=py36-29-43 - - python: '3.6' - env: - - TOXENV=py36-29-44 - - python: '3.6' - env: - - TOXENV=py36-30-43 - - python: '3.6' - env: - - TOXENV=py36-30-44 - - python: '3.6' - env: - - TOXENV=py36-31-43 - - python: '3.6' - env: - - TOXENV=py36-31-44 - - python: '3.6' - env: - - TOXENV=py36-32-43 - python: '3.6' env: - TOXENV=py36-32-44 - python: 'pypy-5.4' env: - - TOXENV=pypy-29-43 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-29-44 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-30-43 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-30-44 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-31-43 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-31-44 - - python: 'pypy-5.4' - env: - - TOXENV=pypy-32-43 + - TOXENV=pypy-32-44 - python: 'pypy-5.4' env: - TOXENV=pypy-32-44 diff --git a/tox.ini b/tox.ini index 8395c939..c2f75072 100644 --- a/tox.ini +++ b/tox.ini @@ -3,8 +3,7 @@ [tox] envlist = check, - {py26,py27,py33,py34,py35,pypy}-{29,30,31,32}-{40,41,42,43}, - {py27,py33,py34,py35,py36,pypy}-{29,30,31,32}-{43,44}, + {py26,py27,py33,py34,py35,py36,pypy}-{32}-{44}, docs [testenv] @@ -23,26 +22,9 @@ setenv = passenv = * deps = - 28: pytest==2.8.7 - 28: pytest-xdist==1.17.1 - - 29: pytest==2.9.2 - 29: pytest-xdist==1.17.1 - - 30: pytest==3.0.7 - 30: pytest-xdist==1.20.1 - - 31: pytest==3.1.3 - 31: pytest-xdist==1.20.1 - 32: pytest==3.2.3 32: pytest-xdist==1.20.1 - 37: coverage==3.7.1 - 40: coverage==4.0.3 - 41: coverage==4.1 - 42: coverage==4.2 - 43: coverage==4.3.4 44: coverage==4.4.1 virtualenv From dc2d0e23e0c65d27f92795ddb158b239feea71be Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 21 Nov 2017 12:40:53 +0200 Subject: [PATCH 2/3] Run slower jobs first to make full use of parallelism so as not to hold up build --- .travis.yml | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2a9529d..0dd84ed6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,30 +10,27 @@ env: - TOXENV=docs matrix: include: - - python: '2.6' + - python: 'pypy-5.4' env: - - TOXENV=py26-32-44 - - python: '2.7' + - TOXENV=pypy-32-44 + - python: '3.6' env: - - TOXENV=py27-32-44 - - python: '3.3' + - TOXENV=py36-32-44 + - python: '3.5' env: - - TOXENV=py33-32-44 + - TOXENV=py35-32-44 - python: '3.4' env: - TOXENV=py34-32-44 - - python: '3.5' - env: - - TOXENV=py35-32-44 - - python: '3.6' + - python: '3.3' env: - - TOXENV=py36-32-44 - - python: 'pypy-5.4' + - TOXENV=py33-32-44 + - python: '2.7' env: - - TOXENV=pypy-32-44 - - python: 'pypy-5.4' + - TOXENV=py27-32-44 + - python: '2.6' env: - - TOXENV=pypy-32-44 + - TOXENV=py26-32-44 before_install: - python --version - uname -a From c957959e87d87bc66b22bfc56de87ef72dfa4445 Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 21 Nov 2017 12:50:39 +0200 Subject: [PATCH 3/3] Only test against a single recent pytest and coverage.py --- appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0c84b34a..0d0dd0e6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,11 +5,11 @@ cache: environment: matrix: - TOXENV: check - - TOXENV: 'py26-29-40,py26-29-41,py26-29-42,py26-29-43,py26-30-40,py26-30-41,py26-30-42,py26-30-43,py26-31-40,py26-31-41,py26-31-42,py26-31-43,py26-32-40,py26-32-41,py26-32-42,py26-32-43' - - TOXENV: 'py27-29-40,py27-29-41,py27-29-42,py27-29-43,py27-30-40,py27-30-41,py27-30-42,py27-30-43,py27-31-40,py27-31-41,py27-31-42,py27-31-43,py27-32-40,py27-32-41,py27-32-42,py27-32-43,py27-29-43,py27-29-44,py27-30-43,py27-30-44,py27-31-43,py27-31-44,py27-32-43,py27-32-44' - - TOXENV: 'py34-29-40,py34-29-41,py34-29-42,py34-29-43,py34-30-40,py34-30-41,py34-30-42,py34-30-43,py34-31-40,py34-31-41,py34-31-42,py34-31-43,py34-32-40,py34-32-41,py34-32-42,py34-32-43,py34-29-43,py34-29-44,py34-30-43,py34-30-44,py34-31-43,py34-31-44,py34-32-43,py34-32-44' - - TOXENV: 'py35-29-40,py35-29-41,py35-29-42,py35-29-43,py35-30-40,py35-30-41,py35-30-42,py35-30-43,py35-31-40,py35-31-41,py35-31-42,py35-31-43,py35-32-40,py35-32-41,py35-32-42,py35-32-43,py35-29-43,py35-29-44,py35-30-43,py35-30-44,py35-31-43,py35-31-44,py35-32-43,py35-32-44' - - TOXENV: 'pypy-29-40,pypy-29-41,pypy-29-42,pypy-29-43,pypy-30-40,pypy-30-41,pypy-30-42,pypy-30-43,pypy-31-40,pypy-31-41,pypy-31-42,pypy-31-43,pypy-32-40,pypy-32-41,pypy-32-42,pypy-32-43,pypy-29-43,pypy-29-44,pypy-30-43,pypy-30-44,pypy-31-43,pypy-31-44,pypy-32-43,pypy-32-44' + - TOXENV: 'py26-32-44' + - TOXENV: 'py27-32-44' + - TOXENV: 'py34-32-44' + - TOXENV: 'py35-32-44' + - TOXENV: 'pypy-32-44' init: - ps: echo $env:TOXENV