From 1c222843e69ed2a4702c30b2b723d401298311c4 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Thu, 24 Dec 2015 16:31:28 +0100
Subject: [PATCH 1/3] Switch to travis' container-based infrastructure.

https://docs.travis-ci.com/user/migrating-from-legacy/
---
 .travis.yml | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8b7b19a..124c8e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: python
 cache: pip
+sudo: false
+
 env:
   global:
     - PILLOW="Pillow"
@@ -14,21 +16,32 @@ matrix:
     - python: 3.6
 
 
-before_install:
-    # Add PPA to get ffmpeg on trusty
-    - sudo add-apt-repository ppa:mc3man/trusty-media -y
-    # Dependencies to build PIL
-    - sudo apt-get update -qq
-    - sudo apt-get install -qq ubuntu-restricted-extras
-    - sudo apt-get install -qq libfreetype6-dev libjpeg8-dev zlib1g-dev ffmpeg
-    - sudo locale-gen fr_FR.UTF-8
-    - ffmpeg -version
+addons:
+  apt:
+    sources:
+      - trusty-media
+    packages:
+      - ubuntu-restricted-extras
+      - ffmpeg
+      - language-pack-fr
+      - libavcodec-extra-54
+      # Dependencies to build PIL
+      - libfreetype6-dev
+      - libjpeg8-dev
+      - zlib1g-dev
+
 install:
     - pip install -q $PILLOW
     - pip install pytest pytest-cov coveralls
     - pip install .
+
+before_script:
+  ffmpeg --help
+
 script: py.test -sv --cov sigal --cov-report term-missing tests/
+
 after_success:
     coveralls
+
 notifications:
     irc: "chat.freenode.net#sigal"

From 02b46efadb2d934600f210c14cf2bb22847d7551 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Wed, 3 Jan 2018 18:00:12 +0100
Subject: [PATCH 2/3] Use up-to-date pip and setuptools

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

diff --git a/.travis.yml b/.travis.yml
index 124c8e7..73674f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,7 @@ addons:
       - zlib1g-dev
 
 install:
+    - pip install -U pip setuptools wheel
     - pip install -q $PILLOW
     - pip install pytest pytest-cov coveralls
     - pip install .

From 3b9d5c82bd972277a4cc2d6378b9800990a11878 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Wed, 3 Jan 2018 18:02:17 +0100
Subject: [PATCH 3/3] Remove use of fr language

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

diff --git a/.travis.yml b/.travis.yml
index 73674f2..c33c9e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,6 @@ addons:
     packages:
       - ubuntu-restricted-extras
       - ffmpeg
-      - language-pack-fr
       - libavcodec-extra-54
       # Dependencies to build PIL
       - libfreetype6-dev