From 5739a9d58d2e5005259718d615d4c8ec3971173a Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Sun, 2 Mar 2025 21:03:02 +0000 Subject: [PATCH 1/6] Bump version --- sphinx/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sphinx/__init__.py b/sphinx/__init__.py index d8287d4ea19..b70b6db47a6 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -17,7 +17,7 @@ if TYPE_CHECKING: from typing import Final -__version__: Final = '8.2.2' +__version__: Final = '8.3.0' __display_version__: Final = __version__ # used for command line version warnings.filterwarnings( @@ -35,11 +35,11 @@ #: #: .. versionadded:: 1.2 #: Before version 1.2, check the string ``sphinx.__version__``. -version_info: Final = (8, 2, 2, 'final', 0) +version_info: Final = (8, 3, 0, 'beta', 0) package_dir: Final = _StrPath(__file__).resolve().parent -_in_development = False +_in_development = True if _in_development: # Only import subprocess if needed import subprocess From 92b5303219101dee99ca50c245c5eb65257d4580 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Sun, 2 Mar 2025 22:11:40 +0000 Subject: [PATCH 2/6] Define ``_StrPath.__radd__()`` --- sphinx/util/_pathlib.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sphinx/util/_pathlib.py b/sphinx/util/_pathlib.py index a304ff75ca4..0506131f962 100644 --- a/sphinx/util/_pathlib.py +++ b/sphinx/util/_pathlib.py @@ -57,6 +57,10 @@ def __add__(self, other: str) -> str: warnings.warn(_MSG, RemovedInSphinx90Warning, stacklevel=2) return self.__str__() + other + def __radd__(self, other: str) -> str: + warnings.warn(_MSG, RemovedInSphinx90Warning, stacklevel=2) + return other + self.__str__() + def __bool__(self) -> bool: if not self.__str__(): warnings.warn(_MSG, RemovedInSphinx90Warning, stacklevel=2) @@ -108,6 +112,10 @@ def __add__(self, other: str) -> str: warnings.warn(_MSG, RemovedInSphinx90Warning, stacklevel=2) return self.__str__() + other + def __radd__(self, other: str) -> str: + warnings.warn(_MSG, RemovedInSphinx90Warning, stacklevel=2) + return other + self.__str__() + def __bool__(self) -> bool: if not self.__str__(): warnings.warn(_MSG, RemovedInSphinx90Warning, stacklevel=2) From b3881bb23471584d3999ecbb03cb20184da22738 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Sun, 2 Mar 2025 22:16:20 +0000 Subject: [PATCH 3/6] Fix _CurrentDocument membership testing with '{c,cpp}:parent_symbol' --- sphinx/environment/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx/environment/__init__.py b/sphinx/environment/__init__.py index 2e4bc230cc1..79fa6278549 100644 --- a/sphinx/environment/__init__.py +++ b/sphinx/environment/__init__.py @@ -1069,7 +1069,7 @@ def __delitem__(self, key: str) -> None: def __contains__(self, item: str) -> bool: if item in {'c:parent_symbol', 'cpp:parent_symbol'}: - return getattr(self, item) is not None + return getattr(self, self.__attr_map[item]) is not None return item in self.__attr_map or item in self._extension_data def __iter__(self) -> Iterator[str]: From c84c21ff935e840f67413e9397fc6a75cb87e529 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Sun, 2 Mar 2025 22:23:35 +0000 Subject: [PATCH 4/6] Correct the date for Sphinx 8.2.2 --- doc/changes/8.2.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changes/8.2.rst b/doc/changes/8.2.rst index 31e218c5e20..2417a607715 100644 --- a/doc/changes/8.2.rst +++ b/doc/changes/8.2.rst @@ -3,7 +3,7 @@ Sphinx 8.2 ========== -Release 8.2.2 (released Mar 01, 2025) +Release 8.2.2 (released Mar 02, 2025) ===================================== Bugs fixed From 4091fe335444236181f765adaf9e9bf0a2bcc735 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Sun, 2 Mar 2025 22:26:39 +0000 Subject: [PATCH 5/6] Add CHANGES for Sphinx 8.2.3 --- doc/changes/8.2.rst | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/changes/8.2.rst b/doc/changes/8.2.rst index 2417a607715..edc88fb0a53 100644 --- a/doc/changes/8.2.rst +++ b/doc/changes/8.2.rst @@ -3,6 +3,17 @@ Sphinx 8.2 ========== +Release 8.2.3 (in development) +============================== + +Bugs fixed +---------- + +* #13403: Define ``_StrPath.__radd__()``. + Patch by Adam Turner. +* #13399: Fix _CurrentDocument membership testing with '{c,cpp}:parent_symbol'. + Patch by Adam Turner. + Release 8.2.2 (released Mar 02, 2025) ===================================== @@ -11,9 +22,11 @@ Bugs fixed * #13392: Fix argument type for ``jieba.load_userdict()``. * Add workaround for ``nbsphinx`` implicit imports. + Patch by Adam Turner. * #13402: Ensure inline ``