[ARVADOS] updated: 863280201573355f380c59226015373885b50617
Git user
git at public.curoverse.com
Thu Jan 12 14:48:07 EST 2017
Summary of changes:
build/run-build-packages.sh | 10 +++++-----
sdk/cwl/setup.py | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
via 863280201573355f380c59226015373885b50617 (commit)
via 293f8a1d393d7fbfd12ed6c62260aa1b24c2e0fe (commit)
from 49db3b740b861688eff2a872c8f69f65ee893ed2 (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 863280201573355f380c59226015373885b50617
Merge: 49db3b7 293f8a1
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Jan 12 14:47:03 2017 -0500
Merge branch '10812-cwl-package-update' refs #10812
commit 293f8a1d393d7fbfd12ed6c62260aa1b24c2e0fe
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Jan 12 12:39:25 2017 -0500
10812: Update arvados-cwl-runner dependencies. Remove pathlib2 from backports.
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 40e3b43..18a8475 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -109,7 +109,7 @@ case "$TARGET" in
ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
'pycurl<7.21.5' pyyaml 'rdflib>=4.2.0' \
shellescape mistune typing avro ruamel.ordereddict
- cachecontrol 'pathlib2==2.1.0')
+ cachecontrol junit-xml==1.7)
PYTHON3_BACKPORTS=(docker-py==1.7.2 six requests websocket-client==0.37.0)
;;
ubuntu1204)
@@ -120,7 +120,7 @@ case "$TARGET" in
ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
contextlib2 'pycurl<7.21.5' pyyaml 'rdflib>=4.2.0' \
shellescape mistune typing avro isodate ruamel.ordereddict
- cachecontrol requests 'pathlib2==2.1.0')
+ cachecontrol requests junit-xml==1.7)
PYTHON3_BACKPORTS=(docker-py==1.7.2 six requests websocket-client==0.37.0)
;;
ubuntu1404)
@@ -129,7 +129,7 @@ case "$TARGET" in
google-api-python-client==1.4.2 six uritemplate oauth2client==1.5.2 httplib2 \
rsa 'pycurl<7.21.5' backports.ssl_match_hostname pyyaml 'rdflib>=4.2.0' \
shellescape mistune typing avro ruamel.ordereddict
- cachecontrol 'pathlib2==2.1.0')
+ cachecontrol junit-xml==1.7)
PYTHON3_BACKPORTS=(docker-py==1.7.2 requests websocket-client==0.37.0)
;;
centos7)
@@ -148,7 +148,7 @@ case "$TARGET" in
python-daemon==2.1.1 llfuse==0.41.1 'pbr<1.0' pyyaml contextlib2 \
'rdflib>=4.2.0' shellescape mistune typing avro \
isodate pyparsing sparqlwrapper html5lib==0.9999999 keepalive \
- ruamel.ordereddict cachecontrol 'pathlib2==2.1.0')
+ ruamel.ordereddict cachecontrol junit-xml==1.7)
PYTHON3_BACKPORTS=(docker-py==1.7.2 six requests websocket-client==0.37.0)
export PYCURL_SSL_LIBRARY=nss
;;
@@ -419,7 +419,7 @@ fpm_build ruamel.yaml "" "" python 0.13.7 --python-setup-py-arguments "--single-
# Dependency of cwltool. Fpm doesn't produce a package with the correct version
# number unless we build it explicitly
-fpm_build cwltest "" "" python 1.0.20160907111242
+fpm_build cwltest "" "" python 1.0.20161227194859
# And for cwltool we have the same problem as for schema_salad. Ward, 2016-03-17
cwltoolversion=$(cat "$WORKSPACE/sdk/cwl/setup.py" | grep cwltool== | sed "s/.*==\(.*\)'.*/\1/")
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 61b8f0b..534eb74 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -48,10 +48,10 @@ setup(name='arvados-cwl-runner',
# Note that arvados/build/run-build-packages.sh looks at this
# file to determine what version of cwltool and schema-salad to build.
install_requires=[
- 'cwltool==1.0.20170105144051',
- 'schema-salad==2.1.20161227191302',
+ 'cwltool==1.0.20170112185927',
+ 'schema-salad==2.2.20170111180227',
'ruamel.yaml==0.13.7',
- 'arvados-python-client>=0.1.20160826210445',
+ 'arvados-python-client>=0.1.20170112173420',
'setuptools'
],
data_files=[
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list