Merge "move doc requirements to doc/requirements.txt"

doc/requirements.txt

@@ -0,0 +1,3 @@
+openstackdocstheme>=1.17.0 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
+sphinx>=1.6.2 # BSD

setup.cfg

@@ -16,11 +16,6 @@ classifier =
     Intended Audience :: Developers
     Environment :: Console
 
-[extras]
-docs =
-  openstackdocstheme>=1.17.0 # Apache-2.0
-  reno>=2.5.0 # Apache-2.0
-
 [global]
 setup-hooks =
     pbr.hooks.setup_hook

test-requirements.txt

@@ -2,7 +2,8 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-sphinx>=1.6.2 # BSD
 mock>=2.0.0 # BSD
 coverage!=4.4,>=4.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
+# sphinx is needed for testing the sphinxext module
+sphinx>=1.6.2 # BSD

tox.ini

@@ -10,11 +10,13 @@ setenv =
 install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 deps =
   -r{toxinidir}/test-requirements.txt
-  .[docs]
 distribute = False
 commands = python setup.py testr --testr-args='{posargs}'
 
 [testenv:venv]
+deps =
+  -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/doc/requirements.txt
 commands = {posargs}
 
 [testenv:pep8]
@@ -23,6 +25,7 @@ ignore = E251
 commands = flake8 stevedore setup.py
 
 [testenv:docs]
+deps = -r{toxinidir}/doc/requirements.txt
 commands = python setup.py build_sphinx
 
 [flake8]
@@ -31,4 +34,5 @@ show-source = True
 exclude=.venv,.git,.tox,dist,*lib/python*,*egg,build
 
 [testenv:releasenotes]
+deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html