Merge branch 'travis-docker'

.travis.yml

@@ -1,4 +1,5 @@
-dist: trusty
+# So we get Ubuntu Trusty - using "dist: trusty" breaks OS X.
+services: docker
 
 os:
   - linux
@@ -30,9 +31,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

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')