From cb74c40afa8f57c871ad9a2edfa8d0fe87dc0be4 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 15:37:29 -0500 Subject: [PATCH 01/17] Try using Python 3.4 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10c0863a4..e61b65f4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ language: c -#python: +python: # - 3.3 -# - 3.4 + - 3.4 install: - time sudo apt-get update From ec5c8cccefd9e2132609dbab36fee172b9dd1310 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 15:44:25 -0500 Subject: [PATCH 02/17] Try using built in pip3 --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e61b65f4f..ac87f99d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ language: c python: -# - 3.3 - 3.4 install: @@ -12,8 +11,8 @@ install: - 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 curl https://bootstrap.pypa.io/get-pip.py | sudo python3 - - travis_retry sudo pip3 install Django==1.7 +# - 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 From bc0562d9b311125c5f67a77c533be810173c3418 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 15:50:14 -0500 Subject: [PATCH 03/17] Try using built in pip --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac87f99d3..fd7241caf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,9 @@ install: - travis_retry sudo apt-get install python3-gobject python3-gi python3-cairo python3-gi-cairo python3-bsddb3 python3-dev python3-nose # - 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 Django==1.7 + - travis_retry sudo pip install pyicu==1.8 + - travis_retry sudo pip install mock - cd $TRAVIS_BUILD_DIR # $TRAVIS_BUILD_DIR is set to the location of the cloned repository: From 4394535139d0cc2346b0614c34768c740aaf493a Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 15:56:08 -0500 Subject: [PATCH 04/17] Try using built in pip3.4 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd7241caf..2707e24f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,8 @@ install: # - travis_retry curl https://bootstrap.pypa.io/get-pip.py | sudo python3 # - travis_retry sudo pip install Django==1.7 - - travis_retry sudo pip install pyicu==1.8 - - travis_retry sudo pip install mock + - travis_retry sudo pip3.4 install pyicu==1.8 + - travis_retry sudo pip3.4 install mock - cd $TRAVIS_BUILD_DIR # $TRAVIS_BUILD_DIR is set to the location of the cloned repository: From b9e5db35635589afff690cda69412f13bbd5a11a Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 16:02:40 -0500 Subject: [PATCH 05/17] Try using downloaded pip3.4 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2707e24f2..4157ac917 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ install: - 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 curl https://bootstrap.pypa.io/get-pip.py | sudo python3 + - travis_retry curl https://bootstrap.pypa.io/get-pip.py | sudo python3 # - travis_retry sudo pip install Django==1.7 - travis_retry sudo pip3.4 install pyicu==1.8 - travis_retry sudo pip3.4 install mock From 05eef13110f58e0db6097c37fee1a84ebd1387d2 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 16:06:42 -0500 Subject: [PATCH 06/17] Try using python3-pip package --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4157ac917..0a2c8145f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,9 @@ python: 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 python3-pip - - travis_retry curl https://bootstrap.pypa.io/get-pip.py | sudo python3 +# - travis_retry curl https://bootstrap.pypa.io/get-pip.py | sudo python3 # - travis_retry sudo pip install Django==1.7 - travis_retry sudo pip3.4 install pyicu==1.8 - travis_retry sudo pip3.4 install mock From adecfe26cff858ad5352a9c57cf6245c2f3ed50c Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 16:16:37 -0500 Subject: [PATCH 07/17] Try using python3.4 specifically --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0a2c8145f..ff3c9dbb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,9 @@ python: 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 python3-pip + - travis_retry sudo apt-get install python3-gobject python3-gi python3-cairo python3-gi-cairo python3-bsddb3 python3-dev python3-nose -# - travis_retry curl https://bootstrap.pypa.io/get-pip.py | sudo python3 -# - travis_retry sudo pip install Django==1.7 + - travis_retry curl https://bootstrap.pypa.io/get-pip.py | sudo python3.4 - travis_retry sudo pip3.4 install pyicu==1.8 - travis_retry sudo pip3.4 install mock From 106cff20aa66ec7ee7deeec6a21055c33a885005 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 16:24:09 -0500 Subject: [PATCH 08/17] Get pip a different way --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff3c9dbb4..4e99a08da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,11 @@ install: - 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 curl https://bootstrap.pypa.io/get-pip.py | sudo python3.4 - - travis_retry sudo pip3.4 install pyicu==1.8 - - travis_retry sudo pip3.4 install mock + + - travis_retry curl https://bootstrap.pypa.io/get-pip.py > get-pip.py + - sudo python3 get-pip.py + - travis_retry sudo pip3 install pyicu==1.8 + - travis_retry sudo pip3 install mock - cd $TRAVIS_BUILD_DIR # $TRAVIS_BUILD_DIR is set to the location of the cloned repository: From 885af4271c39c06ebf36e767c4c19e08fd55b596 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 16:28:29 -0500 Subject: [PATCH 09/17] Use python3.4 directly --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4e99a08da..dad648566 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ install: - travis_retry curl https://bootstrap.pypa.io/get-pip.py > get-pip.py - - sudo python3 get-pip.py + - sudo python3.4 get-pip.py - travis_retry sudo pip3 install pyicu==1.8 - travis_retry sudo pip3 install mock From 02818ac86715a5ee6ccd108be9a9992b78a183c5 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 16:32:30 -0500 Subject: [PATCH 10/17] Use python3 and forget pip --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index dad648566..83ab03eb9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,15 +7,17 @@ python: - 3.4 install: + - python3 --version - 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 curl https://bootstrap.pypa.io/get-pip.py > get-pip.py - - sudo python3.4 get-pip.py - - travis_retry sudo pip3 install pyicu==1.8 - - travis_retry sudo pip3 install mock + #- travis_retry curl https://bootstrap.pypa.io/get-pip.py > get-pip.py + #- sudo python3.4 get-pip.py + #- travis_retry sudo pip3 install pyicu==1.8 + #- travis_retry sudo pip3 install mock + - travis_retry sudo apt-get install python3-mock - cd $TRAVIS_BUILD_DIR # $TRAVIS_BUILD_DIR is set to the location of the cloned repository: From e3e32bcddfb34c86b6a3d1defe207ce3dc3caa38 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 17:05:01 -0500 Subject: [PATCH 11/17] Use python rather than python3 --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 83ab03eb9..2885c16de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,27 +2,27 @@ # http://lint.travis-ci.org/ -language: c +language: python python: - 3.4 install: - python3 --version + - python --version - 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 curl https://bootstrap.pypa.io/get-pip.py > get-pip.py - #- sudo python3.4 get-pip.py - #- travis_retry sudo pip3 install pyicu==1.8 - #- travis_retry sudo pip3 install mock - - travis_retry sudo apt-get install python3-mock + - travis_retry curl https://bootstrap.pypa.io/get-pip.py > get-pip.py + - sudo python get-pip.py + - travis_retry sudo pip install pyicu==1.8 + - travis_retry sudo pip install mock - cd $TRAVIS_BUILD_DIR # $TRAVIS_BUILD_DIR is set to the location of the cloned repository: # for example: /home/travis/build/gramps-project/gramps - - python3 setup.py build + - python setup.py build #before_script: # - sudo Xvfb :99 -ac & From db6e70d24b5588a68c73f639cd7ff37cc1aded86 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 17:20:23 -0500 Subject: [PATCH 12/17] Use built in python3 only, old version of mock --- .travis.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2885c16de..cd9f06c50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,26 +3,25 @@ language: python -python: - - 3.4 +#python: +# - 3.4 install: - - python3 --version - - python --version - 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 curl https://bootstrap.pypa.io/get-pip.py > get-pip.py + # - sudo python3 get-pip.py + # - travis_retry sudo pip install pyicu==1.8 + # - travis_retry sudo pip install mock - - travis_retry curl https://bootstrap.pypa.io/get-pip.py > get-pip.py - - sudo python get-pip.py - - travis_retry sudo pip install pyicu==1.8 - - travis_retry sudo pip install mock + - travis_retry sudo apt-get install python3-mock - cd $TRAVIS_BUILD_DIR # $TRAVIS_BUILD_DIR is set to the location of the cloned repository: # for example: /home/travis/build/gramps-project/gramps - - python setup.py build + - python3 setup.py build #before_script: # - sudo Xvfb :99 -ac & From 5efb31317713ccb76fbc40e71bf87bec29ac9e8f Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 17:33:46 -0500 Subject: [PATCH 13/17] Get pip3 from python3-setuptools --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd9f06c50..7b5ea17f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,14 @@ install: - 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 + - sudo apt-get install python3-setuptools + - sudo easy_install3 pip + # - travis_retry curl https://bootstrap.pypa.io/get-pip.py > get-pip.py # - sudo python3 get-pip.py - # - travis_retry sudo pip install pyicu==1.8 - # - travis_retry sudo pip install mock - - travis_retry sudo apt-get install python3-mock + - travis_retry sudo pip install pyicu==1.8 + - travis_retry sudo pip install mock - cd $TRAVIS_BUILD_DIR # $TRAVIS_BUILD_DIR is set to the location of the cloned repository: From 44866a90f71c8c3ef195c2f3f2da2b8a0c26e4c9 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 17:39:41 -0500 Subject: [PATCH 14/17] Use easy_install3 to install mock --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b5ea17f1..5badde05c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,13 +12,15 @@ install: - travis_retry sudo apt-get install python3-gobject python3-gi python3-cairo python3-gi-cairo python3-bsddb3 python3-dev python3-nose - sudo apt-get install python3-setuptools - - sudo easy_install3 pip + # - sudo easy_install3 pip # - travis_retry curl https://bootstrap.pypa.io/get-pip.py > get-pip.py # - sudo python3 get-pip.py - travis_retry sudo pip install pyicu==1.8 - - travis_retry sudo pip install mock + + # - travis_retry sudo pip install mock + - sudo easy_install3 mock - cd $TRAVIS_BUILD_DIR # $TRAVIS_BUILD_DIR is set to the location of the cloned repository: From 78f3b29b4c499b568f610d31f51de1349490a816 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 17:50:27 -0500 Subject: [PATCH 15/17] Exclude TestUser tests because of older version of mock --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5badde05c..3ee7a7887 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ install: - travis_retry sudo pip install pyicu==1.8 - # - travis_retry sudo pip install mock - - sudo easy_install3 mock + - travis_retry sudo apt-get install python3-mock + # - sudo easy_install3 mock - cd $TRAVIS_BUILD_DIR # $TRAVIS_BUILD_DIR is set to the location of the cloned repository: @@ -33,4 +33,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=TestUser gramps From feebedad65059e1c7cad1cb6e9403aaacffae32a Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 17:57:23 -0500 Subject: [PATCH 16/17] Exclude user_test because of older version of mock; use python3-icu --- .travis.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ee7a7887..9d2143ac2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,17 +10,10 @@ 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 - - - sudo apt-get install python3-setuptools - # - sudo easy_install3 pip - - # - travis_retry curl https://bootstrap.pypa.io/get-pip.py > get-pip.py - # - sudo python3 get-pip.py - - - travis_retry sudo pip install pyicu==1.8 - - travis_retry sudo apt-get install python3-mock - # - sudo easy_install3 mock + - travis_retry sudo apt-get install python3-icu + + # - travis_retry sudo pip install pyicu==1.8 - cd $TRAVIS_BUILD_DIR # $TRAVIS_BUILD_DIR is set to the location of the cloned repository: @@ -35,4 +28,4 @@ script: - mkdir -p ~/.gramps/grampsdb/ # --exclude=TestUser because of older version of mock # without configure_mock - - nosetests3 --exclude=TestcaseGenerator --exclude=vcard --exclude=merge_ref_test --exclude=TestUser gramps + - nosetests3 --exclude=TestcaseGenerator --exclude=vcard --exclude=merge_ref_test --exclude=user_test gramps From b13112107200240bc6d2787e95074d6115fc9bd5 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 23 Jan 2016 18:00:58 -0500 Subject: [PATCH 17/17] Remove python3-icu in testing --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9d2143ac2..4304fd1c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ install: - 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 apt-get install python3-icu + # - travis_retry sudo apt-get install python3-icu # - travis_retry sudo pip install pyicu==1.8