Merge branch 'daily'

* daily:
  Update to latest multibuild.
  Add six as dependency
  Label pkgconfig as a dependency
  Update to branch adding back rsync
  Add unittest2 as test dependency
  Update to latest multibuild
  Try fix unexplained failures.
  Try to rebuild, debugging build errors.
  Try another multibuild fix
  Try workaround in multibuild
  Update to latest multibuild
  Fix upload of h5py development wheels

Author: matthew-brett

.travis.yml

@@ -102,6 +102,9 @@ matrix:
         - NP_TEST_DEP="1.11.3"
 
 before_install:
+    # See:
+    # https://github.com/travis-ci/travis-ci/issues/8920#issuecomment-352661024
+    - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
     - if [ "$TRAVIS_BRANCH" == "daily" ]; then
           CONTAINER="pre-release";
           BUILD_COMMIT=${DAILY_COMMIT:-$BUILD_COMMIT};
@@ -128,5 +131,5 @@ after_success:
     - pip install wheelhouse-uploader
     - python -m wheelhouse_uploader upload --local-folder
           ${TRAVIS_BUILD_DIR}/wheelhouse/
-          --no-update-index
-          wheels
+          $UPLOAD_ARGS
+          $CONTAINER