X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=.travis.yml;h=92f326860f660fa67a79b31385c6b481dd8276c5;hb=e11ccd76c6dc8438c01d30445627eab5203cb1dc;hp=c6cc7a994be31732c563612d3560ba1cdf6379da;hpb=24e6ec8ac862267b100539fbe745ec87015bbc3d;p=youtube-dl

diff --git a/.travis.yml b/.travis.yml
index c6cc7a994..92f326860 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,16 +2,26 @@ language: python
 python:
   - "2.6"
   - "2.7"
+  - "3.2"
   - "3.3"
   - "3.4"
-script: nosetests test --verbose
-notifications:
-  email:
-    - filippo.valsorda@gmail.com
-    - phihag@phihag.de
-    - jaime.marquinez.ferrandiz+travis@gmail.com
-    - yasoob.khld@gmail.com
-#  irc:
-#    channels:
-#      - "irc.freenode.org#youtube-dl"
-#    skip_join: true
+  - "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