[ARVADOS] updated: 1.1.3-259-g7db10f4
Git user
git at public.curoverse.com
Fri Mar 23 14:41:11 EDT 2018
Summary of changes:
build/go-python-package-scripts/postinst | 1 +
build/go-python-package-scripts/prerm | 1 +
sdk/python/setup.py | 6 +++---
3 files changed, 5 insertions(+), 3 deletions(-)
via 7db10f470ee4148d1b4214882ac8db745072539c (commit)
from e6f36206268c5ea4748f9ef1357bb936b2a2b1a3 (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 7db10f470ee4148d1b4214882ac8db745072539c
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Fri Mar 23 15:41:02 2018 -0300
13200:test update on version in gittaggers on sdk python
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>
diff --git a/build/go-python-package-scripts/postinst b/build/go-python-package-scripts/postinst
index cc63f35..6d303f2 100755
--- a/build/go-python-package-scripts/postinst
+++ b/build/go-python-package-scripts/postinst
@@ -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}")"
diff --git a/build/go-python-package-scripts/prerm b/build/go-python-package-scripts/prerm
index 49bd7fc..d840ee1 100755
--- a/build/go-python-package-scripts/prerm
+++ b/build/go-python-package-scripts/prerm
@@ -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}")"
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 88bf51e..0c143a1 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -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
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list