Merge pull request #1421 from Cito/upgrade-dev-env

Cito · web-flow · commit 9c3e4bb7da00 · 2022-05-07T00:53:24.000+02:00
Make Graphene compatible with GraphQL-Core 3.2
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@ default_language_version:
 
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.2.0
     hooks:
     -   id: check-merge-conflict
     -   id: check-json
@@ -17,11 +17,11 @@ repos:
     -   id: trailing-whitespace
         exclude: README.md
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.0
+    rev: v2.32.1
     hooks:
     -   id: pyupgrade
 -   repo: https://github.com/ambv/black
-    rev: 21.12b0
+    rev: 22.3.0
     hooks:
     -   id: black
 -   repo: https://github.com/PyCQA/flake8
diff --git a/docs/conf.py b/docs/conf.py
@@ -64,18 +64,18 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"Graphene"
-copyright = u"Graphene 2016"
-author = u"Syrus Akbary"
+project = "Graphene"
+copyright = "Graphene 2016"
+author = "Syrus Akbary"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u"1.0"
+version = "1.0"
 # The full version, including alpha/beta/rc tags.
-release = u"1.0"
+release = "1.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -278,7 +278,7 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, "Graphene.tex", u"Graphene Documentation", u"Syrus Akbary", "manual")
+    (master_doc, "Graphene.tex", "Graphene Documentation", "Syrus Akbary", "manual")
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -318,7 +318,7 @@
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [(master_doc, "graphene", u"Graphene Documentation", [author], 1)]
+man_pages = [(master_doc, "graphene", "Graphene Documentation", [author], 1)]
 
 # If true, show URL addresses after external links.
 #
@@ -334,7 +334,7 @@
     (
         master_doc,
         "Graphene",
-        u"Graphene Documentation",
+        "Graphene Documentation",
         author,
         "Graphene",
         "One line description of project.",
diff --git a/examples/starwars_relay/tests/snapshots/snap_test_objectidentification.py b/examples/starwars_relay/tests/snapshots/snap_test_objectidentification.py
@@ -115,5 +115,4 @@
   shipName: String!
   factionId: String!
   clientMutationId: String
-}
-'''
+}'''
diff --git a/examples/starwars_relay/tests/test_objectidentification.py b/examples/starwars_relay/tests/test_objectidentification.py
@@ -9,7 +9,7 @@
 
 
 def test_str_schema(snapshot):
-    snapshot.assert_match(str(schema))
+    snapshot.assert_match(str(schema).strip())
 
 
 def test_correctly_fetches_id_name_rebels(snapshot):
diff --git 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 textwrap import dedent
 
-from graphene.tests.utils import dedent
+from graphql_relay import to_global_id
 
 from ...types import ObjectType, Schema, String
 from ..node import Node, is_node
@@ -171,8 +171,10 @@ def test_node_field_only_lazy_type_wrong():
 
 
 def test_str_schema():
-    assert str(schema) == dedent(
-        '''
+    assert (
+        str(schema).strip()
+        == dedent(
+            '''
         schema {
           query: RootQuery
         }
@@ -213,4 +215,5 @@ def test_str_schema():
           ): MyNode
         }
         '''
+        ).strip()
     )
diff --git a/graphene/relay/tests/test_node_custom.py b/graphene/relay/tests/test_node_custom.py
@@ -1,6 +1,6 @@
-from graphql import graphql_sync
+from textwrap import dedent
 
-from graphene.tests.utils import dedent
+from graphql import graphql_sync
 
 from ...types import Interface, ObjectType, Schema
 from ...types.scalars import Int, String
@@ -54,8 +54,10 @@ class RootQuery(ObjectType):
 
 
 def test_str_schema_correct():
-    assert str(schema) == dedent(
-        '''
+    assert (
+        str(schema).strip()
+        == dedent(
+            '''
         schema {
           query: RootQuery
         }
@@ -93,6 +95,7 @@ def test_str_schema_correct():
           ): Node
         }
         '''
+        ).strip()
     )
 
 
diff --git a/graphene/test/__init__.py b/graphene/test/__init__.py
@@ -1,13 +1,12 @@
 from promise import Promise, is_thenable
-from graphql.error import format_error as format_graphql_error
 from graphql.error import GraphQLError
 
 from graphene.types.schema import Schema
 
 
 def default_format_error(error):
     if isinstance(error, GraphQLError):
-        return format_graphql_error(error)
+        return error.formatted
     return {"message": str(error)}
 
 
diff --git a/graphene/tests/utils.py b/graphene/tests/utils.py
diff --git a/graphene/types/definitions.py b/graphene/types/definitions.py
@@ -7,7 +7,6 @@
     GraphQLObjectType,
     GraphQLScalarType,
     GraphQLUnionType,
-    Undefined,
 )
 
 
@@ -50,7 +49,7 @@ def serialize(self, value):
                 try:
                     value = enum[value]
                 except KeyError:
-                    return Undefined
+                    pass
         return super(GrapheneEnumType, self).serialize(value)
 
 
diff --git a/graphene/types/scalars.py b/graphene/types/scalars.py
@@ -143,7 +143,7 @@ class String(Scalar):
     @staticmethod
     def coerce_string(value):
         if isinstance(value, bool):
-            return u"true" if value else u"false"
+            return "true" if value else "false"
         return str(value)
 
     serialize = coerce_string
diff --git a/graphene/types/schema.py b/graphene/types/schema.py
@@ -376,19 +376,11 @@ def get_function_for_type(self, graphene_type, func_name, name, default_value):
     def resolve_type(self, resolve_type_func, type_name, root, info, _type):
         type_ = resolve_type_func(root, info)
 
-        if not type_:
-            return_type = self[type_name]
-            return default_type_resolver(root, info, return_type)
-
         if inspect.isclass(type_) and issubclass(type_, ObjectType):
-            graphql_type = self.get(type_._meta.name)
-            assert graphql_type, f"Can't find type {type_._meta.name} in schema"
-            assert (
-                graphql_type.graphene_type == type_
-            ), f"The type {type_} does not match with the associated graphene type {graphql_type.graphene_type}."
-            return graphql_type
+            return type_._meta.name
 
-        return type_
+        return_type = self[type_name]
+        return default_type_resolver(root, info, return_type)
 
 
 class Schema:
diff --git a/graphene/types/tests/test_enum.py b/graphene/types/tests/test_enum.py
@@ -251,19 +251,22 @@ def resolve_color(_, info):
 
     schema = Schema(query=Query)
 
-    assert str(schema) == dedent(
-        '''\
-        type Query {
-          color: Color!
-        }
+    assert (
+        str(schema).strip()
+        == dedent(
+            '''
+            type Query {
+              color: Color!
+            }
 
-        """Primary colors"""
-        enum Color {
-          RED
-          YELLOW
-          BLUE
-        }
-    '''
+            """Primary colors"""
+            enum Color {
+              RED
+              YELLOW
+              BLUE
+            }
+            '''
+        ).strip()
     )
 
 
@@ -345,10 +348,7 @@ def resolve_color(_, info):
 
     results = schema.execute("query { color }")
     assert results.errors
-    assert (
-        results.errors[0].message
-        == "Expected a value of type 'Color' but received: 'BLACK'"
-    )
+    assert results.errors[0].message == "Enum 'Color' cannot represent value: 'BLACK'"
 
 
 def test_field_enum_argument():
@@ -460,12 +460,13 @@ class Query(ObjectType):
 
     schema = Schema(query=Query, mutation=MyMutation)
     result = schema.execute(
-        """ mutation MyMutation {
-        createPaint(colorInput: { color: RED }) {
-            color
+        """
+        mutation MyMutation {
+            createPaint(colorInput: { color: RED }) {
+                color
+            }
         }
-    }
-    """
+        """
     )
     assert not result.errors
     assert result.data == {"createPaint": {"color": "RED"}}
diff --git a/graphene/types/tests/test_scalar.py b/graphene/types/tests/test_scalar.py
@@ -11,19 +11,19 @@ class JSONScalar(Scalar):
 
 
 def test_ints():
-    assert Int.parse_value(2 ** 31 - 1) is not None
+    assert Int.parse_value(2**31 - 1) is not None
     assert Int.parse_value("2.0") is not None
-    assert Int.parse_value(2 ** 31) is None
+    assert Int.parse_value(2**31) is None
 
-    assert Int.parse_literal(IntValueNode(value=str(2 ** 31 - 1))) == 2 ** 31 - 1
-    assert Int.parse_literal(IntValueNode(value=str(2 ** 31))) is None
+    assert Int.parse_literal(IntValueNode(value=str(2**31 - 1))) == 2**31 - 1
+    assert Int.parse_literal(IntValueNode(value=str(2**31))) is None
 
-    assert Int.parse_value(-(2 ** 31)) is not None
-    assert Int.parse_value(-(2 ** 31) - 1) is None
+    assert Int.parse_value(-(2**31)) is not None
+    assert Int.parse_value(-(2**31) - 1) is None
 
-    assert BigInt.parse_value(2 ** 31) is not None
+    assert BigInt.parse_value(2**31) is not None
     assert BigInt.parse_value("2.0") is not None
-    assert BigInt.parse_value(-(2 ** 31) - 1) is not None
+    assert BigInt.parse_value(-(2**31) - 1) is not None
 
-    assert BigInt.parse_literal(IntValueNode(value=str(2 ** 31 - 1))) == 2 ** 31 - 1
-    assert BigInt.parse_literal(IntValueNode(value=str(2 ** 31))) == 2 ** 31
+    assert BigInt.parse_literal(IntValueNode(value=str(2**31 - 1))) == 2**31 - 1
+    assert BigInt.parse_literal(IntValueNode(value=str(2**31))) == 2**31
diff --git a/graphene/types/tests/test_scalars_serialization.py b/graphene/types/tests/test_scalars_serialization.py
@@ -38,7 +38,7 @@ def test_serializes_output_string():
     assert String.serialize(-1.1) == "-1.1"
     assert String.serialize(True) == "true"
     assert String.serialize(False) == "false"
-    assert String.serialize(u"\U0001F601") == u"\U0001F601"
+    assert String.serialize("\U0001F601") == "\U0001F601"
 
 
 def test_serializes_output_boolean():
diff --git a/graphene/types/tests/test_schema.py b/graphene/types/tests/test_schema.py
@@ -1,7 +1,8 @@
-from graphql.type import GraphQLObjectType, GraphQLSchema
+from textwrap import dedent
+
 from pytest import raises
 
-from graphene.tests.utils import dedent
+from graphql.type import GraphQLObjectType, GraphQLSchema
 
 from ..field import Field
 from ..objecttype import ObjectType
@@ -43,8 +44,10 @@ def test_schema_get_type_error():
 
 def test_schema_str():
     schema = Schema(Query)
-    assert str(schema) == dedent(
-        """
+    assert (
+        str(schema).strip()
+        == dedent(
+            """
         type Query {
           inner: MyOtherType
         }
@@ -53,6 +56,7 @@ def test_schema_str():
           field: String
         }
         """
+        ).strip()
     )
 
 
diff --git a/setup.py b/setup.py
@@ -53,12 +53,12 @@ def run_tests(self):
     "snapshottest>=0.6,<1",
     "coveralls>=3.3,<4",
     "promise>=2.3,<3",
-    "mock>=4.0,<5",
-    "pytz==2021.3",
+    "mock>=4,<5",
+    "pytz==2022.1",
     "iso8601>=1,<2",
 ]
 
-dev_requires = ["black==19.10b0", "flake8>=3.7,<4"] + tests_require
+dev_requires = ["black==22.3.0", "flake8>=4,<5"] + tests_require
 
 setup(
     name="graphene",
@@ -84,8 +84,8 @@ def run_tests(self):
     keywords="api graphql protocol rest relay graphene",
     packages=find_packages(exclude=["examples*"]),
     install_requires=[
-        "graphql-core~=3.1.2",
-        "graphql-relay>=3.0,<4",
+        "graphql-core>=3.1,<3.3",
+        "graphql-relay>=3.1,<3.3",
         "aniso8601>=8,<10",
     ],
     tests_require=tests_require,
diff --git a/tox.ini b/tox.ini
@@ -22,7 +22,7 @@ commands =
 [testenv:mypy]
 basepython = python3.9
 deps =
-    mypy>=0.931,<1
+    mypy>=0.950,<1
 commands =
     mypy graphene
 
