Merge "Create doc/requirements.txt"

doc/requirements.txt

@@ -0,0 +1,8 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+
+openstackdocstheme>=1.18.1 # Apache-2.0
+sphinx!=1.6.6,>=1.6.2 # BSD
+reno>=2.5.0 # Apache-2.0
+sphinxcontrib-httpdomain>=1.3.0 # BSD

test-requirements.txt

@@ -7,13 +7,10 @@ fixtures>=3.0.0 # Apache-2.0/BSD
 # Hacking already pins down pep8, pyflakes and flake8
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 mock>=2.0.0 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
 paunch>=1.0.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
 requests>=2.14.2 # Apache-2.0
 requests-mock>=1.1.0 # Apache-2.0
 salt
-sphinx!=1.6.6,>=1.6.2 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT

tox.ini

@@ -15,9 +15,7 @@ commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi'
 commands = flake8
 
 [testenv:docs]
-deps = -r{toxinidir}/requirements.txt
+deps = -r{toxinidir}/doc/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-       sphinxcontrib-httpdomain
 commands = python setup.py build_sphinx
 
 [testenv:venv]
@@ -29,4 +27,5 @@ builtins = _
 exclude=.venv,.git,.tox,*lib/python*,private,.eggs
 
 [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