From ec79abf6bee02e08f1e9a716437e1d4ca40c3ff5 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Mon, 12 Apr 2021 00:34:01 +0900 Subject: [PATCH 1/3] Bump version --- CHANGES | 21 +++++++++++++++++++++ sphinx/__init__.py | 6 +++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 219c7881ef..98f538d7fa 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,24 @@ +Release 5.0.0 (in development) +============================== + +Dependencies +------------ + +Incompatible changes +-------------------- + +Deprecated +---------- + +Features added +-------------- + +Bugs fixed +---------- + +Testing +-------- + Release 4.1.0 (in development) ============================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index a1de1402bc..b8865f4e11 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -27,8 +27,8 @@ warnings.filterwarnings('ignore', "'U' mode is deprecated", DeprecationWarning, module='docutils.io') -__version__ = '4.1.0' -__released__ = '4.1.0' # used when Sphinx builds its own docs +__version__ = '5.0.0+' +__released__ = '5.0.0' # used when Sphinx builds its own docs #: Version info for better programmatic use. #: @@ -38,7 +38,7 @@ #: #: .. versionadded:: 1.2 #: Before version 1.2, check the string ``sphinx.__version__``. -version_info = (4, 1, 0, 'final', 0) +version_info = (5, 0, 0, 'final', 0) package_dir = path.abspath(path.dirname(__file__)) From 311dfaab16b57d1843d35d8a2e53712422dce583 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Thu, 22 Apr 2021 17:53:21 -0400 Subject: [PATCH 2/3] Fix search unnecessarily requiring source files This seems to have been a mistake with #4022 the ajax call functions correctly without the source files being included in the build (they are never used). I have tested this out on several themes and now everything works correctly with `html_copy_source = False` --- sphinx/themes/basic/static/searchtools.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sphinx/themes/basic/static/searchtools.js b/sphinx/themes/basic/static/searchtools.js index 2f500ae5d2..5ae27062ec 100644 --- a/sphinx/themes/basic/static/searchtools.js +++ b/sphinx/themes/basic/static/searchtools.js @@ -276,7 +276,7 @@ var Search = { setTimeout(function() { displayNextItem(); }, 5); - } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) { + } else { $.ajax({url: requestUrl, dataType: "text", complete: function(jqxhr, textstatus) { @@ -289,12 +289,6 @@ var Search = { displayNextItem(); }, 5); }}); - } else { - // no source available, just display title - Search.output.append(listItem); - setTimeout(function() { - displayNextItem(); - }, 5); } } // search finished, update title and status message From 195b98ca21a996c385f190867418e76f38a968c2 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Thu, 22 Apr 2021 17:53:21 -0400 Subject: [PATCH 3/3] Fix search unnecessarily requiring source files This seems to have been a mistake with #4022 the ajax call functions correctly without the source files being included in the build (they are never used). I have tested this out on several themes and now everything works correctly with `html_copy_source = False` --- sphinx/themes/basic/static/searchtools.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sphinx/themes/basic/static/searchtools.js b/sphinx/themes/basic/static/searchtools.js index 2f500ae5d2..5ae27062ec 100644 --- a/sphinx/themes/basic/static/searchtools.js +++ b/sphinx/themes/basic/static/searchtools.js @@ -276,7 +276,7 @@ var Search = { setTimeout(function() { displayNextItem(); }, 5); - } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) { + } else { $.ajax({url: requestUrl, dataType: "text", complete: function(jqxhr, textstatus) { @@ -289,12 +289,6 @@ var Search = { displayNextItem(); }, 5); }}); - } else { - // no source available, just display title - Search.output.append(listItem); - setTimeout(function() { - displayNextItem(); - }, 5); } } // search finished, update title and status message