From 2014c9302bbc573d8af5df9a8c311eb9c034b9c1 Mon Sep 17 00:00:00 2001 From: Daniel Gallagher Date: Thu, 7 Mar 2019 21:54:35 -0800 Subject: [PATCH] Run pre-commit autoupdate to bump versions of precommit hooks, then run them on all files --- .pre-commit-config.yaml | 16 ++++++++++------ UPGRADE-v2.0.md | 4 ++-- graphene/pyutils/signature.py | 5 ++++- graphene/types/argument.py | 4 +--- graphene/types/base.py | 4 ++++ graphene/types/scalars.py | 3 +++ graphene/types/tests/test_definition.py | 2 -- graphene/types/tests/test_inputobjecttype.py | 1 - graphene/types/tests/test_json.py | 1 - graphene/types/tests/test_mountedtype.py | 1 - graphene/types/tests/test_resolver.py | 1 - graphene/types/tests/test_scalar.py | 1 - graphene/utils/str_converters.py | 2 +- 13 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a71f6fe0..93ab2e6d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,24 +1,28 @@ repos: - repo: git://github.com/pre-commit/pre-commit-hooks - rev: v1.3.0 + rev: v2.1.0 hooks: + - id: check-merge-conflict - id: check-json - id: check-yaml - id: debug-statements - id: end-of-file-fixer exclude: ^docs/.*$ - - id: trailing-whitespace - exclude: README.md - id: pretty-format-json args: - --autofix - - id: flake8 + - id: trailing-whitespace + exclude: README.md - repo: https://github.com/asottile/pyupgrade - rev: v1.4.0 + rev: v1.12.0 hooks: - id: pyupgrade - repo: https://github.com/ambv/black - rev: 18.6b4 + rev: 18.9b0 hooks: - id: black language_version: python3 +- repo: https://github.com/PyCQA/flake8 + rev: 3.7.7 + hooks: + - id: flake8 diff --git a/UPGRADE-v2.0.md b/UPGRADE-v2.0.md index c2048bd1..d9d48005 100644 --- a/UPGRADE-v2.0.md +++ b/UPGRADE-v2.0.md @@ -276,7 +276,7 @@ If you are using Middelwares, you need to some adjustments: Before: ```python -class MyGrapheneMiddleware(object): +class MyGrapheneMiddleware(object): def resolve(self, next_mw, root, args, context, info): ## Middleware code @@ -287,7 +287,7 @@ class MyGrapheneMiddleware(object): With 2.0: ```python -class MyGrapheneMiddleware(object): +class MyGrapheneMiddleware(object): def resolve(self, next_mw, root, info, **args): context = info.context diff --git a/graphene/pyutils/signature.py b/graphene/pyutils/signature.py index c66c2563..7757d9d0 100644 --- a/graphene/pyutils/signature.py +++ b/graphene/pyutils/signature.py @@ -707,7 +707,10 @@ class Signature(object): break elif param.name in kwargs: if param.kind == _POSITIONAL_ONLY: - msg = "{arg!r} parameter is positional only, " "but was passed as a keyword" + msg = ( + "{arg!r} parameter is positional only, " + "but was passed as a keyword" + ) msg = msg.format(arg=param.name) raise TypeError(msg) parameters_ex = (param,) diff --git a/graphene/types/argument.py b/graphene/types/argument.py index 9c75bcee..bf304608 100644 --- a/graphene/types/argument.py +++ b/graphene/types/argument.py @@ -75,9 +75,7 @@ def to_arguments(args, extra_args=None): arg_name = default_name or arg.name assert ( arg_name not in arguments - ), 'More than one Argument have same name "{}".'.format( - arg_name - ) + ), 'More than one Argument have same name "{}".'.format(arg_name) arguments[arg_name] = arg return arguments diff --git a/graphene/types/base.py b/graphene/types/base.py index aa97ed22..75685d98 100644 --- a/graphene/types/base.py +++ b/graphene/types/base.py @@ -1,5 +1,9 @@ from ..utils.subclass_with_meta import SubclassWithMeta from ..utils.trim_docstring import trim_docstring +import six + +if six.PY3: + from typing import Type class BaseOptions(object): diff --git a/graphene/types/scalars.py b/graphene/types/scalars.py index dfb63e52..c5f43787 100644 --- a/graphene/types/scalars.py +++ b/graphene/types/scalars.py @@ -4,6 +4,9 @@ from graphql.language.ast import BooleanValue, FloatValue, IntValue, StringValue from .base import BaseOptions, BaseType from .unmountedtype import UnmountedType +if six.PY3: + from typing import Any + class ScalarOptions(BaseOptions): pass diff --git a/graphene/types/tests/test_definition.py b/graphene/types/tests/test_definition.py index 347de9c9..549847d5 100644 --- a/graphene/types/tests/test_definition.py +++ b/graphene/types/tests/test_definition.py @@ -1,5 +1,3 @@ - - from ..argument import Argument from ..enum import Enum from ..field import Field diff --git a/graphene/types/tests/test_inputobjecttype.py b/graphene/types/tests/test_inputobjecttype.py index d565ff40..dc557b94 100644 --- a/graphene/types/tests/test_inputobjecttype.py +++ b/graphene/types/tests/test_inputobjecttype.py @@ -1,4 +1,3 @@ - from ..argument import Argument from ..field import Field from ..inputfield import InputField diff --git a/graphene/types/tests/test_json.py b/graphene/types/tests/test_json.py index 6b8189c4..b5537180 100644 --- a/graphene/types/tests/test_json.py +++ b/graphene/types/tests/test_json.py @@ -1,4 +1,3 @@ - from ..json import JSONString from ..objecttype import ObjectType from ..schema import Schema diff --git a/graphene/types/tests/test_mountedtype.py b/graphene/types/tests/test_mountedtype.py index 787bee56..b964233e 100644 --- a/graphene/types/tests/test_mountedtype.py +++ b/graphene/types/tests/test_mountedtype.py @@ -1,4 +1,3 @@ - from ..field import Field from ..scalars import String diff --git a/graphene/types/tests/test_resolver.py b/graphene/types/tests/test_resolver.py index 3be9a492..2a15028d 100644 --- a/graphene/types/tests/test_resolver.py +++ b/graphene/types/tests/test_resolver.py @@ -1,4 +1,3 @@ - from ..resolver import ( attr_resolver, dict_resolver, diff --git a/graphene/types/tests/test_scalar.py b/graphene/types/tests/test_scalar.py index 1ec986cd..559c0ce6 100644 --- a/graphene/types/tests/test_scalar.py +++ b/graphene/types/tests/test_scalar.py @@ -1,4 +1,3 @@ - from ..scalars import Scalar diff --git a/graphene/utils/str_converters.py b/graphene/utils/str_converters.py index 2d455d5d..216b0547 100644 --- a/graphene/utils/str_converters.py +++ b/graphene/utils/str_converters.py @@ -18,4 +18,4 @@ def to_snake_case(name): def to_const(string): - return re.sub("[\W|^]+", "_", string).upper() # noqa + return re.sub(r"[\W|^]+", "_", string).upper() # noqa