From 09888fa2631aa0571e20edf9e11bc40a22305215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sviatoslav=20Sydorenko=20=28=D0=A1=D0=B2=D1=8F=D1=82=D0=BE?=
 =?UTF-8?q?=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A1=D0=B8=D0=B4=D0=BE=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BA=D0=BE=29?= <webknjaz@redhat.com>
Date: Wed, 26 Jun 2024 14:39:31 +0200
Subject: [PATCH] Merge pull request #12533 from
 webknjaz/docs/drop-extlinks-bpo

(cherry picked from commit f74e947c1fdfef238235b7dd18c8fe52108268f2)
---
 changelog/12533.contrib.rst | 7 +++++++
 doc/en/changelog.rst        | 4 +++-
 doc/en/conf.py              | 6 ------
 3 files changed, 10 insertions(+), 7 deletions(-)
 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`
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 7668c4900..ab566ad4c 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?)