Merge pull request #743 from pytest-dev/pre-commit-ci-update-config

Author: nicoddemus

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
         language: python
         additional_dependencies: [pygments, restructuredtext_lint]
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.910-1
+    rev: v0.920
     hooks:
     -   id: mypy
         files: ^(src/|testing/)

testing/acceptance_test.py

@@ -154,7 +154,6 @@ def test_skip():
         result.stdout.fnmatch_lines(["*2*Python*", "*2 failed, 1 passed, 1 skipped*"])
         assert result.ret == 1
 
-    @pytest.mark.xfail("sys.platform.startswith('java')", run=False)
     def test_dist_tests_with_crash(self, pytester: pytest.Pytester) -> None:
         if not hasattr(os, "kill"):
             pytest.skip("no os.kill")

testing/test_looponfail.py

@@ -1,3 +1,5 @@
+from typing import cast
+
 import py
 import pytest
 import shutil
@@ -123,7 +125,7 @@ def test_failures_somewhere(self, pytester: pytest.Pytester) -> None:
         failures = control.runsession()
         assert failures
         control.setup()
-        item_path = item.path if PYTEST_GTE_7 else Path(item.fspath)  # type: ignore[attr-defined]
+        item_path = item.path if PYTEST_GTE_7 else Path(cast(py.path.local, item.fspath))  # type: ignore[attr-defined]
         item_path.write_text("def test_func():\n assert 1\n")
         removepyc(item_path)
         topdir, failures = control.runsession()[:2]
@@ -141,7 +143,11 @@ def test_func():
         control = RemoteControl(modcol.config)
         control.loop_once()
         assert control.failures
-        modcol_path = modcol.path if PYTEST_GTE_7 else Path(modcol.fspath)  # type: ignore[attr-defined]
+        if PYTEST_GTE_7:
+            modcol_path = modcol.path  # type:ignore[attr-defined]
+        else:
+            modcol_path = Path(cast(py.path.local, modcol.fspath))
+
         modcol_path.write_text(
             textwrap.dedent(
                 """
@@ -173,7 +179,7 @@ def test_func():
         if PYTEST_GTE_7:
             parent = modcol.path.parent.parent  # type: ignore[attr-defined]
         else:
-            parent = Path(modcol.fspath.dirpath().dirpath())
+            parent = Path(cast(py.path.local, modcol.fspath).dirpath().dirpath())
         monkeypatch.chdir(parent)
         modcol.config.args = [
             str(Path(x).relative_to(parent)) for x in modcol.config.args