File fix-dummy-collector-pytest6.patch of Package python-wrapt

Overview Repositories Revisions Requests Users Attributes Meta

File fix-dummy-collector-pytest6.patch of Package python-wrapt (Revision f7bfedd27eaf52cc586f3e47b908842e)

Currently displaying revision f7bfedd27eaf52cc586f3e47b908842e , Show latest

From abb18d6f52a0fd22de209f5d02f4d5c66656a26a Mon Sep 17 00:00:00 2001
From: Ben Greiner <code@bnavigator.de>
Date: Fri, 4 Dec 2020 01:24:34 +0100
Subject: [PATCH] fix dummycollector for pytest >= 6

---
 tests/conftest.py | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index e37790f..9e9e35b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2,18 +2,30 @@
 
 import pytest
 
+try:
+    from pytest import File as FileCollector
+except ImportError:
+    from pytest.collect import File as FileCollector
+
 version = tuple(sys.version_info[:2])
 
-class DummyCollector(pytest.collect.File):
+class DummyCollector(FileCollector):
     def collect(self):
         return []
 
+def construct_dummy(path, parent):
+    if hasattr(DummyCollector, "from_parent"):
+        item = DummyCollector.from_parent(parent, fspath=path)
+        return item
+    else:
+        return DummyCollector(path, parent=parent)
+
 def pytest_pycollect_makemodule(path, parent):
     if '_py33' in path.basename and version < (3, 3):
-        return DummyCollector(path, parent=parent)
+        return construct_dummy(path, parent)
     if '_py37' in path.basename and version < (3, 7):
-        return DummyCollector(path, parent=parent)
+        return construct_dummy(path, parent)
     if '_py3' in path.basename and version < (3, 0):
-        return DummyCollector(path, parent=parent)
+        return construct_dummy(path, parent)
     if '_py2' in path.basename and version >= (3, 0):
-        return DummyCollector(path, parent=parent)
+        return construct_dummy(path, parent)

Places

File fix-dummy-collector-pytest6.patch of Package python-wrapt (Revision f7bfedd27eaf52cc586f3e47b908842e)

Places