Skip to content

Commit 64be38d

Browse files
webknjazpatchback[bot]
authored andcommitted
Merge pull request #12522 from webknjaz/docs/sphinx-issues-ext
📝 Replace GH/PyPI `extlinks` w/ `sphinx-issues` (cherry picked from commit 2371525)
1 parent d68e0e4 commit 64be38d

8 files changed

+65
-59
lines changed

changelog/12522.contrib.rst

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
The ``:pull:`` RST role has been replaced with a shorter
2+
``:pr:`` due to starting to use the implementation from
3+
the third-party :pypi:`sphinx-issues` Sphinx extension
4+
-- by :user:`webknjaz`.

doc/en/announce/release-2.9.0.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The py.test Development Team
4545
**New Features**
4646

4747
* New ``pytest.mark.skip`` mark, which unconditionally skips marked tests.
48-
Thanks :user:`MichaelAquilina` for the complete PR (:pull:`1040`).
48+
Thanks :user:`MichaelAquilina` for the complete PR (:pr:`1040`).
4949

5050
* ``--doctest-glob`` may now be passed multiple times in the command-line.
5151
Thanks :user:`jab` and :user:`nicoddemus` for the PR.

doc/en/announce/release-2.9.1.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The py.test Development Team
4444
Thanks :user:`nicoddemus` for the PR.
4545

4646
* Fix (:issue:`469`): junit parses report.nodeid incorrectly, when params IDs
47-
contain ``::``. Thanks :user:`tomviner` for the PR (:pull:`1431`).
47+
contain ``::``. Thanks :user:`tomviner` for the PR (:pr:`1431`).
4848

4949
* Fix (:issue:`578`): SyntaxErrors
5050
containing non-ascii lines at the point of failure generated an internal

doc/en/announce/release-2.9.2.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ The py.test Development Team
4444

4545
* Fix Xfail does not work with condition keyword argument.
4646
Thanks :user:`astraw38` for reporting the issue (:issue:`1496`) and :user:`tomviner`
47-
for PR the (:pull:`1524`).
47+
for PR the (:pr:`1524`).
4848

4949
* Fix win32 path issue when putting custom config file with absolute path
5050
in ``pytest.main("-c your_absolute_path")``.
5151

5252
* Fix maximum recursion depth detection when raised error class is not aware
5353
of unicode/encoded bytes.
54-
Thanks :user:`prusse-martin` for the PR (:pull:`1506`).
54+
Thanks :user:`prusse-martin` for the PR (:pr:`1506`).
5555

5656
* Fix ``pytest.mark.skip`` mark when used in strict mode.
5757
Thanks :user:`pquentin` for the PR and :user:`RonnyPfannschmidt` for

doc/en/changelog.rst

+49-49
Large diffs are not rendered by default.

doc/en/conf.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
"sphinx_removed_in",
9090
"sphinxcontrib_trio",
9191
"sphinxcontrib.towncrier.ext", # provides `towncrier-draft-entries` directive
92+
"sphinx_issues", # implements `:issue:`, `:pr:` and other GH-related roles
9293
]
9394

9495
# Building PDF docs on readthedocs requires inkscape for svg to pdf
@@ -170,13 +171,8 @@
170171
linkcheck_workers = 5
171172

172173

173-
_repo = "https://github.com/pytest-dev/pytest"
174174
extlinks = {
175175
"bpo": ("https://bugs.python.org/issue%s", "bpo-%s"),
176-
"pypi": ("https://pypi.org/project/%s/", "%s"),
177-
"issue": (f"{_repo}/issues/%s", "issue #%s"),
178-
"pull": (f"{_repo}/pull/%s", "pull request #%s"),
179-
"user": ("https://github.com/%s", "@%s"),
180176
}
181177

182178

@@ -451,6 +447,11 @@
451447
towncrier_draft_config_path = "pyproject.toml" # relative to cwd
452448

453449

450+
# -- Options for sphinx_issues extension -----------------------------------
451+
452+
issues_github_path = "pytest-dev/pytest"
453+
454+
454455
intersphinx_mapping = {
455456
"pluggy": ("https://pluggy.readthedocs.io/en/stable", None),
456457
"python": ("https://docs.python.org/3", None),

doc/en/historical-notes.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Here is a non-exhaustive list of issues fixed by the new implementation:
107107

108108
* Marker transfer incompatible with inheritance (:issue:`535`).
109109

110-
More details can be found in the :pull:`original PR <3317>`.
110+
More details can be found in the :pr:`original PR <3317>`.
111111

112112
.. note::
113113

doc/en/requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ sphinxcontrib-svg2pdfconverter
1010
packaging
1111
furo
1212
sphinxcontrib-towncrier
13+
sphinx-issues

0 commit comments

Comments
 (0)