[ARVADOS] updated: 1.1.1-117-gecb85dd

[Git user]

Summary of changes:
 build/run-build-test-packages-one-target.sh | 4 +++-
 sdk/python/setup.py                         | 6 ++++--
 services/dockercleaner/setup.py             | 5 ++++-
 services/fuse/setup.py                      | 5 ++++-
 services/nodemanager/setup.py               | 7 +++++--
 5 files changed, 20 insertions(+), 7 deletions(-)

       via  ecb85dd771a699f0e10a48e6e36abf90adfa0721 (commit)
      from  f581fbe79e3b9bad147bafd91679ee7d0ebd2ca8 (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 ecb85dd771a699f0e10a48e6e36abf90adfa0721
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Mon Dec 4 16:07:55 2017 -0300

    12771: pass newversion for packages or take the usual hash
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/run-build-test-packages-one-target.sh b/build/run-build-test-packages-one-target.sh
index 9706184..426fb0f 100755
--- a/build/run-build-test-packages-one-target.sh
+++ b/build/run-build-test-packages-one-target.sh
@@ -59,7 +59,9 @@ while [ $# -gt 0 ]; do
             ;;
         --verno)
             VERNO="$2"; shift
-            printf $VERNO > $WORKSPACE/version
+            if [ -n $VERNO ]; then
+                printf $VERNO > $WORKSPACE/version
+            fi    
             ;;              
         --upload)
             UPLOAD=1
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index fdc1502..e937c21 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -11,20 +11,22 @@ from setuptools import setup, find_packages
 
 SETUP_DIR = os.path.dirname(__file__) or '.'
 README = os.path.join(SETUP_DIR, 'README.rst')
+package_version = os.path.join(SETUP_DIR, "version")
 
 try:
     import gittaggers
     tagger = gittaggers.EggInfoFromGit
 except ImportError:
     tagger = egg_info_cmd.egg_info
-
+try:
+    gitinfo = package_version.read()
 short_tests_only = False
 if '--short-tests-only' in sys.argv:
     short_tests_only = True
     sys.argv.remove('--short-tests-only')
 
 setup(name='arvados-python-client',
-      version='0.1',
+      version=gitinfo,
       description='Arvados client library',
       long_description=open(README).read(),
       author='Arvados',
diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py
index b904b0f..377832a 100644
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -8,15 +8,18 @@ import sys
 import setuptools.command.egg_info as egg_info_cmd
 
 from setuptools import setup, find_packages
+package_version = os.path.join(SETUP_DIR, "version")
 
 try:
     import gittaggers
     tagger = gittaggers.EggInfoFromGit
 except ImportError:
     tagger = egg_info_cmd.egg_info
+try:
+    gitinfo = package_version.read()
 
 setup(name="arvados-docker-cleaner",
-      version="0.1",
+      version=gitinfo,
       description="Arvados Docker cleaner",
       author="Arvados",
       author_email="info at arvados.org",
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index d46a312..5e5f5d1 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -11,12 +11,15 @@ from setuptools import setup, find_packages
 
 SETUP_DIR = os.path.dirname(__file__) or '.'
 README = os.path.join(SETUP_DIR, 'README.rst')
+package_version = os.path.join(SETUP_DIR, "version")
 
 try:
     import gittaggers
     tagger = gittaggers.EggInfoFromGit
 except ImportError:
     tagger = egg_info_cmd.egg_info
+try:
+    gitinfo = package_version.read()
 
 short_tests_only = False
 if '--short-tests-only' in sys.argv:
@@ -24,7 +27,7 @@ if '--short-tests-only' in sys.argv:
     sys.argv.remove('--short-tests-only')
 
 setup(name='arvados_fuse',
-      version='0.1',
+      version=gitinfo,
       description='Arvados FUSE driver',
       long_description=open(README).read(),
       author='Arvados',
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 6382dcb..fb5d748 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -11,15 +11,18 @@ from setuptools import setup, find_packages
 
 SETUP_DIR = os.path.dirname(__file__) or "."
 README = os.path.join(SETUP_DIR, 'README.rst')
+package_version = os.path.join(SETUP_DIR, "version")
 
 try:
     import gittaggers
     tagger = gittaggers.EggInfoFromGit
 except ImportError:
     tagger = egg_info_cmd.egg_info
-
+try:
+    gitinfo = package_version.read()
+    
 setup(name='arvados-node-manager',
-      version='0.1',
+      version=gitinfo,
       description='Arvados compute node manager',
       long_description=open(README).read(),
       author='Arvados',

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


hooks/post-receive
--