diff --git a/tox.ini b/tox.ini index 96d980c..e1464f1 100644 --- a/tox.ini +++ b/tox.ini @@ -3,17 +3,16 @@ minversion = 3.18.0 # python runtimes: https://governance.openstack.org/tc/reference/project-testing-interface.html#tested-runtimes envlist = py3,pep8 skipsdist = True -setenv = VIRTUAL_ENV={envdir} -# this allows tox to infer the base python from the environment name -# and override any basepython configured in this file +# setting ignore_basepython_conflict allows tox to infer the base python +# from the environment name and override any basepython configured in this file ignore_basepython_conflict=true - [testenv] basepython=python3 setenv = OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 OS_TEST_PATH=./cinderlib/tests/unit + VIRTUAL_ENV={envdir} usedevelop=True install_command = python -m pip install {env:PIP_OPTIONS:} {opts} {packages} # Use cinder and os-brick from the appropriate development branch instead of