Merge pull request #7411 from bluetech/contributing-changelog
CONTRIBUTING: sync changelog types
This commit is contained in:
commit
d69e9e60d6
|
@ -173,8 +173,10 @@ Short version
|
||||||
The test environments above are usually enough to cover most cases locally.
|
The test environments above are usually enough to cover most cases locally.
|
||||||
|
|
||||||
#. Write a ``changelog`` entry: ``changelog/2574.bugfix.rst``, use issue id number
|
#. Write a ``changelog`` entry: ``changelog/2574.bugfix.rst``, use issue id number
|
||||||
and one of ``bugfix``, ``removal``, ``feature``, ``vendor``, ``doc`` or
|
and one of ``feature``, ``improvement``, ``bugfix``, ``doc``, ``deprecation``,
|
||||||
``trivial`` for the issue type.
|
``breaking``, ``vendor`` or ``trivial`` for the issue type.
|
||||||
|
|
||||||
|
|
||||||
#. Unless your change is a trivial or a documentation fix (e.g., a typo or reword of a small section) please
|
#. Unless your change is a trivial or a documentation fix (e.g., a typo or reword of a small section) please
|
||||||
add yourself to the ``AUTHORS`` file, in alphabetical order.
|
add yourself to the ``AUTHORS`` file, in alphabetical order.
|
||||||
|
|
||||||
|
@ -274,8 +276,9 @@ Here is a simple overview, with pytest-specific bits:
|
||||||
|
|
||||||
#. Create a new changelog entry in ``changelog``. The file should be named ``<issueid>.<type>.rst``,
|
#. Create a new changelog entry in ``changelog``. The file should be named ``<issueid>.<type>.rst``,
|
||||||
where *issueid* is the number of the issue related to the change and *type* is one of
|
where *issueid* is the number of the issue related to the change and *type* is one of
|
||||||
``bugfix``, ``removal``, ``feature``, ``vendor``, ``doc`` or ``trivial``. You may not create a
|
``feature``, ``improvement``, ``bugfix``, ``doc``, ``deprecation``, ``breaking``, ``vendor``
|
||||||
changelog entry if the change doesn't affect the documented behaviour of Pytest.
|
or ``trivial``. You may skip creating the changelog entry if the change doesn't affect the
|
||||||
|
documented behaviour of pytest.
|
||||||
|
|
||||||
#. Add yourself to ``AUTHORS`` file if not there yet, in alphabetical order.
|
#. Add yourself to ``AUTHORS`` file if not there yet, in alphabetical order.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue