[ARVADOS] updated: 1.1.3-157-g65c5570

[Git user]

Summary of changes:
 build/run-library.sh     | 3 ++-
 sdk/cwl/gittaggers.py    | 6 +++++-
 sdk/python/gittaggers.py | 7 ++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

       via  65c557035c0b36f0b2f0d4a602ca396e566eb158 (commit)
      from  ada99960f879387bb5f3d2c20cf6a601c53b4bc4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 65c557035c0b36f0b2f0d4a602ca396e566eb158
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Wed Mar 14 14:15:45 2018 -0300

    13200:fix python gittagers version with latest git tag and timestamp
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 9081c22..5db8fd2 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -59,7 +59,8 @@ version_from_git() {
     fi
 
     declare $(format_last_commit_here "git_ts=%ct")
-    echo "$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
+    ARVADOS_BUILDING_VERSION="$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
+    echo "$ARVADOS_BUILDING_VERSION"
 }
 
 nohash_version_from_git() {
diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py
index 3fb0fde..da5ae3b 100644
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -28,6 +28,10 @@ class EggInfoFromGit(egg_info):
     If a build tag has already been set (e.g., "egg_info -b", building
     from source package), leave it alone.
     """
+    def git_latest_tag(self):
+        gitinfo = subprocess.check_output(
+            ['git', 'describe', '--abbrev=0']).strip()
+        return str(gitinfo)
 
     def git_timestamp_tag(self):
         gitinfo = subprocess.check_output(
@@ -37,5 +41,5 @@ class EggInfoFromGit(egg_info):
 
     def tags(self):
         if self.tag_build is None:
-            self.tag_build = self.git_timestamp_tag()
+            self.tag_build = self.git_timestamp_tag() + self.git_latest_tag()
         return egg_info.tags(self)
diff --git a/sdk/python/gittaggers.py b/sdk/python/gittaggers.py
index da73634..4e848ed 100644
--- a/sdk/python/gittaggers.py
+++ b/sdk/python/gittaggers.py
@@ -12,6 +12,11 @@ class EggInfoFromGit(egg_info):
     If a build tag has already been set (e.g., "egg_info -b", building
     from source package), leave it alone.
     """
+    def git_latest_tag(self):
+        gitinfo = subprocess.check_output(
+            ['git', 'describe', '--abbrev=0']).strip()
+        return str(gitinfo)
+
     def git_timestamp_tag(self):
         gitinfo = subprocess.check_output(
             ['git', 'log', '--first-parent', '--max-count=1',
@@ -20,5 +25,5 @@ class EggInfoFromGit(egg_info):
 
     def tags(self):
         if self.tag_build is None:
-            self.tag_build = self.git_timestamp_tag()
+            self.tag_build = self.git_latest_tag()+self.git_timestamp_tag()
         return egg_info.tags(self)

-----------------------------------------------------------------------


hooks/post-receive
--