summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-06-19 23:16:54 +0200
committerJoffrey F <joffrey@docker.com>2015-06-19 23:16:54 +0200
commited94c0d52519002f460a377d787eff505a0ed3e9 (patch)
tree3cbf570a0a3099e319664e0cc717411414611a07
parent3170277347a1ddca19b734dd09fba2d2ae784eb0 (diff)
downloaddocker-py-ed94c0d52519002f460a377d787eff505a0ed3e9.tar.gz
Simplified tox configupdate-websocket-client-dep
-rw-r--r--tox.ini20
1 files changed, 1 insertions, 19 deletions
diff --git a/tox.ini b/tox.ini
index 35b9bd6..10b9df9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,24 +2,6 @@
envlist = py26, py27, py32, py33, py34, flake8
skipsdist=True
-[testenv:py26]
-usedevelop=True
-commands =
- {envbindir}/coverage run -p tests/test.py
- {envbindir}/coverage run -p tests/utils_test.py
-deps =
- -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements.txt
-
-[testenv:py27]
-usedevelop=True
-commands =
- {envbindir}/coverage run -p tests/test.py
- {envbindir}/coverage run -p tests/utils_test.py
-deps =
- -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements.txt
-
[testenv]
usedevelop=True
commands =
@@ -29,8 +11,8 @@ commands =
{envbindir}/coverage report
{envbindir}/coverage html
deps =
- -r{toxinidir}/requirements3.txt
-r{toxinidir}/test-requirements.txt
+ -r{toxinidir}/requirements.txt
[testenv:flake8]
commands = flake8 docker tests