From b892985a5676cf58c4659658e22ba95f0cc92531 Mon Sep 17 00:00:00 2001 From: Nguyen Hai Date: Wed, 29 Aug 2018 22:03:09 +0900 Subject: [PATCH] switch documentation job to new PTI This is a mechanically generated patch to switch the documentation jobs to use the new PTI versions of the jobs as part of the python3-first goal. See the python3-first goal document for details: https://governance.openstack.org/tc/goals/stein/python3-first.html Change-Id: I766b9d504ea24e1fadaad0d158da43012a07290a Story: #2002586 Task: #24328 --- .zuul.yaml | 2 +- doc/source/conf.py | 1 - requirements.txt | 1 - tox.ini | 3 +-- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 6419942..488fab5 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,4 @@ - project: templates: - openstack-python-jobs - - publish-openstack-sphinx-docs + - publish-openstack-docs-pti diff --git a/doc/source/conf.py b/doc/source/conf.py index a6a2cf3..4e65f2f 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -29,7 +29,6 @@ sys.path.insert(0, os.path.abspath('../..')) # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ - 'rst2pdf.pdfbuilder', 'sphinx.ext.autodoc', 'sphinxcontrib.httpdomain', 'openstackdocstheme', diff --git a/requirements.txt b/requirements.txt index 6ce12c4..9b2e1e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ openstackdocstheme>=1.11.0 # Apache-2.0 sphinx>=1.6.2 # BSD -rst2pdf six>=1.9.0 sphinxcontrib-httpdomain sphinx_rtd_theme diff --git a/tox.ini b/tox.ini index 3a3fecb..b2b5451 100644 --- a/tox.ini +++ b/tox.ini @@ -29,8 +29,7 @@ commands = flake8 [testenv:docs] basepython = python3 -commands = - python setup.py build_sphinx +commands = sphinx-build -b html doc/source doc/build/html [testenv:pdf] deps =