From 689eaf26032434ba3eff1632c416b6c863c7e2f9 Mon Sep 17 00:00:00 2001
From: Doug Blank <dblank@cs.brynmawr.edu>
Date: Sun, 28 Feb 2016 18:20:37 -0500
Subject: [PATCH] Travis: cleanup, include pyicu

---
 .travis.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d87245c0c..ca2af1ecd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,18 +5,17 @@ language: python
 python:
     - 3.4
 
+before_install:
+    - pip install --upgrade pip
+    - pip install --upgrade setuptools wheel nose coverage codecov
+
 install:
     - time sudo apt-get update
     - travis_retry sudo apt-get install gir1.2-pango gir1.2-gtk xdg-utils librsvg2-common libglib2.0-dev intltool
     - travis_retry sudo apt-get install python3-gobject python3-gi python3-cairo python3-gi-cairo python3-bsddb3 python3-dev python3-nose 
     - travis_retry sudo apt-get install python3-mock 
-    - travis_retry sudo wget https://bootstrap.pypa.io/get-pip.py
-    - sudo python get-pip.py
-    - travis_retry sudo pip install --upgrade coverage codecov pillow
-
-    # - travis_retry sudo apt-get install python3-icu
-
-    # - travis_retry sudo pip install pyicu==1.8
+    - travis_retry sudo pip install --upgrade pillow
+    - travis_retry sudo pip install pyicu==1.8
 
     - cd $TRAVIS_BUILD_DIR
     # $TRAVIS_BUILD_DIR is set to the location of the cloned repository:
@@ -31,7 +30,7 @@ script:
     -  mkdir -p ~/.gramps/grampsdb/
     # --exclude=TestUser because of older version of mock
     #                    without configure_mock
-    -  nosetests3 --nologcapture --with-coverage --cover-package=gramps --exclude=TestcaseGenerator --exclude=vcard --exclude=merge_ref_test  --exclude=user_test gramps
+    -  nosetests -v --nologcapture --with-coverage --cover-package=gramps --exclude=TestcaseGenerator --exclude=vcard --exclude=merge_ref_test  --exclude=user_test gramps
 
 after_success:
     - codecov