From 7a77c12393af75320d879b3dd0000e52432ab32b Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Sun, 8 Dec 2013 05:15:47 +0200
Subject: [PATCH 1/3] Only run coverage for Python 3.

---
 .travis.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2972fd9d..be76c078 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,8 +63,11 @@ script:
     - "echo 'backend.qt4 : PyQt4' >> $HOME/.matplotlib/matplotlibrc"
 
     # Run all tests
-    - nosetests --exe -v --with-doctest --with-cov --cov skimage --cov-config .coveragerc skimage
-
+    - if [[ $PYVER == '3.x' ]]; then
+    -   nosetests --exe -v --with-doctest --with-cov --cov skimage --cov-config .coveragerc skimage
+    - else
+    -   nosetests --exe -v --with-doctest skimage
+    - fi
     # 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
@@ -74,4 +77,6 @@ script:
     - flake8 --exit-zero --exclude=test_*,six.py skimage doc/examples viewer_examples
 
 after_success:
-    - coveralls
+     - if [[ $PYVER == '3.x' ]]; then
+     -   coveralls
+     - fi

From 4c80d31e1d155d6bce69380aa021724457ef58d5 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Mon, 9 Dec 2013 10:38:20 +0200
Subject: [PATCH 2/3] Exit with status zero under Python 2

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

diff --git a/.travis.yml b/.travis.yml
index be76c078..a860d48b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,4 +79,6 @@ script:
 after_success:
      - if [[ $PYVER == '3.x' ]]; then
      -   coveralls
+     - else
+     -   exit 0
      - fi

From ddf06f1fcb47f7c7d9ba3b9a6ffd39cfd7758b52 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Wed, 12 Feb 2014 14:25:46 +0200
Subject: [PATCH 3/3] Travis-ci doesn't like 'if-else'?

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a860d48b..0e038f4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,7 +65,8 @@ script:
     # Run all tests
     - if [[ $PYVER == '3.x' ]]; then
     -   nosetests --exe -v --with-doctest --with-cov --cov skimage --cov-config .coveragerc skimage
-    - else
+    - fi
+    - if [[ $PYVER == '2.x' ]]; then
     -   nosetests --exe -v --with-doctest skimage
     - fi
     # Run all doc examples
@@ -79,6 +80,5 @@ script:
 after_success:
      - if [[ $PYVER == '3.x' ]]; then
      -   coveralls
-     - else
-     -   exit 0
      - fi
+