Merge "fix tox python3 overrides"

tox.ini

@@ -22,17 +22,21 @@ whitelist_externals = sh
 passenv = SWIFT_* *_proxy
 
 [testenv:pep8]
+basepython = python3
 commands =
     python -m flake8 swiftclient tests
 
 [testenv:venv]
+basepython = python3
 commands = {posargs}
 
 [testenv:cover]
+basepython = python3
 commands = python setup.py testr --coverage
            coverage report
 
 [testenv:func]
+basepython = python3
 setenv = OS_TEST_PATH=tests.functional
 whitelist_externals =
     coverage
@@ -43,6 +47,7 @@ commands =
     rm -f .coverage
 
 [testenv:docs]
+basepython = python3
 commands=
     python setup.py build_sphinx
 
@@ -60,6 +65,7 @@ show-source = True
 exclude = .venv,.tox,dist,doc,*egg
 
 [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
@@ -69,6 +75,7 @@ deps = bindep
 commands = bindep test
 
 [testenv:releasenotes]
+basepython = python3
 commands = sphinx-build -a -W -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:lower-constraints]