From ad8131be9e971801080dd21ddaa03557edee9e32 Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Tue, 24 Jun 2014 22:46:57 +0100 Subject: [PATCH] Re-add accidentally removed changelog items --- CHANGELOG | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index dfdaa1c17..8d93f8d93 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -61,6 +61,10 @@ NEXT (2.6) - fix issue483: trial/py33 works now properly. Thanks Daniel Grana for PR. +- improve example for pytest integration with "python setup.py test" + which now has a generic "-a" or "--pytest-args" option where you + can pass additional options as a quoted string. Thanks Trevor Bekolay. + - simplified internal capturing mechanism and made it more robust against tests or setups changing FD1/FD2, also better integrated now with pytest.pdb() in single tests. @@ -87,6 +91,9 @@ NEXT (2.6) functions, including unittest-style Classes. If set to False, the test will not be collected. +- fix issue512: show "" for arguments which might not be set + in monkeypatch plugin. Improves output in documentation. + 2.5.2 -----------------------------------