13200:fix python gittagers version with latest git tag and timestamp

Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat@veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 9f77cb8dc5dce399212b6ae484264f331f87f51f..83d069c2605af37271838515fb79bcbbe049b6ee 100755 (executable)
--- 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 0e9ee945fbcddd304005b09e2cd5683702ba966a..d9dd970c82adaf35a4c5882cabd361756adc0bec 100644 (file)
--- 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 88bf51e8a8971181ea0f45a50e2b44ec27a9f275..5804517a6c168b0bc072bd3edcd7d92b6cd39e81 100644 (file)
--- 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 6a6a96a0455eee17d5f5bb1b725b69f767805cae..1506c20820edd0fea21f5bced2a2e6992afe2eee 100644 (file)
--- 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 454c24edbf115aa594b3e89cf810a89d2dbf7fdc..437e95e272a61d4a6a0e8d2ee4e0e977a14ae014 100644 (file)
--- 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