[ARVADOS] updated: e8e45c5267f216909382aad7fc976dca82008284

Git user git at public.curoverse.com
Tue Oct 18 16:40:02 EDT 2016


Summary of changes:
 .../test-package-python27-python-arvados-python-client.sh             | 2 +-
 build/run-build-packages.sh                                           | 4 ++--
 sdk/cwl/setup.py                                                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

       via  e8e45c5267f216909382aad7fc976dca82008284 (commit)
      from  cde03921959a7edbac9f6e969b3b8b99ee3c5b86 (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 e8e45c5267f216909382aad7fc976dca82008284
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Oct 18 16:39:55 2016 -0400

    10194: Package testing passes for debian7

diff --git a/build/package-testing/test-package-python27-python-arvados-python-client.sh b/build/package-testing/test-package-python27-python-arvados-python-client.sh
index 0772fbf..3e8c7cc 100755
--- a/build/package-testing/test-package-python27-python-arvados-python-client.sh
+++ b/build/package-testing/test-package-python27-python-arvados-python-client.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-exec python <<EOF
+exec python2.7 <<EOF
 import arvados
 print "Successfully imported arvados"
 EOF
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 65c9282..5987963 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -104,7 +104,7 @@ case "$TARGET" in
             ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
             'pycurl<7.21.5' contextlib2 pyyaml 'rdflib>=4.2.0' \
             shellescape mistune typing avro ruamel.ordereddict
-            cachecontrol)
+            cachecontrol requests)
         PYTHON3_BACKPORTS=(docker-py==1.7.2 six requests websocket-client)
         ;;
     debian8)
@@ -446,7 +446,7 @@ fpm_build $WORKSPACE/sdk/python "${PYTHON2_PKG_PREFIX}-arvados-python-client" 'C
 # cwl-runner
 cd $WORKSPACE/packages/$TARGET
 rm -rf "$WORKSPACE/sdk/cwl/build"
-fpm_build $WORKSPACE/sdk/cwl "${PYTHON2_PKG_PREFIX}-arvados-cwl-runner" 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/cwl/arvados_cwl_runner.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados CWL runner" --iteration 3
+fpm_build $WORKSPACE/sdk/cwl "${PYTHON2_PKG_PREFIX}-arvados-cwl-runner" 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/cwl/arvados_cwl_runner.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados CWL runner" --depends "${PYTHON2_PKG_PREFIX}-setuptools" --iteration 3
 
 fpm_build lockfile "" "" python 0.12.2 --epoch 1
 
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index c9875a4..5caa5c8 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -23,7 +23,7 @@ try:
     with open("arvados_cwl/_version.py", "w") as f:
         f.write("__version__ = '%s'\n" % gitinfo)
 except Exception as e:
-    print e
+    print(e)
     pass
 
 setup(name='arvados-cwl-runner',

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list