[ARVADOS] updated: 1.1.0-82-g6c32a1f

Git user git at public.curoverse.com
Tue Oct 17 16:09:45 EDT 2017


Summary of changes:
 build/run-library.sh | 8 ++++----
 sdk/cwl/setup.py     | 1 -
 sdk/python/setup.py  | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

       via  6c32a1fcc8527f4b8c46baea3929fe5fd9179420 (commit)
      from  910f08182bfb794657ab70cac9008288705a4d5f (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 6c32a1fcc8527f4b8c46baea3929fe5fd9179420
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Tue Oct 17 17:09:27 2017 -0300

    12389: Fix for last digit in version plus one in python files
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 8a65f82..e1234ef 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -351,8 +351,8 @@ fpm_build () {
           # Make sure we build with that for consistency.
           set -- "$@" --python-bin python2.7 \
               --python-easyinstall "$EASY_INSTALL2" \
-             # --python-package-name-prefix "$PYTHON2_PKG_PREFIX" \
-             #--prefix "$PYTHON2_PREFIX" \
+              --python-package-name-prefix "$PYTHON2_PKG_PREFIX" \
+              --prefix "$PYTHON2_PREFIX" \
               --python-install-lib "$PYTHON2_INSTALL_LIB" \
               --python-install-data . \
               --exclude "${PYTHON2_INSTALL_LIB#/}/tests" \
@@ -366,8 +366,8 @@ fpm_build () {
           PACKAGE_TYPE=python
           set -- "$@" --python-bin python3 \
               --python-easyinstall "$EASY_INSTALL3" \
-            #  --python-package-name-prefix "$PYTHON3_PKG_PREFIX" \
-            #  --prefix "$PYTHON3_PREFIX" \
+              --python-package-name-prefix "$PYTHON3_PKG_PREFIX" \
+              --prefix "$PYTHON3_PREFIX" \
               --python-install-lib "$PYTHON3_INSTALL_LIB" \
               --python-install-data . \
               --exclude "${PYTHON3_INSTALL_LIB#/}/tests" \
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 0e52e92..2895589 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -33,7 +33,6 @@ except Exception as e:
         raise
 
 setup(name='arvados-cwl-runner',
-      version='1.0',
       description='Arvados Common Workflow Language runner',
       long_description=open(README).read(),
       author='Arvados',
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index c2ac6a9..d017bb8 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -24,7 +24,6 @@ if '--short-tests-only' in sys.argv:
     sys.argv.remove('--short-tests-only')
 
 setup(name='arvados-python-client',
-      version='0.1',
       description='Arvados client library',
       long_description=open(README).read(),
       author='Arvados',

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list