Merge branch '1.8' into 5421_warning_for_autodoc_default_flags

This commit is contained in:
Takeshi KOMIYA authored and GitHub committed 2018-09-14 02:06:29 +09:00
commit aa69231bc7
2 files changed
+2 -1

No files matched your search

+1
View File
@@ -16,6 +16,7 @@ Features added
Bugs fixed
----------
* #5418: Incorrect default path for sphinx-build -d/doctrees files
* #5421: autodoc emits deprecation warning for :confval:`autodoc_default_flags`
Testing
+1 -1
View File
@@ -219,7 +219,7 @@ def build_main(argv=sys.argv[1:]): # type: ignore
args.confdir = args.sourcedir
if not args.doctreedir:
args.doctreedir = os.path.join(args.sourcedir, '.doctrees')
args.doctreedir = os.path.join(args.outputdir, '.doctrees')
# handle remaining filename arguments
filenames = args.filenames