X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=.travis.yml;h=92f326860f660fa67a79b31385c6b481dd8276c5;hb=7a6c204fcb6ba5a1a5149ea7a3c186eab87fc7e4;hp=0aabce6a73cf96dc70bff38901a6e4f98521bf17;hpb=d050de77f94a5dc9071c0b459ba62cb09c6696c4;p=youtube-dl

diff --git a/.travis.yml b/.travis.yml
index 0aabce6a7..92f326860 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,26 @@ language: python
 python:
   - "2.6"
   - "2.7"
-#  - "3.3"
-script: nosetests test --verbose
-notifications:
-  email:
-    - filippo.valsorda@gmail.com
-  irc:
-    channels:
-      - "irc.freenode.org#youtube-dl"
-    skip_join: true
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "pypy"
+  - "pypy3"
+sudo: false
+env:
+  - YTDL_TEST_SET=core
+  - YTDL_TEST_SET=download
+matrix:
+  include:
+    - env: JYTHON=true; YTDL_TEST_SET=core
+    - env: JYTHON=true; YTDL_TEST_SET=download
+  fast_finish: true
+  allow_failures:
+    - env: YTDL_TEST_SET=download
+    - env: JYTHON=true; YTDL_TEST_SET=core
+    - env: JYTHON=true; YTDL_TEST_SET=download
+before_install:
+  - if [ "$JYTHON" == "true" ]; then ./devscripts/install_jython.sh; export PATH="$HOME/jython/bin:$PATH"; fi
+script: ./devscripts/run_tests.sh