From 81d54983382bed9107d805f200186c45aaa09b6e Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Thu, 9 Oct 2014 20:34:25 -0500
Subject: [PATCH] Put the TEST_ARGS in travis_setup.sh

---
 .travis.yml           | 15 +++++++--------
 tools/travis_setup.sh |  6 ++++++
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 58206877..47983033 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,12 @@
 
 language: python
 
-matrix:
-  include:
-    - python: "2.6"
-    - python: "2.7_with_system_site_packages"
-    - python: "3.2"
-    - python: "3.3"
-      env: TEST_ARGS="--with-cov --cover-package"
-    - python: "3.4"
+python:
+- 2.6
+- "2.7_with_system_site_packages"
+- 3.2
+- 3.3
+- 3.4
 
 before_install:
     - export DISPLAY=:99.0
@@ -47,6 +45,7 @@ script:
 
     - tools/header.py "Run tests with all dependencies"
     # run tests again with optional dependencies to get more coverage
+    # we get TEST_ARGS from travis_setup.sh
     - nosetests --exe -v --with-doctest $TEST_ARGS
 
 after_success:
diff --git a/tools/travis_setup.sh b/tools/travis_setup.sh
index af14be4d..5595f769 100644
--- a/tools/travis_setup.sh
+++ b/tools/travis_setup.sh
@@ -11,3 +11,9 @@ fi
 
 pip install  -r requirements.txt $WHEELHOUSE
 python check_bento_build.py
+
+if [[  $TRAVIS_PYTHON_VERSION == 3.3 ]]; then
+    export TEST_ARGS="--with-cov --cover-package skimage"
+else
+    export TEST_ARGS=""
+fi