Skip to content

Commit a8e1743

Browse files
authored
Document custom CVE, CWE and PyPI roles (#1307)
1 parent 8c95d16 commit a8e1743

File tree

7 files changed

+18
-20
lines changed

7 files changed

+18
-20
lines changed

conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@
178178
# https://www.sphinx-doc.org/en/master/usage/extensions/extlinks.html
179179
extlinks = {
180180
"github": ("https://github.com/%s/", "%s"),
181+
"pypi": ("https://pypi.org/project/%s/", "%s"),
181182
}
182183

183184
# sphinxext-opengraph config

core-developers/committing.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@ How to add a NEWS entry
125125

126126
``NEWS`` entries go into the ``Misc/NEWS.d`` directory as individual files. The
127127
``NEWS`` entry can be created by using `blurb-it <https://blurb-it.herokuapp.com/>`_,
128-
or the `blurb <https://pypi.org/project/blurb/>`_ tool and its ``blurb add``
129-
command.
128+
or the :pypi:`blurb` tool and its ``blurb add`` command.
130129

131130
If you are unable to use the tool, then you can create the ``NEWS`` entry file
132131
manually. The ``Misc/NEWS.d`` directory contains a sub-directory named

developer-workflow/communication-channels.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,11 @@ order to make open source pleasant for everyone involved.
249249
Additional repositories
250250
=======================
251251

252-
`Python Core Workflow`_ hosts the codebase for tools such as `blurb`_.
252+
`Python Core Workflow`_ hosts the codebase for tools such as :pypi:`blurb`.
253253

254254
Other core workflow tools are:
255255

256-
* `cherry_picker`_ (`PyPI`_)
256+
* `cherry_picker`_ (:pypi:`PyPI <cherry_picker>`)
257257
* `bedevere`_
258258
* `blurb_it`_
259259
* `miss-islington`_
@@ -264,9 +264,7 @@ Python `Performance Benchmark`_ project is intended to be an authoritative
264264
source of benchmarks for all Python implementations.
265265

266266
.. _Python Core Workflow: https://github.com/python/core-workflow
267-
.. _blurb: https://pypi.org/project/blurb
268267
.. _cherry_picker: https://github.com/python/cherry-picker
269-
.. _PyPI: https://pypi.org/project/cherry_picker/
270268
.. _bedevere: https://github.com/python/bedevere
271269
.. _blurb_it: https://github.com/python/blurb_it
272270
.. _miss-islington: https://github.com/python/miss-islington

documentation/markup.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -732,9 +732,12 @@ where simpler markup should be used:
732732

733733
In addition, the CPython documentation defines a few custom roles:
734734

735-
* ``:gh:`ID```: creates a link to a GitHub issue.
736-
* ``:issue:`ID```: creates a link to a bugs.python.com issue.
737-
* ``:source:`PATH```: creates a link to a source file on GitHub.
735+
* ``:cve:`YYYY-NNNNN```: link to a Common Vulnerabilities and Exposures entry.
736+
* ``:cwe:`NNN```: link to a Common Weakness Enumeration entry.
737+
* ``:gh:`ID```: link to a GitHub issue.
738+
* ``:issue:`ID```: link to a bugs.python.com issue.
739+
* ``:pypi:`NAME```: link to a project on PyPI.
740+
* ``:source:`PATH```: link to a source file on GitHub.
738741

739742
There are some additional facilities that make cross-referencing roles more
740743
versatile:

documentation/translating.rst

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -209,23 +209,20 @@ Which version of the Python documentation should be translated?
209209
---------------------------------------------------------------
210210

211211
Consensus is to work on current stable. You can then propagate your
212-
translation from one branch to another using `pomerge
213-
<https://pypi.org/project/pomerge/>`__.
212+
translation from one branch to another using :pypi:`pomerge`.
214213

215214

216215
Are there some tools to help in managing the repo?
217216
--------------------------------------------------
218217

219218
Here's what we're using:
220219

221-
- `pomerge <https://pypi.org/project/pomerge/>`__ to propagate translations
222-
from one file to others.
223-
- `pospell <https://pypi.org/project/pospell/>`__ to check for typos in ``.po`` files.
224-
- `powrap <https://pypi.org/project/powrap/>`__ to rewrap the ``.po`` files
220+
- :pypi:`pomerge` to propagate translations from one file to others.
221+
- :pypi:`pospell` to check for typos in ``.po`` files.
222+
- :pypi:`powrap` to rewrap the ``.po`` files
225223
before committing. This helps keep Git diffs short.
226-
- `potodo <https://pypi.org/project/potodo/>`__ to list what needs to be translated.
227-
- `sphinx-lint <https://pypi.org/project/sphinx-lint/>`__ to validate reST syntax in
228-
translation files.
224+
- :pypi:`potodo` to list what needs to be translated.
225+
- :pypi:`sphinx-lint` to validate reST syntax in translation files.
229226

230227

231228
How is a coordinator elected?

getting-started/pull-request-lifecycle.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ The automated patch checklist runs through:
266266
* Has the test suite been updated?
267267
* Has an entry under ``Misc/NEWS.d/next`` been added?
268268
(using `blurb-it <https://blurb-it.herokuapp.com/>`_,
269-
or the `blurb <https://pypi.org/project/blurb/>`_ tool)
269+
or the :pypi:`blurb` tool)
270270
* Has ``Misc/ACKS`` been updated?
271271
* Has ``configure`` been regenerated, if necessary?
272272
* Has ``pyconfig.h.in`` been regenerated, if necessary?

index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ instructions please see the :ref:`setup guide <setup>`.
124124
125125
8. Add a News entry into the ``Misc/NEWS.d`` directory as individual file. The
126126
news entry can be created by using `blurb-it <https://blurb-it.herokuapp.com/>`_,
127-
or the `blurb <https://pypi.org/project/blurb/>`_ tool and its ``blurb add``
127+
or the :pypi:`blurb` tool and its ``blurb add``
128128
command. Please read more about ``blurb`` in its
129129
`repository <https://github.com/python/blurb>`_.
130130

0 commit comments

Comments
 (0)