From 020a01b18f8e9537acbc31bf009b43e7d5c45d05 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Fri, 14 Dec 2018 17:43:58 +0100 Subject: Updated the Travis environment to xenial (#10090) * Updated the Travis environment to xenial. * Python 2.6 needs to remain on Trusty (can't be installed from Xenial) --- .travis.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d26ec83fd..c0378261f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,11 +12,7 @@ branches: # Build matrix #============================================================================= -# Adding the keyword dist to permit an `allow_failures` section -# under `matrix.include`. More information here: -# -# https://docs.travis-ci.com/user/customizing-the-build/#Rows-that-are-Allowed-to-Fail -dist: trusty +dist: xenial jobs: fast_finish: true @@ -29,6 +25,7 @@ jobs: env: TEST_SUITE=flake8 - stage: 'unit tests + documentation' python: '2.6' + dist: trusty sudo: required os: linux language: python @@ -56,7 +53,6 @@ jobs: - python: '3.7' sudo: required os: linux - dist: xenial language: python env: TEST_SUITE=unit - python: '3.6' @@ -114,10 +110,7 @@ jobs: language: generic env: TEST_SUITE=docker allow_failures: - - dist: xenial - env: TEST_SUITE=docker - # temporary Python 2.6 exception while we figure out why Travis is hanging - - python: '2.6' stages: - 'style checks' -- cgit v1.2.3-60-g2f50