Merge branch 'master' into extract_info_rewrite

[youtube-dl] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index f4c2095d29a9178cb1a61dea7c24c6ae116f186e..0687c89572eab53ade23dd8dc1b7afd09ae63910 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,13 @@ language: python
 python:
   - "2.6"
   - "2.7"
-#  - "3.3"
-script: nosetests test --verbose --processes 4
+  - "3.3"
+script: nosetests test --verbose
 notifications:
   email:
     - filippo.valsorda@gmail.com
     - phihag@phihag.de
-  irc:
-    channels:
-      - "irc.freenode.org#youtube-dl"
-    skip_join: true
+#  irc:
+#    channels:
+#      - "irc.freenode.org#youtube-dl"
+#    skip_join: true