summaryrefslogtreecommitdiff
path: root/changelog
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2018-05-17 21:13:38 -0300
committerBruno Oliveira <nicoddemus@gmail.com>2018-05-17 21:18:12 -0300
commit5be85a1f55b181e1f2c8fcc11d44d395fb6ac3e0 (patch)
treefe3fcc21e697fc0918fa9985509dca3eb185e5bd /changelog
parentbb626fe8a780706698b700feb410036f4d5b88bb (diff)
downloadpytest-5be85a1f55b181e1f2c8fcc11d44d395fb6ac3e0.tar.gz
Merge changelog marks refactoring changelog entries as discussed in review
Diffstat (limited to 'changelog')
-rw-r--r--changelog/3317.feature7
-rw-r--r--changelog/3446.feature1
-rw-r--r--changelog/3459.feature1
3 files changed, 4 insertions, 5 deletions
diff --git a/changelog/3317.feature b/changelog/3317.feature
index b7f947af8..fb6824958 100644
--- a/changelog/3317.feature
+++ b/changelog/3317.feature
@@ -1,3 +1,4 @@
-Revamp the internals of the ``pytest.mark`` implementation with correct per node handling and introduce a new ``Node.iter_markers``
-API for mark iteration over nodes which fixes a number of long standing bugs caused by the old approach. More details can be
-found in `the marks documentation <https://docs.pytest.org/en/latest/mark.html#marker-revamp-and-iteration>`_.
+Revamp the internals of the ``pytest.mark`` implementation with correct per node handling which fixes a number of
+long standing bugs caused by the old design. This introduces new ``Node.iter_markers(name)`` and ``Node.get_closest_mark(name)`` APIs.
+Users are **strongly encouraged** to read `reasons for the revamp in the docs <https://docs.pytest.org/en/latest/mark.html#marker-revamp-and-iteration>`_,
+or jump over to details about `updating existing code to use the new APIs <https://docs.pytest.org/en/latest/mark.html#updating-code>`_.
diff --git a/changelog/3446.feature b/changelog/3446.feature
deleted file mode 100644
index 55d4b2264..000000000
--- a/changelog/3446.feature
+++ /dev/null
@@ -1 +0,0 @@
-Introduce ``Node.get_closest_marker(name, default=None)`` to support simple marker usage scenarios.
diff --git a/changelog/3459.feature b/changelog/3459.feature
deleted file mode 100644
index b3dc3235e..000000000
--- a/changelog/3459.feature
+++ /dev/null
@@ -1 +0,0 @@
-Introduce optional name-based filtering for ``Node.iter_markers``.