Merge "tox: Trivial cleanup"

tox.ini

@@ -1,8 +1,10 @@
 [tox]
-minversion = 2.0
+minversion = 3.1
 envlist = py27,py36,py37,pep8
+ignore_basepython_conflict = True
 
 [testenv]
+basepython = python3
 whitelist_externals =
   find
 deps =
@@ -14,18 +16,15 @@ commands =
   stestr slowest
 
 [testenv:pep8]
-basepython = python3
 commands =
   flake8
   # Run security linter
   bandit -r oslo_log -x tests -n5
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:docs]
-basepython = python3
 whitelist_externals = rm
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
@@ -35,7 +34,6 @@ commands =
   sphinx-build -a -E -W --keep-going -b html doc/source doc/build/html
 
 [testenv:releasenotes]
-basepython = python3
 whitelist_externals = rm
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
@@ -45,7 +43,6 @@ commands =
   sphinx-build -a -E -W --keep-going -b html releasenotes/source releasenotes/build/html
 
 [testenv:cover]
-basepython = python3
 commands =
   coverage erase
   {[testenv]commands}
@@ -55,11 +52,9 @@ commands =
   coverage report --show-missing
 
 [testenv:bandit]
-basepython = python3
 commands = bandit -r oslo_log -x tests -n5
 
 [testenv:lower-constraints]
-basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt