[ARVADOS] updated: 1.1.0-91-g56b1135

Git user git at public.curoverse.com
Wed Oct 18 16:22:06 EDT 2017


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

       via  56b113504c7be2fb82b45233555115f4eae6f971 (commit)
      from  844c17fa54e98673d3584ffd5ff23cc7b8bb92ee (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 56b113504c7be2fb82b45233555115f4eae6f971
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Wed Oct 18 17:21:54 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/build/run-build-packages.sh b/build/run-build-packages.sh
index 9c53815..39a9963 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -262,7 +262,7 @@ handle_python_package
 (
     cd "$WORKSPACE"
     COMMIT_HASH=$(format_last_commit_here "%H")
-    arvados_src_version="$(version_from_git)"
+    arvados_src_version="$(version_from_latest_tag)"
 
     cd $WORKSPACE/packages/$TARGET
     test_package_presence arvados-src $arvados_src_version src ""
@@ -437,7 +437,7 @@ fi
 
 # The FUSE driver
 # Please see comment about --no-python-fix-name above; we stay consistent and do
-# not omit the python- prefix first.
+# not omit the python- prefix first.dokc
 cd $WORKSPACE/packages/$TARGET
 rm -rf "$WORKSPACE/services/fuse/build"
 arvados_fuse_version=$(awk '($1 == "Version:"){print $2}' $WORKSPACE/services/fuse/arvados_fuse.egg-info/PKG-INFO)
diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py
index 6d1f756..b07b227 100644
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -41,4 +41,6 @@ class EggInfoFromGit(egg_info):
         return (gitinfo)
 
     def tags(self):
+        if self.tag_build is None:
+            self.tag_build = self.git_latest_tag()
         return egg_info.tags(self)
diff --git a/sdk/python/gittaggers.py b/sdk/python/gittaggers.py
index fa8f993..4365b0b 100644
--- a/sdk/python/gittaggers.py
+++ b/sdk/python/gittaggers.py
@@ -30,4 +30,6 @@ class EggInfoFromGit(egg_info):
         return str(gitinfo)
 
     def tags(self):
+        if self.tag_build is None:
+            self.tag_build = self.git_latest_tag()
         return egg_info.tags(self)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list