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

Fix ci_install.py for Travis on OS X.

Browse Source
This commit is contained in:
Florian Bruhin 2015-06-12 13:49:50 +02:00
parent 219c2f8ae8
commit 9bf749643a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/ci_install.py
View File

@ -40,8 +40,12 @@ def apt_get(args):
subprocess.check_call(['sudo', 'apt-get', '-y', '-q'] + args) subprocess.check_call(['sudo', 'apt-get', '-y', '-q'] + args)
def brew(args): def brew(args, silent=False):
subprocess.check_call(['brew'] + args) if silent:
with open(os.devnull, 'w') as f:
subprocess.check_call(['brew'] + args, stdout=f)
else:
subprocess.check_call(['brew'] + args)
if 'APPVEYOR' in os.environ: if 'APPVEYOR' in os.environ:
@ -69,14 +73,15 @@ elif os.environ.get('TRAVIS_OS_NAME', None) == 'linux':
apt_get(['install'] + pkgs.split()) apt_get(['install'] + pkgs.split())
elif os.environ.get('TRAVIS_OS_NAME', None) == 'osx': elif os.environ.get('TRAVIS_OS_NAME', None) == 'osx':
print("brew update...") print("brew update...")
brew(['update']) brew(['update'], silent=True)
print("Installing packages...") print("Installing packages...")
brew(['install', 'python3', 'pyqt5']) brew(['install', 'python3', 'pyqt5'])
print("Installing tox...") print("Installing tox...")
subprocess.check_call(['pip3.4', 'install', 'tox']) subprocess.check_call(['sudo', 'pip3.4', 'install', 'tox'])
os.system('ls -l /usr/local/bin/xvfb-run')
print("Creating xvfb-run stub...") print("Creating xvfb-run stub...")
with open('/usr/local/bin/xvfb-run', 'w') as f: with open('/usr/local/bin/xvfb-run', 'w') as f:
# This will break when xvfb-run is called differently in .travis.yml, # This will break when xvfb-run is called differently in .travis.yml,
@ -84,6 +89,8 @@ elif os.environ.get('TRAVIS_OS_NAME', None) == 'osx':
f.write('#!/bin/bash\n') f.write('#!/bin/bash\n')
f.write('shift 2\n') f.write('shift 2\n')
f.write('exec "$@"\n') f.write('exec "$@"\n')
os.system('sudo chmod 755 /usr/local/bin/xvfb-run')
os.system('ls -l /usr/local/bin/xvfb-run')
else: else:
def env(key): def env(key):
return os.environ.get(key, None) return os.environ.get(key, None)