diff options
| author | Bert JW Regeer <xistence@0x58.com> | 2020-05-04 00:54:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 00:54:35 -0700 |
| commit | fb61956484fa6733b0c7a1dbea65b2b2467bd511 (patch) | |
| tree | e9597cd110c4449f148fb2619f016448f2a14dcd | |
| parent | 6b74395bfb12b3c04823e360c72e6c33f0d792d9 (diff) | |
| parent | 1a575dc3e506ff8b43bba31363bcda3fd94e57b4 (diff) | |
| download | pyramid-fb61956484fa6733b0c7a1dbea65b2b2467bd511.tar.gz pyramid-fb61956484fa6733b0c7a1dbea65b2b2467bd511.tar.bz2 pyramid-fb61956484fa6733b0c7a1dbea65b2b2467bd511.zip | |
Merge pull request #3577 from Pylons/fix-3573-sphinx-3.0
Fix Sphinx 3.0.x build
| -rw-r--r-- | docs/api/request.rst | 2 | ||||
| -rw-r--r-- | docs/conf.py | 6 | ||||
| -rw-r--r-- | tox.ini | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docs/api/request.rst b/docs/api/request.rst index ed7f91e91..edd319864 100644 --- a/docs/api/request.rst +++ b/docs/api/request.rst @@ -14,7 +14,7 @@ model_url, resource_url, resource_path, set_property, effective_principals, authenticated_userid, unauthenticated_userid, has_permission, - invoke_exception_view, localizer + invoke_exception_view, localizer, response, session .. attribute:: context diff --git a/docs/conf.py b/docs/conf.py index 472485380..613f38dca 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -379,9 +379,9 @@ def app_role(role, rawtext, text, lineno, inliner, options={}, content=[]): def setup(app): app.add_role('app', app_role) - app.add_directive('frontmatter', FrontMatter, 1, (0, 0, 0)) - app.add_directive('mainmatter', MainMatter, 1, (0, 0, 0)) - app.add_directive('backmatter', BackMatter, 1, (0, 0, 0)) + app.add_directive('frontmatter', FrontMatter) + app.add_directive('mainmatter', MainMatter) + app.add_directive('backmatter', BackMatter) app.connect('autodoc-process-signature', resig) @@ -33,14 +33,14 @@ deps = [testenv:docs] whitelist_externals = make commands = - make -C docs {posargs:doctest html epub} BUILDDIR={envdir} "SPHINXOPTS=-W -E" + make -C docs {posargs:doctest html epub} BUILDDIR={envdir} "SPHINXOPTS=-W -E -D suppress_warnings=ref.term" extras = docs [testenv:pdf] whitelist_externals = make commands = - make -C docs latexpdf BUILDDIR={envdir} "SPHINXOPTS=-W -E" + make -C docs latexpdf BUILDDIR={envdir} "SPHINXOPTS=-W -E -D suppress_warnings=ref.term" extras = docs |