[ARVADOS] updated: 1.1.0-67-g1094610

[Git user]

Summary of changes:
 sdk/cwl/gittaggers.py    | 9 ++-------
 sdk/cwl/setup.py         | 3 ++-
 sdk/python/gittaggers.py | 4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

       via  10946106c5c2a838a60c2c46229c645b27a3abeb (commit)
      from  9a61dcd235812b627c93e92ff1279ac6d4a5bc27 (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 10946106c5c2a838a60c2c46229c645b27a3abeb
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Mon Oct 16 14:30:27 2017 -0300

    12389: try --exclude opt/rh/python33
    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 764d0f1..6a177b3 100644
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -29,17 +29,12 @@ 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 str(gitinfo)
-
+ 
     def tags(self):
         if self.tag_build is None:
             self.tag_build = self.git_latest_tag()
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index ab3442b..762c6fd 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -22,7 +22,8 @@ except ImportError:
 versionfile = os.path.join(SETUP_DIR, "arvados_cwl/_version.py")
 try:
     gitinfo = subprocess.check_output(
-            ['git', 'describe', '--abbrev=0'])
+        ['git', 'log', '--first-parent', '--max-count=1',
+         '--format=format:%H', gittaggers.choose_version_from()]).strip()
     with open(versionfile, "w") as f:
         f.write("__version__ = '%s'\n" % gitinfo)
 except Exception as e:
diff --git a/sdk/python/gittaggers.py b/sdk/python/gittaggers.py
index 8acbe27..3065cf9 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,7 +22,7 @@ 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(

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


hooks/post-receive
--