From 13227c9a09f203484aa0a8362aed017b47ae1f54 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Sat, 29 Jul 2023 11:57:17 +0800 Subject: [PATCH] Fix test failure caused by python-sphinx update to 7.0.1 --- ...for-jquery.js-presence-with-Sphinx-6.patch | 37 +++++++++++ Fix-testcase-rel-content-mismatch-error.patch | 61 +++++++++++++++++++ python-sphinx-notfound-page.spec | 8 ++- 3 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 Dont-test-for-jquery.js-presence-with-Sphinx-6.patch create mode 100644 Fix-testcase-rel-content-mismatch-error.patch diff --git a/Dont-test-for-jquery.js-presence-with-Sphinx-6.patch b/Dont-test-for-jquery.js-presence-with-Sphinx-6.patch new file mode 100644 index 0000000..9a61528 --- /dev/null +++ b/Dont-test-for-jquery.js-presence-with-Sphinx-6.patch @@ -0,0 +1,37 @@ +From 491ea985bb06eb7dc9e43bdd99006b36ba104b72 Mon Sep 17 00:00:00 2001 +From: Karolina Surma +Date: Fri, 14 Apr 2023 13:47:28 +0200 +Subject: [PATCH] Don't test for jquery.js presence with Sphinx 6+ + +--- + tests/test_urls.py | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/tests/test_urls.py b/tests/test_urls.py +index 6475715..faafbea 100644 +--- a/tests/test_urls.py ++++ b/tests/test_urls.py +@@ -528,11 +528,18 @@ def test_sphinx_resource_urls(app, status, warning): + + chunks = [ + # Sphinx's resources URLs +- _get_js_html_link_tag('en', 'latest', 'jquery.js'), +- _get_js_html_link_tag('en', 'latest', 'underscore.js'), + _get_js_html_link_tag('en', 'latest', 'doctools.js'), + ] + ++ # Sphinx 6+ no longer includes jquery.js and underscore.js ++ if sphinx.version_info < (6, 0, 0): ++ chunks.extend( ++ [ ++ _get_js_html_link_tag('en', 'latest', 'jquery.js'), ++ _get_js_html_link_tag('en', 'latest', 'underscore.js'), ++ ] ++ ) ++ + # This file was added to all the HTML pages in Sphinx>=1.8. However, it was + # only required for search page. Sphinx>=3.4 fixes this and only adds it on + # search. See (https://github.com/sphinx-doc/sphinx/blob/v3.4.0/CHANGES#L87) +-- +2.39.2 + diff --git a/Fix-testcase-rel-content-mismatch-error.patch b/Fix-testcase-rel-content-mismatch-error.patch new file mode 100644 index 0000000..43f4285 --- /dev/null +++ b/Fix-testcase-rel-content-mismatch-error.patch @@ -0,0 +1,61 @@ +From 6e76ef19e1771aed34a2f6a25e558ed485153cf1 Mon Sep 17 00:00:00 2001 +From: starlet-dx <15929766099@163.com> +Date: Sat, 29 Jul 2023 11:28:15 +0800 +Subject: [PATCH 1/1] fix testcase rel content mismatch error + +--- + tests/test_urls.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/tests/test_urls.py b/tests/test_urls.py +index 59163e0..f836122 100644 +--- a/tests/test_urls.py ++++ b/tests/test_urls.py +@@ -63,7 +63,7 @@ def test_default_settings(app, status, warning): + 'Page not found — Python documentation', + + # favicon and logo +- '', ++ '', + '', + + # sidebar URLs +@@ -135,7 +135,7 @@ def test_default_language_setting(app, status, warning): + '
  • Documentation overview