13200:test update on version in gittaggers on sdk python
authorFernando Monserrat <fernando.monserrat@gmail.com>
Fri, 23 Mar 2018 18:41:02 +0000 (15:41 -0300)
committerFernando Monserrat <fernando.monserrat@gmail.com>
Mon, 2 Apr 2018 13:56:54 +0000 (10:56 -0300)
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat@veritasgenetics.com>

build/go-python-package-scripts/postinst
build/go-python-package-scripts/prerm
sdk/python/setup.py

index cc63f351f61b8b6cce3da4016015fc4a5ef97bf2..6d303f2e3e8cdd00b0d22cd8290d1655643472f2 100755 (executable)
@@ -9,6 +9,7 @@ if [ "%{name}" != "%\{name\}" ]; then
     # Red Hat ("%{...}" is interpolated at package build time)
     pkg="%{name}"
     pkgtype=rpm
+    prefix="${RPM_INSTALL_PREFIX}"
 else
     # Debian
     script="$(basename "${0}")"
index 49bd7fc881c0832d64a65c6c39fe57174495c284..d840ee1bd16cbf272a7807a2b0b36310cbb466ba 100755 (executable)
@@ -9,6 +9,7 @@ if [ "%{name}" != "%\{name\}" ]; then
     # Red Hat ("%{...}" is interpolated at package build time)
     pkg="%{name}"
     pkgtype=rpm
+    prefix="${RPM_INSTALL_PREFIX}"
 else
     # Debian
     script="$(basename "${0}")"
index 88bf51e8a8971181ea0f45a50e2b44ec27a9f275..0c143a11afc3b0f938d432eca3ebaea176d6d28b 100644 (file)
@@ -13,12 +13,12 @@ SETUP_DIR = os.path.dirname(__file__) or '.'
 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"
     try:
         import gittaggers
-        tagger = gittaggers.EggInfoFromGit
+        vtag = gittaggers.EggInfoFromGit
+        version = vtag.git_latest_tag()+vtag.git_timestamp_tag()
     except ImportError:
         pass