Merge 8f5a0ab into 6710fa6

.travis.yml

@@ -16,7 +16,6 @@ addons:
             - texlive-latex-extra
             - dvipng
 
-
 env:
     global:
         # SET DEFAULTS TO AVOID REPEATING IN MOST CASES
@@ -106,12 +105,9 @@ matrix:
 
 
 before_install:
-
-    # CONFIGURE A HEADLESS DISPLAY TO TEST PLOT GENERATION
-    - xvfb-run -a
-    - sleep 3
     - uname -a
     - python --version
+    - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ( sudo Xvfb :99 -ac -screen 0 1024x768x8; sleep 3; echo ok )& fi
 
     # We now use the ci-helpers package to set up our testing environment.
     # This is done by using Miniconda and then using conda and pip to install
@@ -141,7 +137,8 @@ install:
 
 
 script:
-    - $MAIN_CMD  $SETUP_CMD
+    - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ( xvfb-run -a $MAIN_CMD  $SETUP_CMD ) fi
+    - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ( $MAIN_CMD $SETUP_CMD ) fi
 
 
 after_success: