Merge pull request #7846 from asottile/py36_black

py36+: update the target version of black to py36

pyproject.toml

@@ -102,4 +102,4 @@ template = "changelog/_template.rst"
   showcontent = true
 
 [tool.black]
-target-version = ['py35']
+target-version = ['py36']

src/_pytest/_io/saferepr.py

@@ -122,7 +122,7 @@ def _pformat_dispatch(
     width: int = 80,
     depth: Optional[int] = None,
     *,
-    compact: bool = False
+    compact: bool = False,
 ) -> str:
     return AlwaysDispatchingPrettyPrinter(
         indent=indent, width=width, depth=depth, compact=compact

src/_pytest/_io/terminalwriter.py

@@ -109,7 +109,7 @@ class TerminalWriter:
         sepchar: str,
         title: Optional[str] = None,
         fullwidth: Optional[int] = None,
-        **markup: bool
+        **markup: bool,
     ) -> None:
         if fullwidth is None:
             fullwidth = self.fullwidth

src/_pytest/compat.py

@@ -115,7 +115,7 @@ def getfuncargnames(
     *,
     name: str = "",
     is_method: bool = False,
-    cls: Optional[type] = None
+    cls: Optional[type] = None,
 ) -> Tuple[str, ...]:
     """Return the names of a function's mandatory arguments.
 

src/_pytest/config/__init__.py

@@ -866,7 +866,7 @@ class Config:
         self,
         pluginmanager: PytestPluginManager,
         *,
-        invocation_params: Optional[InvocationParams] = None
+        invocation_params: Optional[InvocationParams] = None,
     ) -> None:
         from .argparsing import Parser, FILE_OR_DIR
 

src/_pytest/doctest.py

@@ -260,7 +260,7 @@ class DoctestItem(pytest.Item):
         *,
         name: str,
         runner: "doctest.DocTestRunner",
-        dtest: "doctest.DocTest"
+        dtest: "doctest.DocTest",
     ):
         # incompatible signature due to to imposed limits on sublcass
         """The public named constructor."""

src/_pytest/fixtures.py

@@ -1220,7 +1220,7 @@ def fixture(
             Callable[[Any], Optional[object]],
         ]
     ] = ...,
-    name: Optional[str] = ...
+    name: Optional[str] = ...,
 ) -> _FixtureFunction:
     ...
 
@@ -1238,7 +1238,7 @@ def fixture(
             Callable[[Any], Optional[object]],
         ]
     ] = ...,
-    name: Optional[str] = None
+    name: Optional[str] = None,
 ) -> FixtureFunctionMarker:
     ...
 
@@ -1255,7 +1255,7 @@ def fixture(
             Callable[[Any], Optional[object]],
         ]
     ] = None,
-    name: Optional[str] = None
+    name: Optional[str] = None,
 ) -> Union[FixtureFunctionMarker, _FixtureFunction]:
     """Decorator to mark a fixture factory function.
 
@@ -1325,7 +1325,7 @@ def yield_fixture(
     params=None,
     autouse=False,
     ids=None,
-    name=None
+    name=None,
 ):
     """(Return a) decorator to mark a yield-fixture factory function.
 

src/_pytest/mark/__init__.py

@@ -47,7 +47,7 @@ old_mark_config_key = StoreKey[Optional[Config]]()
 def param(
     *values: object,
     marks: Union[MarkDecorator, Collection[Union[MarkDecorator, Mark]]] = (),
-    id: Optional[str] = None
+    id: Optional[str] = None,
 ) -> ParameterSet:
     """Specify a parameter in `pytest.mark.parametrize`_ calls or
     :ref:`parametrized fixtures <fixture-parametrize-marks>`.

src/_pytest/mark/structures.py

@@ -89,7 +89,7 @@ class ParameterSet(
         cls,
         *values: object,
         marks: Union["MarkDecorator", Collection[Union["MarkDecorator", "Mark"]]] = (),
-        id: Optional[str] = None
+        id: Optional[str] = None,
     ) -> "ParameterSet":
         if isinstance(marks, MarkDecorator):
             marks = (marks,)
@@ -138,7 +138,7 @@ class ParameterSet(
         argnames: Union[str, List[str], Tuple[str, ...]],
         argvalues: Iterable[Union["ParameterSet", Sequence[object], object]],
         *args,
-        **kwargs
+        **kwargs,
     ) -> Tuple[Union[List[str], Tuple[str, ...]], bool]:
         if not isinstance(argnames, (tuple, list)):
             argnames = [x.strip() for x in argnames.split(",") if x.strip()]
@@ -398,7 +398,7 @@ if TYPE_CHECKING:
             self,
             condition: Union[str, bool] = ...,
             *conditions: Union[str, bool],
-            reason: str = ...
+            reason: str = ...,
         ) -> MarkDecorator:
             ...
 
@@ -415,7 +415,7 @@ if TYPE_CHECKING:
             reason: str = ...,
             run: bool = ...,
             raises: Union[Type[BaseException], Tuple[Type[BaseException], ...]] = ...,
-            strict: bool = ...
+            strict: bool = ...,
         ) -> MarkDecorator:
             ...
 
@@ -432,7 +432,7 @@ if TYPE_CHECKING:
                     Callable[[Any], Optional[object]],
                 ]
             ] = ...,
-            scope: Optional[_Scope] = ...
+            scope: Optional[_Scope] = ...,
         ) -> MarkDecorator:
             ...
 

src/_pytest/pathlib.py

@@ -441,7 +441,7 @@ class ImportPathMismatchError(ImportError):
 def import_path(
     p: Union[str, py.path.local, Path],
     *,
-    mode: Union[str, ImportMode] = ImportMode.prepend
+    mode: Union[str, ImportMode] = ImportMode.prepend,
 ) -> ModuleType:
     """Import and return a module from the given path, which can be a file (a module) or
     a directory (a package).

src/_pytest/pytester.py

@@ -1211,7 +1211,7 @@ class Testdir:
         stdout=subprocess.PIPE,
         stderr=subprocess.PIPE,
         stdin=CLOSE_STDIN,
-        **kw
+        **kw,
     ):
         """Invoke subprocess.Popen.
 
@@ -1530,7 +1530,7 @@ class LineMatcher:
         match_func: Callable[[str, str], bool],
         match_nickname: str,
         *,
-        consecutive: bool = False
+        consecutive: bool = False,
     ) -> None:
         """Underlying implementation of ``fnmatch_lines`` and ``re_match_lines``.
 

src/_pytest/python.py

@@ -975,7 +975,7 @@ class Metafunc:
         ] = None,
         scope: "Optional[_Scope]" = None,
         *,
-        _param_mark: Optional[Mark] = None
+        _param_mark: Optional[Mark] = None,
     ) -> None:
         """Add new invocations to the underlying test function using the list
         of argvalues for the given argnames.  Parametrization is performed

src/_pytest/python_api.py

@@ -559,7 +559,7 @@ _E = TypeVar("_E", bound=BaseException)
 def raises(
     expected_exception: Union[Type[_E], Tuple[Type[_E], ...]],
     *,
-    match: Optional[Union[str, Pattern[str]]] = ...
+    match: Optional[Union[str, Pattern[str]]] = ...,
 ) -> "RaisesContext[_E]":
     ...
 
@@ -569,7 +569,7 @@ def raises(
     expected_exception: Union[Type[_E], Tuple[Type[_E], ...]],
     func: Callable[..., Any],
     *args: Any,
-    **kwargs: Any
+    **kwargs: Any,
 ) -> _pytest._code.ExceptionInfo[_E]:
     ...
 

src/_pytest/recwarn.py

@@ -83,7 +83,7 @@ def deprecated_call(
 def warns(
     expected_warning: Optional[Union[Type[Warning], Tuple[Type[Warning], ...]]],
     *,
-    match: Optional[Union[str, Pattern[str]]] = ...
+    match: Optional[Union[str, Pattern[str]]] = ...,
 ) -> "WarningsChecker":
     ...
 
@@ -93,7 +93,7 @@ def warns(
     expected_warning: Optional[Union[Type[Warning], Tuple[Type[Warning], ...]]],
     func: Callable[..., T],
     *args: Any,
-    **kwargs: Any
+    **kwargs: Any,
 ) -> T:
     ...
 
@@ -102,7 +102,7 @@ def warns(
     expected_warning: Optional[Union[Type[Warning], Tuple[Type[Warning], ...]]],
     *args: Any,
     match: Optional[Union[str, Pattern[str]]] = None,
-    **kwargs: Any
+    **kwargs: Any,
 ) -> Union["WarningsChecker", Any]:
     r"""Assert that code raises a particular class of warning.
 

src/_pytest/reports.py

@@ -246,7 +246,7 @@ class TestReport(BaseReport):
         sections: Iterable[Tuple[str, str]] = (),
         duration: float = 0,
         user_properties: Optional[Iterable[Tuple[str, object]]] = None,
-        **extra
+        **extra,
     ) -> None:
         #: Normalized collection nodeid.
         self.nodeid = nodeid
@@ -348,7 +348,7 @@ class CollectReport(BaseReport):
         longrepr,
         result: Optional[List[Union[Item, Collector]]],
         sections: Iterable[Tuple[str, str]] = (),
-        **extra
+        **extra,
     ) -> None:
         #: Normalized collection nodeid.
         self.nodeid = nodeid

src/_pytest/terminal.py

@@ -450,7 +450,7 @@ class TerminalReporter:
         sep: str,
         title: Optional[str] = None,
         fullwidth: Optional[int] = None,
-        **markup: bool
+        **markup: bool,
     ) -> None:
         self.ensure_newline()
         self._tw.sep(sep, title, fullwidth, **markup)