From c93f92b611c9186594df20a715c8ea88f6fb9f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Fri, 20 Dec 2019 11:04:28 +0100
Subject: 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: I0f7296cfd8586b5b41c7a237561c4d931ee1e3d1
---
 tox.ini | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/tox.ini b/tox.ini
index 2da179e..5106760 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,32 +1,27 @@
 [tox]
-minversion = 2.0
+minversion = 3.1
 envlist = py27,py37,pep8
+ignore_basepython_conflict = True
 
 [testenv]
+basepython = python3
 setenv =
     VIRTUAL_ENV={envdir}
-install_command = pip install {opts} {packages}
 deps =
     -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
-[testenv:py27]
-basepython = python2.7
-
 [testenv:pep8]
-basepython = python3
 commands =
   flake8
   # Run security linter
   bandit -r oslo_middleware -x tests -n5
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:docs]
-basepython = python3
 whitelist_externals =
   rm
 deps = -r{toxinidir}/doc/requirements.txt
@@ -35,7 +30,6 @@ commands =
   sphinx-build -W --keep-going -b html doc/source doc/build/html
 
 [testenv:cover]
-basepython = python3
 commands = python setup.py test --coverage --coverage-package-name=oslo_middleware --testr-args='{posargs}'
 
 [flake8]
@@ -49,7 +43,6 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,__init__.py
 import_exceptions = oslo_middleware._i18n
 
 [testenv:releasenotes]
-basepython = python3
 whitelist_externals =
   rm
 deps = -r{toxinidir}/doc/requirements.txt
@@ -58,7 +51,6 @@ commands =
   sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
 
 [testenv:lower-constraints]
-basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt
-- 
cgit v1.2.1