openstack/openstack-manuals
Code Issues Proposed changes

Merge "switch the build to use python3"

Browse Source
This commit is contained in:
Zuul 2018-07-02 15:10:20 +00:00 committed by Gerrit Code Review
commit 4ec3963480
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/publishdocs.sh
View File

@ -27,7 +27,7 @@ tools/build-all-rst.sh --pdf
# Build the www pages so that openstack-indexpage creates a link to # Build the www pages so that openstack-indexpage creates a link to
# www/www-index.html. # www/www-index.html.
if [ "$PUBLISH" = "build" ] ; then if [ "$PUBLISH" = "build" ] ; then
python tools/www-generator.py --source-directory www/ \ python3 tools/www-generator.py --source-directory www/ \
--output-directory publish-docs/www/ --output-directory publish-docs/www/
rsync -a www/static/ publish-docs/www/ rsync -a www/static/ publish-docs/www/
# publish-docs/www-index.html is the trigger for openstack-indexpage # publish-docs/www-index.html is the trigger for openstack-indexpage
@ -35,7 +35,7 @@ if [ "$PUBLISH" = "build" ] ; then
mv publish-docs/www/www-index.html publish-docs/www-index.html mv publish-docs/www/www-index.html publish-docs/www-index.html
fi fi
if [ "$PUBLISH" = "publish" ] ; then if [ "$PUBLISH" = "publish" ] ; then
python tools/www-generator.py --source-directory www/ \ python3 tools/www-generator.py --source-directory www/ \
--output-directory publish-docs --output-directory publish-docs
rsync -a www/static/ publish-docs/ rsync -a www/static/ publish-docs/
# Don't publish these files # Don't publish these files

2
tox.ini
View File

@ -4,7 +4,7 @@ envlist = linters,checkbuild
skipsdist = True skipsdist = True
[testenv] [testenv]
basepython=python2.7 basepython=python3
setenv = setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt