Merge pull request #4267 from ThomasWaldmann/travis-fix-brew-1.0

fix the homebrew 1.9 issues on travis-ci, fixes #4254

.travis/install.sh

@@ -4,6 +4,11 @@ set -e
 set -x
 
 if [[ "$(uname -s)" == 'Darwin' ]]; then
+    # HOMEBREW_NO_AUTO_UPDATE=1
+    export HOMEBREW_LOGS=~/brew-logs
+    export HOMEBREW_TEMP=~/brew-temp
+    mkdir $HOMEBREW_LOGS
+    mkdir $HOMEBREW_TEMP
     # brew update
     if [[ "${OPENSSL}" != "0.9.8" ]]; then
         brew outdated openssl || brew upgrade openssl

tox.ini

@@ -9,7 +9,7 @@ envlist = py{34,35,36},flake8
 # not really matter, should be just different from the toplevel dir.
 changedir = {toxworkdir}
 deps =
-     -rrequirements.d/development.txt
+     -rrequirements.d/development.lock.txt
      -rrequirements.d/fuse.txt
 commands = py.test -n {env:XDISTN:4} -rs --cov=borg --cov-config=../.coveragerc --benchmark-skip --pyargs {posargs:borg.testsuite}
 # fakeroot -u needs some env vars: