[ARVADOS-DEV] updated: 9fa534460eaa10ac16d1de355e45898517306ec5

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-build-packages.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

       via  9fa534460eaa10ac16d1de355e45898517306ec5 (commit)
      from  08d02e15e140740902dfab5895295c08d4ca0d16 (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 9fa534460eaa10ac16d1de355e45898517306ec5
Author: Brett Smith <brett at curoverse.com>
Date:   Thu May 21 10:03:36 2015 -0400

    Improve packaging of third-party Python 3 packages.
    
    * Fix the bug where we're passing in "python3" as the vendor argument
      to build_and_scp_deb.
    * Build more dependencies that docker-py needs.
    * Automatically add a dependency on the python3 package.
    
    Refs #3793.

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 3b9fc15..95a507a 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -156,7 +156,7 @@ build_and_scp_deb () {
       # fpm's command line later.
       PACKAGE_TYPE=python
       set -- "$@" --python-bin python3 --python-easyinstall easy_install3 \
-          --python-package-name-prefix python3
+          --python-package-name-prefix python3 --depends python3
   fi
   # Optional: the package version number.  Passed to fpm -v.
   VERSION=$1
@@ -483,7 +483,11 @@ for deppkg in python-gflags pyvcf google-api-python-client oauth2client \
       pycrypto backports.ssl_match_hostname; do
     build_and_scp_deb "$deppkg"
 done
-build_and_scp_deb docker-py python3-docker-py python3
+# Python 3 dependencies
+for deppkg in docker-py six requests; do
+    # The empty string is the vendor argument: these aren't Curoverse software.
+    build_and_scp_deb "$deppkg" "python3-$deppkg" "" python3
+done
 
 # cwltool from common-workflow-language. We use this in arv-run-pipeline-instance.
 # We use $WORKSPACE/common-workflow-language as the clean directory from which to build the cwltool package

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


hooks/post-receive
--