rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "travis: Patch PyQt on OS X."

Browse Source 
This reverts commit 5fce514168.
This commit is contained in:
Florian Bruhin 2015-10-20 18:14:25 +02:00
parent 0a40dfced6
commit 7d026efbfb
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -67,3 +67,7 @@ matrix:
env: TESTENV=pylint env: TESTENV=pylint
- os: osx - os: osx
env: TESTENV=eslint env: TESTENV=eslint
# https://github.com/Homebrew/homebrew/issues/45114
allow_failures:
- os: osx
env: TESTENV=py35

15
scripts/dev/ci_install.py
View File

@ -117,20 +117,11 @@ elif TRAVIS_OS == 'osx':
print("brew update...") print("brew update...")
brew(['update'], silent=True) 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...") print("Installing packages...")
brew(['install', 'python3']) pkgs = ['python3']
if INSTALL_PYQT: if INSTALL_PYQT:
brew(['install', 'qt5', 'sip']) pkgs.append('pyqt5')
brew(['install', 'pyqt5', '--build-from-source']) brew(['install'] + pkgs)
print("Installing tox...") print("Installing tox...")
subprocess.check_call(['sudo', 'pip3', 'install', 'tox']) subprocess.check_call(['sudo', 'pip3', 'install', 'tox'])