Merge "Add ansible requirement to our docs builds"

2019-07-11 15:03:01 +00:00
parent add4969e6b 32aed164b9
commit 1255faa87d
4 changed files with 10 additions and 12 deletions
@@ -1,10 +0,0 @@
-# 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.
-
-# this is required for the docs build jobs
-sphinx>=2.0.0 # BSD
-openstackdocstheme>=1.29.2 # Apache-2.0
-reno>=2.11.3 # Apache-2.0
-doc8>=0.8.0 # Apache-2.0
-bashate>=0.6.0 # Apache-2.0
@@ -0,0 +1 @@
+../molecule-requirements.txt
@@ -1,3 +1,4 @@
+# this is required for the molecule jobs
 ansible
 ansi2html
 docker
@@ -7,3 +8,10 @@ pytest-html
 pytest-xdist
 mock
 molecule>=2.22rc1
+
+# this is required for the docs build jobs
+sphinx>=2.0.0 # BSD
+openstackdocstheme>=1.29.2 # Apache-2.0
+reno>=2.11.3 # Apache-2.0
+doc8>=0.8.0 # Apache-2.0
+bashate>=0.6.0 # Apache-2.0
@@ -96,8 +96,7 @@ commands =
 [testenv:docs]
 basepython = python3
 deps =
-  -r{toxinidir}/doc/requirements.txt
-  -r{toxinidir}/molecule-requirements.txt
+  -r {toxinidir}/doc/requirements.txt
 commands=
    doc8 doc
    sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html -T