From 02f3fc24bbe18ca4f94d610ba0db77790ea234d9 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 29 Nov 2015 00:53:50 +0100
Subject: [PATCH 1/2] travis: coveralls 1.0 has been released

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index eb8aadfe..5f01f223 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ script:
   - "tox -e $TOX_ENV"
 
 after_success:
-  - "if [ $TOX_ENV == 'py27' ]; then pip install coveralls==1.0b1; coveralls; fi"
+  - "if [ $TOX_ENV == 'py27' ]; then pip install coveralls; coveralls; fi"
 
 branches:
   except:

From 3c24d2d7826c08823e4a280df8adf3ea6985dca2 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 29 Nov 2015 00:45:27 +0100
Subject: [PATCH 2/2] travis: Test on Ubuntu 14.04 infrastructure

This change also minimizes the set of Python packages installed with APT
so that we're testing against the latest PyPI releases when possible.
---
 .travis.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5f01f223..964ae89f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,11 @@
-sudo: false
+sudo: required
+dist: trusty
 
 language: python
 
 python:
   - "2.7_with_system_site_packages"
 
-addons:
-  apt:
-    sources:
-      - mopidy-stable
-    packages:
-      - graphviz-dev
-      - mopidy
-
 env:
   - TOX_ENV=py27
   - TOX_ENV=py27-tornado23
@@ -20,6 +13,11 @@ env:
   - TOX_ENV=docs
   - TOX_ENV=flake8
 
+before_install:
+  - "sudo sed -i '/127.0.1.1/d' /etc/hosts"  # Workaround tornadoweb/tornado#1573
+  - "sudo apt-get update -qq"
+  - "sudo apt-get install -y graphviz-dev gstreamer0.10-plugins-good python-gst0.10"
+
 install:
   - "pip install tox"