From 7d026efbfb80ad7ba4eda37981037f611f911376 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 20 Oct 2015 18:14:25 +0200 Subject: [PATCH] Revert "travis: Patch PyQt on OS X." This reverts commit 5fce514168b07a4d2817b4c3928891a178bb29d7. --- .travis.yml | 4 ++++ scripts/dev/ci_install.py | 15 +++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index d4b6cda51..ec5ed28ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,3 +67,7 @@ matrix: env: TESTENV=pylint - os: osx env: TESTENV=eslint + # https://github.com/Homebrew/homebrew/issues/45114 + allow_failures: + - os: osx + env: TESTENV=py35 diff --git a/scripts/dev/ci_install.py b/scripts/dev/ci_install.py index 790c0361b..a83f93241 100644 --- a/scripts/dev/ci_install.py +++ b/scripts/dev/ci_install.py @@ -117,20 +117,11 @@ elif TRAVIS_OS == 'osx': print("brew update...") brew(['update'], silent=True) - # https://github.com/Homebrew/homebrew/issues/45114 - print("Patching PyQt formula...") - brew_path = subprocess.check_output(['brew', '--prefix']).strip() - pyqt_file = os.path.join(brew_path, 'Library', 'Formula', 'pyqt5.rb') - os.remove(pyqt_file) - urllib.urlretrieve( - 'https://raw.githubusercontent.com/UniqMartin/homebrew/023a20a7959680952d166beca66d2995439d4540/Library/Formula/pyqt5.rb', - pyqt_file) - print("Installing packages...") - brew(['install', 'python3']) + pkgs = ['python3'] if INSTALL_PYQT: - brew(['install', 'qt5', 'sip']) - brew(['install', 'pyqt5', '--build-from-source']) + pkgs.append('pyqt5') + brew(['install'] + pkgs) print("Installing tox...") subprocess.check_call(['sudo', 'pip3', 'install', 'tox'])