Fix deprecation warning for pytest>=5.4.0 (#25)

* Fix deprecation warning for pytest>=5.4.0

* fixup! Fix deprecation warning for pytest>=5.4.0

* Bump pytest

* Remove compatiblity

Author: kornicameister

pytest_mypy_plugins/collect.py

@@ -86,10 +86,9 @@ def collect(self) -> Iterator["YamlTestItem"]:
 
             skip = self._eval_skip(str(raw_test.get("skip", "False")))
             if not skip:
-                yield YamlTestItem(
+                yield YamlTestItem.from_parent(
+                    self,
                     name=test_name,
-                    collector=self,
-                    config=self.config,
                     files=test_files,
                     starting_lineno=starting_lineno,
                     environment_variables=extra_environment_variables,
@@ -105,7 +104,7 @@ def _eval_skip(self, skip_if: str) -> bool:
 
 def pytest_collect_file(path: LocalPath, parent: Node) -> Optional[YamlTestFile]:
     if path.ext in {".yaml", ".yml"} and path.basename.startswith(("test-", "test_")):
-        return YamlTestFile(path, parent=parent, config=parent.config)
+        return YamlTestFile.from_parent(parent, fspath=path)
     return None
 
 

pytest_mypy_plugins/item.py

@@ -96,8 +96,9 @@ class YamlTestItem(pytest.Item):
     def __init__(
         self,
         name: str,
-        collector: YamlTestFile,
-        config: Config,
+        parent: Optional[YamlTestFile] = None,
+        config: Optional[Config] = None,
+        *,
         files: List[File],
         starting_lineno: int,
         expected_output_lines: List[str],
@@ -106,7 +107,7 @@ def __init__(
         mypy_config: str,
         parsed_test_data: Dict[str, Any],
     ) -> None:
-        super().__init__(name, collector, config)
+        super().__init__(name, parent, config)
         self.files = files
         self.environment_variables = environment_variables
         self.disable_cache = disable_cache
@@ -117,9 +118,9 @@ def __init__(
         self.same_process = self.config.option.mypy_same_process
 
         # config parameters
-        self.root_directory = config.option.mypy_testing_base
-        if config.option.mypy_ini_file:
-            self.base_ini_fpath = os.path.abspath(config.option.mypy_ini_file)
+        self.root_directory = self.config.option.mypy_testing_base
+        if self.config.option.mypy_ini_file:
+            self.base_ini_fpath = os.path.abspath(self.config.option.mypy_ini_file)
         else:
             self.base_ini_fpath = None
         self.incremental_cache_dir = os.path.join(self.root_directory, ".mypy_cache")

setup.py

@@ -3,7 +3,7 @@
 with open("README.md", "r") as f:
     readme = f.read()
 
-dependencies = ["pytest", "mypy>=0.730", "decorator", "pyyaml"]
+dependencies = ["pytest>=5.4.0", "mypy>=0.730", "decorator", "pyyaml"]
 
 setup(
     name="pytest-mypy-plugins",