Merge "tox: Trivial cleanup"

tox.ini

@@ -1,22 +1,17 @@
 [tox]
-minversion = 2.0
+minversion = 3.1
 envlist = py27,py37,pypy,pep8
+ignore_basepython_conflict = True
 
 [testenv]
-install_command = pip install {opts} {packages}
-whitelist_externals =
- /bin/sh
+basepython = python3
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
 commands = stestr run --slowest {posargs}
 
-[testenv:py27]
-basepython = python2.7
-
 [testenv:pep8]
-basepython = python3
 deps =
   -r{toxinidir}/test-requirements.txt
 commands =
@@ -25,11 +20,9 @@ commands =
   bandit -r oslo_privsep -x tests -n5 --skip B404,B603
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:docs]
-basepython = python3
 whitelist_externals =
   rm
 deps =
@@ -40,7 +33,6 @@ commands =
   sphinx-build -W --keep-going -b html doc/source doc/build/html
 
 [testenv:cover]
-basepython = python3
 setenv =
     PYTHON=coverage run --source $project --parallel-mode
 commands =
@@ -65,7 +57,6 @@ import_exceptions =
   oslo_privsep._i18n
 
 [testenv:releasenotes]
-basepython = python3
 whitelist_externals =
   rm
 commands =
@@ -73,7 +64,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