summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorSolly Ross <sross@redhat.com>2015-05-06 14:29:51 -0400
committerSolly Ross <sross@redhat.com>2015-05-13 16:03:57 -0400
commit2e57ee315986fa7a94ff0cbcb92e9a740047a5f0 (patch)
tree7e4d97209a09a7ffdbb23d550f0eeb752ab6b03d /tox.ini
parent04fd789a677a84b3c908bb8ac02413d16271d5fb (diff)
downloadwebsockify-2e57ee315986fa7a94ff0cbcb92e9a740047a5f0.tar.gz
Enable Travis
This commit enables running the unit tests on Travis for Python 2.6, 2.7, 3.3, and 3.4. Note that Travis does not support Python 2.4, so we cannot test there.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini6
1 files changed, 2 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index 012d349..79f7201 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,12 +8,10 @@ envlist = py24,py26,py27,py33,py34
[testenv]
commands = nosetests {posargs}
-deps =
- mox
- nose
+deps = -r{toxinidir}/test-requirements.txt
# At some point we should enable this since tox expects it to exist but
-# the code will need pep8ising first.
+# the code will need pep8ising first.
#[testenv:pep8]
#commands = flake8
#dep = flake8