Dependency and tox.ini cleanup

Change-Id: If88fc483936bfb9a8d4e0b8900efde51ae79d748

Author: lukapeschke

doc/requirements.txt

@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 openstackdocstheme>=1.30.0 # Apache-2.0
-sphinx>=1.8.0,!=2.1.0 # BSD
+sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
 reno>=2.5.0 # Apache-2.0
 

test-requirements.txt

@@ -7,7 +7,6 @@ hacking>=1.1.0,<1.2.0 # Apache-2.0
 -e git://github.com/openstack/horizon.git#egg=horizon
 
 coverage>=3.6
-discover
 python-subunit>=0.0.18
 oslotest>=1.10.0 # Apache-2.0
 stestr>=2.0.0 # Apache-2.0

tox.ini

@@ -4,6 +4,7 @@ envlist = py36,py37,py3-{dj111,dj22},pypy,pep8
 skipsdist = True
 
 [testenv]
+basepython = python3
 usedevelop = True
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -U {opts} {packages}
 setenv =
@@ -16,15 +17,12 @@ commands =
    stestr run --slowest {posargs}
 
 [testenv:pep8]
-basepython = python3
 commands = flake8
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:cover]
-basepython = python3
 setenv =
     {[testenv]setenv}
     PYTHON=coverage run --source cloudkittydashboard --parallel-mode
@@ -35,12 +33,10 @@ commands =
     coverage xml -o cover/coverage.xml
 
 [testenv:docs]
-basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W --keep-going -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
-basepython = python3
 envdir = {toxworkdir}/docs
 deps = {[testenv:docs]deps}
 whitelist_externals =
@@ -50,7 +46,6 @@ commands =
   make -C doc/build/pdf
 
 [testenv:debug]
-basepython = python3
 commands = oslo_debug_helper -t cloudkittydashboard/tests {posargs}
 
 [flake8]
@@ -62,7 +57,6 @@ builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject,releasenotes
 
 [testenv:releasenotes]
-basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands =
   sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html