From 85711410b056291742853e70417931fd6ebf83ee Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Mon, 6 Oct 2014 18:19:19 -0500
Subject: [PATCH] Fix travis syntax and use tools/header.py

---
 .travis.yml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f21c53d1..7de2255d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,6 @@ env:
 
 before_install:
     - export DISPLAY=:99.0
-    - export SPACER="\n\n\n\n\n\n\n\n\n\n*************************\n\n"
     - sh -e /etc/init.d/xvfb start
     - sudo apt-get update
 
@@ -44,21 +43,21 @@ script:
     # Run all tests with minimum dependencies
     - nosetests --exe -v skimage
 
-    - echo -e $SPACER
+    - tools/header.py "Pep8 and Flake tests"
 
     # Run pep8 and flake tests
     - flake8 --exit-zero --exclude=test_*,six.py skimage doc/examples viewer_examples
 
-    - echo -e $SPACER
+    - tools/header.py "Install  optional dependencies"
 
     # Install Qt and then update the Matplotlib settings
     - if [[ $TRAVIS_PYTHON_VERSION == 2.7* ]]; then
         sudo apt-get install python-qt4;
-    else
-       sudo apt-get install libqt4-dev;
-      travis_retry pip install PySide $WHEELHOUSE;
-      python ~/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/pyside_postinstall.py -install;
-   fi
+      else
+         sudo apt-get install libqt4-dev;
+         travis_retry pip install PySide $WHEELHOUSE;
+         python ~/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/pyside_postinstall.py -install;
+      fi
 
     # Matplotlib settings - must be after we install Pyside
     - export MPL_DIR=$HOME/.config/matplotlib
@@ -66,11 +65,11 @@ script:
     - touch $MPL_DIR/matplotlibrc
     - "echo 'backend : Agg' > $MPL_DIR/matplotlibrc"
 
-    -  if [[ $TRAVIS_PYTHON_VERSION == 2.7* ]]; then
-          "echo 'backend.qt4 : PyQt4' >> $MPL_DIR/matplotlibrc";
-       else
-           "echo 'backend.qt4 : PySide' >> $MPL_DIR/matplotlibrc";
-       fi
+    - if [[ $TRAVIS_PYTHON_VERSION == 2.7* ]]; then
+          echo 'backend.qt4 : PyQt4' >> $MPL_DIR/matplotlibrc;
+      else
+           echo 'backend.qt4 : PySide' >> $MPL_DIR/matplotlibrc;
+      fi
 
     # - imread does NOT support py3.2
     - if [[  $TRAVIS_PYTHON_VERSION != 3.2 ]]; then
@@ -87,14 +86,14 @@ script:
          travis_retry pip install pyamg;
        fi
 
-    - echo -e $SPACER
+    - tools/header.py "Run doc examples"
 
     # Run all doc examples
     - export PYTHONPATH=$(pwd):$PYTHONPATH
     - for f in doc/examples/*.py; do python "$f"; if [ $? -ne 0 ]; then exit 1; fi done
     - for f in doc/examples/applications/*.py; do python "$f"; if [ $? -ne 0 ]; then exit 1; fi done
 
-    - echo -e $SPACER
+    - tools/header.py "Run tests with all dependencies"
 
     # run tests again with optional dependencies to get more coverage
     # measure coverage on py3.3