From f295b0267d14017c95144ed191fbc8ba75aeb789 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Fri, 2 Oct 2020 13:09:35 -0700 Subject: [PATCH] py36+: update the target version of black to py36 --- pyproject.toml | 2 +- src/_pytest/_io/saferepr.py | 2 +- src/_pytest/_io/terminalwriter.py | 2 +- src/_pytest/compat.py | 2 +- src/_pytest/config/__init__.py | 2 +- src/_pytest/doctest.py | 2 +- src/_pytest/fixtures.py | 8 ++++---- src/_pytest/mark/__init__.py | 2 +- src/_pytest/mark/structures.py | 10 +++++----- src/_pytest/pathlib.py | 2 +- src/_pytest/pytester.py | 4 ++-- src/_pytest/python.py | 2 +- src/_pytest/python_api.py | 4 ++-- src/_pytest/recwarn.py | 6 +++--- src/_pytest/reports.py | 4 ++-- src/_pytest/terminal.py | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index aee467fcf..443b94c26 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -102,4 +102,4 @@ template = "changelog/_template.rst" showcontent = true [tool.black] -target-version = ['py35'] +target-version = ['py36'] diff --git a/src/_pytest/_io/saferepr.py b/src/_pytest/_io/saferepr.py index 9a4975f61..5eb1e0889 100644 --- a/src/_pytest/_io/saferepr.py +++ b/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 diff --git a/src/_pytest/_io/terminalwriter.py b/src/_pytest/_io/terminalwriter.py index a9404ebcc..3dc25c6fe 100644 --- a/src/_pytest/_io/terminalwriter.py +++ b/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 diff --git a/src/_pytest/compat.py b/src/_pytest/compat.py index 8fa58bccf..f96620c18 100644 --- a/src/_pytest/compat.py +++ b/src/_pytest/compat.py @@ -116,7 +116,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. diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py index 799cc19c6..c939de73b 100644 --- a/src/_pytest/config/__init__.py +++ b/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 diff --git a/src/_pytest/doctest.py b/src/_pytest/doctest.py index 817c9f9a8..bdbbc5197 100644 --- a/src/_pytest/doctest.py +++ b/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.""" diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py index d793ea37f..ce61b57f9 100644 --- a/src/_pytest/fixtures.py +++ b/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( # noqa: F811 Callable[[Any], Optional[object]], ] ] = ..., - name: Optional[str] = None + name: Optional[str] = None, ) -> FixtureFunctionMarker: ... @@ -1255,7 +1255,7 @@ def fixture( # noqa: F811 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. diff --git a/src/_pytest/mark/__init__.py b/src/_pytest/mark/__init__.py index f6907b8fd..cc6e80e80 100644 --- a/src/_pytest/mark/__init__.py +++ b/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 `. diff --git a/src/_pytest/mark/structures.py b/src/_pytest/mark/structures.py index 23c552d98..c5a3b8d99 100644 --- a/src/_pytest/mark/structures.py +++ b/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()] @@ -400,7 +400,7 @@ if TYPE_CHECKING: self, condition: Union[str, bool] = ..., *conditions: Union[str, bool], - reason: str = ... + reason: str = ..., ) -> MarkDecorator: ... @@ -417,7 +417,7 @@ if TYPE_CHECKING: reason: str = ..., run: bool = ..., raises: Union[Type[BaseException], Tuple[Type[BaseException], ...]] = ..., - strict: bool = ... + strict: bool = ..., ) -> MarkDecorator: ... @@ -434,7 +434,7 @@ if TYPE_CHECKING: Callable[[Any], Optional[object]], ] ] = ..., - scope: Optional[_Scope] = ... + scope: Optional[_Scope] = ..., ) -> MarkDecorator: ... diff --git a/src/_pytest/pathlib.py b/src/_pytest/pathlib.py index de8917be2..06aba3391 100644 --- a/src/_pytest/pathlib.py +++ b/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). diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py index 29690f0f0..6ced7e250 100644 --- a/src/_pytest/pytester.py +++ b/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``. diff --git a/src/_pytest/python.py b/src/_pytest/python.py index e0a295a06..1acf2c0e5 100644 --- a/src/_pytest/python.py +++ b/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 diff --git a/src/_pytest/python_api.py b/src/_pytest/python_api.py index b1f09030a..130e816ee 100644 --- a/src/_pytest/python_api.py +++ b/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( # noqa: F811 expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], func: Callable[..., Any], *args: Any, - **kwargs: Any + **kwargs: Any, ) -> _pytest._code.ExceptionInfo[_E]: ... diff --git a/src/_pytest/recwarn.py b/src/_pytest/recwarn.py index a455e9e57..059692183 100644 --- a/src/_pytest/recwarn.py +++ b/src/_pytest/recwarn.py @@ -85,7 +85,7 @@ def deprecated_call( # noqa: F811 def warns( expected_warning: Optional[Union[Type[Warning], Tuple[Type[Warning], ...]]], *, - match: Optional[Union[str, Pattern[str]]] = ... + match: Optional[Union[str, Pattern[str]]] = ..., ) -> "WarningsChecker": ... @@ -95,7 +95,7 @@ def warns( # noqa: F811 expected_warning: Optional[Union[Type[Warning], Tuple[Type[Warning], ...]]], func: Callable[..., T], *args: Any, - **kwargs: Any + **kwargs: Any, ) -> T: ... @@ -104,7 +104,7 @@ def warns( # noqa: F811 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. diff --git a/src/_pytest/reports.py b/src/_pytest/reports.py index a6d593ccd..9bf5b02a8 100644 --- a/src/_pytest/reports.py +++ b/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 diff --git a/src/_pytest/terminal.py b/src/_pytest/terminal.py index 21634cbbc..881967a00 100644 --- a/src/_pytest/terminal.py +++ b/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)