Skip to content

Commit b96918a

Browse files
committed
[fix] Fixes a bug that broke compatibility with pytest>=7.0,<7.2.
The "consider_mro" keyword argument to _pytest.mark.structures.get_unpacked_marks was only introduced in pytest-7.2.0. Removing the explicit argument from the function call will adjust the behavior of pytest-asyncio marks to that of pytest. Signed-off-by: Michael Seifert <[email protected]>
1 parent 587dac5 commit b96918a

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

docs/source/reference/changelog.rst

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Changelog
33
=========
44

5+
0.22.1 (UNRELEASED)
6+
===================
7+
- Fixes a bug that broke compatibility with pytest>=7.0,<7.2. `#654 <https://github.com/pytest-dev/pytest-asyncio/pull/654>`_
8+
59
0.22.0 (2023-10-31)
610
===================
711
- Class-scoped and module-scoped event loops can be requested

pytest_asyncio/plugin.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ def pytest_collectstart(collector: pytest.Collector):
549549
return
550550
# pytest.Collector.own_markers is empty at this point,
551551
# so we rely on _pytest.mark.structures.get_unpacked_marks
552-
marks = get_unpacked_marks(collector.obj, consider_mro=True)
552+
marks = get_unpacked_marks(collector.obj)
553553
for mark in marks:
554554
if not mark.name == "asyncio_event_loop":
555555
continue

0 commit comments

Comments
 (0)