From 3613fbea19fd16013d0cfd7d90839b16e9315e70 Mon Sep 17 00:00:00 2001 From: Michael Osthege Date: Thu, 9 Jun 2022 18:37:49 +0200 Subject: [PATCH] Don't set the default language For Sphinx 5 compatibility. --- jupyter_book/config.py | 1 - tests/test_config/test_config_sphinx_command.txt | 1 - .../test_config_sphinx_command_only_build_toc_files.txt | 1 - .../test_config/test_get_final_config_custom_myst_extensions.yml | 1 - tests/test_config/test_get_final_config_empty_.yml | 1 - tests/test_config/test_get_final_config_exclude_patterns_.yml | 1 - tests/test_config/test_get_final_config_execute_method_.yml | 1 - tests/test_config/test_get_final_config_extended_syntax_.yml | 1 - tests/test_config/test_get_final_config_html_extra_footer_.yml | 1 - tests/test_config/test_get_final_config_latex_doc_.yml | 1 - tests/test_config/test_get_final_config_launch_buttons_.yml | 1 - tests/test_config/test_get_final_config_repository_.yml | 1 - tests/test_config/test_get_final_config_sphinx_default_.yml | 1 - tests/test_config/test_get_final_config_sphinx_recurse_.yml | 1 - tests/test_config/test_get_final_config_title_.yml | 1 - tests/test_config/test_mathjax_config_warning.sphinx4.yml | 1 - .../test_mathjax_config_warning_mathjax2path.sphinx4.yml | 1 - 17 files changed, 17 deletions(-) diff --git a/jupyter_book/config.py b/jupyter_book/config.py index 8427c899b..752e7e8e5 100644 --- a/jupyter_book/config.py +++ b/jupyter_book/config.py @@ -34,7 +34,6 @@ def get_default_sphinx_config(): "sphinx_design", "sphinx_book_theme", ], - language=None, pygments_style="sphinx", html_theme="sphinx_book_theme", html_theme_options={"search_bar_text": "Search this book..."}, diff --git a/tests/test_config/test_config_sphinx_command.txt b/tests/test_config/test_config_sphinx_command.txt index a21a866b0..8609dac27 100644 --- a/tests/test_config/test_config_sphinx_command.txt +++ b/tests/test_config/test_config_sphinx_command.txt @@ -23,7 +23,6 @@ html_theme_options = {'search_bar_text': 'Search this book...', 'launch_buttons' html_title = 'test' jupyter_cache = '' jupyter_execute_notebooks = 'auto' -language = None latex_engine = 'pdflatex' myst_enable_extensions = ['colon_fence', 'dollarmath', 'linkify', 'substitution', 'tasklist'] myst_url_schemes = ['mailto', 'http', 'https'] diff --git a/tests/test_config/test_config_sphinx_command_only_build_toc_files.txt b/tests/test_config/test_config_sphinx_command_only_build_toc_files.txt index a299beff8..1897d367b 100644 --- a/tests/test_config/test_config_sphinx_command_only_build_toc_files.txt +++ b/tests/test_config/test_config_sphinx_command_only_build_toc_files.txt @@ -23,7 +23,6 @@ html_theme_options = {'search_bar_text': 'Search this book...', 'launch_buttons' html_title = 'My Jupyter Book' jupyter_cache = '' jupyter_execute_notebooks = 'auto' -language = None latex_engine = 'pdflatex' myst_enable_extensions = ['colon_fence', 'dollarmath', 'linkify', 'substitution', 'tasklist'] myst_url_schemes = ['mailto', 'http', 'https'] diff --git a/tests/test_config/test_get_final_config_custom_myst_extensions.yml b/tests/test_config/test_get_final_config_custom_myst_extensions.yml index e4ec699ed..9bac2a4e5 100644 --- a/tests/test_config/test_get_final_config_custom_myst_extensions.yml +++ b/tests/test_config/test_get_final_config_custom_myst_extensions.yml @@ -57,7 +57,6 @@ final: html_title: My Jupyter Book jupyter_cache: '' jupyter_execute_notebooks: auto - language: null latex_engine: pdflatex myst_enable_extensions: - colon_fence diff --git a/tests/test_config/test_get_final_config_empty_.yml b/tests/test_config/test_get_final_config_empty_.yml index fa79c56d2..0babde276 100644 --- a/tests/test_config/test_get_final_config_empty_.yml +++ b/tests/test_config/test_get_final_config_empty_.yml @@ -54,7 +54,6 @@ final: html_title: My Jupyter Book jupyter_cache: '' jupyter_execute_notebooks: auto - language: null latex_engine: pdflatex myst_enable_extensions: - colon_fence diff --git a/tests/test_config/test_get_final_config_exclude_patterns_.yml b/tests/test_config/test_get_final_config_exclude_patterns_.yml index fbb946597..cae005e2d 100644 --- a/tests/test_config/test_get_final_config_exclude_patterns_.yml +++ b/tests/test_config/test_get_final_config_exclude_patterns_.yml @@ -57,7 +57,6 @@ final: html_title: My Jupyter Book jupyter_cache: '' jupyter_execute_notebooks: auto - language: null latex_engine: pdflatex myst_enable_extensions: - colon_fence diff --git a/tests/test_config/test_get_final_config_execute_method_.yml b/tests/test_config/test_get_final_config_execute_method_.yml index 30fbc77a5..7276c783b 100644 --- a/tests/test_config/test_get_final_config_execute_method_.yml +++ b/tests/test_config/test_get_final_config_execute_method_.yml @@ -56,7 +56,6 @@ final: html_title: My Jupyter Book jupyter_cache: '' jupyter_execute_notebooks: cache - language: null latex_engine: pdflatex myst_enable_extensions: - colon_fence diff --git a/tests/test_config/test_get_final_config_extended_syntax_.yml b/tests/test_config/test_get_final_config_extended_syntax_.yml index 529fa95e1..8d81a10bc 100644 --- a/tests/test_config/test_get_final_config_extended_syntax_.yml +++ b/tests/test_config/test_get_final_config_extended_syntax_.yml @@ -58,7 +58,6 @@ final: html_title: My Jupyter Book jupyter_cache: '' jupyter_execute_notebooks: auto - language: null latex_engine: pdflatex myst_enable_extensions: - linkify diff --git a/tests/test_config/test_get_final_config_html_extra_footer_.yml b/tests/test_config/test_get_final_config_html_extra_footer_.yml index d909b22cb..8ad8c8393 100644 --- a/tests/test_config/test_get_final_config_html_extra_footer_.yml +++ b/tests/test_config/test_get_final_config_html_extra_footer_.yml @@ -56,7 +56,6 @@ final: html_title: My Jupyter Book jupyter_cache: '' jupyter_execute_notebooks: auto - language: null latex_engine: pdflatex myst_enable_extensions: - colon_fence diff --git a/tests/test_config/test_get_final_config_latex_doc_.yml b/tests/test_config/test_get_final_config_latex_doc_.yml index 34370cc66..0e9136da3 100644 --- a/tests/test_config/test_get_final_config_latex_doc_.yml +++ b/tests/test_config/test_get_final_config_latex_doc_.yml @@ -58,7 +58,6 @@ final: html_title: My Jupyter Book jupyter_cache: '' jupyter_execute_notebooks: auto - language: null latex_engine: pdflatex myst_enable_extensions: - colon_fence diff --git a/tests/test_config/test_get_final_config_launch_buttons_.yml b/tests/test_config/test_get_final_config_launch_buttons_.yml index 6302c4472..37dae0c38 100644 --- a/tests/test_config/test_get_final_config_launch_buttons_.yml +++ b/tests/test_config/test_get_final_config_launch_buttons_.yml @@ -56,7 +56,6 @@ final: html_title: My Jupyter Book jupyter_cache: '' jupyter_execute_notebooks: auto - language: null latex_engine: pdflatex myst_enable_extensions: - colon_fence diff --git a/tests/test_config/test_get_final_config_repository_.yml b/tests/test_config/test_get_final_config_repository_.yml index 12d9f0d1b..1ecff2407 100644 --- a/tests/test_config/test_get_final_config_repository_.yml +++ b/tests/test_config/test_get_final_config_repository_.yml @@ -56,7 +56,6 @@ final: html_title: My Jupyter Book jupyter_cache: '' jupyter_execute_notebooks: auto - language: null latex_engine: pdflatex myst_enable_extensions: - colon_fence diff --git a/tests/test_config/test_get_final_config_sphinx_default_.yml b/tests/test_config/test_get_final_config_sphinx_default_.yml index fdff3fb62..d57818931 100644 --- a/tests/test_config/test_get_final_config_sphinx_default_.yml +++ b/tests/test_config/test_get_final_config_sphinx_default_.yml @@ -51,7 +51,6 @@ final: html_title: My Jupyter Book jupyter_cache: '' jupyter_execute_notebooks: auto - language: null latex_engine: pdflatex myst_enable_extensions: - colon_fence diff --git a/tests/test_config/test_get_final_config_sphinx_recurse_.yml b/tests/test_config/test_get_final_config_sphinx_recurse_.yml index 92f3fcc5e..fd5e28224 100644 --- a/tests/test_config/test_get_final_config_sphinx_recurse_.yml +++ b/tests/test_config/test_get_final_config_sphinx_recurse_.yml @@ -68,7 +68,6 @@ final: html_title: My Jupyter Book jupyter_cache: '' jupyter_execute_notebooks: auto - language: null latex_engine: pdflatex myst_enable_extensions: - colon_fence diff --git a/tests/test_config/test_get_final_config_title_.yml b/tests/test_config/test_get_final_config_title_.yml index f2d5abdcf..7e47a265e 100644 --- a/tests/test_config/test_get_final_config_title_.yml +++ b/tests/test_config/test_get_final_config_title_.yml @@ -55,7 +55,6 @@ final: html_title: hallo jupyter_cache: '' jupyter_execute_notebooks: auto - language: null latex_engine: pdflatex myst_enable_extensions: - colon_fence diff --git a/tests/test_config/test_mathjax_config_warning.sphinx4.yml b/tests/test_config/test_mathjax_config_warning.sphinx4.yml index 0f8b7fb6b..630525205 100644 --- a/tests/test_config/test_mathjax_config_warning.sphinx4.yml +++ b/tests/test_config/test_mathjax_config_warning.sphinx4.yml @@ -60,7 +60,6 @@ final: html_title: My Jupyter Book jupyter_cache: '' jupyter_execute_notebooks: auto - language: null latex_engine: pdflatex mathjax3_config: TeX: diff --git a/tests/test_config/test_mathjax_config_warning_mathjax2path.sphinx4.yml b/tests/test_config/test_mathjax_config_warning_mathjax2path.sphinx4.yml index eb069b2a2..9dd725eca 100644 --- a/tests/test_config/test_mathjax_config_warning_mathjax2path.sphinx4.yml +++ b/tests/test_config/test_mathjax_config_warning_mathjax2path.sphinx4.yml @@ -61,7 +61,6 @@ final: html_title: My Jupyter Book jupyter_cache: '' jupyter_execute_notebooks: auto - language: null latex_engine: pdflatex mathjax2_config: TeX: