From ba8392923a0aaf82a76727bd1964f280363f9f58 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Mon, 1 Jun 2015 13:02:55 -0400 Subject: [PATCH] Updated travis to test gramps42, and changed version to omit git number --- .travis.yml | 2 +- gramps/gen/const.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0a3307329..e3f1d3901 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ language: c # - 3.4 install: - - git clone --depth=50 --branch=master git://github.com/gramps-project/gramps.git gramps-project/gramps + - git clone --depth=50 --branch=maintenance/gramps42 git://github.com/gramps-project/gramps.git gramps-project/gramps - cd gramps-project/gramps - 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 diff --git a/gramps/gen/const.py b/gramps/gen/const.py index 3b5c39ff2..fe8b1af1e 100644 --- a/gramps/gen/const.py +++ b/gramps/gen/const.py @@ -128,8 +128,8 @@ sys.path.insert(0, ROOT_DIR) git_revision = get_git_revision(ROOT_DIR) if sys.platform == 'win32' and git_revision == "": git_revision = get_git_revision(os.path.split(ROOT_DIR)[1]) -VERSION += git_revision -#VERSION += "-1" +#VERSION += git_revision +VERSION += "-1" # # Glade files