Merge "tox: Trivial cleanup"

tox.ini

@@ -1,8 +1,10 @@
 [tox]
-minversion = 2.0
+minversion = 3.1
 envlist = py27,py37,pep8
+ignore_basepython_conflict = True
 
 [testenv]
+basepython = python3
 whitelist_externals =
   env
 passenv =
@@ -13,31 +15,23 @@ setenv =
   {mysql,all}: PIFPAF_MYSQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql --
   {mysql,postgresql,all}: BASECOMMAND={toxinidir}/tools/run-pifpaf-tests.sh
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
 commands =
-  {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} {posargs}
+  env TEST_EVENTLET=0 {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} {posargs}
-
+  env TEST_EVENTLET=1 {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} {posargs}
-[testenv:py27]
-basepython = python2.7
-commands =
-  env TEST_EVENTLET=0 stestr run {posargs}
-  env TEST_EVENTLET=1 stestr run {posargs}
 
 [testenv:pep8]
-basepython = python3
 commands =
   flake8
   # Run security linter
   bandit -r oslo_db -x tests -n5 --skip B105,B311
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:cover]
-basepython = python3
 setenv =
   PYTHON=coverage run --source oslo_db --parallel-mode
 commands =
@@ -47,7 +41,6 @@ commands =
   coverage xml -o cover/coverage.xml
 
 [testenv:docs]
-basepython = python3
 whitelist_externals =
   rm
 deps =
@@ -59,10 +52,11 @@ commands =
   sphinx-build -W --keep-going -b html doc/source doc/build/html
 
 [testenv:releasenotes]
-basepython = python3
 whitelist_externals =
   rm
-deps = -r{toxinidir}/doc/requirements.txt
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -r{toxinidir}/doc/requirements.txt
 commands =
   rm -rf releasenotes/build
   sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
@@ -78,7 +72,6 @@ import_exceptions =
   oslo_db._i18n
 
 [testenv:bindep]
-basepython = python3
 # Do not install any requirements. We want this to be fast and work even if
 # system dependencies are missing, since it's used to tell you what system
 # dependencies are missing! This also means that bindep must be installed
@@ -90,7 +83,6 @@ commands = bindep test
 usedevelop = False
 
 [testenv:lower-constraints]
-basepython = python3
 deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt