Skip to content

Commit d2bca93

Browse files
committed
Update grammar in changelog as requested
1 parent 07dd1ca commit d2bca93

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

CHANGELOG.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ Deprecations and Removals
2424
This affects Python 2 users only and in rare situations. (`#2147
2525
<https://github.com/pytest-dev/pytest/issues/2147>`_)
2626

27-
- introduce deprecation warnings for legacy marks based parametersets (`#2427
28-
<https://github.com/pytest-dev/pytest/issues/2427>`_)
27+
- A deprecation warning is now raised when using marks for parameters
28+
in ``pytest.mark.parametrize``. Use ``pytest.param`` to apply marks to
29+
parameters instead. (`#2427 <https://github.com/pytest-dev/pytest/issues/2427>`_)
2930

3031

3132
Features
@@ -52,12 +53,11 @@ Features
5253
sole argument to marks. (`#2540 <https://github.com/pytest-
5354
dev/pytest/issues/2540>`_)
5455

55-
- New ``cache_dir`` ini option: sets a directory where stores content of cache
56-
plugin. Default directory is ``.cache`` which is created in ``rootdir``.
57-
Directory may be relative or absolute path. If setting relative path, then
58-
directory is created relative to ``rootdir``. Additionally path may contain
59-
environment variables, that will be expanded. (`#2543
60-
<https://github.com/pytest-dev/pytest/issues/2543>`_)
56+
- New ``cache_dir`` ini option: sets the directory where the contents of the
57+
cache plugin are stored. Directory may be relative or absolute path: if relative path, then
58+
directory is created relative to ``rootdir``, otherwise it is used as is.
59+
Additionally path may contain environment variables which are expanded during
60+
runtime. (`#2543 <https://github.com/pytest-dev/pytest/issues/2543>`_)
6161

6262
- Introduce the ``PYTEST_CURRENT_TEST`` environment variable that is set with
6363
the ``nodeid`` and stage (``setup``, ``call`` and ``teardown``) of the test

0 commit comments

Comments
 (0)