[ARVADOS] updated: 1.1.3-159-g5441f65

Git user git at public.curoverse.com
Wed Mar 14 15:24:21 EDT 2018


Summary of changes:
 build/run-library.sh            | 3 ++-
 sdk/cwl/setup.py                | 2 +-
 sdk/python/setup.py             | 2 +-
 services/dockercleaner/setup.py | 2 +-
 services/nodemanager/setup.py   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

       via  5441f659157f3fbe190c0bb6c3107a7b7d704345 (commit)
      from  2d10f50f273a34077a989bbee6681724528e04c6 (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 5441f659157f3fbe190c0bb6c3107a7b7d704345
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Wed Mar 14 16:24:15 2018 -0300

    13200:fix python gittagers version with latest git tag and timestamp
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 9f77cb8..83d069c 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -52,6 +52,7 @@ version_from_git() {
 
     ARVADOS_BUILDING_VERSION=`git describe --abbrev=0`
     local git_ts 
+
     declare $(format_last_commit_here "git_ts=%ct")
     ARVADOS_BUILDING_VERSION="$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
     echo "$ARVADOS_BUILDING_VERSION"
@@ -71,7 +72,7 @@ timestamp_from_git() {
 
 handle_python_package () {
   # This function assumes the current working directory is the python package directory
-  if [ -n "$(find dist -name "*-$ARVADOS_BUILDING_VERSION.tar.gz" -print -quit)" ]; then
+  if [ -n "$(find dist -name "*-$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).tar.gz" -print -quit)" ]; then
     # This package doesn't need rebuilding.
     return
   fi
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 5b1d737..353c0cf 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -16,7 +16,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
 tagger = egg_info_cmd.egg_info
 version = os.environ.get("ARVADOS_BUILDING_VERSION")
 if not version:
-    version = "1.0"
+    version = ""
     try:
         import gittaggers
         tagger = gittaggers.EggInfoFromGit
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 88bf51e..5804517 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -15,7 +15,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
 tagger = egg_info_cmd.egg_info
 version = os.environ.get("ARVADOS_BUILDING_VERSION")
 if not version:
-    version = "0.1"
+    version = ""
     try:
         import gittaggers
         tagger = gittaggers.EggInfoFromGit
diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py
index 6a6a96a..1506c20 100644
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -12,7 +12,7 @@ from setuptools import setup, find_packages
 tagger = egg_info_cmd.egg_info
 version = os.environ.get("ARVADOS_BUILDING_VERSION")
 if not version:
-    version = "0.1"
+    version = ""
     try:
         import gittaggers
         tagger = gittaggers.EggInfoFromGit
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 454c24e..437e95e 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -15,7 +15,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
 tagger = egg_info_cmd.egg_info
 version = os.environ.get("ARVADOS_BUILDING_VERSION")
 if not version:
-    version = "0.1"
+    version = ""
     try:
         import gittaggers
         tagger = gittaggers.EggInfoFromGit

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list