From 1181a7dba72918fb41d09110bc007e1a216ca194 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Wed, 11 Jul 2018 13:23:04 -0700 Subject: [PATCH 1/8] travis: require py37 to pass --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32c699d..4758ff0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,4 @@ after_success: matrix: allow_failures: - python: "3.3" - # travis doesn't support py3.7 yet - - python: "3.7" - python: "nightly" From ef32b23fe980b4f33b802f02a8f0031649f3838d Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Wed, 11 Jul 2018 13:30:46 -0700 Subject: [PATCH 2/8] travis: move to 'trusty' dist the old 'precise' environment doesn't have py3.7 available --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4758ff0..f71e5a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ sudo: false +dist: trusty language: python cache: pip before_cache: From 9d220bea733e36aff29ba3d5a552d1d8be848341 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Wed, 11 Jul 2018 16:13:29 -0700 Subject: [PATCH 3/8] travis: try "dist: xenial" I don't think this will actually work --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f71e5a0..be47208 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ sudo: false -dist: trusty +dist: xenial language: python cache: pip before_cache: From 43bf219735d37a835699b244039457692b649281 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Wed, 11 Jul 2018 16:36:50 -0700 Subject: [PATCH 4/8] travis: use sudo=true and group=edge to get bionic which maybe can install py37 --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index be47208..16d4090 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ -sudo: false -dist: xenial +# we don't actually need sudo, but that kicks us onto GCE, which means +# "group: edge" will get us Ubuntu 16.04 LTS (bionic) +sudo: true +group: edge language: python cache: pip before_cache: From d893f7d39ae82f4ea2da69be8d54891ea3d8bffa Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Wed, 11 Jul 2018 17:05:43 -0700 Subject: [PATCH 5/8] try dist:xenial --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 16d4090..650431f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ # we don't actually need sudo, but that kicks us onto GCE, which means -# "group: edge" will get us Ubuntu 16.04 LTS (bionic) +# "group: edge" will let us get Ubuntu 14.04 LTS (xenial) sudo: true group: edge +dist: xenial language: python cache: pip before_cache: From 2bf9370c680db456f8e832ad2211371aab14fa57 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Fri, 27 Jul 2018 14:05:30 -0700 Subject: [PATCH 6/8] travis: use different dists/sudo for different python versions --- .travis.yml | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 650431f..a80ae26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,3 @@ -# we don't actually need sudo, but that kicks us onto GCE, which means -# "group: edge" will let us get Ubuntu 14.04 LTS (xenial) -sudo: true -group: edge -dist: xenial language: python cache: pip before_cache: @@ -10,14 +5,6 @@ before_cache: branches: except: - /^WIP-.*$/ -python: - - "2.7" - - "3.3" - - "3.4" - - "3.5" - - "3.6" - - "3.7" - - "nightly" install: - pip install -U pip tox virtualenv codecov before_script: @@ -30,6 +17,31 @@ script: after_success: - codecov matrix: + include: + - python: 2.7 + dist: trusty + sudo: false + - python: 3.3 + dist: trusty + sudo: false + - python: 3.4 + dist: trusty + sudo: false + - python: 3.5 + dist: trusty + sudo: false + - python: 3.6 + dist: trusty + sudo: false + - python: 3.7 + dist: xenial + # we don't actually need sudo, but that kicks us onto GCE, which means + # "group: edge" will let us get Ubuntu 14.04 LTS (xenial) + #group: edge + sudo: true + - python: nightly + dist: trusty + sudo: false allow_failures: - python: "3.3" - python: "nightly" From d6866e11fe2d1366ce42f393724cc6de4e6b95ea Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Fri, 27 Jul 2018 14:17:16 -0700 Subject: [PATCH 7/8] update allow_failures --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a80ae26..3859d01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,5 +43,9 @@ matrix: dist: trusty sudo: false allow_failures: - - python: "3.3" - - python: "nightly" + - python: 3.3 + dist: trusty + sudo: false + - python: nightly + dist: trusty + sudo: false From 454bf1eaf6c7c49271f5c6ffad2dd6265b5e3b06 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Fri, 27 Jul 2018 14:26:31 -0700 Subject: [PATCH 8/8] simplify .travis.yml --- .travis.yml | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3859d01..33c3dad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,8 @@ language: python +# defaults: the py3.7 environment overrides these +dist: trusty +sudo: false + cache: pip before_cache: - rm -f $HOME/.cache/pip/log/debug.log @@ -19,33 +23,16 @@ after_success: matrix: include: - python: 2.7 - dist: trusty - sudo: false - python: 3.3 - dist: trusty - sudo: false - python: 3.4 - dist: trusty - sudo: false - python: 3.5 - dist: trusty - sudo: false - python: 3.6 - dist: trusty - sudo: false - python: 3.7 - dist: xenial - # we don't actually need sudo, but that kicks us onto GCE, which means - # "group: edge" will let us get Ubuntu 14.04 LTS (xenial) - #group: edge + # we don't actually need sudo, but that kicks us onto GCE, which lets + # us get xenial sudo: true + dist: xenial - python: nightly - dist: trusty - sudo: false allow_failures: - python: 3.3 - dist: trusty - sudo: false - python: nightly - dist: trusty - sudo: false