From 2940a4267b0373975698fe1bd9c251dd31d29332 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 24 Sep 2015 08:47:54 +0200 Subject: [PATCH 1/2] Work around Travis issue with OS X. --- .travis.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 01f568866..97ff353fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ -dist: trusty +# So we get Ubuntu Trusty - using "dist: trusty" breaks OS X. +services: docker os: - linux @@ -29,9 +30,3 @@ script: - tox -e pylint - tox -e pyroma - tox -e check-manifest - -# Travis bug - OS X builds get routed to Ubuntu Trusty if "dist: trusty" is -# given. -matrix: - allow_failures: - - os: osx From a6ceab5dbcb1601b589cc06c34a89f92212d834a Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 24 Sep 2015 08:53:20 +0200 Subject: [PATCH 2/2] Fix pip executable name for OS X. --- scripts/dev/ci_install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dev/ci_install.py b/scripts/dev/ci_install.py index c05407e12..58ae785e3 100644 --- a/scripts/dev/ci_install.py +++ b/scripts/dev/ci_install.py @@ -97,7 +97,7 @@ elif os.environ.get('TRAVIS_OS_NAME', None) == 'osx': brew(['install', 'python3', 'pyqt5']) print("Installing tox...") - subprocess.check_call(['sudo', 'pip3.4', 'install', 'tox']) + subprocess.check_call(['sudo', 'pip3', 'install', 'tox']) check_setup('python3')