Merge remote-tracking branch 'origin/tox'

11 years ago · 226113c880
parent 8932a66e49 79cfb46d42
commit 226113c880
2 changed files with 6 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -25,3 +25,4 @@ updates_key.pem
 *.mp4
 *.part
 test/testdata
 .tox
--- a/tox.ini
+++ b/tox.ini
@ -0,0 +1,5 @@
 [tox]
 envlist = py26,py27,py33
 [testenv]
 deps = nose
 commands = nosetests --with-coverage --cover-package=youtube_dl --cover-html --verbose test