Fix build (#113)

* Fix tests broken by mypy message changes.

* Fix type changes needed for newer mypy version, plus formatting.

Author: brunns

pytest_mypy_plugins/collect.py

@@ -77,7 +77,7 @@ def construct_mapping(self, node: yaml.MappingNode, deep: bool = False) -> Dict[
         mapping = super().construct_mapping(node, deep=deep)
         # Add 1 so line numbering starts at 1
         starting_line = node.start_mark.line + 1
-        for (title_node, contents_node) in node.value:
+        for title_node, contents_node in node.value:
             if title_node.value == "main":
                 starting_line = title_node.start_mark.line + 1
         mapping["__line__"] = starting_line

pytest_mypy_plugins/item.py

@@ -87,7 +87,7 @@ class ReturnCodes:
     FATAL_ERROR = 2
 
 
-def run_mypy_typechecking(cmd_options: List[str]) -> int:
+def run_mypy_typechecking(cmd_options: List[str]) -> Optional[Union[str, int]]:
     fscache = FileSystemCache()
     sources, options = process_options(cmd_options, fscache=fscache)
 
@@ -215,7 +215,7 @@ def typecheck_in_new_subprocess(
 
     def typecheck_in_same_process(
         self, execution_path: Path, mypy_cmd_options: List[Any]
-    ) -> Tuple[int, Tuple[str, str]]:
+    ) -> Tuple[Optional[Union[str, int]], Tuple[str, str]]:
         with utils.temp_environ(), utils.temp_path(), utils.temp_sys_modules():
             # add custom environment variables
             for key, val in self.environment_variables.items():
@@ -241,7 +241,6 @@ def runtest(self) -> None:
             temp_dir = tempfile.TemporaryDirectory(prefix="pytest-mypy-", dir=self.root_directory)
 
         except (FileNotFoundError, PermissionError, NotADirectoryError) as e:
-
             raise TypecheckAssertionError(
                 error_message=f"Testing base directory {self.root_directory} must exist and be writable"
             ) from e

pytest_mypy_plugins/tests/test-parametrized.yml

@@ -44,4 +44,4 @@
       ...
   out: |
     main:2: note: Revealed type is "{{ rt }}"
-    main:4: error: Unsupported operand types for / ("str" and "int")
+    main:4: error: Unsupported operand types for / ("str" and "int")  [operator]

pytest_mypy_plugins/tests/test-paths-from-env.yml

@@ -3,7 +3,7 @@
     import extra_module
     extra_module.extra_fn()
 
-    extra_module.missing()  # E: Module has no attribute "missing"
+    extra_module.missing()  # E: Module has no attribute "missing"  [attr-defined]
   env:
     - MYPYPATH=../extras
   files:

pytest_mypy_plugins/tests/test-simple-cases.yml

@@ -57,7 +57,7 @@
 - case: error_case
   main: |
     a = 1
-    a.lower()  # E: "int" has no attribute "lower"
+    a.lower()  # E: "int" has no attribute "lower"  [attr-defined]
 
 
 - case: custom_mypy_config_strict_optional_true_set
@@ -87,7 +87,7 @@
   skip: sys.version_info < (0, 0)
   main: |
     a = 1
-    a.lower()  # E: "int" has no attribute "lower"
+    a.lower()  # E: "int" has no attribute "lower"  [attr-defined]
 
 - case: fail_if_message_does_not_match
   expect_fail: yes