From 5f64cfc2d7a551e494c101f4ab7849411599d2b5 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Tue, 23 May 2017 10:19:44 +0200
Subject: Travis: Update python version to 3.6

Effectively it was already running 3.6 anyway, since we are using
Miniconda-latest.
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 390b478..37b042e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: python
 
 python:
   - "2.7"
-  - "3.5"
+  - "3.6"
 
 os:
   - linux
@@ -24,7 +24,7 @@ env:
 matrix:
   include:
     - env: CUDA=no CLANG=yes
-      python: "3.5"
+      python: "3.6"
 
 before_install:
   - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-- 
cgit v1.2.3


From 08260ec20c35a3cae7659aced5b5e385f97f64ae Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Tue, 23 May 2017 10:21:00 +0200
Subject: Travis: only install cuda packages for cuda builds

This way non-cuda build failures caused by missing cuda header files will be
detected.
---
 .travis.yml | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37b042e..6d0a3ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,5 @@
 language: python
 
-python:
-  - "2.7"
-  - "3.6"
-
 os:
   - linux
 
@@ -13,19 +9,43 @@ addons:
   apt:
     packages:
       - libboost-all-dev
-      - nvidia-common
-      - nvidia-current
-      - nvidia-cuda-toolkit
-      - nvidia-cuda-dev
-env:
-    - CUDA=yes
-    - CUDA=no
 
 matrix:
   include:
     - env: CUDA=no CLANG=yes
       python: "3.6"
 
+    - env: CUDA=no
+      python: "2.7"
+
+    - env: CUDA=no
+      python: "3.6"
+
+    - env: CUDA=yes
+      python: "2.7"
+      addons:
+        apt:
+          packages:
+            - libboost-all-dev
+            - nvidia-common
+            - nvidia-current
+            - nvidia-cuda-toolkit
+            - nvidia-cuda-dev
+
+    - env: CUDA=yes
+      python: "3.6"
+      addons:
+        apt:
+          packages:
+            - libboost-all-dev
+            - nvidia-common
+            - nvidia-current
+            - nvidia-cuda-toolkit
+            - nvidia-cuda-dev
+  exclude:
+    - os: linux
+
+
 before_install:
   - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
       wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
-- 
cgit v1.2.3