From c44140b4e3af563d1a0bb761b0c1fbb1d9b6b167 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Thu, 20 May 2021 02:03:33 +0900 Subject: [PATCH 1/3] Update CHANGES for PR #9240 --- CHANGES | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index dd832801d20..78c48166363 100644 --- a/CHANGES +++ b/CHANGES @@ -12,8 +12,6 @@ Incompatible changes * #9222: Update Underscore.js to 1.13.1 * #9217: manpage: Stop creating a section directory on build manpage by default (see :confval:`man_make_section_directory`) -* #9240: Unknown node error for pending_xref_condition is raised if an extension - that does not support the node installs a missing-reference handler Deprecated ---------- @@ -25,6 +23,8 @@ Bugs fixed ---------- * #9210: viewcode: crashed if non importable modules found on parallel build +* #9240: Unknown node error for pending_xref_condition is raised if an extension + that does not support the node installs a missing-reference handler Testing -------- From a55816deb546828db1383f2875be815bf805f858 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Thu, 20 May 2021 21:57:27 +0900 Subject: [PATCH 2/3] Bump to 4.0.2 final --- CHANGES | 13 ++----------- sphinx/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index 78c48166363..ef875beac9a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,5 @@ -Release 4.0.2 (in development) -============================== +Release 4.0.2 (released May 20, 2021) +===================================== Dependencies ------------ @@ -13,12 +13,6 @@ Incompatible changes * #9217: manpage: Stop creating a section directory on build manpage by default (see :confval:`man_make_section_directory`) -Deprecated ----------- - -Features added --------------- - Bugs fixed ---------- @@ -26,9 +20,6 @@ Bugs fixed * #9240: Unknown node error for pending_xref_condition is raised if an extension that does not support the node installs a missing-reference handler -Testing --------- - Release 4.0.1 (released May 11, 2021) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 016e84c27df..57ad7242be4 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -27,7 +27,7 @@ warnings.filterwarnings('ignore', "'U' mode is deprecated", DeprecationWarning, module='docutils.io') -__version__ = '4.0.2+' +__version__ = '4.0.2' __released__ = '4.0.2' # 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, 0, 2, 'beta', 0) +version_info = (4, 0, 2, 'final', 0) package_dir = path.abspath(path.dirname(__file__)) From a7ec37cae1f2333b682446edcb0de5c16db8a980 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Thu, 20 May 2021 21:58:59 +0900 Subject: [PATCH 3/3] Bump version --- CHANGES | 21 +++++++++++++++++++++ sphinx/__init__.py | 6 +++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index ef875beac9a..5b890fe8420 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,24 @@ +Release 4.0.3 (in development) +============================== + +Dependencies +------------ + +Incompatible changes +-------------------- + +Deprecated +---------- + +Features added +-------------- + +Bugs fixed +---------- + +Testing +-------- + Release 4.0.2 (released May 20, 2021) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 57ad7242be4..d566b824a1d 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.0.2' -__released__ = '4.0.2' # used when Sphinx builds its own docs +__version__ = '4.0.3+' +__released__ = '4.0.3' # 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, 0, 2, 'final', 0) +version_info = (4, 0, 3, 'beta', 0) package_dir = path.abspath(path.dirname(__file__))