openstack
/
openstack-manuals
Code Issues Proposed changes

Update for openstack-doc-tools 0.25 

Require openstack-doc-tools 0.25. This allows us to remove the content
directory for RST checkbuild.

Change-Id: Iffbdbb312c4e74902aec3cd4ebbfb5e4a4d83a76
This commit is contained in:
Andreas Jaeger 2015-04-30 07:34:02 +02:00
parent 5621d7fc6c
commit 75c5b45173
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test-requirements.txt
View File

@ -8,7 +8,7 @@ hacking>=0.10.0,<0.11
beautifulsoup4 beautifulsoup4
Jinja2>=2.6 # BSD License (3 clause) Jinja2>=2.6 # BSD License (3 clause)
openstack-doc-tools>=0.23 openstack-doc-tools>=0.25
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
openstackdocstheme>=1.0.7 openstackdocstheme>=1.0.7
doc8 # Apache-2.0 doc8 # Apache-2.0

17
tox.ini
View File

@ -45,22 +45,19 @@ commands =
cp www/www-index.html publish-docs/ cp www/www-index.html publish-docs/
rsync -a www/static/ publish-docs/www/ rsync -a www/static/ publish-docs/www/
# Build and copy RST Guides # Build and copy RST Guides
# TODO(ajaeger): We publish to content to allow for reviewing, this needs a
# change of openstack-doc-tools to remove content here in the file layout
# for previewing.
# Build both RST User Guides # Build both RST User Guides
{toxinidir}/tools/build-user-guides.sh {toxinidir}/tools/build-user-guides.sh
# Copy RST user-guide # Copy RST user-guide
mkdir -p publish-docs/user-guide/content/ mkdir -p publish-docs/user-guide/
rsync -a doc/user-guides/build/html/ publish-docs/user-guide/content rsync -a doc/user-guides/build/html/ publish-docs/user-guide/
# Copy RST user-guide-admincontent # Copy RST user-guide-admin
mkdir -p publish-docs/user-guide-admin/content/ mkdir -p publish-docs/user-guide-admin/
rsync -a doc/user-guides/build-admin/html/ publish-docs/user-guide-admin/content/ rsync -a doc/user-guides/build-admin/html/ publish-docs/user-guide-admin/
# Build RST networking guide # Build RST networking guide
{toxinidir}/tools/glossary2rst.py doc/networking-guide/source/glossary.rst {toxinidir}/tools/glossary2rst.py doc/networking-guide/source/glossary.rst
sphinx-build -E -W doc/networking-guide/source doc/networking-guide/build/html sphinx-build -E -W doc/networking-guide/source doc/networking-guide/build/html
mkdir -p publish-docs/networking-guide/content/ mkdir -p publish-docs/networking-guide/
rsync -a doc/networking-guide/build/html/ publish-docs/networking-guide/content/ rsync -a doc/networking-guide/build/html/ publish-docs/networking-guide/
# Build DocBook Guides, note we do not build the DocBook XML Networking Guide # Build DocBook Guides, note we do not build the DocBook XML Networking Guide
openstack-doc-test --check-build --ignore-book networking-guide {posargs} openstack-doc-test --check-build --ignore-book networking-guide {posargs}