diff options
author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-11-22 22:14:32 +0900 |
---|---|---|
committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-11-22 22:14:32 +0900 |
commit | 4761e70c37ea1e288e8fac4c6db608e65db08100 (patch) | |
tree | b8c0425956f5a6024df4ec738f6fd0e9b354079a /tests/test_autodoc.py | |
parent | 8412bdf9d69e10b1afb368a89676fe85da7cb7a3 (diff) | |
parent | 171020dca7f2326cf96c1bc06187f66a8034bcbc (diff) | |
download | sphinx-git-4761e70c37ea1e288e8fac4c6db608e65db08100.tar.gz |
Merge branch '1.8'
Diffstat (limited to 'tests/test_autodoc.py')
-rw-r--r-- | tests/test_autodoc.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/test_autodoc.py b/tests/test_autodoc.py index 86c07b6c3..feaab19f4 100644 --- a/tests/test_autodoc.py +++ b/tests/test_autodoc.py @@ -1483,6 +1483,7 @@ def test_partialmethod(app): @pytest.mark.sphinx('html', testroot='ext-autodoc') +@pytest.mark.filterwarnings('ignore:autodoc_default_flags is now deprecated.') def test_merge_autodoc_default_flags1(app): app.config.autodoc_default_flags = ['members', 'undoc-members'] merge_autodoc_default_flags(app, app.config) @@ -1491,6 +1492,7 @@ def test_merge_autodoc_default_flags1(app): @pytest.mark.sphinx('html', testroot='ext-autodoc') +@pytest.mark.filterwarnings('ignore:autodoc_default_flags is now deprecated.') def test_merge_autodoc_default_flags2(app): app.config.autodoc_default_flags = ['members', 'undoc-members'] app.config.autodoc_default_options = {'members': 'this,that,order', |