summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-10-05 22:47:44 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-10-05 22:47:44 +0200
commit226113c880f90e35dade151807b45138fb306af4 (patch)
treec60b523a4a406425015fbc3285cee92217881e28
parent8932a66e49dda60bdb6ddb1447df63fea5c4f320 (diff)
parent79cfb46d42cf0cd296acf7f0689d2ad4b2e7f971 (diff)
downloadyoutube-dl-226113c880f90e35dade151807b45138fb306af4.tar.gz
youtube-dl-226113c880f90e35dade151807b45138fb306af4.tar.xz
youtube-dl-226113c880f90e35dade151807b45138fb306af4.zip
Merge remote-tracking branch 'origin/tox'
-rw-r--r--.gitignore1
-rw-r--r--tox.ini5
2 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 24fdb3626..7dd0ad09b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ updates_key.pem
 *.mp4
 *.part
 test/testdata
+.tox
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 000000000..53b461fdb
--- /dev/null
+++ 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