[ARVADOS] updated: 1.1.0-89-g18a1b5b

Git user git at public.curoverse.com
Wed Oct 18 15:32:36 EDT 2017


Summary of changes:
 sdk/cwl/gittaggers.py    | 7 ++++---
 sdk/python/gittaggers.py | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

       via  18a1b5bbc0f14389c5bbe840e20508774cde65c3 (commit)
      from  03c98e4b95b64427684c0299fc7a1168c6730a1e (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 18a1b5bbc0f14389c5bbe840e20508774cde65c3
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Wed Oct 18 16:32:27 2017 -0300

    12389: Fix for last digit in version for python iteration
    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 b07b227..008328c 100644
--- 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 4365b0b..44f46a3 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,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

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list