From 704612e95f8fb6c12701dce74795828d27b25755 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Thu, 17 Mar 2016 15:45:54 -0400 Subject: [PATCH 1/1] Build dependencies for arvados-cwl-runner, automatically. closes #8671 --- build/run-build-packages.sh | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh index 697092966b..9b6520ee40 100755 --- a/build/run-build-packages.sh +++ b/build/run-build-packages.sh @@ -93,7 +93,8 @@ case "$TARGET" in oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \ rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \ ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \ - 'pycurl<7.21.5' contextlib2) + 'pycurl<7.21.5' contextlib2 pyyaml 'rdflib>=4.2.0' 'rdflib-jsonld>=0.3.0' \ + shellescape mistune) PYTHON3_BACKPORTS=(docker-py six requests websocket-client) ;; debian8) @@ -106,7 +107,8 @@ case "$TARGET" in oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \ rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \ ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \ - 'pycurl<7.21.5') + 'pycurl<7.21.5' pyyaml 'rdflib>=4.2.0' 'rdflib-jsonld>=0.3.0' \ + shellescape mistune) PYTHON3_BACKPORTS=(docker-py six requests websocket-client) ;; ubuntu1204) @@ -119,8 +121,8 @@ case "$TARGET" in oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \ rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \ ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \ - contextlib2 \ - 'pycurl<7.21.5') + contextlib2 'pycurl<7.21.5' pyyaml 'rdflib>=4.2.0' \ + 'rdflib-jsonld>=0.3.0' shellescape mistune) PYTHON3_BACKPORTS=(docker-py six requests websocket-client) ;; ubuntu1404) @@ -131,7 +133,8 @@ case "$TARGET" in PYTHON3_PKG_PREFIX=python3 PYTHON_BACKPORTS=(pyasn1==0.1.7 pyvcf pyasn1-modules==0.0.5 llfuse==0.41.1 ciso8601 \ google-api-python-client==1.4.2 six uritemplate oauth2client==1.5.2 httplib2 \ - rsa 'pycurl<7.21.5' backports.ssl_match_hostname) + rsa 'pycurl<7.21.5' backports.ssl_match_hostname pyyaml 'rdflib>=4.2.0' \ + 'rdflib-jsonld>=0.3.0' shellescape mistune) PYTHON3_BACKPORTS=(docker-py requests websocket-client) ;; centos6) @@ -144,7 +147,8 @@ case "$TARGET" in oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \ rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \ ciso8601 pycrypto backports.ssl_match_hostname 'pycurl<7.21.5' \ - python-daemon lockfile llfuse==0.41.1 'pbr<1.0') + python-daemon lockfile llfuse==0.41.1 'pbr<1.0' pyyaml \ + 'rdflib>=4.2.0' 'rdflib-jsonld>=0.3.0' shellescape mistune) PYTHON3_BACKPORTS=(docker-py six requests websocket-client) export PYCURL_SSL_LIBRARY=nss ;; @@ -403,6 +407,26 @@ 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" +# schema_salad. This is a python dependency of arvados-cwl-runner, +# but we can't use the usual PYTHONPACKAGES way to build this package due to the +# intricacies of how version numbers get generated in setup.py: we need version +# 1.7.20160316203940. If we don't explicitly list that version with the -v +# argument to fpm, and instead specify it as schema_salad==1.7.20160316203940, we get +# a package with version 1.7. That's because our gittagger hack is not being +# picked up by self.distribution.get_version(), which is called from +# https://github.com/jordansissel/fpm/blob/master/lib/fpm/package/pyfpm/get_metadata.py +# by means of this command: +# +# python2.7 setup.py --command-packages=pyfpm get_metadata --output=metadata.json +# +# So we build this thing separately. +# +# Ward, 2016-03-17 +fpm --maintainer='Ward Vandewege ' -s python -t deb --exclude=*/dist-packages/tests/* --exclude=*/site-packages/tests/* --deb-ignore-iteration-in-dependencies --log info -n python-schema-salad --iteration 1 --python-bin python2.7 --python-easyinstall easy_install-2.7 --python-package-name-prefix python --depends python2.7 -v 1.7.20160316203940 schema_salad + +# And for cwltool we have the same problem as for schema_salad. Ward, 2016-03-17 +fpm --maintainer='Ward Vandewege ' -s python -t deb --exclude=*/dist-packages/tests/* --exclude=*/site-packages/tests/* --deb-ignore-iteration-in-dependencies -n python-cwltool --iteration 1 --python-bin python2.7 --python-easyinstall easy_install-2.7 --python-package-name-prefix python --depends python2.7 -v 1.0.20160316204054 cwltool + # The PAM module if [[ $TARGET =~ debian|ubuntu ]]; then cd $WORKSPACE/packages/$TARGET -- 2.30.2