Skip to content

Commit 41706dc

Browse files
committed
allow baseline to work when using different targets
1 parent a297037 commit 41706dc

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.mypy/baseline.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

.mypy/proper_plugin.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

mypy/errors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def __init__(self,
123123
def filter_prefix(error_map: Dict[str, List[ErrorInfo]]) -> Dict[str, List[ErrorInfo]]:
124124
"""Convert absolute paths to relative paths in an error_map"""
125125
result = {
126-
remove_path_prefix(file, os.getcwd()).replace(os.sep, "/"): errors
126+
Path(file).resolve().relative_to(Path.cwd()).as_posix(): errors
127127
for file, errors in error_map.items()
128128
}
129129
for errors in result.values():
@@ -830,7 +830,7 @@ def filter_baseline(self) -> None:
830830
self.all_errors = self.error_info_map.copy()
831831
for file, errors in self.error_info_map.items():
832832
baseline_errors = self.baseline.get(
833-
remove_path_prefix(file, os.getcwd()).replace(os.sep, "/"))
833+
Path(file).resolve().relative_to(Path.cwd()).as_posix())
834834
if not baseline_errors:
835835
continue
836836
new_errors = []

mypy/main.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -672,15 +672,15 @@ def add_invertible_flag(flag: str,
672672
help="Suppress toplevel errors caused by missing annotations",
673673
group=strictness_group)
674674

675-
add_invertible_flag('--disallow-redefinition', default=True, dest="allow-redefinition",
675+
add_invertible_flag('--disallow-redefinition', default=True, dest="allow_redefinition",
676676
help="Disallow unconditional variable redefinition with a new type",
677677
group=strictness_group)
678678

679679
add_invertible_flag('--no-implicit-reexport', default=True, dest='implicit_reexport',
680680
help="Treat imports as private unless aliased",
681681
group=strictness_group)
682682

683-
add_invertible_flag('--no-strict-equality', default=True, dest="strict-equality",
683+
add_invertible_flag('--no-strict-equality', default=True, dest="strict_equality",
684684
help="Allow equality, identity, and container checks for"
685685
" non-overlapping types",
686686
group=strictness_group)
@@ -703,7 +703,7 @@ def add_invertible_flag(flag: str,
703703
add_invertible_flag('--show-column-numbers', default=False,
704704
help="Show column numbers in error messages",
705705
group=error_group)
706-
add_invertible_flag('--no-show-error-codes', default=True, dest="show-error-codes",
706+
add_invertible_flag('--no-show-error-codes', default=True, dest="show_error_codes",
707707
help="Don't show error codes in error messages",
708708
group=error_group)
709709
add_invertible_flag('--pretty', default=False,

0 commit comments

Comments
 (0)