From 264126ce7b9c197e8303916386b727a9b9a62dc1 Mon Sep 17 00:00:00 2001 From: CAM Gerlach Date: Mon, 18 Mar 2019 05:44:58 -0500 Subject: [PATCH 1/3] [2.7] bpo-36307: Travis: upgrade to Xenial environment (GH-12356) (cherry picked from commit 74ae50e53e59bbe39d6287b902757f0cd01327dc) Co-authored-by: CAM Gerlach --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e1c2ef8756ed19..80e9be7c1962b5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: c -dist: trusty -sudo: false +dist: xenial group: beta # To cache doc-building dependencies and C compiler output. From 9d2b8e3480838ee42c8a17cd72c52ff9bd72b2a3 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Tue, 19 Mar 2019 17:34:17 +0900 Subject: [PATCH 2/3] pyenv global 3.7.1 --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 80e9be7c1962b5d..10db833c2c36751 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ env: global: # Use -O3 because we don't use debugger on Travis-CI - CFLAGS="-O3" + # python3.x in PATH may be pyenv shims, not real python. + - PYTHON_FOR_REGEN=python3 branches: only: @@ -49,6 +51,7 @@ matrix: before_install: - set -e + - pyenv global 3.7.1 # If this fails, try `pyenv versions` - | # Check short-circuit conditions if [ "${TESTING}" != "docs" ] From 7c4452152930994f12715dcad16534fd87108e38 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Tue, 19 Mar 2019 17:46:39 +0900 Subject: [PATCH 3/3] revert last change --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10db833c2c36751..80e9be7c1962b5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,6 @@ env: global: # Use -O3 because we don't use debugger on Travis-CI - CFLAGS="-O3" - # python3.x in PATH may be pyenv shims, not real python. - - PYTHON_FOR_REGEN=python3 branches: only: @@ -51,7 +49,6 @@ matrix: before_install: - set -e - - pyenv global 3.7.1 # If this fails, try `pyenv versions` - | # Check short-circuit conditions if [ "${TESTING}" != "docs" ]