summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorInada Naoki <songofacandy@gmail.com>2019-03-19 17:30:58 +0900
committerGitHub <noreply@github.com>2019-03-19 17:30:58 +0900
commit09e5877cb1191fe09af7a2139780d377bdf19092 (patch)
treefcbd650650e75e3d5dc51d1207f6c42b43e962f8 /.travis.yml
parentdd1cfefd67f254ce44f33995922e347c9d3f7b4e (diff)
downloadcpython-git-09e5877cb1191fe09af7a2139780d377bdf19092.tar.gz
bpo-36307: Travis: upgrade to Xenial environment (GH-12356)
(cherry picked from commit 74ae50e53e59bbe39d6287b902757f0cd01327dc) Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index f44cc741ef..07d2641233 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" ]