From cd694f0117f96cb17e9ba1fdae14159cd693e726 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Mon, 24 Apr 2023 08:20:18 +0100 Subject: [PATCH 1/2] Remove style --- doc/development/templating.rst | 16 ---------------- sphinx/builders/html/__init__.py | 1 - 2 files changed, 17 deletions(-) diff --git a/doc/development/templating.rst b/doc/development/templating.rst index 512240f49b0..0bb6614c4b9 100644 --- a/doc/development/templating.rst +++ b/doc/development/templating.rst @@ -381,22 +381,6 @@ in the future. .. versionadded:: 5.1 -.. data:: style - - The name of the main stylesheet, as given by the theme or - :confval:`html_style`. - - .. versionchanged:: 5.1 - - The theme or :confval:`html_style` are now able to specify multiple - stylesheets, the ``style`` key returns the last stylesheet when more than - one is specified. - - .. deprecated:: 5.1 - - Use the :data:`styles` key instead, as there is no longer a single main - stylesheet. The ``style`` key will be removed in Sphinx 7.0. - .. data:: title The title of the current document, as used in the ```` tag. diff --git a/sphinx/builders/html/__init__.py b/sphinx/builders/html/__init__.py index 2bf14672d46..5cfe8adb56f 100644 --- a/sphinx/builders/html/__init__.py +++ b/sphinx/builders/html/__init__.py @@ -560,7 +560,6 @@ def prepare_writing(self, docnames: set[str]) -> None: 'sphinx_version_tuple': sphinx_version, 'docutils_version_info': docutils.__version_info__[:5], 'styles': styles, - 'style': styles[-1], # xref RemovedInSphinx70Warning 'rellinks': rellinks, 'builder': self.name, 'parents': [], From 000417583708a0bfac3ff847f22b8bad27e0829a Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Fri, 28 Apr 2023 10:34:59 +0100 Subject: [PATCH 2/2] CHANGES --- CHANGES | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES b/CHANGES index 4821f5f99b1..b76832c8363 100644 --- a/CHANGES +++ b/CHANGES @@ -25,6 +25,7 @@ Incompatible changes function. * #11379: Make the ``env`` argument to ``Builder`` subclasses required. * #11380: autosummary: Always emit grouped import exceptions. +* #11381: Remove deprecated ``style`` key for HTML templates. Deprecated ----------