Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -2,20 +2,18 @@
 #   http://lint.travis-ci.org/
 
 
-language: c
+language: python
 #python:
-#    - 3.3
 #    - 3.4
 
 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-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 apt-get install python3-icu
 
-    - travis_retry curl https://bootstrap.pypa.io/get-pip.py | sudo python3
-    - travis_retry sudo pip3 install Django==1.7
-    - travis_retry sudo pip3 install pyicu==1.8
-    - travis_retry sudo pip3 install mock
+    # - travis_retry sudo pip install pyicu==1.8
 
     - cd $TRAVIS_BUILD_DIR
     # $TRAVIS_BUILD_DIR is set to the location of the cloned repository:
@@ -28,4 +26,6 @@ install:
 
 script:
     -  mkdir -p ~/.gramps/grampsdb/
-    -  nosetests3 --exclude=TestcaseGenerator --exclude=vcard --exclude=merge_ref_test  gramps
+    # --exclude=TestUser because of older version of mock
+    #                    without configure_mock
+    -  nosetests3 --exclude=TestcaseGenerator --exclude=vcard --exclude=merge_ref_test  --exclude=user_test gramps