diff --git a/mypy/test/data.py b/mypy/test/data.py index de0267daf918..32f6354cc162 100644 --- a/mypy/test/data.py +++ b/mypy/test/data.py @@ -640,9 +640,7 @@ def pytest_pycollect_makeitem(collector: Any, name: str, obj: object) -> Any | N # 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. - return DataSuiteCollector.from_parent( # type: ignore[no-untyped-call] - parent=collector, name=name - ) + return DataSuiteCollector.from_parent(parent=collector, name=name) return None diff --git a/mypy/test/helpers.py b/mypy/test/helpers.py index bae4f6e81ad1..50de50e60004 100644 --- a/mypy/test/helpers.py +++ b/mypy/test/helpers.py @@ -41,7 +41,7 @@ def run_mypy(args: list[str]) -> None: if status != 0: sys.stdout.write(outval) sys.stderr.write(errval) - pytest.fail(msg="Sample check failed", pytrace=False) + pytest.fail(reason="Sample check failed", pytrace=False) def diff_ranges( diff --git a/pyproject.toml b/pyproject.toml index ef8acda3f95d..35f1592ca83c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -88,7 +88,7 @@ extra-standard-library = ["typing_extensions"] ignore = ["**/.readthedocs.yaml"] [tool.pytest.ini_options] -minversion = "6.0.0" +minversion = "7.0.0" testpaths = ["mypy/test", "mypyc/test"] python_files = 'test*.py' diff --git a/test-requirements.in b/test-requirements.in index 166bdf934d47..637f5b948055 100644 --- a/test-requirements.in +++ b/test-requirements.in @@ -11,7 +11,7 @@ lxml>=4.9.1,<4.9.3; (python_version<'3.11' or sys_platform!='win32') and python_ pre-commit pre-commit-hooks==4.5.0 psutil>=4.0 -pytest>=7.4.0 +pytest>=8.1.0 pytest-xdist>=1.34.0 pytest-cov>=2.10.0 ruff==0.2.0 # must match version in .pre-commit-config.yaml diff --git a/test-requirements.txt b/test-requirements.txt index f105b753799f..9005daab2876 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -44,7 +44,7 @@ platformdirs==3.11.0 # via # black # virtualenv -pluggy==1.3.0 +pluggy==1.4.0 # via pytest pre-commit==3.5.0 # via -r test-requirements.in @@ -52,7 +52,7 @@ pre-commit-hooks==4.5.0 # via -r test-requirements.in psutil==5.9.6 # via -r test-requirements.in -pytest==7.4.2 +pytest==8.1.1 # via # -r test-requirements.in # pytest-cov