Run Python 3.5 on OS X and get rid of Xvfb wrapper.

.travis.yml

@@ -21,7 +21,8 @@ install:
   - python scripts/dev/ci_install.py
 
 script:
-    - xvfb-run -s "-screen 0 640x480x16" tox -e py34
+    - '[[ $TRAVIS_OS_NAME == osx ]] && tox -e py35 || true'
+    - '[[ $TRAVIS_OS_NAME == linux ]] && xvfb-run -s "-screen 0 640x480x16" tox -e py34 || true'
     - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e unittests-nodisp || true'
     - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e misc || true'
     - '[[ $TRAVIS_OS_NAME == linux ]] && tox -e pep257 || true'

scripts/dev/ci_install.py

@@ -100,15 +100,6 @@ elif os.environ.get('TRAVIS_OS_NAME', None) == 'osx':
     subprocess.check_call(['sudo', 'pip3', 'install', 'tox'])
 
     check_setup('python3')
-
-    print("Creating xvfb-run stub...")
-    with open('/usr/local/bin/xvfb-run', 'w') as f:
-        # This will break when xvfb-run is called differently in .travis.yml,
-        # but I can't be bothered to do it in a nicer way.
-        f.write('#!/bin/bash\n')
-        f.write('shift 2\n')
-        f.write('exec "$@"\n')
-    subprocess.check_call(['sudo', 'chmod', '755', '/usr/local/bin/xvfb-run'])
 else:
     def env(key):
         return os.environ.get(key, None)