From: Inada Naoki <songofacandy@gmail.com>
Date: Tue, 19 Mar 2019 08:30:58 +0000 (+0900)
Subject: bpo-36307: Travis: upgrade to Xenial environment (GH-12356)
X-Git-Tag: v3.7.4rc1~327
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09e5877cb1191fe09af7a2139780d377bdf19092;p=thirdparty%2FPython%2Fcpython.git

bpo-36307: Travis: upgrade to Xenial environment (GH-12356)

(cherry picked from commit 74ae50e53e59bbe39d6287b902757f0cd01327dc)

Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>
---

diff --git a/.travis.yml b/.travis.yml
index f44cc741ef46..07d26412333c 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.
@@ -21,6 +20,8 @@ env:
     # Set rpath with env var instead of -Wl,-rpath linker flag
     # OpenSSL ignores LDFLAGS when linking bin/openssl
     - LD_RUN_PATH="${OPENSSL_DIR}/lib"
+    # python3.x in PATH may be pyenv shims, not real python.
+    - PYTHON_FOR_REGEN=python3
 
 branches:
   only:
@@ -82,6 +83,7 @@ matrix:
 
 before_install:
   - set -e
+  - pyenv global 3.7.1  # If this fails, try pyenv versions
   - |
       # Check short-circuit conditions
       if [ "${TESTING}" != "docs" ]