Closes #21, closes #20

Author: sobolevn

.travis.yml

@@ -17,15 +17,28 @@ jobs:
     script: |
       set -e
       pytest
+  - name: "run test suite with python 3.7"
+    python: 3.8
+    script: |
+      set -e
+      pytest
+
   - name: "typecheck with mypy"
     python: 3.7
     script: |
       set -e
       mypy .
 
+  - name: Lint with black
+    python: 3.7
+    script: 'black --check pytest_mypy_plugins setup.py'
+  - name: Lint with isort
+    python: 3.7
+    script: 'isort --check --diff'
+
 before_install: |
   # Upgrade pip, setuptools, and wheel
   pip install -U pip setuptools wheel
 
 install: |
-  pip install -e .
+  pip install -r dev-requirements.txt

dev-requirements.txt

@@ -0,0 +1,3 @@
+black
+isort
+-e .

pyproject.toml

@@ -0,0 +1,2 @@
+[tool.black]
+line-length = 120

pytest_mypy_plugins/collect.py

@@ -1,8 +1,8 @@
-import tempfile
-import sys
-import platform
 import os
-from typing import Any, Dict, List, Iterator, TYPE_CHECKING, Optional
+import platform
+import sys
+import tempfile
+from typing import TYPE_CHECKING, Any, Dict, Iterator, List, Optional
 
 import pytest
 import yaml
@@ -16,7 +16,6 @@
     from pytest_mypy_plugins.item import YamlTestItem
 
 
-
 class File:
     def __init__(self, path: str, content: str):
         self.path = path
@@ -26,19 +25,19 @@ def __init__(self, path: str, content: str):
 def parse_test_files(test_files: List[Dict[str, Any]]) -> List[File]:
     files: List[File] = []
     for test_file in test_files:
-        path = test_file.get('path')
+        path = test_file.get("path")
         if not path:
-            path = 'main.py'
+            path = "main.py"
 
-        file = File(path=path, content=test_file.get('content', ''))
+        file = File(path=path, content=test_file.get("content", ""))
         files.append(file)
     return files
 
 
 def parse_environment_variables(env_vars: List[str]) -> Dict[str, str]:
     parsed_vars: Dict[str, str] = {}
     for env_var in env_vars:
-        name, _, value = env_var.partition('=')
+        name, _, value = env_var.partition("=")
         parsed_vars[name] = value
     return parsed_vars
 
@@ -49,81 +48,81 @@ def construct_mapping(self, node: yaml.Node, deep: bool = False) -> None:
         # Add 1 so line numbering starts at 1
         starting_line = node.start_mark.line + 1
         for (title_node, contents_node) in node.value:
-            if title_node.value == 'main':
+            if title_node.value == "main":
                 starting_line = title_node.start_mark.line + 1
-        mapping['__line__'] = starting_line
+        mapping["__line__"] = starting_line
         return mapping
 
 
 class YamlTestFile(pytest.File):
-    def collect(self) -> Iterator['YamlTestItem']:
+    def collect(self) -> Iterator["YamlTestItem"]:
         from pytest_mypy_plugins.item import YamlTestItem
 
-        parsed_file = yaml.load(stream=self.fspath.read_text('utf8'), Loader=SafeLineLoader)
+        parsed_file = yaml.load(stream=self.fspath.read_text("utf8"), Loader=SafeLineLoader)
         if parsed_file is None:
             return
 
         if not isinstance(parsed_file, list):
-            raise ValueError(f'Test file has to be YAML list, got {type(parsed_file)!r}.')
+            raise ValueError(f"Test file has to be YAML list, got {type(parsed_file)!r}.")
 
         for raw_test in parsed_file:
-            test_name = raw_test['case']
-            if ' ' in test_name:
+            test_name = raw_test["case"]
+            if " " in test_name:
                 raise ValueError(f"Invalid test name {test_name!r}, only '[a-zA-Z0-9_]' is allowed.")
 
-            test_files = [
-                File(path='main.py', content=raw_test['main'])
-            ]
-            test_files += parse_test_files(raw_test.get('files', []))
+            test_files = [File(path="main.py", content=raw_test["main"])]
+            test_files += parse_test_files(raw_test.get("files", []))
 
             output_from_comments = []
             for test_file in test_files:
-                output_lines = utils.extract_errors_from_comments(test_file.path, test_file.content.split('\n'))
+                output_lines = utils.extract_errors_from_comments(test_file.path, test_file.content.split("\n"))
                 output_from_comments.extend(output_lines)
 
-            starting_lineno = raw_test['__line__']
-            extra_environment_variables = parse_environment_variables(raw_test.get('env', []))
-            disable_cache = raw_test.get('disable_cache', False)
-            expected_output_lines = raw_test.get('out', '').split('\n')
-            additional_mypy_config = raw_test.get('mypy_config', '')
+            starting_lineno = raw_test["__line__"]
+            extra_environment_variables = parse_environment_variables(raw_test.get("env", []))
+            disable_cache = raw_test.get("disable_cache", False)
+            expected_output_lines = raw_test.get("out", "").split("\n")
+            additional_mypy_config = raw_test.get("mypy_config", "")
 
-            skip = self._eval_skip(str(raw_test.get('skip', 'False')))
+            skip = self._eval_skip(str(raw_test.get("skip", "False")))
             if not skip:
                 yield YamlTestItem(
-                                   name=test_name,
-                                   collector=self,
-                                   config=self.config,
-                                   files=test_files,
-                                   starting_lineno=starting_lineno,
-                                   environment_variables=extra_environment_variables,
-                                   disable_cache=disable_cache,
-                                   expected_output_lines=output_from_comments + expected_output_lines,
-                                   parsed_test_data=raw_test,
-                                   mypy_config=additional_mypy_config)
+                    name=test_name,
+                    collector=self,
+                    config=self.config,
+                    files=test_files,
+                    starting_lineno=starting_lineno,
+                    environment_variables=extra_environment_variables,
+                    disable_cache=disable_cache,
+                    expected_output_lines=output_from_comments + expected_output_lines,
+                    parsed_test_data=raw_test,
+                    mypy_config=additional_mypy_config,
+                )
 
     def _eval_skip(self, skip_if: str) -> bool:
-        return eval(skip_if, {
-            'sys': sys,
-            'os': os,
-            'pytest': pytest,
-            'platform': platform,
-        })
+        return eval(skip_if, {"sys": sys, "os": os, "pytest": pytest, "platform": platform})
 
 
 def pytest_collect_file(path: LocalPath, parent: Node) -> Optional[YamlTestFile]:
-    if path.ext in {'.yaml', '.yml'} and path.basename.startswith(('test-', 'test_')):
+    if path.ext in {".yaml", ".yml"} and path.basename.startswith(("test-", "test_")):
         return YamlTestFile(path, parent=parent, config=parent.config)
     return None
 
 
 def pytest_addoption(parser: Parser) -> None:
-    group = parser.getgroup('mypy-tests')
-    group.addoption('--mypy-testing-base', type=str, default=tempfile.gettempdir(),
-                    help='Base directory for tests to use')
-    group.addoption('--mypy-ini-file', type=str,
-                    help='Which .ini file to use as a default config for tests')
-    group.addoption('--mypy-same-process', action='store_true',
-                    help='Run in the same process. Useful for debugging, will create problems with import cache')
-    group.addoption('--mypy-extension-hook', type=str,
-                    help='Fully qualifield path to the extension hook function, in case you need custom yaml keys. '
-                         'Has to be top-level.')
+    group = parser.getgroup("mypy-tests")
+    group.addoption(
+        "--mypy-testing-base", type=str, default=tempfile.gettempdir(), help="Base directory for tests to use"
+    )
+    group.addoption("--mypy-ini-file", type=str, help="Which .ini file to use as a default config for tests")
+    group.addoption(
+        "--mypy-same-process",
+        action="store_true",
+        help="Run in the same process. Useful for debugging, will create problems with import cache",
+    )
+    group.addoption(
+        "--mypy-extension-hook",
+        type=str,
+        help="Fully qualifield path to the extension hook function, in case you need custom yaml keys. "
+        "Has to be top-level.",
+    )