Added support for graphql 0.5.0

Author: syrusakbary

.travis.yml

@@ -25,6 +25,8 @@ install:
   if [ "$TEST_TYPE" = build ]; then
     pip install --download-cache $HOME/.cache/pip/ pytest pytest-cov coveralls six pytest-django django-filter sqlalchemy_utils
     pip install --download-cache $HOME/.cache/pip psycopg2 > /dev/null 2>&1
+    pip install https://github.com/graphql-python/graphql-core/archive/master.zip
+    pip install https://github.com/graphql-python/graphql-relay-py/archive/master.zip
     pip install --download-cache $HOME/.cache/pip/ -e .[django]
     pip install --download-cache $HOME/.cache/pip/ -e .[sqlalchemy]
     pip install django==$DJANGO_VERSION

graphene/__init__.py

@@ -33,7 +33,8 @@
 )
 
 from graphene.utils import (
-    resolve_only_args
+    resolve_only_args,
+    with_context
 )
 
 __all__ = [

graphene/contrib/django/debug/plugin.py

@@ -72,8 +72,8 @@ def wrap_schema(self, schema_type):
 
     @contextmanager
     def context_execution(self, executor):
-        executor['root'] = WrappedRoot(root=executor['root'])
+        executor['root_value'] = WrappedRoot(root=executor.get('root_value'))
         executor['schema'] = self.wrap_schema(executor['schema'])
-        self.enable_instrumentation(executor['root'])
+        self.enable_instrumentation(executor['root_value'])
         yield executor
         self.disable_instrumentation()

graphene/contrib/django/debug/tests/test_query.py

@@ -149,6 +149,7 @@ def resolve_all_reporters(self, *args, **kwargs):
     schema = graphene.Schema(query=Query, plugins=[DjangoDebugPlugin()])
     result = schema.execute(query)
     assert not result.errors
+    print result.data['__debug']['sql']
     assert result.data['allReporters'] == expected['allReporters']
     assert 'COUNT' in result.data['__debug']['sql'][0]['rawSql']
     query = str(Reporter.objects.all()[:1].query)

graphene/contrib/django/filter/filterset.py

@@ -14,15 +14,15 @@ class GlobalIDFilter(Filter):
     field_class = GlobalIDFormField
 
     def filter(self, qs, value):
-        gid = from_global_id(value)
-        return super(GlobalIDFilter, self).filter(qs, gid.id)
+        _type, _id = from_global_id(value)
+        return super(GlobalIDFilter, self).filter(qs, _id)
 
 
 class GlobalIDMultipleChoiceFilter(MultipleChoiceFilter):
     field_class = GlobalIDMultipleChoiceField
 
     def filter(self, qs, value):
-        gids = [from_global_id(v).id for v in value]
+        gids = [from_global_id(v)[1] for v in value]
         return super(GlobalIDMultipleChoiceFilter, self).filter(qs, gids)
 
 

graphene/contrib/django/forms.py

@@ -16,13 +16,13 @@ def clean(self, value):
             return None
 
         try:
-            gid = from_global_id(value)
+            _type, _id = from_global_id(value)
         except (TypeError, ValueError, UnicodeDecodeError, binascii.Error):
             raise ValidationError(self.error_messages['invalid'])
 
         try:
-            IntegerField().clean(gid.id)
-            CharField().clean(gid.type)
+            IntegerField().clean(_id)
+            CharField().clean(_type)
         except ValidationError:
             raise ValidationError(self.error_messages['invalid'])
 

graphene/contrib/django/views.py

@@ -11,6 +11,3 @@ def __init__(self, schema, **kwargs):
             executor=schema.executor,
             **kwargs
         )
-
-    def execute(self, *args, **kwargs):
-        return self.graphene_schema.execute(*args, **kwargs)

graphene/core/classtypes/tests/test_uniontype.py

@@ -25,4 +25,4 @@ class Meta:
     assert isinstance(object_type, GraphQLUnionType)
     assert Thing._meta.type_name == 'Thing'
     assert object_type.description == 'Thing union description'
-    assert object_type.get_possible_types() == [schema.T(Human), schema.T(Pet)]
+    assert object_type.get_types() == [schema.T(Human), schema.T(Pet)]

graphene/core/schema.py

@@ -1,7 +1,6 @@
 import inspect
-from collections import OrderedDict
 
-from graphql.execution.executors.sync import SyncExecutor
+from graphql import graphql
 from graphql.type import GraphQLSchema as _GraphQLSchema
 from graphql.utils.introspection_query import introspection_query
 from graphql.utils.schema_printer import print_schema
@@ -116,10 +115,19 @@ def get_type(self, type_name):
     def types(self):
         return self._types_names
 
-    def execute(self, request='', root=None, args=None, **kwargs):
-        kwargs = dict(kwargs, request=request, root=root, args=args, schema=self.schema)
+    def execute(self, request_string='', root_value=None, variable_values=None,
+                context_value=None, operation_name=None, executor=None):
+        kwargs = dict(
+            schema=self.schema,
+            request_string=request_string,
+            root_value=root_value,
+            context_value=context_value,
+            variable_values=variable_values,
+            operation_name=operation_name,
+            executor=executor or self._executor
+        )
         with self.plugins.context_execution(**kwargs) as execute_kwargs:
-            return self.executor.execute(**execute_kwargs)
+            return graphql(**execute_kwargs)
 
     def introspect(self):
-        return self.execute(introspection_query).data
+        return graphql(self.schema, introspection_query).data

graphene/core/tests/test_mutations.py

@@ -58,6 +58,6 @@ def test_execute_mutations():
             'result': '5',
         }
     }
-    result = schema.execute(query, root=object())
+    result = schema.execute(query, root_value=object())
     assert not result.errors
     assert result.data == expected