Merge pull request #3579 from stevepiercy/1.10-branch

Backport #3577
Pylons · May 7, 2020 · 5d68745 · 5d68745
2 parents aad9921 + f1ad155
commit 5d68745
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/docs/api/request.rst b/docs/api/request.rst
@@ -14,7 +14,8 @@
                      model_url, resource_url, resource_path, set_property, 
                      effective_principals, authenticated_userid,
                      unauthenticated_userid, has_permission,
-                     invoke_exception_view
+                     invoke_exception_view, localizer, response, session,
+                     json_body
 
    .. attribute:: context
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -384,9 +384,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)
 
 

diff --git a/setup.cfg b/setup.cfg
@@ -23,4 +23,4 @@ ignore =
     *.egg-info/*
 ignore-default-rules = true
 ignore-bad-ideas =
-    tests/pkgs/localeapp/*
+    tests/pkgs/localeapp/**/*.mo
diff --git a/tox.ini b/tox.ini
@@ -66,15 +66,15 @@ deps =
 basepython = python3.5
 whitelist_externals = make
 commands =
-    make -C docs doctest html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E"
+    make -C docs doctest html epub BUILDDIR={envdir} "SPHINXOPTS=-W -E -D suppress_warnings=ref.term"
 extras =
     docs
 
 [testenv:pdf]
 basepython = python3.5
 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