[ARVADOS] updated: 1.1.0-47-g8a1eadd

Git user git at public.curoverse.com
Wed Oct 11 16:17:51 EDT 2017


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

       via  8a1eaddcafffa712b32f6341dd6bdc94fa1137ab (commit)
      from  5cc58e199cb18e6ad3c3fc36b5507d34a277dc16 (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 8a1eaddcafffa712b32f6341dd6bdc94fa1137ab
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Wed Oct 11 17:15:54 2017 -0300

    12389: change in docker tagging for python pckgs
    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 089732e..764d0f1 100644
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -37,7 +37,7 @@ class EggInfoFromGit(egg_info):
     """
     def git_latest_tag(self):
         gitinfo = subprocess.check_output(
-            ['git', 'describe', '--abbrev=0'], 'curl --silent https://ci.curoverse.com/job/new-versioning-build-packages-centos7/lastBuild/buildNumber')
+            ['git', 'describe', '--abbrev=0'])
         return str(gitinfo)
 
     def tags(self):
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 762c6fd..ada7a68 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -22,8 +22,8 @@ except ImportError:
 versionfile = os.path.join(SETUP_DIR, "arvados_cwl/_version.py")
 try:
     gitinfo = subprocess.check_output(
-        ['git', 'log', '--first-parent', '--max-count=1',
-         '--format=format:%H', gittaggers.choose_version_from()]).strip()
+            ['git', 'describe', '--abbrev=0'])
+        return str(gitinfo)
     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 da45bba..8acbe27 100644
--- a/sdk/python/gittaggers.py
+++ b/sdk/python/gittaggers.py
@@ -26,7 +26,7 @@ class EggInfoFromGit(egg_info):
 
     def git_latest_tag(self):
         gitinfo = subprocess.check_output(
-            ['git', 'describe', '--abbrev=0'], 'curl --silent https://ci.curoverse.com/job/new-versioning-build-packages-centos7/lastBuild/buildNumber')
+            ['git', 'describe', '--abbrev=0'])
         return str(gitinfo)
 
     def tags(self):

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list