Bläddra i källkod

Merge pull request #4099 from ThomasWaldmann/fix-travis

fix travis-ci breakage on 1.0-maint branch
TW 6 år sedan
förälder
incheckning
6f9025c28f
2 ändrade filer med 2 tillägg och 2 borttagningar
  1. 1 1
      .travis/install.sh
  2. 1 1
      requirements.d/development.txt

+ 1 - 1
.travis/install.sh

@@ -4,7 +4,7 @@ set -e
 set -x
 
 if [[ "$(uname -s)" == 'Darwin' ]]; then
-    brew update
+    # brew update
     if [[ "${OPENSSL}" != "0.9.8" ]]; then
         brew outdated openssl || brew upgrade openssl
     fi

+ 1 - 1
requirements.d/development.txt

@@ -2,7 +2,7 @@ setuptools
 setuptools_scm
 pip
 virtualenv<14.0
-tox
+tox<3.2.0
 pytest!=3.3.0
 pytest-xdist
 pytest-cov