Merge "Drop duplicated doc requirements"

doc/requirements.txt

@@ -6,6 +6,7 @@
 # added in alphabetical order, however, some dependencies may need to
 # be installed in a specific order.
 openstackdocstheme>=2.2.1 # Apache-2.0
+os-api-ref>=1.4.0 # Apache-2.0
 reno>=3.1.0 # Apache-2.0
 sphinx>=2.0.0,!=2.1.0 # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD

test-requirements.txt

@@ -11,7 +11,3 @@ doc8>=0.8.1 # Apache-2.0
 astroid==1.6.5 # LGPLv2.1
 oslotest>=3.2.0 # Apache-2.0
 tenacity>=4.9.0  # Apache-2.0
-# Docs building
-openstackdocstheme>=2.2.1 # Apache-2.0
-os-api-ref>=1.4.0 # Apache-2.0
-reno>=3.1.0 # Apache-2.0

tox.ini

@@ -27,6 +27,7 @@ allowlist_externals = find
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/doc/requirements.txt
 commands =
     flake8
     reno lint
@@ -82,6 +83,9 @@ paths = ./trove/hacking
 [testenv:api-ref]
 # This environment is called from CI scripts to test and publish
 # the API Ref to developer.openstack.org.
+deps =
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -r{toxinidir}/doc/requirements.txt
 commands =
   rm -rf api-ref/build
   sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
@@ -108,6 +112,10 @@ commands = oslo-config-generator --config-file=tools/trove-config-generator.conf
 commands = oslopolicy-sample-generator --config-file=tools/trove-policy-generator.conf
 
 [testenv:docs]
+deps =
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:trovestack]