Merge pull request #159 from graphql-python/core-update

Core update GraphQL-core 0.5.0

Author: syrusakbary

.travis.yml

@@ -25,6 +25,7 @@ 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 --download-cache $HOME/.cache/pip/ -e .
     pip install --download-cache $HOME/.cache/pip/ -e .[django]
     pip install --download-cache $HOME/.cache/pip/ -e .[sqlalchemy]
     pip install django==$DJANGO_VERSION

examples/cookbook_django/cookbook/ingredients/tests.py

@@ -1,3 +1,2 @@
-from django.test import TestCase
 
 # Create your tests here.

examples/cookbook_django/cookbook/ingredients/views.py

@@ -1,3 +1,2 @@
-from django.shortcuts import render
 
 # Create your views here.

examples/cookbook_django/cookbook/recipes/migrations/0001_initial.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.9 on 2015-12-04 18:20
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

examples/cookbook_django/cookbook/recipes/tests.py

@@ -1,3 +1,2 @@
-from django.test import TestCase
 
 # Create your tests here.

examples/cookbook_django/cookbook/recipes/views.py

@@ -1,3 +1,2 @@
-from django.shortcuts import render
 
 # Create your views here.

graphene/__init__.py

@@ -33,7 +33,8 @@
 )
 
 from graphene.utils import (
-    resolve_only_args
+    resolve_only_args,
+    with_context
 )
 
 __all__ = [
@@ -65,4 +66,5 @@
     'ListField',
     'NonNullField',
     'FloatField',
-    'resolve_only_args']
+    'resolve_only_args',
+    'with_context']

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/filter/filterset.py

@@ -4,25 +4,25 @@
 from django.utils.text import capfirst
 from django_filters import Filter, MultipleChoiceFilter
 from django_filters.filterset import FilterSet, FilterSetMetaclass
-from graphql_relay.node.node import from_global_id
 
 from graphene.contrib.django.forms import (GlobalIDFormField,
                                            GlobalIDMultipleChoiceField)
+from graphql_relay.node.node import from_global_id
 
 
 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

@@ -3,6 +3,7 @@
 from django.core.exceptions import ValidationError
 from django.forms import CharField, Field, IntegerField, MultipleChoiceField
 from django.utils.translation import ugettext_lazy as _
+
 from graphql_relay import from_global_id
 
 
@@ -16,13 +17,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/tests/test_types.py

@@ -1,4 +1,4 @@
-from graphql.core.type import GraphQLObjectType
+from graphql.type import GraphQLObjectType
 from mock import patch
 
 from graphene import Schema

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/contrib/sqlalchemy/tests/test_query.py

@@ -7,7 +7,7 @@
 from graphene.contrib.sqlalchemy import (SQLAlchemyConnectionField,
                                          SQLAlchemyNode, SQLAlchemyObjectType)
 
-from .models import Article, Base, Reporter, Editor
+from .models import Article, Base, Editor, Reporter
 
 db = create_engine('sqlite:///test_sqlalchemy.sqlite3')
 

graphene/contrib/sqlalchemy/tests/test_types.py

@@ -1,4 +1,4 @@
-from graphql.core.type import GraphQLObjectType
+from graphql.type import GraphQLObjectType
 from pytest import raises
 
 from graphene import Schema

graphene/core/classtypes/enum.py

@@ -1,9 +1,9 @@
 import six
-from graphql.core.type import GraphQLEnumType, GraphQLEnumValue
+from graphql.type import GraphQLEnumType, GraphQLEnumValue
 
-from .base import ClassTypeMeta, ClassType
-from ..types.base import MountedType
 from ...utils.enum import Enum as PyEnum
+from ..types.base import MountedType
+from .base import ClassType, ClassTypeMeta
 
 
 class EnumMeta(ClassTypeMeta):

graphene/core/classtypes/inputobjecttype.py

@@ -1,6 +1,6 @@
 from functools import partial
 
-from graphql.core.type import GraphQLInputObjectType
+from graphql.type import GraphQLInputObjectType
 
 from .base import FieldsClassType
 

graphene/core/classtypes/interface.py

@@ -1,7 +1,7 @@
 from functools import partial
 
 import six
-from graphql.core.type import GraphQLInterfaceType
+from graphql.type import GraphQLInterfaceType
 
 from .base import FieldsClassTypeMeta
 from .objecttype import ObjectType, ObjectTypeMeta

graphene/core/classtypes/objecttype.py

@@ -1,7 +1,7 @@
 from functools import partial
 
 import six
-from graphql.core.type import GraphQLObjectType
+from graphql.type import GraphQLObjectType
 
 from graphene import signals
 

graphene/core/classtypes/scalar.py

@@ -1,4 +1,4 @@
-from graphql.core.type import GraphQLScalarType
+from graphql.type import GraphQLScalarType
 
 from ..types.base import MountedType
 from .base import ClassType

graphene/core/classtypes/tests/test_enum.py

@@ -1,4 +1,4 @@
-from graphql.core.type import GraphQLEnumType
+from graphql.type import GraphQLEnumType
 
 from graphene.core.schema import Schema
 

graphene/core/classtypes/tests/test_inputobjecttype.py

@@ -1,5 +1,5 @@
 
-from graphql.core.type import GraphQLInputObjectType
+from graphql.type import GraphQLInputObjectType
 
 from graphene.core.schema import Schema
 from graphene.core.types import String

graphene/core/classtypes/tests/test_interface.py

@@ -1,4 +1,4 @@
-from graphql.core.type import GraphQLInterfaceType, GraphQLObjectType
+from graphql.type import GraphQLInterfaceType, GraphQLObjectType
 from py.test import raises
 
 from graphene.core.schema import Schema

graphene/core/classtypes/tests/test_mutation.py

@@ -1,5 +1,5 @@
 
-from graphql.core.type import GraphQLObjectType
+from graphql.type import GraphQLObjectType
 
 from graphene.core.schema import Schema
 from graphene.core.types import String

graphene/core/classtypes/tests/test_objecttype.py

@@ -1,4 +1,4 @@
-from graphql.core.type import GraphQLObjectType
+from graphql.type import GraphQLObjectType
 from py.test import raises
 
 from graphene.core.schema import Schema

graphene/core/classtypes/tests/test_scalar.py

@@ -1,12 +1,12 @@
-from graphql.core.type import GraphQLScalarType
+from graphql.type import GraphQLScalarType
 
 from ...schema import Schema
 from ..scalar import Scalar
 
 
 def test_custom_scalar():
     import datetime
-    from graphql.core.language import ast
+    from graphql.language import ast
 
     class DateTimeScalar(Scalar):
         '''DateTimeScalar Documentation'''

graphene/core/classtypes/tests/test_uniontype.py

@@ -1,4 +1,4 @@
-from graphql.core.type import GraphQLUnionType
+from graphql.type import GraphQLUnionType
 
 from graphene.core.schema import Schema
 from graphene.core.types import String
@@ -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/classtypes/uniontype.py

@@ -1,7 +1,7 @@
 from functools import partial
 
 import six
-from graphql.core.type import GraphQLUnionType
+from graphql.type import GraphQLUnionType
 
 from .base import FieldsClassType, FieldsClassTypeMeta, FieldsOptions
 

graphene/core/schema.py

@@ -1,12 +1,9 @@
 import inspect
-from collections import OrderedDict
 
-from graphql.core.execution.executor import Executor
-from graphql.core.execution.middlewares.sync import \
-    SynchronousExecutionMiddleware
-from graphql.core.type import GraphQLSchema as _GraphQLSchema
-from graphql.core.utils.introspection_query import introspection_query
-from graphql.core.utils.schema_printer import print_schema
+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
 
 from graphene import signals
 
@@ -68,9 +65,6 @@ def T(self, _type):
 
     @property
     def executor(self):
-        if not self._executor:
-            self._executor = Executor(
-                [SynchronousExecutionMiddleware()], map_type=OrderedDict)
         return self._executor
 
     @executor.setter
@@ -121,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

graphene/core/tests/test_old_fields.py

@@ -1,6 +1,5 @@
-from graphql.core.type import (GraphQLBoolean, GraphQLField, GraphQLFloat,
-                               GraphQLID, GraphQLInt, GraphQLNonNull,
-                               GraphQLString)
+from graphql.type import (GraphQLBoolean, GraphQLField, GraphQLFloat,
+                          GraphQLID, GraphQLInt, GraphQLNonNull, GraphQLString)
 from py.test import raises
 
 from graphene.core.fields import (BooleanField, Field, FloatField, IDField,
@@ -94,7 +93,7 @@ def test_field_resolve():
     f = StringField(required=True, resolve=lambda *args: 'RESOLVED').as_field()
     f.contribute_to_class(MyOt, 'field_name')
     field_type = schema.T(f)
-    assert 'RESOLVED' == field_type.resolver(MyOt, None, None)
+    assert 'RESOLVED' == field_type.resolver(MyOt, None, None, None)
 
 
 def test_field_resolve_type_custom():

graphene/core/tests/test_query.py

@@ -1,7 +1,7 @@
 
 
-from graphql.core import graphql
-from graphql.core.type import GraphQLSchema
+from graphql import graphql
+from graphql.type import GraphQLSchema
 
 from graphene.core.fields import Field
 from graphene.core.schema import Schema
@@ -40,7 +40,7 @@ def resolve_pet(self, *args):
 
 def test_type():
     assert Human._meta.fields_map['name'].resolver(
-        Human(object()), {}, None) == 'Peter'
+        Human(object()), {}, None, None) == 'Peter'
 
 
 def test_query():
@@ -59,6 +59,6 @@ def test_query():
             'type': 'Dog'
         }
     }
-    result = graphql(schema, query, root=Human(object()))
+    result = graphql(schema, query, root_value=Human(object()))
     assert not result.errors
     assert result.data == expected