[ARVADOS] updated: 1.1.0-40-g2c174f2

[Git user]

Summary of changes:
 sdk/cwl/gittaggers.py    |  9 +++++++--
 sdk/python/gittaggers.py | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

       via  2c174f28c51afbc31fd0260fa0e2e6b414de8e40 (commit)
      from  fda2e317aecabc5a2019ba91edccd7b770a8753e (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 2c174f28c51afbc31fd0260fa0e2e6b414de8e40
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Tue Oct 10 18:21:19 2017 -0300

    12389: update gittaggers for latest tag
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py
index 3fb0fde..9842343 100644
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -29,13 +29,18 @@ class EggInfoFromGit(egg_info):
     from source package), leave it alone.
     """
 
-    def git_timestamp_tag(self):
+    """def git_timestamp_tag(self):
         gitinfo = subprocess.check_output(
             ['git', 'log', '--first-parent', '--max-count=1',
              '--format=format:%ct', choose_version_from()]).strip()
         return time.strftime('.%Y%m%d%H%M%S', time.gmtime(int(gitinfo)))
+    """
+    def git_latest_tag(self):
+        gitinfo = subprocess.check_output(
+            ['git', 'describe --abbrev=0'])
+        return gitinfo
 
     def tags(self):
         if self.tag_build is None:
-            self.tag_build = self.git_timestamp_tag()
+            self.tag_build = self.git_latest_tag()
         return egg_info.tags(self)
diff --git a/sdk/python/gittaggers.py b/sdk/python/gittaggers.py
index da73634..06ff4b2 100644
--- a/sdk/python/gittaggers.py
+++ b/sdk/python/gittaggers.py
@@ -12,7 +12,7 @@ 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_timestamp_tag(self):
+    """def git_timestamp_tag(self):
         gitinfo = subprocess.check_output(
             ['git', 'log', '--first-parent', '--max-count=1',
              '--format=format:%ct', '.']).strip()
@@ -22,3 +22,14 @@ class EggInfoFromGit(egg_info):
         if self.tag_build is None:
             self.tag_build = self.git_timestamp_tag()
         return egg_info.tags(self)
+    """
+    
+    def git_latest_tag(self):
+        gitinfo = subprocess.check_output(
+            ['git', 'describe --abbrev=0'])
+        return gitinfo
+
+    def tags(self):
+        if self.tag_build is None:
+            self.tag_build = self.git_latest_tag()
+        return egg_info.tags(self)

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


hooks/post-receive
--