From d2bca93109a7c85f316e493c5c31ee2322578980 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Tue, 1 Aug 2017 18:01:22 -0300 Subject: [PATCH] Update grammar in changelog as requested --- CHANGELOG.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e51a8f9d8..f033f8cab 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -24,8 +24,9 @@ Deprecations and Removals This affects Python 2 users only and in rare situations. (`#2147 `_) -- introduce deprecation warnings for legacy marks based parametersets (`#2427 - `_) +- A deprecation warning is now raised when using marks for parameters + in ``pytest.mark.parametrize``. Use ``pytest.param`` to apply marks to + parameters instead. (`#2427 `_) Features @@ -52,12 +53,11 @@ Features sole argument to marks. (`#2540 `_) -- New ``cache_dir`` ini option: sets a directory where stores content of cache - plugin. Default directory is ``.cache`` which is created in ``rootdir``. - Directory may be relative or absolute path. If setting relative path, then - directory is created relative to ``rootdir``. Additionally path may contain - environment variables, that will be expanded. (`#2543 - `_) +- New ``cache_dir`` ini option: sets the directory where the contents of the + cache plugin are stored. Directory may be relative or absolute path: if relative path, then + directory is created relative to ``rootdir``, otherwise it is used as is. + Additionally path may contain environment variables which are expanded during + runtime. (`#2543 `_) - Introduce the ``PYTEST_CURRENT_TEST`` environment variable that is set with the ``nodeid`` and stage (``setup``, ``call`` and ``teardown``) of the test