From: Peter Amstutz Date: Wed, 9 May 2018 17:53:11 +0000 (-0400) Subject: Fix subprocess32 version constraint, refs #13435 X-Git-Tag: 1.2.0~161 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/7929ac54418f95a274b0173c8a06d1292a75590f Fix subprocess32 version constraint, refs #13435 Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh index ef7e2840a6..fb37d53774 100755 --- a/build/run-build-packages.sh +++ b/build/run-build-packages.sh @@ -345,14 +345,14 @@ rm -rf "$WORKSPACE/sdk/cwl/build" arvados_cwl_runner_version=${ARVADOS_BUILDING_VERSION:-$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/cwl/arvados_cwl_runner.egg-info/PKG-INFO)} declare -a iterargs=() if [[ -z "$ARVADOS_BUILDING_VERSION" ]]; then - arvados_cwl_runner_iteration=3 + arvados_cwl_runner_iteration=4 iterargs+=(--iteration $arvados_cwl_runner_iteration) else arvados_cwl_runner_iteration= fi test_package_presence ${PYTHON2_PKG_PREFIX}-arvados-cwl-runner "$arvados_cwl_runner_version" python "$arvados_cwl_runner_iteration" if [[ "$?" == "0" ]]; then - fpm_build $WORKSPACE/sdk/cwl "${PYTHON2_PKG_PREFIX}-arvados-cwl-runner" 'Curoverse, Inc.' 'python' "$arvados_cwl_runner_version" "--url=https://arvados.org" "--description=The Arvados CWL runner" --depends "${PYTHON2_PKG_PREFIX}-setuptools" --depends "${PYTHON2_PKG_PREFIX}-subprocess32" --depends "${PYTHON2_PKG_PREFIX}-pathlib2" --depends "${PYTHON2_PKG_PREFIX}-scandir" "${iterargs[@]}" + fpm_build $WORKSPACE/sdk/cwl "${PYTHON2_PKG_PREFIX}-arvados-cwl-runner" 'Curoverse, Inc.' 'python' "$arvados_cwl_runner_version" "--url=https://arvados.org" "--description=The Arvados CWL runner" --depends "${PYTHON2_PKG_PREFIX}-setuptools" --depends "${PYTHON2_PKG_PREFIX}-subprocess32 >= 3.5.0rc1" --depends "${PYTHON2_PKG_PREFIX}-pathlib2" --depends "${PYTHON2_PKG_PREFIX}-scandir" "${iterargs[@]}" fi # schema_salad. This is a python dependency of arvados-cwl-runner,