From 099df45200a259e98c3c565454b46d0e01792a8e Mon Sep 17 00:00:00 2001 From: cocodrips Date: Wed, 26 Dec 2018 00:34:26 +0900 Subject: [PATCH 1/3] Add extensions from master --- sphinx/ext/apidoc.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sphinx/ext/apidoc.py b/sphinx/ext/apidoc.py index d0c87be13..2bb7384f4 100644 --- a/sphinx/ext/apidoc.py +++ b/sphinx/ext/apidoc.py @@ -371,6 +371,8 @@ Note: By default this script will not overwrite already created files.""")) 'defaults to --doc-version')) group = parser.add_argument_group(__('extension options')) + group.add_argument('--extensions', metavar='EXTENSIONS', dest='extensions', + action='append', help=__('enable arbitrary extensions')) for ext in EXTENSIONS: group.add_argument('--ext-%s' % ext, action='append_const', const='sphinx.ext.%s' % ext, dest='extensions', @@ -439,6 +441,11 @@ def main(argv=sys.argv[1:]): if args.extensions: d['extensions'].extend(args.extensions) + for ext in d['extensions'][:]: + if ',' in ext: + d['extensions'].remove(ext) + d['extensions'].extend(ext.split(',')) + if not args.dryrun: qs.generate(d, silent=True, overwrite=args.force) elif args.tocfile: From 448181d9f97611d352c0c8ec21e55e8242db9d60 Mon Sep 17 00:00:00 2001 From: cocodrips Date: Wed, 26 Dec 2018 11:23:51 +0900 Subject: [PATCH 3/3] Add feature to CHANGES. --- CHANGES | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES b/CHANGES index 2d669ce60..d46acccc1 100644 --- a/CHANGES +++ b/CHANGES @@ -127,6 +127,7 @@ Features added * LaTeX: support rendering (not in math, yet) of Greek and Cyrillic Unicode letters in non-Cyrillic document even with ``'pdflatex'`` as :confval:`latex_engine` (refs: #5645) +* #5841: apidoc: Add --extensions option to sphinx-apidoc Bugs fixed ----------