From 373b110c31f42e478549926c52e1ac7d1c4a25d6 Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Fri, 26 Jun 2015 12:44:22 +0100
Subject: [PATCH 1/2] Test on MacOS X

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

diff --git a/.travis.yml b/.travis.yml
index 4665ddc7..97a640db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-language: c
+language: objective-c
 
 env:
   matrix:

From f6ab0e85075e4fbf37ba118e4d440b0ff41d2a51 Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Fri, 26 Jun 2015 12:48:27 +0100
Subject: [PATCH 2/2] Disable code in .travis.yml that is Linux-specific

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

diff --git a/.travis.yml b/.travis.yml
index 97a640db..ee42cc6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,10 +16,6 @@ before_install:
     - conda create --yes -n test python=$PYTHON_VERSION
     - source activate test
 
-    # Make sure that interactive matplotlib backends work
-    - export DISPLAY=:99.0
-    - sh -e /etc/init.d/xvfb start
-
 install:
     - conda install --yes pip pytest matplotlib nose