Updated grapqhl-core version to 0.5.0

Author: syrusakbary

graphql_django_view/__init__.py

@@ -2,11 +2,11 @@
 from django.http import HttpResponse, HttpResponseNotAllowed
 from django.http.response import HttpResponseBadRequest
 from django.views.generic import View
-from graphql.core import Source, parse
-from graphql.core.error import GraphQLError, format_error as format_graphql_error
-from graphql.core.execution import ExecutionResult, get_default_executor
-from graphql.core.type.schema import GraphQLSchema
-from graphql.core.utils.get_operation_ast import get_operation_ast
+from graphql import Source, parse, execute, validate
+from graphql.error import GraphQLError, format_error as format_graphql_error
+from graphql.execution import ExecutionResult
+from graphql.type.schema import GraphQLSchema
+from graphql.utils.get_operation_ast import get_operation_ast
 import six
 
 
@@ -25,17 +25,13 @@ class GraphQLView(View):
 
     def __init__(self, **kwargs):
         super(GraphQLView, self).__init__(**kwargs)
-
-        if not self.executor:
-            self.executor = get_default_executor()
-
         assert isinstance(self.schema, GraphQLSchema), 'A Schema is required to be provided to GraphQLView.'
 
     # noinspection PyUnusedLocal
     def get_root_value(self, request):
         return self.root_value
 
-    def get_request_context(self, request):
+    def get_context(self, request):
         return request
 
     def dispatch(self, request, *args, **kwargs):
@@ -97,7 +93,7 @@ def parse_body(self, request):
         return {}
 
     def execute(self, *args, **kwargs):
-        return self.executor.execute(self.schema, *args, **kwargs)
+        return execute(self.schema, *args, **kwargs)
 
     def execute_graphql_request(self, request):
         query, variables, operation_name = self.get_graphql_params(request, self.parse_body(request))
@@ -109,6 +105,12 @@ def execute_graphql_request(self, request):
 
         try:
             document_ast = parse(source)
+            validation_errors = validate(self.schema, document_ast)
+            if validation_errors:
+                return ExecutionResult(
+                    errors=validation_errors,
+                    invalid=True,
+                )
         except Exception as e:
             return ExecutionResult(errors=[e], invalid=True)
 
@@ -122,10 +124,10 @@ def execute_graphql_request(self, request):
         try:
             return self.execute(
                 document_ast,
-                self.get_root_value(request),
-                variables,
+                root_value=self.get_root_value(request),
+                variable_values=variables,
                 operation_name=operation_name,
-                request_context=self.get_request_context(request)
+                context_value=self.get_context(request)
             )
         except Exception as e:
             return ExecutionResult(errors=[e], invalid=True)

pytest.ini

@@ -1,3 +1,7 @@
 [flake8]
 exclude = tests,scripts,setup.py,docs
 max-line-length = 160
+
+[pytest]
+DJANGO_SETTINGS_MODULE=tests.settings
+norecursedirs = venv .tox .cache

setup.cfg

@@ -1,10 +1,10 @@
 from setuptools import setup, find_packages
 
-required_packages = ['graphql-core>=0.4.15', 'django>=1.8.0']
+required_packages = ['graphql-core>=0.5.0', 'django>=1.8.0']
 
 setup(
     name='graphql-django-view',
-    version='1.1.1',
+    version='1.2.0',
     description='A django view that will execute a GraphQL Schema',
     url='https://github.com/graphql-python/graphql-django-view',
     download_url='https://github.com/graphql-python/graphql-django-view/releases',

setup.py

@@ -1,9 +1,9 @@
-from graphql.core.type.definition import GraphQLArgument, GraphQLField, GraphQLNonNull, GraphQLObjectType
-from graphql.core.type.scalars import GraphQLString
-from graphql.core.type.schema import GraphQLSchema
+from graphql.type.definition import GraphQLArgument, GraphQLField, GraphQLNonNull, GraphQLObjectType
+from graphql.type.scalars import GraphQLString
+from graphql.type.schema import GraphQLSchema
 
 
-def resolve_raises(o, a, i):
+def resolve_raises(*_):
     raise Exception("Throws!")
 
 
@@ -12,13 +12,13 @@ def resolve_raises(o, a, i):
     fields={
         'thrower': GraphQLField(GraphQLNonNull(GraphQLString), resolver=resolve_raises),
         'request': GraphQLField(GraphQLNonNull(GraphQLString),
-                                resolver=lambda obj, args, info: info.request_context.GET.get('q')),
+                                resolver=lambda obj, args, request, info: request.GET.get('q')),
         'test': GraphQLField(
             type=GraphQLString,
             args={
                 'who': GraphQLArgument(GraphQLString)
             },
-            resolver=lambda obj, args, info: 'Hello %s' % (args.get('who') or 'World')
+            resolver=lambda obj, args, request, info: 'Hello %s' % (args.get('who') or 'World')
         )
     }
 )

tests/schema.py

@@ -405,7 +405,7 @@ def test_handles_unsupported_http_methods(client):
     }
 
 
-def test_passes_request_into_request_context(client):
+def test_passes_request_into_context_request(client):
     response = client.get(url_string(query='{request}', q='testing'))
 
     assert response.status_code == 200

tests/test_http.py

@@ -8,7 +8,7 @@ setenv =
 deps =
     pytest>=2.7.2
     pytest-django>=2.9.1
-    graphql-core>=0.4.7b2
+    https://github.com/graphql-python/graphql-core/archive/master.zip
     django>=1.8.0
     pytest-cov
 commands =
@@ -18,15 +18,13 @@ commands =
 basepython=python3.5
 deps = flake8
 commands =
-    pip install -e .
     flake8 graphql_django_view
 
 [testenv:import-order]
 basepython=python3.5
 deps =
-    import-order
-    graphql-core>=0.4.7b2
+    isort
+    https://github.com/graphql-python/graphql-core/archive/master.zip
     django>=1.8.0
 commands =
-    pip install -e .
-    import-order graphql_django_view
+    isort --check-only graphql_django_view/ -rc