12389: Fix for last digit in version for python iteration

Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat@veritasgenetics.com>

diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py
index b07b22765f150697ba3e26288477981c325586d5..008328c2da374cc3eaaf6cda8399fd9ed742b124 100644 (file)
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -29,13 +29,13 @@ 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):
+    
+    """def git_latest_tag(self):
         gitinfo = subprocess.check_output(
             ['git', 'describe', '--abbrev=0']).strip()
         return (gitinfo)
@@ -44,3 +44,4 @@ class EggInfoFromGit(egg_info):
         if self.tag_build is None:
             self.tag_build = self.git_latest_tag()
         return egg_info.tags(self)
+    """
\ No newline at end of file

diff --git a/sdk/python/gittaggers.py b/sdk/python/gittaggers.py
index 4365b0b7a550be781088e6a9fde029448491742a..44f46a3dc453306c29c58f9c7f2f2206224661a9 100644 (file)
--- 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,9 +22,9 @@ 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):
+     """def git_latest_tag(self):
         gitinfo = subprocess.check_output(
             ['git', 'describe', '--abbrev=0']).strip()
         return str(gitinfo)
@@ -33,3 +33,4 @@ class EggInfoFromGit(egg_info):
         if self.tag_build is None:
             self.tag_build = self.git_latest_tag()
         return egg_info.tags(self)
+     """
\ No newline at end of file