Merge pull request #369 from saimn/travis

Update travis conf for xenial
2019-06-16 00:30:06 +02:00
parent 912ca39991 46f4389f91
commit 795658dba3
1 changed files with 9 additions and 17 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,32 +1,24 @@
 language: python
 cache: pip
+dist: xenial

 matrix:
  include:
    - python: 3.5
-      addons:
-        apt:
-          sources:
-            - trusty-media
-          packages:
-            - ubuntu-restricted-extras
-            - ffmpeg
-            - libavcodec-extra-54
+      before_install:
+        - sudo add-apt-repository ppa:mc3man/xerus-media -y
+        - sudo apt-get update -qq
+        - sudo apt-get install -qq ubuntu-restricted-extras ffmpeg
      before_script:
        ffmpeg --help
    - python: 3.6
-      addons:
-        apt:
-          sources:
-            - trusty-media
-          packages:
-            - ubuntu-restricted-extras
-            - ffmpeg
-            - libavcodec-extra-54
+      before_install:
+        - sudo add-apt-repository ppa:mc3man/xerus-media -y
+        - sudo apt-get update -qq
+        - sudo apt-get install -qq ubuntu-restricted-extras ffmpeg
      before_script:
        ffmpeg --help
    - python: 3.7
-      dist: xenial
      before_install:
        - sudo add-apt-repository ppa:mc3man/xerus-media -y
        - sudo apt-get update -qq