[ARVADOS] updated: 087ad4d01176703f22fde4cf053427e562890c16
Git user
git at public.curoverse.com
Sat Mar 26 22:19:38 EDT 2016
Summary of changes:
build/run-build-packages-one-target.sh | 7 +++----
build/run-build-packages.sh | 11 ++++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
via 087ad4d01176703f22fde4cf053427e562890c16 (commit)
from a810fa495eab5bc3356ac53a9a3aa40d69b1c77e (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 087ad4d01176703f22fde4cf053427e562890c16
Author: Ward Vandewege <ward at curoverse.com>
Date: Sat Mar 26 22:19:09 2016 -0400
Fix package build and test of the arvados-cwl-runner package for
ubuntu1204 and centos6.
refs #8671
diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index cce4bf3..e5e7f0b 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -132,17 +132,16 @@ if test -z "$packages" ; then
keep-rsync
keepstore
keep-web
- libarvados-perl
- python-arvados-cwl-runner"
+ libarvados-perl"
case "$TARGET" in
centos6)
packages="$packages python27-python-arvados-fuse
- python27-python-arvados-python-client"
+ python27-python-arvados-python-client python27-python-arvados-cwl-runner"
;;
*)
packages="$packages python-arvados-fuse
- python-arvados-python-client"
+ python-arvados-python-client python-arvados-cwl-runner"
;;
esac
fi
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 313b92f..6e086b9 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -122,7 +122,7 @@ case "$TARGET" in
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
contextlib2 'pycurl<7.21.5' pyyaml 'rdflib>=4.2.0' \
- shellescape mistune typing avro)
+ shellescape mistune typing avro isodate)
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
ubuntu1404)
@@ -148,7 +148,8 @@ case "$TARGET" in
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' pyyaml \
- 'rdflib>=4.2.0' shellescape mistune typing avro)
+ 'rdflib>=4.2.0' shellescape mistune typing avro requests \
+ isodate pyparsing sparqlwrapper html5lib keepalive)
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
export PYCURL_SSL_LIBRARY=nss
;;
@@ -422,13 +423,13 @@ fpm_build $WORKSPACE/sdk/cwl "${PYTHON2_PKG_PREFIX}-arvados-cwl-runner" 'Curover
# So we build this thing separately.
#
# Ward, 2016-03-17
-fpm --maintainer='Ward Vandewege <ward at curoverse.com>' -s python -t deb --exclude=*/dist-packages/tests/* --exclude=*/site-packages/tests/* --deb-ignore-iteration-in-dependencies -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
+fpm --maintainer='Ward Vandewege <ward at curoverse.com>' -s python -t $FORMAT --exclude=*/dist-packages/tests/* --exclude=*/site-packages/tests/* --deb-ignore-iteration-in-dependencies -n "${PYTHON2_PKG_PREFIX}-schema-salad" --iteration 1 --python-bin python2.7 --python-easyinstall "$EASY_INSTALL2" --python-package-name-prefix "$PYTHON2_PKG_PREFIX" --depends "$PYTHON2_PACKAGE" -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 <ward at curoverse.com>' -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
+fpm --maintainer='Ward Vandewege <ward at curoverse.com>' -s python -t $FORMAT --exclude=*/dist-packages/tests/* --exclude=*/site-packages/tests/* --deb-ignore-iteration-in-dependencies -n "${PYTHON2_PKG_PREFIX}-cwltool" --iteration 1 --python-bin python2.7 --python-easyinstall "$EASY_INSTALL2" --python-package-name-prefix "$PYTHON2_PKG_PREFIX" --depends "$PYTHON2_PACKAGE" -v 1.0.20160316204054 cwltool
# FPM eats the trailing .0 in the python-rdflib-jsonld package when built with 'rdflib-jsonld>=0.3.0'. Force the version. Ward, 2016-03-25
-fpm --maintainer='Ward Vandewege <ward at curoverse.com>' -s python -t deb --exclude=*/dist-packages/tests/* --exclude=*/site-packages/tests/* --deb-ignore-iteration-in-dependencies --verbose --log info -n python-rdflib-jsonld --iteration 1 --python-bin python2.7 --python-easyinstall easy_install-2.7 --python-package-name-prefix python --depends python2.7 -v 0.3.0 rdflib-jsonld
+fpm --maintainer='Ward Vandewege <ward at curoverse.com>' -s python -t $FORMAT --exclude=*/dist-packages/tests/* --exclude=*/site-packages/tests/* --deb-ignore-iteration-in-dependencies --verbose --log info -n "${PYTHON2_PKG_PREFIX}-rdflib-jsonld" --iteration 1 --python-bin python2.7 --python-easyinstall "$EASY_INSTALL2" --python-package-name-prefix "$PYTHON2_PKG_PREFIX" --depends "$PYTHON2_PACKAGE" -v 0.3.0 rdflib-jsonld
# The PAM module
if [[ $TARGET =~ debian|ubuntu ]]; then
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list