Reduce content in the sphinx-quickstart conf.py file#10571
Reduce content in the sphinx-quickstart conf.py file#10571AA-Turner merged 4 commits intosphinx-doc:5.xfrom
sphinx-quickstart conf.py file#10571Conversation
This makes the file be simpler whenever possible, reducing the amount of explanation and commented behaviour provided in the `conf.py` file generated by `sphinx-quickstart`.
|
For comparing the difference in the output files generated by this, here's an example based on running: Before this PR: Details# Configuration file for the Sphinx documentation builder.
#
# This file only contains a selection of the most common options. For a full
# list see the documentation:
# https://www.sphinx-doc.org/en/master/usage/configuration.html
# -- Path setup --------------------------------------------------------------
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
# import os
# import sys
# sys.path.insert(0, os.path.abspath('.'))
# -- Project information -----------------------------------------------------
project = 'test'
copyright = '2022, test'
author = 'test'
# The short X.Y version
version = '1.0'
# The full version, including alpha/beta/rc tags
release = '1.0'
# -- General configuration ---------------------------------------------------
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.intersphinx',
'sphinx.ext.todo',
]
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = 'en'
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = []
# -- Options for HTML output -------------------------------------------------
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'alabaster'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
# -- Extension configuration -------------------------------------------------
# -- Options for intersphinx extension ---------------------------------------
# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {
'python': ('https://docs.python.org/3', None),
}
# -- Options for todo extension ----------------------------------------------
# If true, `todo` and `todoList` produce output, else they produce nothing.
todo_include_todos = True(no trailing newline) After this PR: Details# Configuration file for the Sphinx documentation builder.
#
# For the full list of built-in configuration values, see the documentation:
# https://www.sphinx-doc.org/en/master/usage/configuration.html
# -- Project information -----------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
project = 'test'
copyright = '2022, test'
author = 'test'
version = '1.0'
release = '1.0'
# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
extensions = [
'sphinx.ext.intersphinx',
'sphinx.ext.todo',
]
templates_path = ['_templates']
exclude_patterns = []
language = 'en'
# -- Options for HTML output -------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
html_theme = 'alabaster'
html_static_path = ['_static']
# -- Options for intersphinx extension ---------------------------------------
# https://www.sphinx-doc.org/en/master/usage/extensions/intersphinx.html#configuration
intersphinx_mapping = {
'python': ('https://docs.python.org/3', None),
}
# -- Options for todo extension ----------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/extensions/todo.html#configuration
todo_include_todos = True |
| {% else -%} | ||
| # import os | ||
| # import sys | ||
| {% if module_path -%} |
There was a problem hiding this comment.
Note: Bothappend_syspath and module_path are available on apidoc. And quickstart does not passes both of them. So this if-condition is not needed.
|
This will need a CHANGES entry but looks reasonable1 apart from that. @pradyunsg please can you add one? A Footnotes
|
I don't like them either, but I guess these weren't touched to reduce the friction/amount of changes of the PR and be able to merge faster 😄 |
|
Precisely. :) |
|
@AA-Turner Added the CHANGES entry. :) |
4d4a9cb to
e47f55d
Compare
e47f55d to
aa96883
Compare
|
Thanks @pradyunsg! A |
Subject: (see pull request title)
Feature or Bugfix
BugfixRefactoringPurpose
Simplify the sphinx-quickstart
conf.pyfile, reducing the percieved complexity of theconf.pyfile generated by default.Detail
Relates
Closes #10056