Require Pytest 6+

Author: dmtucker

pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
     "attrs>=19.0",
     "filelock>=3.0",
     "mypy>=1.0",
-    "pytest>=5.0",
+    "pytest>=6.0",
 ]
 
 [project.entry-points.pytest11]

src/pytest_mypy.py

@@ -10,7 +10,7 @@
 import attr
 from filelock import FileLock  # type: ignore
 import mypy.api
-import pytest  # type: ignore
+import pytest
 
 
 PYTEST_MAJOR_VERSION = int(pytest.__version__.partition(".")[0])
@@ -141,12 +141,6 @@ def pytest_collect_file(path, parent):  # type: ignore
 class MypyFile(pytest.File):
     """A File that Mypy will run on."""
 
-    @classmethod
-    def from_parent(cls, *args, **kwargs):
-        """Override from_parent for compatibility."""
-        # pytest.File.from_parent did not exist before pytest 5.4.
-        return getattr(super(), "from_parent", cls)(*args, **kwargs)
-
     def collect(self):
         """Create a MypyFileItem for the File."""
         yield MypyFileItem.from_parent(parent=self, name=nodeid_name)
@@ -169,19 +163,6 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.add_marker(self.MARKER)
 
-    def collect(self):
-        """
-        Partially work around https://github.com/pytest-dev/pytest/issues/8016
-        for pytest < 6.0 with --looponfail.
-        """
-        yield self
-
-    @classmethod
-    def from_parent(cls, *args, **kwargs):
-        """Override from_parent for compatibility."""
-        # pytest.Item.from_parent did not exist before pytest 5.4.
-        return getattr(super(), "from_parent", cls)(*args, **kwargs)
-
     def repr_failure(self, excinfo):
         """
         Unwrap mypy errors so we get a clean error message without the
@@ -213,7 +194,7 @@ def reportinfo(self):
         return (
             self.fspath,
             None,
-            self.config.invocation_dir.bestrelpath(self.fspath),
+            str(Path(str(self.fspath)).relative_to(self.config.invocation_params.dir)),
         )
 
 

tests/test_pytest_mypy.py

@@ -540,30 +540,6 @@ def _break():
     child.kill(signal.SIGTERM)
 
 
-def test_mypy_item_collect(testdir, xdist_args):
-    """Ensure coverage for a 3.10<=pytest<6.0 workaround."""
-    testdir.makepyfile(
-        """
-        def test_mypy_item_collect(request):
-            plugin = request.config.pluginmanager.getplugin("mypy")
-            mypy_items = [
-                item
-                for item in request.session.items
-                if isinstance(item, plugin.MypyItem)
-            ]
-            assert mypy_items
-            for mypy_item in mypy_items:
-                assert all(item is mypy_item for item in mypy_item.collect())
-        """,
-    )
-    result = testdir.runpytest_subprocess("--mypy", *xdist_args)
-    test_count = 1
-    mypy_file_checks = 1
-    mypy_status_check = 1
-    result.assert_outcomes(passed=test_count + mypy_file_checks + mypy_status_check)
-    assert result.ret == pytest.ExitCode.OK
-
-
 def test_mypy_results_from_mypy_with_opts():
     """MypyResults.from_mypy respects passed options."""
     mypy_results = pytest_mypy.MypyResults.from_mypy([], opts=["--version"])

tox.ini

@@ -3,9 +3,9 @@
 minversion = 4.4
 isolated_build = true
 envlist =
-    py37-pytest{5.0, 5.x, 6.0, 6.x, 7.0, 7.x}-mypy{1.0, 1.x}
-    py38-pytest{5.0, 5.x, 6.0, 6.x, 7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
-    py39-pytest{5.0, 5.x, 6.0, 6.x, 7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
+    py37-pytest{6.0, 6.x, 7.0, 7.x}-mypy{1.0, 1.x}
+    py38-pytest{6.0, 6.x, 7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
+    py39-pytest{6.0, 6.x, 7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
     py310-pytest{6.2, 6.x, 7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
     py311-pytest{6.2, 6.x, 7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
     py312-pytest{6.2, 6.x, 7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
@@ -14,18 +14,16 @@ envlist =
 
 [gh-actions]
 python =
-    3.7: py37-pytest{5.0, 5.x, 6.0, 6.x, 7.0, 7.x}-mypy{1.0, 1.x}
-    3.8: py38-pytest{5.0, 5.x, 6.0, 6.x, 7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}, publish, static
-    3.9: py39-pytest{5.0, 5.x, 6.0, 6.x, 7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
+    3.7: py37-pytest{6.0, 6.x, 7.0, 7.x}-mypy{1.0, 1.x}
+    3.8: py38-pytest{6.0, 6.x, 7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}, publish, static
+    3.9: py39-pytest{6.0, 6.x, 7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
     3.10: py310-pytest{6.2, 6.x, 7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
     3.11: py311-pytest{6.2, 6.x, 7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
     3.12: py312-pytest{6.2, 6.x, 7.0, 7.x, 8.0, 8.x}-mypy{1.0, 1.x}
 
 [testenv]
 constrain_package_deps = true
 deps =
-    pytest5.0: pytest ~= 5.0.0
-    pytest5.x: pytest ~= 5.0
     pytest6.0: pytest ~= 6.0.0
     pytest6.2: pytest ~= 6.2.0
     pytest6.x: pytest ~= 6.0