From 2837bff516eb283e43ec0795d285b9485dbc4e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Fri, 20 Dec 2019 11:15:51 +0100 Subject: [PATCH] tox: Trivial cleanup Move 'basepython' to the top-level 'testenv'. Use the default 'install_command' https://tox.readthedocs.io/en/latest/config.html#conf-install_command Change-Id: I7c672f05753886e234430c760f1afc1ed01ff2a3 --- tox.ini | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tox.ini b/tox.ini index de79014..eeb1e4e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,12 @@ [tox] -minversion = 1.8 +minversion = 3.1 envlist = py27,py37,pep8 skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 usedevelop = True -install_command = pip install {opts} {packages} setenv = VIRTUAL_ENV={envdir} OS_DEBUG=1 @@ -18,15 +19,12 @@ deps = commands = stestr run --slowest {posargs} [testenv:pep8] -basepython = python3 commands = flake8 {posargs} [testenv:venv] -basepython = python3 commands = {posargs} [testenv:cover] -basepython = python3 deps = {[testenv]deps} coverage setenv = @@ -38,7 +36,6 @@ commands = coverage xml -o cover/coverage.xml [testenv:docs] -basepython = python3 whitelist_externals = rm deps = @@ -49,7 +46,6 @@ commands = sphinx-build -W --keep-going -b html doc/source doc/build/html [testenv:debug] -basepython = python3 commands = oslo_debug_helper {posargs} [testenv:lower-constraints]