Merge pull request #3665 from nicoddemus/changelog-tweaks

Small tweaks to the changelog entries

changelog/2220.bugfix.rst

@@ -1,3 +1 @@
-In case a (direct) parameter of a test overrides some fixture upon which the
-test depends indirectly, do the pruning of the fixture dependency tree. That
-is, recompute the full set of fixtures the test function needs.
+Fix a bug where fixtures overriden by direct parameters (for example parametrization) were being instantiated even if they were not being used by a test.

changelog/3576.feature.rst

@@ -1 +1 @@
-``Node.add_marker`` now supports an append=True/False to determine whether the mark comes last (default) or first.
+``Node.add_marker`` now supports an ``append=True/False`` parameter to determine whether the mark comes last (default) or first.

changelog/3610.feature.rst

@@ -1 +1 @@
-Added the `--trace` option to enter the debugger at the start of a test.
+New ``--trace`` option to enter the debugger at the start of a test.

changelog/3623.feature.rst

@@ -1 +1 @@
-introduce ``pytester.copy_example`` as helper to do acceptance tests against examples from the project
+Introduce ``pytester.copy_example`` as helper to do acceptance tests against examples from the project.

changelog/README.rst

@@ -26,7 +26,7 @@ changelog using that instead.
 
 If you are not sure what issue type to use, don't hesitate to ask in your PR.
 
-Note that the ``towncrier`` tool will automatically
-reflow your text, so it will work best if you stick to a single paragraph, but multiple sentences and links are OK
-and encouraged. You can install ``towncrier`` and then run ``towncrier --draft``
+``towncrier`` preserves multiple paragraphs and formatting (code blocks, lists, and so on), but for entries
+other than ``features`` it is usually better to stick to a single paragraph to keep it concise. You can install
+``towncrier`` and then run ``towncrier --draft``
 if you want to get a preview of how your change will look in the final release notes.

changelog/_template.rst

@@ -14,7 +14,7 @@
 {% if definitions[category]['showcontent'] %}
 {% for text, values in sections[section][category]|dictsort(by='value') %}
 {% set issue_joiner = joiner(', ') %}
-- {{ text }}{% if category != 'vendor' %} ({% for value in values|sort %}{{ issue_joiner() }}`{{ value }} <https://github.com/pytest-dev/pytest/issues/{{ value[1:] }}>`_{% endfor %}){% endif %}
+- {% for value in values|sort %}{{ issue_joiner() }}`{{ value }} <https://github.com/pytest-dev/pytest/issues/{{ value[1:] }}>`_{% endfor %}: {{ text }}
 
 
 {% endfor %}