diff --git a/changelog/2220.bugfix.rst b/changelog/2220.bugfix.rst index bc74b44bb..e15101131 100644 --- a/changelog/2220.bugfix.rst +++ b/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. diff --git a/changelog/3576.feature.rst b/changelog/3576.feature.rst index a2af6f9d9..6763a00e6 100644 --- a/changelog/3576.feature.rst +++ b/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. diff --git a/changelog/3610.feature.rst b/changelog/3610.feature.rst index fd044b4b2..a98295ce8 100644 --- a/changelog/3610.feature.rst +++ b/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. diff --git a/changelog/3623.feature.rst b/changelog/3623.feature.rst index 2e6f4c428..589d858b9 100644 --- a/changelog/3623.feature.rst +++ b/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. diff --git a/changelog/README.rst b/changelog/README.rst index e34bd4da2..47e21fb33 100644 --- a/changelog/README.rst +++ b/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. diff --git a/changelog/_template.rst b/changelog/_template.rst index a898abc15..5de4ae97e 100644 --- a/changelog/_template.rst +++ b/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 }} `_{% endfor %}){% endif %} +- {% for value in values|sort %}{{ issue_joiner() }}`{{ value }} `_{% endfor %}: {{ text }} {% endfor %}