From 261c7497c793a8bad19bebf114294f8b54c47d68 Mon Sep 17 00:00:00 2001
From: Kristian Evers <kristianevers@gmail.com>
Date: Tue, 12 Sep 2017 11:22:53 +0200
Subject: Move python version setup to build matrix. Different Travis platforms
 seem to have different setups. This *should* take care of the differing
 python setups between linux and osx.

---
 .travis.yml              | 7 ++++---
 travis/before_install.sh | 6 +++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 89b4c4b0..4a0a2a98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ matrix:
       env:
         - BUILD_NAME=linux_gcc
         - DETAILS="linux, gcc"
+        - PY_VERSION=3.4
     - os: linux
       compiler: clang
       language: c
@@ -26,11 +27,13 @@ matrix:
       env:
         - BUILD_NAME=linux_clang
         - DETAILS="linux, clang"
+        - PY_VERSION=3.4
     - os: osx
       language: c
       env:
         - BUILD_NAME=osx
         - DETAILS="osx"
+        - PY_VERSION=3.4
     - os: linux
       compiler: gcc
       language: c
@@ -38,9 +41,7 @@ matrix:
       env:
         - BUILD_NAME=mingw32
         - DETAILS="mingw32"
-
-python:
-    - 3.6
+        - PY_VERSION=3.4
 
 #  allow_failures:
 #    - os: osx
diff --git a/travis/before_install.sh b/travis/before_install.sh
index d4a71766..e70a4f3e 100755
--- a/travis/before_install.sh
+++ b/travis/before_install.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 
-pyenv global system 3.6
+# Specify python version. This introduced because the
+# Travis setup seems to vary between platforms.
+pyenv global system $PY_VERSION
+pyenv versions # a bit of debug info
+
 pip install --user cpp-coveralls
 ./travis/docker.sh
 
-- 
cgit v1.2.3