From 14c281a93a726bf6d53fef9126503f9bc833db5a Mon Sep 17 00:00:00 2001 From: David Tucker Date: Wed, 18 Sep 2024 08:37:16 -0700 Subject: [PATCH 1/5] Remove unnecessary kwargs from the tests --- tests/test_pytest_mypy.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_pytest_mypy.py b/tests/test_pytest_mypy.py index 6ee40a0..fbfc361 100644 --- a/tests/test_pytest_mypy.py +++ b/tests/test_pytest_mypy.py @@ -552,7 +552,7 @@ def test_py_typed(testdir): def test_mypy_no_status_check(testdir, xdist_args): """Verify that --mypy-no-status-check disables MypyStatusItem collection.""" - testdir.makepyfile(thon="one: int = 1") + testdir.makepyfile("one: int = 1") result = testdir.runpytest_subprocess("--mypy", *xdist_args) mypy_file_checks = 1 mypy_status_check = 1 @@ -565,7 +565,7 @@ def test_mypy_no_status_check(testdir, xdist_args): def test_mypy_xfail_passes(testdir, xdist_args): """Verify that --mypy-xfail passes passes.""" - testdir.makepyfile(thon="one: int = 1") + testdir.makepyfile("one: int = 1") result = testdir.runpytest_subprocess("--mypy", *xdist_args) mypy_file_checks = 1 mypy_status_check = 1 @@ -578,7 +578,7 @@ def test_mypy_xfail_passes(testdir, xdist_args): def test_mypy_xfail_xfails(testdir, xdist_args): """Verify that --mypy-xfail xfails failures.""" - testdir.makepyfile(thon="one: str = 1") + testdir.makepyfile("one: str = 1") result = testdir.runpytest_subprocess("--mypy", *xdist_args) mypy_file_checks = 1 mypy_status_check = 1 From 0cb8090cf02d5e73e7751cfea7ee7af0f1c02def Mon Sep 17 00:00:00 2001 From: David Tucker Date: Tue, 17 Sep 2024 20:42:59 -0700 Subject: [PATCH 2/5] Use Path.resolve instead of Path.absolute --- src/pytest_mypy/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pytest_mypy/__init__.py b/src/pytest_mypy/__init__.py index 699a900..42845b9 100644 --- a/src/pytest_mypy/__init__.py +++ b/src/pytest_mypy/__init__.py @@ -233,7 +233,7 @@ class MypyFileItem(MypyItem): def runtest(self) -> None: """Raise an exception if mypy found errors for this item.""" results = MypyResults.from_session(self.session) - abspath = str(self.path.absolute()) + abspath = str(self.path.resolve()) errors = results.abspath_errors.get(abspath) if errors: if not all( @@ -312,7 +312,7 @@ def from_mypy( if opts is None: opts = mypy_argv[:] abspath_errors = { - str(path.absolute()): [] for path in paths + str(path.resolve()): [] for path in paths } # type: MypyResults._abspath_errors_type cwd = Path.cwd() @@ -325,7 +325,7 @@ def from_mypy( if not line: continue path, _, error = line.partition(":") - abspath = str(Path(path).absolute()) + abspath = str(Path(path).resolve()) try: abspath_errors[abspath].append(error) except KeyError: From 1aa7dbd97d862997a47565c80deb2d602d9d4755 Mon Sep 17 00:00:00 2001 From: David Tucker Date: Tue, 17 Sep 2024 20:49:23 -0700 Subject: [PATCH 3/5] Preserve the whole line in abspath_errors --- src/pytest_mypy/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pytest_mypy/__init__.py b/src/pytest_mypy/__init__.py index 42845b9..065485b 100644 --- a/src/pytest_mypy/__init__.py +++ b/src/pytest_mypy/__init__.py @@ -234,7 +234,10 @@ def runtest(self) -> None: """Raise an exception if mypy found errors for this item.""" results = MypyResults.from_session(self.session) abspath = str(self.path.resolve()) - errors = results.abspath_errors.get(abspath) + errors = [ + error.partition(":")[2].strip() + for error in results.abspath_errors.get(abspath, []) + ] if errors: if not all( error.partition(":")[2].partition(":")[0].strip() == "note" @@ -327,7 +330,7 @@ def from_mypy( path, _, error = line.partition(":") abspath = str(Path(path).resolve()) try: - abspath_errors[abspath].append(error) + abspath_errors[abspath].append(line) except KeyError: unmatched_lines.append(line) From f974cb1b6598adade992d2c03b3c200e1747f035 Mon Sep 17 00:00:00 2001 From: David Tucker Date: Tue, 17 Sep 2024 23:06:18 -0700 Subject: [PATCH 4/5] Refactor pytest_terminal_summary --- src/pytest_mypy/__init__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pytest_mypy/__init__.py b/src/pytest_mypy/__init__.py index 065485b..25cbb49 100644 --- a/src/pytest_mypy/__init__.py +++ b/src/pytest_mypy/__init__.py @@ -391,15 +391,17 @@ def pytest_terminal_summary( except FileNotFoundError: # No MypyItems executed. return - if config.option.mypy_xfail or results.unmatched_stdout or results.stderr: - terminalreporter.section(terminal_summary_title) + if not results.stdout and not results.stderr: + return + terminalreporter.section(terminal_summary_title) + if results.stdout: if config.option.mypy_xfail: terminalreporter.write(results.stdout) elif results.unmatched_stdout: color = {"red": True} if results.status else {"green": True} terminalreporter.write_line(results.unmatched_stdout, **color) - if results.stderr: - terminalreporter.write_line(results.stderr, yellow=True) + if results.stderr: + terminalreporter.write_line(results.stderr, yellow=True) def pytest_unconfigure(self, config: pytest.Config) -> None: """Clean up the mypy results path.""" From 8c794f2e0d870c71d3ca0ff59a1ddbbd71308c30 Mon Sep 17 00:00:00 2001 From: David Tucker Date: Tue, 17 Sep 2024 20:29:36 -0700 Subject: [PATCH 5/5] Remove MypyWarning --- src/pytest_mypy/__init__.py | 48 +++++++++++++++++++++---------------- tests/test_pytest_mypy.py | 4 +++- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/src/pytest_mypy/__init__.py b/src/pytest_mypy/__init__.py index 25cbb49..d6a0172 100644 --- a/src/pytest_mypy/__init__.py +++ b/src/pytest_mypy/__init__.py @@ -7,7 +7,6 @@ from pathlib import Path from tempfile import NamedTemporaryFile import typing -import warnings from filelock import FileLock import mypy.api @@ -227,6 +226,14 @@ def repr_failure( return super().repr_failure(excinfo) +def _error_severity(error: str) -> str: + components = [component.strip() for component in error.split(":")] + # The second component is either the line or the severity: + # demo/note.py:2: note: By default the bodies of untyped functions are not checked + # demo/sub/conftest.py: error: Duplicate module named "conftest" + return components[2] if components[1].isdigit() else components[1] + + class MypyFileItem(MypyItem): """A check for Mypy errors in a File.""" @@ -238,20 +245,15 @@ def runtest(self) -> None: error.partition(":")[2].strip() for error in results.abspath_errors.get(abspath, []) ] - if errors: - if not all( - error.partition(":")[2].partition(":")[0].strip() == "note" - for error in errors - ): - if self.session.config.option.mypy_xfail: - self.add_marker( - pytest.mark.xfail( - raises=MypyError, - reason="mypy errors are expected by --mypy-xfail.", - ) + if errors and not all(_error_severity(error) == "note" for error in errors): + if self.session.config.option.mypy_xfail: + self.add_marker( + pytest.mark.xfail( + raises=MypyError, + reason="mypy errors are expected by --mypy-xfail.", ) - raise MypyError(file_error_formatter(self, results, errors)) - warnings.warn("\n" + "\n".join(errors), MypyWarning) + ) + raise MypyError(file_error_formatter(self, results, errors)) def reportinfo(self) -> Tuple[str, None, str]: """Produce a heading for the test report.""" @@ -371,10 +373,6 @@ class MypyError(Exception): """ -class MypyWarning(pytest.PytestWarning): - """A non-failure message regarding the mypy run.""" - - class MypyControllerPlugin: """A plugin that is not registered on xdist worker processes.""" @@ -397,9 +395,17 @@ def pytest_terminal_summary( if results.stdout: if config.option.mypy_xfail: terminalreporter.write(results.stdout) - elif results.unmatched_stdout: - color = {"red": True} if results.status else {"green": True} - terminalreporter.write_line(results.unmatched_stdout, **color) + else: + for note in ( + unreported_note + for errors in results.abspath_errors.values() + if all(_error_severity(error) == "note" for error in errors) + for unreported_note in errors + ): + terminalreporter.write_line(note) + if results.unmatched_stdout: + color = {"red": True} if results.status else {"green": True} + terminalreporter.write_line(results.unmatched_stdout, **color) if results.stderr: terminalreporter.write_line(results.stderr, yellow=True) diff --git a/tests/test_pytest_mypy.py b/tests/test_pytest_mypy.py index fbfc361..ed909c7 100644 --- a/tests/test_pytest_mypy.py +++ b/tests/test_pytest_mypy.py @@ -130,7 +130,9 @@ def pyfunc(x): mypy_checks = mypy_file_checks + mypy_status_check outcomes = {"passed": mypy_checks} result.assert_outcomes(**outcomes) - result.stdout.fnmatch_lines(["*MypyWarning*"]) + result.stdout.fnmatch_lines( + ["*:2: note: By default the bodies of untyped functions are not checked*"] + ) assert result.ret == pytest.ExitCode.OK