Skip to content

Commit

Permalink
Close sphinx-doc#10146: autodoc: autodoc_default_options does not sup…
Browse files Browse the repository at this point in the history
…port `no-value` option
  • Loading branch information
tk0miya committed Jan 30, 2022
1 parent 799385f commit 9a0c1d1
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGES
Expand Up @@ -24,6 +24,8 @@ Bugs fixed
----------

* #10133: autodoc: Crashed when mocked module is used for type annotation
* #10146: autodoc: :confval:`autodoc_default_options` does not support
``no-value`` option
* #10122: sphinx-build: make.bat does not check the installation of sphinx-build
command before showing help

Expand Down
6 changes: 5 additions & 1 deletion doc/usage/extensions/autodoc.rst
Expand Up @@ -528,7 +528,8 @@ There are also config values that you can set:
The supported options are ``'members'``, ``'member-order'``,
``'undoc-members'``, ``'private-members'``, ``'special-members'``,
``'inherited-members'``, ``'show-inheritance'``, ``'ignore-module-all'``,
``'imported-members'``, ``'exclude-members'`` and ``'class-doc-from'``.
``'imported-members'``, ``'exclude-members'``, ``'class-doc-from'`` and
``'no-value'``.

.. versionadded:: 1.8

Expand All @@ -541,6 +542,9 @@ There are also config values that you can set:
.. versionchanged:: 4.1
Added ``'class-doc-from'``.

.. versionchanged:: 4.5
Added ``'class-doc-from'``.

.. confval:: autodoc_docstring_signature

Functions imported from C modules cannot be introspected, and therefore the
Expand Down
3 changes: 2 additions & 1 deletion sphinx/ext/autodoc/__init__.py
Expand Up @@ -1001,7 +1001,8 @@ class ModuleDocumenter(Documenter):
'platform': identity, 'deprecated': bool_option,
'member-order': member_order_option, 'exclude-members': exclude_members_option,
'private-members': members_option, 'special-members': members_option,
'imported-members': bool_option, 'ignore-module-all': bool_option
'imported-members': bool_option, 'ignore-module-all': bool_option,
'no-value': bool_option,
}

def __init__(self, *args: Any) -> None:
Expand Down
2 changes: 1 addition & 1 deletion sphinx/ext/autodoc/directive.py
Expand Up @@ -30,7 +30,7 @@
AUTODOC_DEFAULT_OPTIONS = ['members', 'undoc-members', 'inherited-members',
'show-inheritance', 'private-members', 'special-members',
'ignore-module-all', 'exclude-members', 'member-order',
'imported-members', 'class-doc-from']
'imported-members', 'class-doc-from', 'no-value']

AUTODOC_EXTENDABLE_OPTIONS = ['members', 'private-members', 'special-members',
'exclude-members']
Expand Down

0 comments on commit 9a0c1d1

Please sign in to comment.