From a2414f43a53dbcef4011a36a5b16f67892bff35b Mon Sep 17 00:00:00 2001
From: Jens Hedegaard Nielsen <jens.nielsen@ucl.ac.uk>
Date: Wed, 23 Dec 2015 15:33:47 +0100
Subject: [PATCH 1/4] Run on 14.04 trusty

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8f9bcf46a0d1..262d7d249a5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
-sudo: false
+sudo: required
+dist: trusty
 
 addons:
   apt:

From 127efe2e90a9fda2a51e827be4696d07d5a7dd43 Mon Sep 17 00:00:00 2001
From: Jens Hedegaard Nielsen <jens.nielsen@ucl.ac.uk>
Date: Wed, 23 Dec 2015 15:43:58 +0100
Subject: [PATCH 2/4] Don't use wheelhouse.

The wheelhouse binaries are not 14.04 compatible
---
 .travis.yml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 262d7d249a5f..79eb77fb907f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,20 +57,12 @@ before_install:
   - source venv/bin/activate
 
 install:
-  # Upgrade pip and setuptools. Mock has issues with the default version of
-  # setuptools
   - |
     pip install --upgrade pip
     pip install --upgrade setuptools
-  # Install only from travis wheelhouse
-  - if [ -z "$PRE" ]; then
-        wheelhouse_pip_install python-dateutil $NUMPY $PANDAS pyparsing!=2.0.4 pillow sphinx!=1.3.0 $MOCK;
-    else
-        pip install $PRE python-dateutil $NUMPY pyparsing!=2.0.4 pillow sphinx!=1.3.0;
-    fi
-  # Always install from pypi
-  - pip install $PRE pep8 cycler coveralls coverage
-  - 'pip install git+https://github.com/jenshnielsen/nose.git@matplotlibnose'
+    pip install --upgrade wheel
+    pip install $PRE pep8 cycler coveralls coverage python-dateutil $NUMPY pyparsing!=2.0.4 pillow sphinx!=1.3.0 $MOCK $PANDAS
+    pip install 'git+https://github.com/jenshnielsen/nose.git@matplotlibnose'
 
   # We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not
   # availible in the Ubuntu version used by Travis but we can manually install the deb from a later

From be6a30bfffbd5822306dc81b6898a06c99b7b27f Mon Sep 17 00:00:00 2001
From: Jens Hedegaard Nielsen <jens.nielsen@ucl.ac.uk>
Date: Wed, 23 Dec 2015 15:52:59 +0100
Subject: [PATCH 3/4] Install xetex, pgf and lmodern

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 79eb77fb907f..a3255dc238e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,14 +9,14 @@ addons:
       - gdb
       - mencoder
       - dvipng
+      - pgf
+      - lmodern
       - texlive-latex-base
       - texlive-latex-extra
       - texlive-fonts-recommended
       - texlive-latex-recommended
+      - texlive-xetex
       - graphviz
-#     - fonts-humor-sans
-#    sources:
-#      - debian-sid
 
 env:
   global:

From 6b1cdc7676d2066bd49bd57fe6a72067f51553fd Mon Sep 17 00:00:00 2001
From: Jens Hedegaard Nielsen <jens.nielsen@ucl.ac.uk>
Date: Wed, 23 Dec 2015 17:40:36 +0100
Subject: [PATCH 4/4] Don't use our own envrionment

---
 .travis.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a3255dc238e5..8c61f29aebe7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,12 +50,6 @@ matrix:
   allow_failures:
     - python: "nightly"
 
-before_install:
-  - source ci/travis/travis_tools.sh
-  # Install into our own pristine virtualenv
-  - virtualenv --python=python venv
-  - source venv/bin/activate
-
 install:
   - |
     pip install --upgrade pip