diff --git a/changelog/7148.bugfix.rst b/changelog/7148.bugfix.rst deleted file mode 100644 index 71753334c5..0000000000 --- a/changelog/7148.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fixed ``--log-cli`` potentially causing unrelated ``print`` output to be swallowed. diff --git a/changelog/7672.bugfix.rst b/changelog/7672.bugfix.rst deleted file mode 100644 index 88608e1618..0000000000 --- a/changelog/7672.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fixed log-capturing level restored incorrectly if ``caplog.set_level`` is called more than once. diff --git a/changelog/7686.bugfix.rst b/changelog/7686.bugfix.rst deleted file mode 100644 index 8549fae8eb..0000000000 --- a/changelog/7686.bugfix.rst +++ /dev/null @@ -1,2 +0,0 @@ -Fixed `NotSetType.token` being used as the parameter ID when the parametrization list is empty. -Regressed in pytest 6.0.0. diff --git a/changelog/7707.bugfix.rst b/changelog/7707.bugfix.rst deleted file mode 100644 index fbe979d9d6..0000000000 --- a/changelog/7707.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix internal error when handling some exceptions that contain multiple lines or the style uses multiple lines (``--tb=line`` for example). diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst index 49d7a0465c..e011aaa816 100644 --- a/doc/en/announce/index.rst +++ b/doc/en/announce/index.rst @@ -6,6 +6,7 @@ Release announcements :maxdepth: 2 + release-6.0.2 release-6.0.1 release-6.0.0 release-6.0.0rc1 diff --git a/doc/en/announce/release-6.0.2.rst b/doc/en/announce/release-6.0.2.rst new file mode 100644 index 0000000000..16eabc5863 --- /dev/null +++ b/doc/en/announce/release-6.0.2.rst @@ -0,0 +1,19 @@ +pytest-6.0.2 +======================================= + +pytest 6.0.2 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/stable/changelog.html. + +Thanks to all of the contributors to this release: + +* Bruno Oliveira +* Ran Benita + + +Happy testing, +The pytest Development Team diff --git a/doc/en/changelog.rst b/doc/en/changelog.rst index 05ce4caea8..feb113e213 100644 --- a/doc/en/changelog.rst +++ b/doc/en/changelog.rst @@ -28,6 +28,25 @@ with advance notice in the **Deprecations** section of releases. .. towncrier release notes start +pytest 6.0.2 (2020-09-04) +========================= + +Bug Fixes +--------- + +- `#7148 `_: Fixed ``--log-cli`` potentially causing unrelated ``print`` output to be swallowed. + + +- `#7672 `_: Fixed log-capturing level restored incorrectly if ``caplog.set_level`` is called more than once. + + +- `#7686 `_: Fixed `NotSetType.token` being used as the parameter ID when the parametrization list is empty. + Regressed in pytest 6.0.0. + + +- `#7707 `_: Fix internal error when handling some exceptions that contain multiple lines or the style uses multiple lines (``--tb=line`` for example). + + pytest 6.0.1 (2020-07-30) ========================= diff --git a/doc/en/getting-started.rst b/doc/en/getting-started.rst index c160191b65..caca6f511d 100644 --- a/doc/en/getting-started.rst +++ b/doc/en/getting-started.rst @@ -28,7 +28,7 @@ Install ``pytest`` .. code-block:: bash $ pytest --version - pytest 6.0.1 + pytest 6.0.2 .. _`simpletest`: