From a16c8c8c96f50a22a4b149871f54127f054ab160 Mon Sep 17 00:00:00 2001 From: AlexWaygood Date: Thu, 6 Jul 2023 17:09:27 +0100 Subject: [PATCH] Bump pytest to >=7.4.0 --- mypy/test/data.py | 7 +++++-- test-requirements.txt | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mypy/test/data.py b/mypy/test/data.py index 940776bf7b19..f9bb951650df 100644 --- a/mypy/test/data.py +++ b/mypy/test/data.py @@ -378,7 +378,10 @@ def teardown(self) -> None: def reportinfo(self) -> tuple[str, int, str]: return self.file, self.line, self.name - def repr_failure(self, excinfo: Any, style: Any | None = None) -> str: + def repr_failure( + self, excinfo: pytest.ExceptionInfo[BaseException], style: Any | None = None + ) -> str: + excrepr: object if isinstance(excinfo.value, SystemExit): # We assume that before doing exit() (which raises SystemExit) we've printed # enough context about what happened so that a stack trace is not useful. @@ -388,7 +391,7 @@ def repr_failure(self, excinfo: Any, style: Any | None = None) -> str: elif isinstance(excinfo.value, pytest.fail.Exception) and not excinfo.value.pytrace: excrepr = excinfo.exconly() else: - self.parent._prunetraceback(excinfo) + excinfo.traceback = self.parent._traceback_filter(excinfo) excrepr = excinfo.getrepr(style="short") return f"data: {self.file}:{self.line}:\n{excrepr}" diff --git a/test-requirements.txt b/test-requirements.txt index 661187823368..0b43750bf82b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,9 +7,7 @@ lxml>=4.9.1; (python_version<'3.11' or sys_platform!='win32') and python_version pre-commit pre-commit-hooks==4.4.0 psutil>=4.0 -# pytest 6.2.3 does not support Python 3.10 -# TODO: fix use of removed private APIs so we can use the latest pytest -pytest>=6.2.4,<7.4.0 +pytest>=7.4.0 pytest-xdist>=1.34.0 pytest-cov>=2.10.0 ruff==0.0.272 # must match version in .pre-commit-config.yaml