Merge tag '2.0.x' into 2.1.x

last 2.0.x maintenance

Author: davidism

.readthedocs.yaml

@@ -1,8 +1,8 @@
 version: 2
 build:
-  os: ubuntu-20.04
+  os: ubuntu-24.04
   tools:
-    python: "3.10"
+    python: '3.12'
 python:
   install:
     - requirements: requirements/docs.txt

docs/conf.py

@@ -13,14 +13,17 @@
 master_doc = "index"
 extensions = [
     "sphinx.ext.autodoc",
+    "sphinx.ext.extlinks",
     "sphinx.ext.intersphinx",
     "pallets_sphinx_themes",
     "sphinxcontrib.log_cabinet",
-    "sphinx_issues",
 ]
 autodoc_typehints = "description"
+extlinks = {
+    "issue": ("https://github.com/pallets/markupsafe/issues/%s", "#%s"),
+    "pr": ("https://github.com/pallets/markupsafe/pull/%s", "#%s"),
+}
 intersphinx_mapping = {"python": ("https://docs.python.org/3/", None)}
-issues_github_path = "pallets/markupsafe"
 
 # HTML -----------------------------------------------------------------
 

requirements/docs.in

@@ -1,4 +1,3 @@
 pallets-sphinx-themes
 sphinx
-sphinx-issues
 sphinxcontrib-log-cabinet