Merge pull request #45 from DoctorJohn/graphene-v3

Upgrade to graphene v3
graphql-python · Nov 9, 2020 · a744fce · a744fce
2 parents a8acf13 + 51f3f13
commit a744fce
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 156 deletions.
diff --git a/examples/departments.py b/examples/departments.py
@@ -103,37 +103,32 @@ def resolve_list_departments(self, info):
 
 
 if __name__ == "__main__":
-    from graphql.execution.executors.sync import SyncExecutor
-
     schema = graphene.Schema(query=Query)
-    result = schema.execute(
-        """
-      query {
-        listDepartments {
-          id,
-          name,
-          employees {
-            ...on Employee {
-              id
-              name
-              hiredOn
-              salary { rating }
-            }
-            ...on Manager {
-              name
-              salary {
-                rating
-                amount
-              }
-              teamSize
+    query = """
+        query {
+            listDepartments {
+                id,
+                name,
+                employees {
+                    ...on Employee {
+                    id
+                    name
+                    hiredOn
+                    salary { rating }
+                }
+                ...on Manager {
+                    name
+                    salary {
+                        rating
+                        amount
+                    }
+                    teamSize
+                }
             }
-          }
         }
-      }
-""",
-        executor=SyncExecutor(),
-        return_promise=False,
-    )
+    }
+    """
+    result = schema.execute(query)
 
     print(result.errors)
     print(json.dumps(result.data, indent=2))
diff --git a/graphene_pydantic/converters.py b/graphene_pydantic/converters.py
@@ -97,7 +97,7 @@ def convert_pydantic_input_field(
     """
     declared_type = getattr(field, "type_", None)
     field_kwargs.setdefault(
-        "type",
+        "type_",
         convert_pydantic_type(
             declared_type, field, registry, parent_type=parent_type, model=model
         ),
@@ -126,7 +126,7 @@ def convert_pydantic_field(
     """
     declared_type = getattr(field, "type_", None)
     field_kwargs.setdefault(
-        "type",
+        "type_",
         convert_pydantic_type(
             declared_type, field, registry, parent_type=parent_type, model=model
         ),

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "graphene_pydantic"
-version = "0.1.0"
+version = "0.2.0"
 description = "Graphene Pydantic integration"
 readme = "README.md"
 repository = "https://github.com/upsidetravel/graphene-pydantic"
@@ -21,7 +21,7 @@ keywords = ["api", "graphql", "protocol", "rest", "relay", "graphene", "pydantic
 [tool.poetry.dependencies]
 python = "^3.6"
 # To keep things simple, we only support newer versions of Graphene & Pydantic
-graphene = ">=2.1.3,<3"
+graphene = ">=3.0b5"
 pydantic = ">=1.0,<1.7"
 
 [tool.poetry.dev-dependencies]

diff --git a/tests/test_forward_refs.py b/tests/test_forward_refs.py
@@ -77,34 +77,29 @@ def resolve_list_foos(self, info):
 
 
 def test_query():
-    from graphql.execution.executors.sync import SyncExecutor
-
     schema = graphene.Schema(query=Query)
-    result = schema.execute(
-        """
-      query {
-        listFoos {
-          id
-          name
-          bar {
-            id
-            name
-            foo {
-              id
-              baz {
+    query = """
+        query {
+            listFoos {
+                id
                 name
-                bar { id }
-              }
+                bar {
+                    id
+                    name
+                    foo {
+                        id
+                        baz {
+                            name
+                            bar { id }
+                        }
+                    }
+                }
+                baz { name }
+                someBars { id }
             }
-          }
-          baz { name }
-          someBars { id }
         }
-    }
-    """,
-        executor=SyncExecutor(),
-        return_promise=False,
-    )
+    """
+    result = schema.execute(query)
 
     assert result.errors is None
     assert result.data is not None