From e17c541b073459a874225f2db93f78ac59ec4270 Mon Sep 17 00:00:00 2001
From: Radovan Bast <bast@users.noreply.github.com>
Date: Wed, 4 Nov 2015 19:38:10 +0100
Subject: [PATCH] update .travis.yml

---
 .travis.yml  | 85 ++++++++++++++++++++++++++++++----------------------
 test/test.py |  1 -
 2 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8e5cf5c..dc4e6eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,46 +1,59 @@
-sudo: false
 language: cpp
-os:
-    - linux
-    - osx
-addons:
-  apt:
-    packages:
-       # Compilers
-      - g++
-      - gfortran
-      - cmake
-        # Math libraries
-        # do not install libatlas-dev due to conflicts of repeating xerbla in *.a lib files
-      - libblas-dev
-      - liblapack-dev
-      - libatlas-base-dev
-        # MPI
-      - openmpi-bin
-      - libopenmpi-dev
-        # Python library, development version
-      - libpython2.7
-        # Boost
-      - libboost-all-dev
-before_install:
-  - if test ${TRAVIS_OS_NAME} = osx; then brew update; fi
-  - if test ${TRAVIS_OS_NAME} = osx; then brew outdated xctool || brew upgrade xctool; fi
-  - if test ${TRAVIS_OS_NAME} = osx; then brew install python open-mpi; fi
-  - if test ${TRAVIS_OS_NAME} = osx; then brew linkapps python; fi
-before_script:
-  - export PATH=$HOME/.local/bin:$PATH
-    # PEP8 and py.test
-  - if test ${TRAVIS_OS_NAME} = linux;
-    then pip install --upgrade pip setuptools pytest pep8 --user `whoami`;
-    else sudo pip install --upgrade pip setuptools pytest pep8; fi
+sudo: false
+
+matrix:
+  include:
+
+    - os: linux
+      compiler: gcc
+      env: SOURCES=ubuntu-toolchain-r-test
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+             # compilers
+            - g++
+            - gfortran
+            - cmake
+              # math libraries
+            - libblas-dev
+            - liblapack-dev
+            - libatlas-base-dev
+              # mpi
+            - openmpi-bin
+            - libopenmpi-dev
+              # python library, development version
+            - libpython2.7
+              # boost
+            - libboost-all-dev
+
+    - os: osx
+      osx_image: xcode6.4
+      compiler: gcc
+      env: SOURCES=homebrew
+
+install:
+  - |
+    if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
+        brew install cmake boost python gcc
+        pip install virtualenv
+    elif [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+        pip install --user virtualenv
+    fi
+  - virtualenv venv
+  - source venv/bin/activate
+  - pip install pep8 pytest
+
 script:
-    # test PEP8 conformity
+    # pep8 tests
   - pep8 --ignore=E501 update.py
   - pep8 --ignore=E501 test/test.py
   - pep8 --ignore=E501 lib/config.py
-    # run unit tests
+    # unit tests
   - py.test -vv update.py
   - py.test -vv test/test.py
   - py.test -vv lib/config.py
+
 notifications:
   email: false
diff --git a/test/test.py b/test/test.py
index e5e296d..11996e8 100644
--- a/test/test.py
+++ b/test/test.py
@@ -145,7 +145,6 @@ def test_cxx_cblas():
 
 
 @skip_on_osx
-@skip_on_linux
 @skip_on_windows
 def test_cxx_lapacke():
     configure_build_and_exe('cxx_lapacke', 'python setup --cxx=g++ --lapacke --cblas')