Merge "fix tox python3 overrides"

tox.ini

@@ -21,29 +21,33 @@ commands =
   rm -Rf .testrepository/times.dbm
 
 [testenv:py27]
+basepython = python2.7
 commands =
   {[testenv]commands}
   stestr run {posargs}
   stestr slowest
 
 [testenv:py27-postgresql]
+basepython = python2.7
 commands =
   {[testenv]commands}
   {toxinidir}/tools/run_pifpaf.sh '{posargs}'
 
 [testenv:py35]
+basepython = python3
 commands =
   {[testenv]commands}
   stestr run {posargs}
   stestr slowest
 
 [testenv:py35-postgresql]
+basepython = python3
 commands =
     {[testenv]commands}
     {toxinidir}/tools/run_pifpaf.sh '{posargs}'
 
 [testenv:functional]
-basepython=python3.5
+basepython=python3
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
@@ -53,7 +57,7 @@ commands =
   py.test -svx {toxinidir}/deckhand/tests/common/test_gabbi.py -k '{posargs}'
 
 [testenv:functional-dev]
-basepython=python3.5
+basepython=python3
 # Minimalistic functional test job for running Deckhand functional tests
 # via uwsgi. Uses pifpaf for DB instantiation. Useful for developers.
 # Requires PostgreSQL be installed on host.
@@ -65,6 +69,7 @@ commands =
   pifpaf run postgresql -- {toxinidir}/tools/functional-tests.sh "{posargs}"
 
 [testenv:cover]
+basepython = python3
 setenv = {[testenv]setenv}
          PYTHON=coverage run --source deckhand --parallel-mode
 commands =
@@ -77,15 +82,19 @@ commands =
   coverage report
 
 [testenv:bandit]
+basepython = python3
 commands = bandit -r deckhand -x deckhand/tests -n 5
 
 [testenv:genconfig]
+basepython = python3
 commands = oslo-config-generator --config-file=etc/deckhand/config-generator.conf
 
 [testenv:genpolicy]
+basepython = python3
 commands = oslopolicy-sample-generator --config-file=etc/deckhand/policy-generator.conf
 
 [testenv:pep8]
+basepython = python3
 deps =
   .[bandit]
   {[testenv]deps}