projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 3950ffc 3a7b90d)
Merge branch 'master' into 7478-anm-spot-instances
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Fri, 25 May 2018 15:42:25 +0000 (12:42 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Fri, 25 May 2018 15:42:25 +0000 (12:42 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

1  2 
build/build.list patch | diff1 | diff2 | blob | history
build/run-build-packages.sh patch | diff1 | diff2 | blob | history

diff --combined build/build.list
index bd457872fd09737a02d051412fa7c738b5dea73d,3d98fafb449b77f19bf074a7c8fa84ba88535d4f..fa1a260c3a225fcbf29bfccb17e364b1f7277000
--- 1/build/build.list
--- 2/build/build.list
+++ b/build/build.list
@@@ -5,6 -5,7 +5,6 @@@
  #distribution(s)|name|version|iteration|type|architecture|extra fpm arguments
  debian8,debian9,centos7|python-gflags|2.0|2|python|all
  debian8,debian9,ubuntu1404,ubuntu1604,centos7|google-api-python-client|1.6.2|2|python|all
 -debian8,debian9,ubuntu1404,ubuntu1604,centos7|apache-libcloud|2.3.0|3|python|all|--depends 'python-requests >= 2.4.3'
  debian8,debian9,ubuntu1404,centos7|oauth2client|1.5.2|2|python|all
  debian8,debian9,ubuntu1404,centos7|pyasn1|0.1.7|2|python|all
  debian8,debian9,ubuntu1404,centos7|pyasn1-modules|0.0.5|2|python|all
@@@ -41,9 -42,9 +41,9 @@@ centos7|pbr|0.11.1|2|python|al
  centos7|pyparsing|2.1.10|2|python|all
  centos7|keepalive|0.5|2|python|all
  debian8,debian9,ubuntu1404,ubuntu1604,centos7|lockfile|0.12.2|2|python|all|--epoch 1
- debian8,debian9,ubuntu1404,ubuntu1604,centos7|subprocess32|3.5.0rc1|2|python|all
+ debian8,debian9,ubuntu1404,ubuntu1604,centos7|subprocess32|3.5.1|2|python|all
  all|ruamel.yaml|0.14.12|2|python|amd64|--python-setup-py-arguments --single-version-externally-managed
- all|cwltest|1.0.20180416154033|4|python|all|--depends 'python-futures >= 3.0.5' --depends 'python-subprocess32'
+ all|cwltest|1.0.20180518074130|4|python|all|--depends 'python-futures >= 3.0.5' --depends 'python-subprocess32 >= 3.5.0'
  all|junit-xml|1.8|3|python|all
  all|rdflib-jsonld|0.4.0|2|python|all
  all|futures|3.0.5|2|python|all
diff --combined build/run-build-packages.sh
index 0bf68f485a09499499667eba0d57e99a56f09c0b,63f81832f0abecf4688cef2a65fa16bda31d691e..351d1b2a1f3df666c7fc90df6f456c10522c2dcf
--- 1/build/run-build-packages.sh
--- 2/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@@ -352,7 -352,7 +352,7 @@@ els
  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 >= 3.5.0rc1" --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.0" --depends "${PYTHON2_PKG_PREFIX}-pathlib2" --depends "${PYTHON2_PKG_PREFIX}-scandir" "${iterargs[@]}"
  fi
  
  # schema_salad. This is a python dependency of arvados-cwl-runner,
@@@ -434,30 -434,8 +434,30 @@@ if [[ "$?" == "0" ]]; the
    fpm_build $WORKSPACE/tools/crunchstat-summary ${PYTHON2_PKG_PREFIX}-crunchstat-summary 'Curoverse, Inc.' 'python' "$crunchstat_summary_version" "--url=https://arvados.org" "--description=Crunchstat-summary reads Arvados Crunch log files and summarize resource usage" --iteration "$iteration"
  fi
  
 -## if libcloud becomes our own fork see
 -## https://dev.arvados.org/issues/12268#note-27
 +# Forked libcloud
 +if test_package_presence "$PYTHON2_PKG_PREFIX"-apache-libcloud "$LIBCLOUD_PIN" python 2
 +then
 +  LIBCLOUD_DIR=$(mktemp -d)
 +  (
 +      cd $LIBCLOUD_DIR
 +      git clone $DASHQ_UNLESS_DEBUG https://github.com/curoverse/libcloud.git .
 +      git checkout $DASHQ_UNLESS_DEBUG apache-libcloud-$LIBCLOUD_PIN
 +      # libcloud is absurdly noisy without -q, so force -q here
 +      OLD_DASHQ_UNLESS_DEBUG=$DASHQ_UNLESS_DEBUG
 +      DASHQ_UNLESS_DEBUG=-q
 +      handle_python_package
 +      DASHQ_UNLESS_DEBUG=$OLD_DASHQ_UNLESS_DEBUG
 +  )
 +
 +  # libcloud >= 2.3.0 now requires python-requests 2.4.3 or higher, otherwise
 +  # it throws
 +  #   ImportError: No module named packages.urllib3.poolmanager
 +  # when loaded. We only see this problem on ubuntu1404, because that is our
 +  # only supported distribution that ships with a python-requests older than
 +  # 2.4.3.
 +  fpm_build $LIBCLOUD_DIR "$PYTHON2_PKG_PREFIX"-apache-libcloud "" python "" --iteration 2 --depends 'python-requests >= 2.4.3'
 +  rm -rf $LIBCLOUD_DIR
 +fi
  
  # Python 2 dependencies
  declare -a PIP_DOWNLOAD_SWITCHES=(--no-deps)