From b3f8bd1e3cff91753fa524ee8058b32608e33335 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Mon, 4 Jan 2021 21:11:58 +0900 Subject: [PATCH 1/3] doc: Quote URLs in release checklist To improve the install process, the commands on the checklist is updated to allow to copy & paste it to console. --- utils/release-checklist | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/release-checklist b/utils/release-checklist index dad83c850..671f932d8 100644 --- a/utils/release-checklist +++ b/utils/release-checklist @@ -4,7 +4,7 @@ Release checklist for stable releases ------------------- -* open https://github.com/sphinx-doc/sphinx/actions?query=branch:X.Y.x and all tests has passed +* open "https://github.com/sphinx-doc/sphinx/actions?query=branch:X.Y.x" and all tests has passed * Run ``git fetch; git status`` and check nothing changed * ``python utils/bump_version.py X.Y.Z`` * Check diff by ``git diff`` @@ -28,7 +28,7 @@ for stable releases for first beta releases ----------------------- -* open https://github.com/sphinx-doc/sphinx/actions?query=branch:master and all tests has passed +* open "https://github.com/sphinx-doc/sphinx/actions?query=branch:master" and all tests has passed * Run ``git fetch; git status`` and check nothing changed * Run ``python setup.py extract_messages`` * Run ``(cd sphinx/locale; tx push -s)`` @@ -58,7 +58,7 @@ for first beta releases for other beta releases ----------------------- -* open https://github.com/sphinx-doc/sphinx/actions?query=branch:X.x and all tests has passed +* open "https://github.com/sphinx-doc/sphinx/actions?query=branch:X.x" and all tests has passed * Run ``git fetch; git status`` and check nothing changed * ``python utils/bump_version.py X.Y.0bN`` * Check diff by ``git diff`` @@ -81,7 +81,7 @@ for other beta releases for major releases ------------------ -* open https://github.com/sphinx-doc/sphinx/actions?query=branch:X.x and all tests has passed +* open "https://github.com/sphinx-doc/sphinx/actions?query=branch:X.x" and all tests has passed * Run ``git fetch; git status`` and check nothing changed * Run ``(cd sphinx/locale; tx pull -a -f)`` * Run ``python setup.py compile_catalog`` From 83d5a323ef113294bb1c6e93f7752451668ed886 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Mon, 4 Jan 2021 21:42:37 +0900 Subject: [PATCH 2/3] Bump to 3.4.2 final --- CHANGES | 19 ++----------------- sphinx/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/CHANGES b/CHANGES index 726eacf8e..a7d99eb20 100644 --- a/CHANGES +++ b/CHANGES @@ -1,17 +1,5 @@ -Release 3.4.2 (in development) -============================== - -Dependencies ------------- - -Incompatible changes --------------------- - -Deprecated ----------- - -Features added --------------- +Release 3.4.2 (released Jan 04, 2021) +===================================== Bugs fixed ---------- @@ -22,9 +10,6 @@ Bugs fixed * #8616: autodoc: AttributeError is raised on non-class object is passed to autoclass directive -Testing --------- - Release 3.4.1 (released Dec 25, 2020) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 11d4b1c9e..3ce3b94e5 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -32,7 +32,7 @@ if 'PYTHONWARNINGS' not in os.environ: warnings.filterwarnings('ignore', "'U' mode is deprecated", DeprecationWarning, module='docutils.io') -__version__ = '3.4.2+' +__version__ = '3.4.2' __released__ = '3.4.2' # used when Sphinx builds its own docs #: Version info for better programmatic use. @@ -43,7 +43,7 @@ __released__ = '3.4.2' # used when Sphinx builds its own docs #: #: .. versionadded:: 1.2 #: Before version 1.2, check the string ``sphinx.__version__``. -version_info = (3, 4, 2, 'beta', 0) +version_info = (3, 4, 2, 'final', 0) package_dir = path.abspath(path.dirname(__file__)) From 4755557a7df0a335b62c3f6bc062ce1c01c2d45a Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Mon, 4 Jan 2021 21:43:54 +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 a7d99eb20..7139f6540 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,24 @@ +Release 3.4.3 (in development) +============================== + +Dependencies +------------ + +Incompatible changes +-------------------- + +Deprecated +---------- + +Features added +-------------- + +Bugs fixed +---------- + +Testing +-------- + Release 3.4.2 (released Jan 04, 2021) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 3ce3b94e5..98c6ffe8f 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -32,8 +32,8 @@ if 'PYTHONWARNINGS' not in os.environ: warnings.filterwarnings('ignore', "'U' mode is deprecated", DeprecationWarning, module='docutils.io') -__version__ = '3.4.2' -__released__ = '3.4.2' # used when Sphinx builds its own docs +__version__ = '3.4.3+' +__released__ = '3.4.3' # used when Sphinx builds its own docs #: Version info for better programmatic use. #: @@ -43,7 +43,7 @@ __released__ = '3.4.2' # used when Sphinx builds its own docs #: #: .. versionadded:: 1.2 #: Before version 1.2, check the string ``sphinx.__version__``. -version_info = (3, 4, 2, 'final', 0) +version_info = (3, 4, 3, 'beta', 0) package_dir = path.abspath(path.dirname(__file__))