From cfe360b95ef5d22431dfe7936197742b2f52a57d Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 10 Jun 2016 23:14:57 +0200 Subject: [PATCH] travis: Update OS X bottle to Qt 5.6.1 --- .travis.yml | 3 --- scripts/dev/ci/travis_install.sh | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c7a22b873..1a67a8361 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,9 +36,6 @@ matrix: env: TESTENV=check-manifest - os: linux env: TESTENV=eslint - allow_failures: - - os: osx - env: TESTENV=py35 cache: directories: diff --git a/scripts/dev/ci/travis_install.sh b/scripts/dev/ci/travis_install.sh index b1e0d35db..6976db8d0 100644 --- a/scripts/dev/ci/travis_install.sh +++ b/scripts/dev/ci/travis_install.sh @@ -83,7 +83,8 @@ if [[ $DOCKER ]]; then elif [[ $TRAVIS_OS_NAME == osx ]]; then # Disable App Nap defaults write NSGlobalDomain NSAppSleepDisabled -bool YES - curl -LOO https://github.com/The-Compiler/homebrew-qt5-webkit/releases/download/v5.6.0-1/{qt5-5.6.0,pyqt5-5.6}.el_capitan.bottle.1.tar.gz + curl -LO https://github.com/The-Compiler/homebrew-qt5-webkit/releases/download/v5.6.0-1/pyqt5-5.6.el_capitan.bottle.1.tar.gz + curl -LO https://github.com/The-Compiler/homebrew-qt5-webkit/releases/download/v5.6.1-1/qt5-5.6.1.el_capitan.bottle.1.tar.gz brew_install python3 {qt5,pyqt5}-*.bottle.1.tar.gz pip_install pip pip_install tox