From 00e5b1e6e2946edc49dc2371a3b3d70c4dcbfe5d Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 8 Aug 2018 16:50:36 -0400 Subject: [PATCH] 13931: Add dependencies required by latest cwltool Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- build/build.list | 5 ++++- build/package-testing/deb-common-test-packages.sh | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build/build.list b/build/build.list index ef6407031c..039625ca79 100644 --- a/build/build.list +++ b/build/build.list @@ -23,7 +23,7 @@ debian8,debian9,ubuntu1404,ubuntu1604,centos7|pyyaml|3.12|2|python|amd64 debian8,debian9,ubuntu1404,ubuntu1604,centos7|rdflib|4.2.2|2|python|all debian8,debian9,ubuntu1404,centos7|shellescape|3.4.1|2|python|all debian8,debian9,ubuntu1404,ubuntu1604,centos7|mistune|0.7.3|2|python|all -debian8,debian9,ubuntu1404,ubuntu1604,centos7|typing|3.5.3.0|2|python|all +debian8,debian9,ubuntu1404,ubuntu1604,centos7|typing|3.6.2|2|python|all debian8,debian9,ubuntu1404,ubuntu1604,centos7|avro|1.8.1|2|python|all debian8,debian9,ubuntu1404,centos7|ruamel.ordereddict|0.4.9|2|python|amd64 debian8,debian9,ubuntu1404,ubuntu1604,centos7|cachecontrol|0.11.7|2|python|all @@ -50,3 +50,6 @@ all|futures|3.0.5|2|python|all all|future|0.16.0|2|python|all all|future|0.16.0|2|python3|all all|mypy-extensions|0.3.0|1|python|all +all|prov|1.5.1|0|python|all +all|bagit|1.6.4|0|python|all +all|typing-extensions|3.6.5|0|python|all diff --git a/build/package-testing/deb-common-test-packages.sh b/build/package-testing/deb-common-test-packages.sh index b4ea35c574..e02532cdad 100755 --- a/build/package-testing/deb-common-test-packages.sh +++ b/build/package-testing/deb-common-test-packages.sh @@ -27,7 +27,13 @@ cd /tmp/opts export ARV_PACKAGES_DIR="/arvados/packages/$target" -dpkg-deb -x $(ls -t "$ARV_PACKAGES_DIR/$1"_*.deb | head -n1) . +if [[ -f "$ARV_PACKAGES_DIR/$1"_*.deb ]] ; then + debpkg=$(ls -t "$ARV_PACKAGES_DIR/$1"_*.deb | head -n1) +else + debpkg=$(ls -t "$ARV_PACKAGES_DIR/processed/$1"_*.deb | head -n1) +fi + +dpkg-deb -x $debpkg . while read so && [ -n "$so" ]; do echo -- 2.30.2