From 29e4b6b9f010828594df599fcf0b6164a59da27b Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Wed, 26 Jun 2024 14:16:30 +0200
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=93=9D=F0=9F=94=A5=20Remove=20the=20`?=
 =?UTF-8?q?:bpo:`=20RST=20role=20declaration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BPO is in read-only mode and all issues have been migrated to GitHub.
This patch replaces the use of that role with `:issue:`, recently
integrated via #12522. It also disables the built-in `extlinks` Sphinx
extension, as it's no longer in use.
---
 doc/en/changelog.rst | 4 +++-
 doc/en/conf.py       | 6 ------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/doc/en/changelog.rst b/doc/en/changelog.rst
index 2c07f208a..8e3efd047 100644
--- a/doc/en/changelog.rst
+++ b/doc/en/changelog.rst
@@ -3360,7 +3360,9 @@ Bug Fixes
 - :issue:`5914`: pytester: fix :py:func:`~pytest.LineMatcher.no_fnmatch_line` when used after positive matching.
 
 
-- :issue:`6082`: Fix line detection for doctest samples inside :py:class:`python:property` docstrings, as a workaround to :bpo:`17446`.
+- :issue:`6082`: Fix line detection for doctest samples inside
+  :py:class:`python:property` docstrings, as a workaround to
+  :issue:`python/cpython#61648`.
 
 
 - :issue:`6254`: Fix compatibility with pytest-parallel (regression in pytest 5.3.0).
diff --git a/doc/en/conf.py b/doc/en/conf.py
index 7ec862a60..0d440ec44 100644
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -82,7 +82,6 @@ extensions = [
     "pygments_pytest",
     "sphinx.ext.autodoc",
     "sphinx.ext.autosummary",
-    "sphinx.ext.extlinks",
     "sphinx.ext.intersphinx",
     "sphinx.ext.todo",
     "sphinx.ext.viewcode",
@@ -171,11 +170,6 @@ linkcheck_ignore = [
 linkcheck_workers = 5
 
 
-extlinks = {
-    "bpo": ("https://bugs.python.org/issue%s", "bpo-%s"),
-}
-
-
 nitpicky = True
 nitpick_ignore = [
     # TODO (fix in pluggy?)

From d75fa9f9b420124b1ad3ee5a43d04367dba3054c Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Wed, 26 Jun 2024 14:22:56 +0200
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=9D=20Add=20a=20change=20note=20fo?=
 =?UTF-8?q?r=20PE=20#12533?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog/12533.contrib.rst | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 changelog/12533.contrib.rst

diff --git a/changelog/12533.contrib.rst b/changelog/12533.contrib.rst
new file mode 100644
index 000000000..3da7007a0
--- /dev/null
+++ b/changelog/12533.contrib.rst
@@ -0,0 +1,7 @@
+The ``extlinks`` Sphinx extension is no longer enabled. The ``:bpo:``
+role it used to declare has been removed with that. BPO itself has
+migrated to GitHub some years ago and it is possible to link the
+respective issues by using their GitHub issue numbers and the
+``:issue:`` role that the ``sphinx-issues`` extension implements.
+
+-- by :user:`webknjaz`