Merge remote-tracking branch 'origin/master' into fork_master

[youtube-dl] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 03947b1eb7877066fbe65108cbd7cd1260e9eea0..c6c758fd555e29dca0941ae877dcb86a8a582af0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,13 @@
 language: python
-#specify the python version
 python:
   - "2.6"
   - "2.7"
-#command to install the setup
-install:
-# command to run tests
+#  - "3.3"
 script: nosetests test --nocapture
+notifications:
+  email:
+    - filippo.valsorda@gmail.com
+  irc:
+    channels:
+      - "irc.freenode.org#youtube-dl"
+    skip_join: true