From 2b764a0e73b44ba4285d96a770d06fff68a65fa7 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sat, 6 Feb 2016 09:37:13 -0200 Subject: [PATCH] Fix CHANGELOG entry to new format --- CHANGELOG.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3005c44fe..d36fd5e3c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -57,11 +57,15 @@ ``Config.fromdictargs`` now represents its input much more faithfully. Thanks to `@bukzor`_ for the complete PR (`#680`_). +* Fix (`#1290`_): support Python 3.5's `@` operator in assertion rewriting. + Thanks `@Shinkenjoe`_ for report with test case and `@tomviner`_ for the PR. + .. _#1040: https://github.com/pytest-dev/pytest/pull/1040 .. _#680: https://github.com/pytest-dev/pytest/issues/680 .. _#1287: https://github.com/pytest-dev/pytest/pull/1287 .. _#1226: https://github.com/pytest-dev/pytest/pull/1226 +.. _#1290: https://github.com/pytest-dev/pytest/pull/1290 .. _@MichaelAquilina: https://github.com/MichaelAquilina .. _@bukzor: https://github.com/bukzor .. _@nicoddemus: https://github.com/nicoddemus @@ -69,12 +73,10 @@ .. _@codewarrior0: https://github.com/codewarrior0 .. _@jaraco: https://github.com/jaraco .. _@The-Compiler: https://github.com/The-Compiler +.. _@Shinkenjoe: https://github.com/Shinkenjoe +.. _@tomviner: https://github.com/tomviner - -- fix #1290: support Python 3.5's @ operator in assertion rewriting. - Thanks Shinkenjoe for report with test case and Tom Viner for the PR. - 2.8.7 -----