From 790c33e602c6d1648d6b0c2d524ebba6d1d8436e Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Wed, 22 Oct 2014 11:41:10 +0100
Subject: [PATCH 1/2] Use conda instead of wheels

---
 .travis.yml | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ec9d409..23fe940 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,35 +5,21 @@ python:
     - 2.7
     - 3.2
     - 3.3
+    - 3.4
 
-env:
-    global:
-        - PIP_WHEEL_COMMAND="pip install --find-links http://wheels.astropy.org/ --use-wheel --use-mirrors"
-    matrix:
-        - SETUP_CMD='test'
-
-matrix:
-    include:
-        - python: 2.7
-          env: SETUP_CMD='cov'
-
-before_install:
-   - pip install setuptools --upgrade
-   - pip install pip --upgrade
-   - pip install wheel
-   - if [[ $SETUP_CMD == 'cov' ]]; then pip install pytest -q --use-mirrors; fi
-   - if [[ $SETUP_CMD == 'cov' ]]; then pip install pytest-cov -q --use-mirrors; fi
-   - if [[ $SETUP_CMD == 'cov' ]]; then pip install coveralls -q --use-mirrors; fi
-
+before_install:  # Install conda
+    - wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
+    - chmod +x miniconda.sh
+    - ./miniconda.sh -b
+    - export PATH=/home/travis/miniconda/bin:$PATH
+    - conda update --yes conda
 
 install:
-   - pip install psutil
-   - $PIP_WHEEL_COMMAND "numpy==1.8.0"
-   - $PIP_WHEEL_COMMAND "matplotlib==1.3.0"
+    - conda install --yes pip pytest numpy matplotlib psutil
+    - pip install coveralls pytest-cov
 
 script:
-   - if [[ $SETUP_CMD == 'test' ]]; then py.test psrecord; fi
-   - if [[ $SETUP_CMD == 'cov' ]]; then py.test --cov psrecord; fi
+   - py.test --cov psrecord
 
 after_success:
-  - if [[ $SETUP_CMD == 'cov' ]]; then coveralls; fi
+  - coveralls

From d9c93a454469447e13b6a61bfa7e315b5f47b063 Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Wed, 22 Oct 2014 11:45:58 +0100
Subject: [PATCH 2/2] Fix failures with Matplotlib

---
 .travis.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 23fe940..6becb2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,13 +7,19 @@ python:
     - 3.3
     - 3.4
 
-before_install:  # Install conda
+before_install:
+
+    # Install conda
     - wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
     - chmod +x miniconda.sh
     - ./miniconda.sh -b
     - export PATH=/home/travis/miniconda/bin:$PATH
     - conda update --yes conda
 
+    # Make sure that interactive matplotlib backends work
+    - export DISPLAY=:99.0
+    - sh -e /etc/init.d/xvfb start
+
 install:
     - conda install --yes pip pytest numpy matplotlib psutil
     - pip install coveralls pytest-cov