Skip to content

Commit

Permalink
Revert "travis: Patch PyQt on OS X."
Browse files Browse the repository at this point in the history
This reverts commit 5fce514.
  • Loading branch information
The-Compiler committed Oct 20, 2015
1 parent 0a40dfc commit 7d026ef
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
15 changes: 3 additions & 12 deletions scripts/dev/ci_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,20 +117,11 @@ def check_setup(executable):
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'])
Expand Down

0 comments on commit 7d026ef

Please sign in to comment.