From 810db2726d3ef31f58cdf44eca1a5bb30c66bee0 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Tue, 15 Oct 2019 18:57:59 -0700 Subject: [PATCH] Put the 4.6 changelogs together --- CHANGELOG.rst | 53 +++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2d27b5e65..07e8d26cc 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -27,33 +27,6 @@ Bug Fixes - `#5902 `_: Fix warnings about deprecated ``cmp`` attribute in ``attrs>=19.2``. -pytest 4.6.6 (2019-10-11) -========================= - -Bug Fixes ---------- - -- `#5523 `_: Fixed using multiple short options together in the command-line (for example ``-vs``) in Python 3.8+. - - -- `#5537 `_: Replace ``importlib_metadata`` backport with ``importlib.metadata`` from the - standard library on Python 3.8+. - - -- `#5806 `_: Fix "lexer" being used when uploading to bpaste.net from ``--pastebin`` to "text". - - -- `#5902 `_: Fix warnings about deprecated ``cmp`` attribute in ``attrs>=19.2``. - - - -Trivial/Internal Changes ------------------------- - -- `#5801 `_: Fixes python version checks (detected by ``flake8-2020``) in case python4 becomes a thing. - - - pytest 5.2.0 (2019-09-28) ========================= @@ -524,6 +497,32 @@ Improved Documentation - `#5416 `_: Fix PytestUnknownMarkWarning in run/skip example. +pytest 4.6.6 (2019-10-11) +========================= + +Bug Fixes +--------- + +- `#5523 `_: Fixed using multiple short options together in the command-line (for example ``-vs``) in Python 3.8+. + + +- `#5537 `_: Replace ``importlib_metadata`` backport with ``importlib.metadata`` from the + standard library on Python 3.8+. + + +- `#5806 `_: Fix "lexer" being used when uploading to bpaste.net from ``--pastebin`` to "text". + + +- `#5902 `_: Fix warnings about deprecated ``cmp`` attribute in ``attrs>=19.2``. + + + +Trivial/Internal Changes +------------------------ + +- `#5801 `_: Fixes python version checks (detected by ``flake8-2020``) in case python4 becomes a thing. + + pytest 4.6.5 (2019-08-05) =========================