From 0da7834584f18dd70a6b5e979b33629f9051b003 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 14 Apr 2015 15:46:25 -0700 Subject: [PATCH] Move command for v1 back into testenv so that we have a default (We have a jenkins build that creates a [testenv:jenkins] so it needs there to be a default value --- tox.ini | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 5691980b60..5440a5825c 100644 --- a/tox.ini +++ b/tox.ini @@ -2,20 +2,22 @@ envlist = {py26,py27}-v{1} [testenv] +commands = make tests deps = -r{toxinidir}/test-requirements.txt whitelist_externals = make [testenv:py26-v1] -commands = make tests [testenv:py27-v1] -commands = make tests [testenv:py26-v2] +deps = -r{toxinidir}/v2/test-requirements.txt commands = make newtests [testenv:py27-v2] +deps = -r{toxinidir}/v2/test-requirements.txt commands = make newtests [testenv:py34-v2] +deps = -r{toxinidir}/v2/test-requirements.txt commands = make newtests