[ARVADOS] updated: 1.1.0-90-g844c17f

Git user git at public.curoverse.com
Wed Oct 18 15:46:57 EDT 2017


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

       via  844c17fa54e98673d3584ffd5ff23cc7b8bb92ee (commit)
      from  18a1b5bbc0f14389c5bbe840e20508774cde65c3 (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 844c17fa54e98673d3584ffd5ff23cc7b8bb92ee
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Wed Oct 18 16:46:47 2017 -0300

    12389: Fix for first digit in oython versions
    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 008328c..6d1f756 100644
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -29,19 +29,16 @@ 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)
 
     def tags(self):
-        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 44f46a3..fa8f993 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,15 +22,12 @@ 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)
 
     def tags(self):
-        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