diff --git a/tox.ini b/tox.ini index ef9add803dc..b064e51db30 100644 --- a/tox.ini +++ b/tox.ini @@ -16,9 +16,9 @@ setenv = VIRTUAL_ENV={envdir} OS_TEST_TIMEOUT=60 OS_TEST_PATH=./cinder/tests/unit usedevelop = True +install_command=python -m pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} -deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} - -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt # By default stestr will set concurrency @@ -123,7 +123,6 @@ commands = {posargs} [testenv:docs] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/doc/requirements.txt commands = rm -fr doc/source/contributor/api/ @@ -224,6 +223,7 @@ ignore-path=.tox,*.egg-info,doc/src/api,doc/source/drivers.rst,doc/build,.eggs/* extension=.txt,.rst,.inc [testenv:lower-constraints] +install_command=python -m pip install {opts} {packages} deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt