Update for openstack-doc-tools 2.0

With the new release, we can remove some hacks ;)

Change-Id: I5cc60ad8e27930623f6a047d5e831aef923b28f0
This commit is contained in:
Andreas Jaeger 2019-08-22 15:12:07 +02:00
parent bb9e5cbeea
commit 82543f7c07
3 changed files with 1 additions and 10 deletions

View File

@ -3,7 +3,7 @@
# process, which may cause wedges in the gate later.
doc8 # Apache-2.0
openstack-doc-tools>=1.6.0 # Apache-2.0
openstack-doc-tools>=2.0.0 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
openstackdocstheme>=1.18.1 # Apache-2.0

View File

@ -7,11 +7,7 @@ MARKER_TEXT="Project: $ZUUL_PROJECT Ref: $ZUUL_REFNAME Build: $ZUUL_UUID Revisio
doc-tools-build-rst security-guide --build build \
--target security-guide
# TODO (AJaeger): Remove once openstack-doc-tools is updated
mv publish-docs/security-guide publish-docs/html
echo $MARKER_TEXT > publish-docs/html/security-guide/.root-marker
doc-tools-build-rst security-threat-analysis --build build \
--target security-threat-analysis
# TODO (AJaeger): Remove once openstack-doc-tools is updated
mv publish-docs/security-threat-analysis publish-docs/html
echo $MARKER_TEXT > publish-docs/html/security-threat-analysis/.root-marker

View File

@ -47,11 +47,6 @@ commands =
basepython = python3
whitelist_externals = doc-tools-check-languages
commands = doc-tools-check-languages doc-tools-check-languages.conf test all
# Move from publish-docs to publish-docs/html
# TODO(AJaeger): Remove once openstack-doc-tools is updated
mkdir publish-docs-new
mv publish-docs publish-docs-new/html
mv publish-docs-new publish-docs
[testenv:docs]
basepython = python3