Skip to content

Commit 3b0215f

Browse files
authored
docs: Integrate sphinx-issues into the Sphinx config (#12616)
By using sphinx-issues, we can use consistent roles for common links.
1 parent 6f3ebcd commit 3b0215f

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

NEWS.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -3350,7 +3350,7 @@ Improved Documentation
33503350
- Upgrade the bundled copy of requests to 2.6.0, fixing CVE-2015-2296.
33513351
- Display format of latest package when using ``pip list --outdated``. (#2475)
33523352
- Don't use pywin32 as ctypes should always be available on Windows, using
3353-
pywin32 prevented uninstallation of pywin32 on Windows. (:pull:`2467`)
3353+
pywin32 prevented uninstallation of pywin32 on Windows. (:pr:`2467`)
33543354
- Normalize the ``--wheel-dir`` option, expanding out constructs such as ``~``
33553355
when used. (#2441)
33563356
- Display a warning when an undefined extra has been requested. (#2142)
@@ -3641,7 +3641,7 @@ Improved Documentation
36413641
--no-download`` are now formally deprecated. See #906 for discussion on
36423642
possible alternatives, or lack thereof, in future releases.
36433643
- **DEPRECATION** ``pip zip`` and ``pip unzip`` are now formally deprecated.
3644-
- pip will now install Mac OSX platform wheels from PyPI. (:pull:`1278`)
3644+
- pip will now install Mac OSX platform wheels from PyPI. (:pr:`1278`)
36453645
- pip now generates the appropriate platform-specific console scripts when
36463646
installing wheels. (#1251)
36473647
- pip now confirms a wheel is supported when installing directly from a path or

docs/html/conf.py

+5-9
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
# first-party extensions
1818
"sphinx.ext.autodoc",
1919
"sphinx.ext.todo",
20-
"sphinx.ext.extlinks",
2120
"sphinx.ext.intersphinx",
2221
# our extensions
2322
"pip_sphinxext",
@@ -26,6 +25,7 @@
2625
"sphinx_copybutton",
2726
"sphinx_inline_tabs",
2827
"sphinxcontrib.towncrier",
28+
"sphinx_issues",
2929
]
3030

3131
# General information about the project.
@@ -71,14 +71,6 @@
7171
"pypug": ("https://packaging.python.org", None),
7272
}
7373

74-
# -- Options for extlinks -------------------------------------------------------------
75-
76-
extlinks = {
77-
"issue": ("https://github.com/pypa/pip/issues/%s", "#%s"),
78-
"pull": ("https://github.com/pypa/pip/pull/%s", "PR #%s"),
79-
"pypi": ("https://pypi.org/project/%s/", "%s"),
80-
}
81-
8274
# -- Options for towncrier_draft extension --------------------------------------------
8375

8476
towncrier_draft_autoversion_mode = "draft" # or: 'sphinx-release', 'sphinx-version'
@@ -137,3 +129,7 @@ def to_document_name(path: str, base_dir: str) -> str:
137129
copybutton_prompt_text = r"\$ | C\:\> "
138130
copybutton_prompt_is_regexp = True
139131
copybutton_only_copy_prompt_lines = False
132+
133+
# -- Options for sphinx_issues --------------------------------------------------------
134+
135+
issues_default_group_project = "pypa/pip"

docs/requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ myst_parser
77
sphinx-copybutton
88
sphinx-inline-tabs
99
sphinxcontrib-towncrier >= 0.2.0a0
10+
sphinx-issues
1011

1112
# `docs.pipext` uses pip's internals to generate documentation. So, we install
1213
# the current directory to make it work.

news/12551.trivial.rst

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Integrate ``sphinx-issues`` into the Sphinx config.

0 commit comments

Comments
 (0)