From d91a2d1286ced026586699e8843a780b36592e84 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Mon, 24 Apr 2023 08:21:35 +0100
Subject: [PATCH 1/2] Update ``sphinx.deprecation`` for Sphinx 7

---
 sphinx/deprecation.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sphinx/deprecation.py b/sphinx/deprecation.py
index fbd5463cce3..519c8ea90bb 100644
--- a/sphinx/deprecation.py
+++ b/sphinx/deprecation.py
@@ -5,15 +5,15 @@
 import warnings
 
 
-class RemovedInSphinx70Warning(DeprecationWarning):
+class RemovedInSphinx80Warning(DeprecationWarning):
     pass
 
 
-class RemovedInSphinx80Warning(PendingDeprecationWarning):
+class RemovedInSphinx90Warning(PendingDeprecationWarning):
     pass
 
 
-RemovedInNextVersionWarning = RemovedInSphinx70Warning
+RemovedInNextVersionWarning = RemovedInSphinx80Warning
 
 
 def _deprecation_warning(
@@ -41,15 +41,15 @@ def __getattr__(name):
 
            from sphinx.deprecation import _deprecation_warning
 
-           deprecated_object, canonical_name = _DEPRECATED_OBJECTS[name]
-           _deprecation_warning(__name__, name, canonical_name, remove=(7, 0))
+           deprecated_object, canonical_name, remove = _DEPRECATED_OBJECTS[name]
+           _deprecation_warning(__name__, name, canonical_name, remove=remove)
            return deprecated_object
     """
 
-    if remove == (7, 0):
-        warning_class: type[Warning] = RemovedInSphinx70Warning
-    elif remove == (8, 0):
-        warning_class = RemovedInSphinx80Warning
+    if remove == (8, 0):
+        warning_class: type[Warning] = RemovedInSphinx80Warning
+    elif remove == (9, 0):
+        warning_class = RemovedInSphinx90Warning
     else:
         raise RuntimeError(f'removal version {remove!r} is invalid!')
 

From 1c74a5458b669a698302057e92f802a601852b07 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Fri, 28 Apr 2023 12:02:44 +0100
Subject: [PATCH 2/2] Remove

---
 sphinx/deprecation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sphinx/deprecation.py b/sphinx/deprecation.py
index 519c8ea90bb..d708fdaa0c3 100644
--- a/sphinx/deprecation.py
+++ b/sphinx/deprecation.py
@@ -31,7 +31,7 @@ def _deprecation_warning(
 
        # deprecated name -> (object to return, canonical path or empty string)
        _DEPRECATED_OBJECTS = {
-           'deprecated_name': (object_to_return, 'fully_qualified_replacement_name'),
+           'deprecated_name': (object_to_return, 'fully_qualified_replacement_name', (8, 0)),
        }