IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7415 from tk0miya/7409_priority_for_config-inited_handlers

Browse Source 
Fix #7409: Convert configuration values on late config-inited event
This commit is contained in:
Takeshi KOMIYA 2020-04-05 22:12:14 +09:00 committed by GitHub
commit 44db2b5da2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -33,6 +33,8 @@ Bugs fixed
* #6564: html: a width of table was ignored on HTML builder * #6564: html: a width of table was ignored on HTML builder
* #7401: Incorrect argument is passed for :event:`env-get-outdated` handlers * #7401: Incorrect argument is passed for :event:`env-get-outdated` handlers
* #7355: autodoc: a signature of cython-function is not recognized well * #7355: autodoc: a signature of cython-function is not recognized well
* #7409: intersphinx: ValueError is raised when an extension sets up
:confval:`intersphinx_mapping` on :event:`config-inited` event
Testing Testing
-------- --------

2
sphinx/builders/epub3.py
View File

@ -282,7 +282,7 @@ def setup(app: Sphinx) -> Dict[str, Any]:
ENUM('horizontal', 'vertical')) ENUM('horizontal', 'vertical'))
# event handlers # event handlers
app.connect('config-inited', convert_epub_css_files) app.connect('config-inited', convert_epub_css_files, priority=800)
app.connect('builder-inited', validate_config_values) app.connect('builder-inited', validate_config_values)
return { return {

12
sphinx/builders/html/__init__.py
View File

@ -1231,12 +1231,12 @@ def setup(app: Sphinx) -> Dict[str, Any]:
app.add_config_value('html4_writer', False, 'html') app.add_config_value('html4_writer', False, 'html')
# event handlers # event handlers
app.connect('config-inited', convert_html_css_files) app.connect('config-inited', convert_html_css_files, priority=800)
app.connect('config-inited', convert_html_js_files) app.connect('config-inited', convert_html_js_files, priority=800)
app.connect('config-inited', validate_html_extra_path) app.connect('config-inited', validate_html_extra_path, priority=800)
app.connect('config-inited', validate_html_static_path) app.connect('config-inited', validate_html_static_path, priority=800)
app.connect('config-inited', validate_html_logo) app.connect('config-inited', validate_html_logo, priority=800)
app.connect('config-inited', validate_html_favicon) app.connect('config-inited', validate_html_favicon, priority=800)
app.connect('builder-inited', validate_math_renderer) app.connect('builder-inited', validate_math_renderer)
app.connect('html-page-context', setup_js_tag_helper) app.connect('html-page-context', setup_js_tag_helper)

2
sphinx/builders/latex/__init__.py
View File

@ -536,7 +536,7 @@ def setup(app: Sphinx) -> Dict[str, Any]:
app.setup_extension('sphinx.builders.latex.transforms') app.setup_extension('sphinx.builders.latex.transforms')
app.add_builder(LaTeXBuilder) app.add_builder(LaTeXBuilder)
app.connect('config-inited', validate_config_values) app.connect('config-inited', validate_config_values, priority=800)
app.add_config_value('latex_engine', default_latex_engine, None, app.add_config_value('latex_engine', default_latex_engine, None,
ENUM('pdflatex', 'xelatex', 'lualatex', 'platex', 'uplatex')) ENUM('pdflatex', 'xelatex', 'lualatex', 'platex', 'uplatex'))

10
sphinx/config.py
View File

@ -478,11 +478,11 @@ def check_master_doc(app: "Sphinx", env: "BuildEnvironment", added: Set[str],
def setup(app: "Sphinx") -> Dict[str, Any]: def setup(app: "Sphinx") -> Dict[str, Any]:
app.connect('config-inited', convert_source_suffix) app.connect('config-inited', convert_source_suffix, priority=800)
app.connect('config-inited', init_numfig_format) app.connect('config-inited', init_numfig_format, priority=800)
app.connect('config-inited', correct_copyright_year) app.connect('config-inited', correct_copyright_year, priority=800)
app.connect('config-inited', check_confval_types) app.connect('config-inited', check_confval_types, priority=800)
app.connect('config-inited', check_primary_domain) app.connect('config-inited', check_primary_domain, priority=800)
app.connect('env-get-outdated', check_master_doc) app.connect('env-get-outdated', check_master_doc)
return { return {

2
sphinx/ext/intersphinx.py
View File

@ -367,7 +367,7 @@ def setup(app: Sphinx) -> Dict[str, Any]:
app.add_config_value('intersphinx_mapping', {}, True) app.add_config_value('intersphinx_mapping', {}, True)
app.add_config_value('intersphinx_cache_limit', 5, False) app.add_config_value('intersphinx_cache_limit', 5, False)
app.add_config_value('intersphinx_timeout', None, False) app.add_config_value('intersphinx_timeout', None, False)
app.connect('config-inited', normalize_intersphinx_mapping) app.connect('config-inited', normalize_intersphinx_mapping, priority=800)
app.connect('builder-inited', load_mappings) app.connect('builder-inited', load_mappings)
app.connect('missing-reference', missing_reference) app.connect('missing-reference', missing_reference)
return { return {

2
sphinx/extension.py
View File

@ -60,7 +60,7 @@ def verify_needs_extensions(app: "Sphinx", config: Config) -> None:
def setup(app: "Sphinx") -> Dict[str, Any]: def setup(app: "Sphinx") -> Dict[str, Any]:
app.connect('config-inited', verify_needs_extensions) app.connect('config-inited', verify_needs_extensions, priority=800)
return { return {
'version': 'builtin', 'version': 'builtin',

2
sphinx/registry.py
View File

@ -453,7 +453,7 @@ def merge_source_suffix(app: "Sphinx", config: Config) -> None:
def setup(app: "Sphinx") -> Dict[str, Any]: def setup(app: "Sphinx") -> Dict[str, Any]:
app.connect('config-inited', merge_source_suffix) app.connect('config-inited', merge_source_suffix, priority=800)
return { return {
'version': 'builtin', 'version': 'builtin',