From 66dc5d34883e6eff4008762b575841c2bb29eab8 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Sun, 21 Feb 2021 21:25:51 -0800 Subject: [PATCH 1/3] dmypy - warn instead of failing if report generation is configured but unsupported --- mypy/dmypy_server.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mypy/dmypy_server.py b/mypy/dmypy_server.py index eb53935db297..5c7653926cb2 100644 --- a/mypy/dmypy_server.py +++ b/mypy/dmypy_server.py @@ -135,10 +135,10 @@ def process_start_options(flags: List[str], allow_sources: bool) -> Options: ['-i'] + flags, require_targets=False, server_options=True ) if options.report_dirs: - sys.exit("dmypy: start/restart cannot generate reports") + print("dmypy: ignoring report generation settings. Start/restart cannot generate reports.") if options.junit_xml: - sys.exit("dmypy: start/restart does not support --junit-xml; " - "pass it to check/recheck instead") + print("dmypy: ignoring report generation settings. " + "Start/restart does not support --junit-xml. Pass it to check/recheck instead") if not options.incremental: sys.exit("dmypy: start/restart should not disable incremental mode") if options.follow_imports not in ('skip', 'error', 'normal'): From 4959a215b5b302e289a99968e74a1a5ed2d801d4 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 3 May 2021 20:31:30 -0700 Subject: [PATCH 2/3] Updating for PR feedback --- mypy/dmypy_server.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mypy/dmypy_server.py b/mypy/dmypy_server.py index 5c7653926cb2..d655d02142b1 100644 --- a/mypy/dmypy_server.py +++ b/mypy/dmypy_server.py @@ -135,10 +135,11 @@ def process_start_options(flags: List[str], allow_sources: bool) -> Options: ['-i'] + flags, require_targets=False, server_options=True ) if options.report_dirs: - print("dmypy: ignoring report generation settings. Start/restart cannot generate reports.") + print("dmypy: Ignoring report generation settings. Start/restart cannot generate reports.") if options.junit_xml: - print("dmypy: ignoring report generation settings. " + print("dmypy: Ignoring report generation settings. " "Start/restart does not support --junit-xml. Pass it to check/recheck instead") + options.junit_xml = False if not options.incremental: sys.exit("dmypy: start/restart should not disable incremental mode") if options.follow_imports not in ('skip', 'error', 'normal'): From 5ae07431e37aaa5f538ff69c88585f3fa6226ac4 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 24 May 2021 12:24:29 -0700 Subject: [PATCH 3/3] Update dmypy_server.py --- mypy/dmypy_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mypy/dmypy_server.py b/mypy/dmypy_server.py index bf807eb0e0de..a1e968d63690 100644 --- a/mypy/dmypy_server.py +++ b/mypy/dmypy_server.py @@ -139,7 +139,7 @@ def process_start_options(flags: List[str], allow_sources: bool) -> Options: if options.junit_xml: print("dmypy: Ignoring report generation settings. " "Start/restart does not support --junit-xml. Pass it to check/recheck instead") - options.junit_xml = False + options.junit_xml = None if not options.incremental: sys.exit("dmypy: start/restart should not disable incremental mode") if options.follow_imports not in ('skip', 'error', 'normal'):