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 5db8fd240c1f4e95885a7a9e8c4994effd9f0cf0..9f77cb8dc5dce399212b6ae484264f331f87f51f 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -52,12 +52,6 @@ version_from_git() {
 
     ARVADOS_BUILDING_VERSION=`git describe --abbrev=0`
     local git_ts 
-    if [[ -n "$1" ]] ; then
-        prefix="$1"
-    else
-        prefix="0.1"
-    fi
-
     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"
@@ -77,7 +71,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.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).tar.gz" -print -quit)" ]; then
+  if [ -n "$(find dist -name "*-$ARVADOS_BUILDING_VERSION.tar.gz" -print -quit)" ]; then
     # This package doesn't need rebuilding.
     return
   fi

diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py
index da5ae3bb4ea447a799b2944bb76ac8526ce1db33..40f6e6ce8921ac0d92aef81be76de435aeacc69e 100644 (file)
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -41,5 +41,5 @@ class EggInfoFromGit(egg_info):
 
     def tags(self):
         if self.tag_build is None:
-            self.tag_build = self.git_timestamp_tag() + self.git_latest_tag()
+            self.tag_build = self.git_latest_tag() + self.git_timestamp_tag()
         return egg_info.tags(self)