From 4547b49a6be73f398e46ddc9d27bb235ff1f1ef3 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Wed, 17 Apr 2024 02:36:48 +0100 Subject: [PATCH 1/3] Bump version --- CHANGES.rst | 7 +++++++ sphinx/__init__.py | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 60090eeee18..68d025cf90c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,10 @@ +Release 7.3.4 (in development) +============================== + +Bugs fixed +---------- + + Release 7.3.3 (released Apr 17, 2024) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 6dcd841fe59..4361f02c03f 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -1,6 +1,6 @@ """The Sphinx documentation toolchain.""" -__version__ = '7.3.3' +__version__ = '7.3.4' __display_version__ = __version__ # used for command line version # Keep this file executable as-is in Python 3! @@ -28,11 +28,11 @@ #: #: .. versionadded:: 1.2 #: Before version 1.2, check the string ``sphinx.__version__``. -version_info = (7, 3, 3, 'final', 0) +version_info = (7, 3, 4, 'beta', 0) package_dir = path.abspath(path.dirname(__file__)) -_in_development = False +_in_development = True if _in_development: # Only import subprocess if needed import subprocess From 34c18129f0d1416a94699ca3a71901b5f9682e11 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Wed, 17 Apr 2024 02:37:56 +0100 Subject: [PATCH 2/3] Handle cases when ``Any`` is not an instance of ``type`` This is only needed for Python 3.10 and earlier. --- CHANGES.rst | 2 ++ sphinx/config.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 68d025cf90c..ca043339e1b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,8 @@ Release 7.3.4 (in development) Bugs fixed ---------- +* Handle cases when ``Any`` is not an instance of ``type``. + Patch by Adam Turner. Release 7.3.3 (released Apr 17, 2024) ===================================== diff --git a/sphinx/config.py b/sphinx/config.py index 84e20f6e59f..e4a3c99b008 100644 --- a/sphinx/config.py +++ b/sphinx/config.py @@ -532,7 +532,7 @@ def _validate_valid_types( return () if isinstance(valid_types, (frozenset, ENUM)): return valid_types - if isinstance(valid_types, type): + if isinstance(valid_types, type) or valid_types is Any: return frozenset((valid_types,)) if isinstance(valid_types, set): return frozenset(valid_types) From 9d649e235bbff6ff19e6722e630e8e922b05371c Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Wed, 17 Apr 2024 02:38:22 +0100 Subject: [PATCH 3/3] Bump to 7.3.4 final --- CHANGES.rst | 4 ++-- sphinx/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index ca043339e1b..d240e7d26ff 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,5 +1,5 @@ -Release 7.3.4 (in development) -============================== +Release 7.3.4 (released Apr 17, 2024) +===================================== Bugs fixed ---------- diff --git a/sphinx/__init__.py b/sphinx/__init__.py index 4361f02c03f..bfbdbb299c4 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -28,11 +28,11 @@ #: #: .. versionadded:: 1.2 #: Before version 1.2, check the string ``sphinx.__version__``. -version_info = (7, 3, 4, 'beta', 0) +version_info = (7, 3, 4, 'final', 0) package_dir = path.abspath(path.dirname(__file__)) -_in_development = True +_in_development = False if _in_development: # Only import subprocess if needed import subprocess