diff options
author | Martin Liška <mliska@suse.cz> | 2022-10-13 15:16:17 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-13 15:16:17 +0300 |
commit | e008e162005fa51a04b61f4271d4e766cf7c671f (patch) | |
tree | 16efabdf585fc615238f263f2cc698807109c563 | |
parent | cef1a030cd892cd9f0f4931e39a96331947f695b (diff) |
Revert "Fix detection for out of date files (#9360)" (#10908)
This reverts commit b1390c4191319e75d14ce3e6e73ef43c31d981b4.
The change is reverted because some builders don't have
fine-grained support for outdated docs:
https://github.com/sphinx-doc/sphinx/issues/10903#issuecomment-1273199352
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | sphinx/builders/__init__.py | 2 | ||||
-rw-r--r-- | tests/test_build_html.py | 2 | ||||
-rw-r--r-- | tests/test_build_latex.py | 2 | ||||
-rw-r--r-- | tests/test_build_manpage.py | 2 | ||||
-rw-r--r-- | tests/test_build_texinfo.py | 2 |
6 files changed, 6 insertions, 6 deletions
@@ -20,8 +20,6 @@ Features added ``:option:`--module[=foobar]``` or ``:option:`--module foobar```. Patch by Martin Liska. * #10881: autosectionlabel: Record the generated section label to the debug log. -* #9360: Fix caching for now-outdated files for some builders (e.g. manpage) - when there is no change in source files. Patch by Martin Liska. Bugs fixed ---------- diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py index 6ca77c4bc..e70d1956c 100644 --- a/sphinx/builders/__init__.py +++ b/sphinx/builders/__init__.py @@ -347,7 +347,7 @@ class Builder: with progress_message(__('checking consistency')): self.env.check_consistency() else: - if method == 'update' and (not docnames or docnames == ['__all__']): + if method == 'update' and not docnames: logger.info(bold(__('no targets are out of date.'))) return diff --git a/tests/test_build_html.py b/tests/test_build_html.py index 0d19de4ca..138f8a9c1 100644 --- a/tests/test_build_html.py +++ b/tests/test_build_html.py @@ -633,6 +633,7 @@ def test_tocdepth(app, cached_etree_parse, fname, expect): ], })) @pytest.mark.sphinx('singlehtml', testroot='tocdepth') +@pytest.mark.test_params(shared_result='test_build_html_tocdepth') def test_tocdepth_singlehtml(app, cached_etree_parse, fname, expect): app.build() check_xpath(cached_etree_parse(app.outdir / fname), fname, *expect) @@ -1137,6 +1138,7 @@ def test_numfig_with_secnum_depth(app, cached_etree_parse, fname, expect): ], })) @pytest.mark.sphinx('singlehtml', testroot='numfig', confoverrides={'numfig': True}) +@pytest.mark.test_params(shared_result='test_build_html_numfig_on') def test_numfig_with_singlehtml(app, cached_etree_parse, fname, expect): app.build() check_xpath(cached_etree_parse(app.outdir / fname), fname, *expect) diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py index ae141a4f2..db0e67fc4 100644 --- a/tests/test_build_latex.py +++ b/tests/test_build_latex.py @@ -1634,7 +1634,7 @@ def test_latex_container(app, status, warning): @pytest.mark.sphinx('latex', testroot='reST-code-role') def test_latex_code_role(app): - app.build(force_all=True) + app.build() content = (app.outdir / 'python.tex').read_text() common_content = ( diff --git a/tests/test_build_manpage.py b/tests/test_build_manpage.py index 6c34e1771..8509684d1 100644 --- a/tests/test_build_manpage.py +++ b/tests/test_build_manpage.py @@ -42,7 +42,7 @@ def test_man_pages_empty_description(app, status, warning): @pytest.mark.sphinx('man', testroot='basic', confoverrides={'man_make_section_directory': True}) def test_man_make_section_directory(app, status, warning): - app.build(force_all=True) + app.build() assert (app.outdir / 'man1' / 'python.1').exists() diff --git a/tests/test_build_texinfo.py b/tests/test_build_texinfo.py index c60dd994b..b33a7e01f 100644 --- a/tests/test_build_texinfo.py +++ b/tests/test_build_texinfo.py @@ -60,7 +60,7 @@ def test_texinfo(app, status, warning): @pytest.mark.sphinx('texinfo', testroot='markup-rubric') def test_texinfo_rubric(app, status, warning): - app.build(force_all=True) + app.build() output = (app.outdir / 'python.texi').read_text(encoding='utf8') assert '@heading This is a rubric' in output |