allow baseline to work when using different targets

KotlinIsland · Dec 16, 2021 · 41706dc · 41706dc
1 parent a297037
commit 41706dc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.mypy/baseline.json b/.mypy/baseline.json
diff --git a/.mypy/proper_plugin.json b/.mypy/proper_plugin.json
diff --git a/mypy/errors.py b/mypy/errors.py
@@ -123,7 +123,7 @@ def __init__(self,
 def filter_prefix(error_map: Dict[str, List[ErrorInfo]]) -> Dict[str, List[ErrorInfo]]:
     """Convert absolute paths to relative paths in an error_map"""
     result = {
-        remove_path_prefix(file, os.getcwd()).replace(os.sep, "/"): errors
+        Path(file).resolve().relative_to(Path.cwd()).as_posix(): errors
         for file, errors in error_map.items()
     }
     for errors in result.values():
@@ -830,7 +830,7 @@ def filter_baseline(self) -> None:
         self.all_errors = self.error_info_map.copy()
         for file, errors in self.error_info_map.items():
             baseline_errors = self.baseline.get(
-                remove_path_prefix(file, os.getcwd()).replace(os.sep, "/"))
+                Path(file).resolve().relative_to(Path.cwd()).as_posix())
             if not baseline_errors:
                 continue
             new_errors = []

diff --git a/mypy/main.py b/mypy/main.py
@@ -672,15 +672,15 @@ def add_invertible_flag(flag: str,
                         help="Suppress toplevel errors caused by missing annotations",
                         group=strictness_group)
 
-    add_invertible_flag('--disallow-redefinition', default=True, dest="allow-redefinition",
+    add_invertible_flag('--disallow-redefinition', default=True, dest="allow_redefinition",
                         help="Disallow unconditional variable redefinition with a new type",
                         group=strictness_group)
 
     add_invertible_flag('--no-implicit-reexport', default=True, dest='implicit_reexport',
                         help="Treat imports as private unless aliased",
                         group=strictness_group)
 
-    add_invertible_flag('--no-strict-equality', default=True, dest="strict-equality",
+    add_invertible_flag('--no-strict-equality', default=True, dest="strict_equality",
                         help="Allow equality, identity, and container checks for"
                              " non-overlapping types",
                         group=strictness_group)
@@ -703,7 +703,7 @@ def add_invertible_flag(flag: str,
     add_invertible_flag('--show-column-numbers', default=False,
                         help="Show column numbers in error messages",
                         group=error_group)
-    add_invertible_flag('--no-show-error-codes', default=True, dest="show-error-codes",
+    add_invertible_flag('--no-show-error-codes', default=True, dest="show_error_codes",
                         help="Don't show error codes in error messages",
                         group=error_group)
     add_invertible_flag('--pretty', default=False,