diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1bef283ef..89437663f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -18,6 +18,28 @@ with advance notice in the **Deprecations** section of releases. .. towncrier release notes start +pytest 4.6.11 (2020-06-04) +========================== + +Bug Fixes +--------- + +- `#6334 `_: Fix summary entries appearing twice when ``f/F`` and ``s/S`` report chars were used at the same time in the ``-r`` command-line option (for example ``-rFf``). + + The upper case variants were never documented and the preferred form should be the lower case. + + +- `#7310 `_: Fix ``UnboundLocalError: local variable 'letter' referenced before + assignment`` in ``_pytest.terminal.pytest_report_teststatus()`` + when plugins return report objects in an unconventional state. + + This was making ``pytest_report_teststatus()`` skip + entering if-block branches that declare the ``letter`` variable. + + The fix was to set the initial value of the ``letter`` before + the if-block cascade so that it always has a value. + + pytest 4.6.10 (2020-05-08) ========================== diff --git a/changelog/6334.bugfix.rst b/changelog/6334.bugfix.rst deleted file mode 100644 index abd4c748b..000000000 --- a/changelog/6334.bugfix.rst +++ /dev/null @@ -1,3 +0,0 @@ -Fix summary entries appearing twice when ``f/F`` and ``s/S`` report chars were used at the same time in the ``-r`` command-line option (for example ``-rFf``). - -The upper case variants were never documented and the preferred form should be the lower case. diff --git a/changelog/7310.bugfix.rst b/changelog/7310.bugfix.rst deleted file mode 100644 index 9dab65c5d..000000000 --- a/changelog/7310.bugfix.rst +++ /dev/null @@ -1,9 +0,0 @@ -Fix ``UnboundLocalError: local variable 'letter' referenced before -assignment`` in ``_pytest.terminal.pytest_report_teststatus()`` -when plugins return report objects in an unconventional state. - -This was making ``pytest_report_teststatus()`` skip -entering if-block branches that declare the ``letter`` variable. - -The fix was to set the initial value of the ``letter`` before -the if-block cascade so that it always has a value. diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst index ab3bbad5b..74ad02855 100644 --- a/doc/en/announce/index.rst +++ b/doc/en/announce/index.rst @@ -6,6 +6,7 @@ Release announcements :maxdepth: 2 + release-4.6.11 release-4.6.10 release-4.6.9 release-4.6.8 diff --git a/doc/en/announce/release-4.6.11.rst b/doc/en/announce/release-4.6.11.rst new file mode 100644 index 000000000..276584bdf --- /dev/null +++ b/doc/en/announce/release-4.6.11.rst @@ -0,0 +1,20 @@ +pytest-4.6.11 +======================================= + +pytest 4.6.11 has just been released to PyPI. + +This is a bug-fix release, being a drop-in replacement. To upgrade:: + + pip install --upgrade pytest + +The full changelog is available at https://docs.pytest.org/en/latest/changelog.html. + +Thanks to all who contributed to this release, among them: + +* Anthony Sottile +* Bruno Oliveira +* Sviatoslav Sydorenko + + +Happy testing, +The pytest Development Team diff --git a/doc/en/example/simple.rst b/doc/en/example/simple.rst index 140f4b840..1dee981be 100644 --- a/doc/en/example/simple.rst +++ b/doc/en/example/simple.rst @@ -440,7 +440,7 @@ Now we can profile which test functions execute the slowest: test_some_are_slow.py ... [100%] ========================= slowest 3 test durations ========================= - 0.30s call test_some_are_slow.py::test_funcslow2 + 0.31s call test_some_are_slow.py::test_funcslow2 0.20s call test_some_are_slow.py::test_funcslow1 0.10s call test_some_are_slow.py::test_funcfast ========================= 3 passed in 0.12 seconds =========================