Commit 84d6dfc4aa (#113382) bumped pytest from 6.1.2 to 6.2.2 with insufficient testing, breaking pytest-dependency. Fix it by pulling in the upstream patch. Signed-off-by: Anders Kaseorg <andersk@mit.edu>
84d6dfc4aa