From 1d3525e6f91a41201835d775abd8bd7212d72cb4 Mon Sep 17 00:00:00 2001 From: Jonathan Kim Date: Thu, 9 Jul 2020 16:36:41 +0100 Subject: [PATCH] Use custom dedent function and pin graphql-core to >3.1.2 --- graphene/relay/tests/test_node.py | 2 +- graphene/relay/tests/test_node_custom.py | 3 ++- graphene/tests/utils.py | 9 +++++++++ graphene/types/tests/test_schema.py | 4 ++-- setup.py | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 graphene/tests/utils.py diff --git a/graphene/relay/tests/test_node.py b/graphene/relay/tests/test_node.py index 92d85105..d46838ac 100644 --- a/graphene/relay/tests/test_node.py +++ b/graphene/relay/tests/test_node.py @@ -1,7 +1,7 @@ import re from graphql_relay import to_global_id -from graphql.pyutils import dedent +from graphene.tests.utils import dedent from ...types import ObjectType, Schema, String from ..node import Node, is_node diff --git a/graphene/relay/tests/test_node_custom.py b/graphene/relay/tests/test_node_custom.py index 30d62e7b..76a2cad3 100644 --- a/graphene/relay/tests/test_node_custom.py +++ b/graphene/relay/tests/test_node_custom.py @@ -1,5 +1,6 @@ from graphql import graphql_sync -from graphql.pyutils import dedent + +from graphene.tests.utils import dedent from ...types import Interface, ObjectType, Schema from ...types.scalars import Int, String diff --git a/graphene/tests/utils.py b/graphene/tests/utils.py new file mode 100644 index 00000000..b9804d9b --- /dev/null +++ b/graphene/tests/utils.py @@ -0,0 +1,9 @@ +from textwrap import dedent as _dedent + + +def dedent(text: str) -> str: + """Fix indentation of given text by removing leading spaces and tabs. + Also removes leading newlines and trailing spaces and tabs, but keeps trailing + newlines. + """ + return _dedent(text.lstrip("\n").rstrip(" \t")) diff --git a/graphene/types/tests/test_schema.py b/graphene/types/tests/test_schema.py index 0c85e170..fe4739c9 100644 --- a/graphene/types/tests/test_schema.py +++ b/graphene/types/tests/test_schema.py @@ -1,7 +1,7 @@ +from graphql.type import GraphQLObjectType, GraphQLSchema from pytest import raises -from graphql.type import GraphQLObjectType, GraphQLSchema -from graphql.pyutils import dedent +from graphene.tests.utils import dedent from ..field import Field from ..objecttype import ObjectType diff --git a/setup.py b/setup.py index 24bddcf9..48d7d285 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,7 @@ setup( keywords="api graphql protocol rest relay graphene", packages=find_packages(exclude=["examples*"]), install_requires=[ - "graphql-core>=3.1.1,<4", + "graphql-core>=3.1.2,<4", "graphql-relay>=3.0,<4", "aniso8601>=8,<9", ],