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

Merge branch 'travis-docker'

Browse Source
This commit is contained in:
Florian Bruhin 2015-09-28 22:23:58 +02:00
commit 2cfc1361b5
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -1,4 +1,5 @@
dist: trusty # So we get Ubuntu Trusty - using "dist: trusty" breaks OS X.
services: docker
os: os:
- linux - linux
@ -30,9 +31,3 @@ script:
- tox -e pylint - tox -e pylint
- tox -e pyroma - tox -e pyroma
- tox -e check-manifest - tox -e check-manifest
# Travis bug - OS X builds get routed to Ubuntu Trusty if "dist: trusty" is
# given.
matrix:
allow_failures:
- os: osx

2
scripts/dev/ci_install.py
View File

@ -97,7 +97,7 @@ elif os.environ.get('TRAVIS_OS_NAME', None) == 'osx':
brew(['install', 'python3', 'pyqt5']) brew(['install', 'python3', 'pyqt5'])
print("Installing tox...") print("Installing tox...")
subprocess.check_call(['sudo', 'pip3.4', 'install', 'tox']) subprocess.check_call(['sudo', 'pip3', 'install', 'tox'])
check_setup('python3') check_setup('python3')