Use pytest Node.from_parent unconditionally (requires pytest 5.4+)

python · gvanrossum · Aug 4, 2020 · Aug 4, 2020 · Aug 4, 2020 · Aug 4, 2020
commit 1fde3b8746d0d8ca9412c7a5cdb88488ea4e3bf1
diff --git a/mypy/test/data.py b/mypy/test/data.py
@@ -10,18 +10,7 @@
 import sys
 
 import pytest  # type: ignore  # no pytest in typeshed
-from typing import (
-    Any,
-    Callable,
-    Dict,
-    Iterator,
-    List,
-    NamedTuple,
-    Optional,
-    Set,
-    Tuple,
-    Union,
-)
+from typing import List, Tuple, Set, Optional, Iterator, Any, Dict, NamedTuple, Union
 
 from mypy.test.config import test_data_prefix, test_temp_dir, PREFIX
 
@@ -521,10 +510,7 @@ def pytest_pycollect_makeitem(collector: Any, name: str,
             # Non-None result means this obj is a test case.
             # The collect method of the returned DataSuiteCollector instance will be called later,
             # with self.obj being obj.
-            if hasattr(DataSuiteCollector, 'from_parent'):
-                return DataSuiteCollector.from_parent(parent=collector, name=name)
-            else:
-                return DataSuiteCollector(name=name, parent=collector)
+            return DataSuiteCollector.from_parent(parent=collector, name=name)
     return None
 
 
@@ -549,11 +535,7 @@ def split_test_cases(parent: 'DataSuiteCollector', suite: 'DataSuite',
     for i in range(1, len(cases), 6):
         name, writescache, only_when, platform_flag, skip, data = cases[i:i + 6]
         platform = platform_flag[1:] if platform_flag else None
-        if hasattr(DataDrivenTestCase, 'from_parent'):
-            creator = DataDrivenTestCase.from_parent  # type: Callable[..., DataDrivenTestCase]
-        else:
-            creator = DataDrivenTestCase
-        yield creator(
+        yield DataDrivenTestCase.from_parent(
             parent=parent,
             suite=suite,
             file=file,

diff --git a/pytest.ini b/pytest.ini
@@ -1,6 +1,6 @@
 [pytest]
 # testpaths is new in 2.8
-minversion = 2.8
+minversion = 5.4
 
 testpaths = mypy/test mypyc/test