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

diff --git a/.travis.yml b/.travis.yml
index 03947b1eb..92f326860 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,27 @@
 language: python
-#specify the python version
 python:
   - "2.6"
   - "2.7"
-#command to install the setup
-install:
-# command to run tests
-script: nosetests test --nocapture
+  - "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