From 1d44f5f91837fa7bfe9c9bd90f1fb85e1440b2d3 Mon Sep 17 00:00:00 2001 From: Alec Aivazis Date: Fri, 6 May 2016 08:55:17 -0700 Subject: [PATCH 1/5] updated to reflect changes to graphql-core --- graphene/contrib/django/tests/test_types.py | 2 +- graphene/contrib/sqlalchemy/tests/test_types.py | 2 +- graphene/core/classtypes/enum.py | 2 +- graphene/core/classtypes/inputobjecttype.py | 2 +- graphene/core/classtypes/interface.py | 2 +- graphene/core/classtypes/objecttype.py | 2 +- graphene/core/classtypes/scalar.py | 2 +- graphene/core/classtypes/tests/test_enum.py | 2 +- graphene/core/classtypes/tests/test_inputobjecttype.py | 2 +- graphene/core/classtypes/tests/test_interface.py | 2 +- graphene/core/classtypes/tests/test_mutation.py | 2 +- graphene/core/classtypes/tests/test_objecttype.py | 2 +- graphene/core/classtypes/tests/test_scalar.py | 4 ++-- graphene/core/classtypes/tests/test_uniontype.py | 2 +- graphene/core/classtypes/uniontype.py | 2 +- graphene/core/schema.py | 10 ++++------ graphene/core/tests/test_old_fields.py | 2 +- graphene/core/tests/test_query.py | 4 ++-- graphene/core/tests/test_schema.py | 2 +- graphene/core/types/argument.py | 2 +- graphene/core/types/custom_scalars.py | 2 +- graphene/core/types/definitions.py | 2 +- graphene/core/types/field.py | 2 +- graphene/core/types/scalars.py | 2 +- graphene/core/types/tests/test_argument.py | 2 +- graphene/core/types/tests/test_custom_scalars.py | 2 +- graphene/core/types/tests/test_definitions.py | 2 +- graphene/core/types/tests/test_field.py | 2 +- graphene/core/types/tests/test_scalars.py | 2 +- graphene/relay/tests/test_mutations.py | 2 +- graphene/relay/tests/test_query.py | 2 +- graphene/relay/tests/test_types.py | 2 +- graphene/utils/misc.py | 2 +- graphene/utils/tests/test_misc.py | 2 +- 34 files changed, 39 insertions(+), 41 deletions(-) diff --git a/graphene/contrib/django/tests/test_types.py b/graphene/contrib/django/tests/test_types.py index 42028a5e..bb996193 100644 --- a/graphene/contrib/django/tests/test_types.py +++ b/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 diff --git a/graphene/contrib/sqlalchemy/tests/test_types.py b/graphene/contrib/sqlalchemy/tests/test_types.py index feffbc74..378411ae 100644 --- a/graphene/contrib/sqlalchemy/tests/test_types.py +++ b/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 diff --git a/graphene/core/classtypes/enum.py b/graphene/core/classtypes/enum.py index d12201d4..bb9f661c 100644 --- a/graphene/core/classtypes/enum.py +++ b/graphene/core/classtypes/enum.py @@ -1,5 +1,5 @@ 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 diff --git a/graphene/core/classtypes/inputobjecttype.py b/graphene/core/classtypes/inputobjecttype.py index 43f4c897..9bff031e 100644 --- a/graphene/core/classtypes/inputobjecttype.py +++ b/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 diff --git a/graphene/core/classtypes/interface.py b/graphene/core/classtypes/interface.py index c3aa3110..e7dd1870 100644 --- a/graphene/core/classtypes/interface.py +++ b/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 diff --git a/graphene/core/classtypes/objecttype.py b/graphene/core/classtypes/objecttype.py index e341ba97..ae7c94fb 100644 --- a/graphene/core/classtypes/objecttype.py +++ b/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 diff --git a/graphene/core/classtypes/scalar.py b/graphene/core/classtypes/scalar.py index 8d34eba0..79dbd3df 100644 --- a/graphene/core/classtypes/scalar.py +++ b/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 diff --git a/graphene/core/classtypes/tests/test_enum.py b/graphene/core/classtypes/tests/test_enum.py index 1425d259..e7ea9f83 100644 --- a/graphene/core/classtypes/tests/test_enum.py +++ b/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 diff --git a/graphene/core/classtypes/tests/test_inputobjecttype.py b/graphene/core/classtypes/tests/test_inputobjecttype.py index 2268d46f..98c6ba80 100644 --- a/graphene/core/classtypes/tests/test_inputobjecttype.py +++ b/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 diff --git a/graphene/core/classtypes/tests/test_interface.py b/graphene/core/classtypes/tests/test_interface.py index 7994659a..d47df1e0 100644 --- a/graphene/core/classtypes/tests/test_interface.py +++ b/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 diff --git a/graphene/core/classtypes/tests/test_mutation.py b/graphene/core/classtypes/tests/test_mutation.py index 85dd2368..2d3cfab4 100644 --- a/graphene/core/classtypes/tests/test_mutation.py +++ b/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 diff --git a/graphene/core/classtypes/tests/test_objecttype.py b/graphene/core/classtypes/tests/test_objecttype.py index 5e71ab73..c554dbbf 100644 --- a/graphene/core/classtypes/tests/test_objecttype.py +++ b/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 diff --git a/graphene/core/classtypes/tests/test_scalar.py b/graphene/core/classtypes/tests/test_scalar.py index a6e37881..8c2e17c8 100644 --- a/graphene/core/classtypes/tests/test_scalar.py +++ b/graphene/core/classtypes/tests/test_scalar.py @@ -1,4 +1,4 @@ -from graphql.core.type import GraphQLScalarType +from graphql.type import GraphQLScalarType from ...schema import Schema from ..scalar import Scalar @@ -6,7 +6,7 @@ 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''' diff --git a/graphene/core/classtypes/tests/test_uniontype.py b/graphene/core/classtypes/tests/test_uniontype.py index 308b2ce0..0808ee53 100644 --- a/graphene/core/classtypes/tests/test_uniontype.py +++ b/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 diff --git a/graphene/core/classtypes/uniontype.py b/graphene/core/classtypes/uniontype.py index 24c3d441..2d545b59 100644 --- a/graphene/core/classtypes/uniontype.py +++ b/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 diff --git a/graphene/core/schema.py b/graphene/core/schema.py index 81ded66c..c3d9752c 100644 --- a/graphene/core/schema.py +++ b/graphene/core/schema.py @@ -1,12 +1,10 @@ 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.execution.executors.sync import SyncExecutor +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 diff --git a/graphene/core/tests/test_old_fields.py b/graphene/core/tests/test_old_fields.py index 3f24aedf..6614e929 100644 --- a/graphene/core/tests/test_old_fields.py +++ b/graphene/core/tests/test_old_fields.py @@ -1,4 +1,4 @@ -from graphql.core.type import (GraphQLBoolean, GraphQLField, GraphQLFloat, +from graphql.type import (GraphQLBoolean, GraphQLField, GraphQLFloat, GraphQLID, GraphQLInt, GraphQLNonNull, GraphQLString) from py.test import raises diff --git a/graphene/core/tests/test_query.py b/graphene/core/tests/test_query.py index 5fbe2faa..23c5b180 100644 --- a/graphene/core/tests/test_query.py +++ b/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 diff --git a/graphene/core/tests/test_schema.py b/graphene/core/tests/test_schema.py index 189111a1..7766c3ed 100644 --- a/graphene/core/tests/test_schema.py +++ b/graphene/core/tests/test_schema.py @@ -1,4 +1,4 @@ -from graphql.core import graphql +from graphql import graphql from py.test import raises from graphene import Interface, List, ObjectType, Schema, String diff --git a/graphene/core/types/argument.py b/graphene/core/types/argument.py index b10aff21..e75c0471 100644 --- a/graphene/core/types/argument.py +++ b/graphene/core/types/argument.py @@ -1,7 +1,7 @@ from functools import wraps from itertools import chain -from graphql.core.type import GraphQLArgument +from graphql.type import GraphQLArgument from ...utils import ProxySnakeDict from .base import ArgumentType, GroupNamedType, NamedType, OrderedType diff --git a/graphene/core/types/custom_scalars.py b/graphene/core/types/custom_scalars.py index 2dad3c64..55580a5d 100644 --- a/graphene/core/types/custom_scalars.py +++ b/graphene/core/types/custom_scalars.py @@ -1,7 +1,7 @@ import json import iso8601 -from graphql.core.language import ast +from graphql.language import ast from ...core.classtypes.scalar import Scalar diff --git a/graphene/core/types/definitions.py b/graphene/core/types/definitions.py index 14cbc29d..396ed0dd 100644 --- a/graphene/core/types/definitions.py +++ b/graphene/core/types/definitions.py @@ -1,5 +1,5 @@ import six -from graphql.core.type import GraphQLList, GraphQLNonNull +from graphql.type import GraphQLList, GraphQLNonNull from .base import LazyType, MountedType, MountType diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py index f825f861..9b24e7e3 100644 --- a/graphene/core/types/field.py +++ b/graphene/core/types/field.py @@ -2,7 +2,7 @@ from collections import OrderedDict from functools import wraps import six -from graphql.core.type import GraphQLField, GraphQLInputObjectField +from graphql.type import GraphQLField, GraphQLInputObjectField from ...utils import maybe_func from ..classtypes.base import FieldsClassType diff --git a/graphene/core/types/scalars.py b/graphene/core/types/scalars.py index 9d7f5aeb..12ea3d14 100644 --- a/graphene/core/types/scalars.py +++ b/graphene/core/types/scalars.py @@ -1,4 +1,4 @@ -from graphql.core.type import (GraphQLBoolean, GraphQLFloat, GraphQLID, +from graphql.type import (GraphQLBoolean, GraphQLFloat, GraphQLID, GraphQLInt, GraphQLString) from .base import MountedType diff --git a/graphene/core/types/tests/test_argument.py b/graphene/core/types/tests/test_argument.py index 0263496c..d16055d5 100644 --- a/graphene/core/types/tests/test_argument.py +++ b/graphene/core/types/tests/test_argument.py @@ -1,4 +1,4 @@ -from graphql.core.type import GraphQLArgument +from graphql.type import GraphQLArgument from pytest import raises from graphene.core.schema import Schema diff --git a/graphene/core/types/tests/test_custom_scalars.py b/graphene/core/types/tests/test_custom_scalars.py index 49c9a9c7..be0f77a9 100644 --- a/graphene/core/types/tests/test_custom_scalars.py +++ b/graphene/core/types/tests/test_custom_scalars.py @@ -1,6 +1,6 @@ import iso8601 -from graphql.core.language.ast import StringValue +from graphql.language.ast import StringValue from ..custom_scalars import DateTime diff --git a/graphene/core/types/tests/test_definitions.py b/graphene/core/types/tests/test_definitions.py index d56843d8..a87e89ee 100644 --- a/graphene/core/types/tests/test_definitions.py +++ b/graphene/core/types/tests/test_definitions.py @@ -1,4 +1,4 @@ -from graphql.core.type import GraphQLList, GraphQLNonNull, GraphQLString +from graphql.type import GraphQLList, GraphQLNonNull, GraphQLString from graphene.core.schema import Schema diff --git a/graphene/core/types/tests/test_field.py b/graphene/core/types/tests/test_field.py index 049ee92c..6cdeeec9 100644 --- a/graphene/core/types/tests/test_field.py +++ b/graphene/core/types/tests/test_field.py @@ -1,4 +1,4 @@ -from graphql.core.type import (GraphQLField, GraphQLInputObjectField, +from graphql.type import (GraphQLField, GraphQLInputObjectField, GraphQLString) from graphene.core.schema import Schema diff --git a/graphene/core/types/tests/test_scalars.py b/graphene/core/types/tests/test_scalars.py index 39fd6063..acd657d8 100644 --- a/graphene/core/types/tests/test_scalars.py +++ b/graphene/core/types/tests/test_scalars.py @@ -1,4 +1,4 @@ -from graphql.core.type import (GraphQLBoolean, GraphQLFloat, GraphQLID, +from graphql.type import (GraphQLBoolean, GraphQLFloat, GraphQLID, GraphQLInt, GraphQLString) from graphene.core.schema import Schema diff --git a/graphene/relay/tests/test_mutations.py b/graphene/relay/tests/test_mutations.py index 82329519..8176ba6c 100644 --- a/graphene/relay/tests/test_mutations.py +++ b/graphene/relay/tests/test_mutations.py @@ -1,4 +1,4 @@ -from graphql.core.type import GraphQLInputObjectField +from graphql.type import GraphQLInputObjectField import graphene from graphene import relay diff --git a/graphene/relay/tests/test_query.py b/graphene/relay/tests/test_query.py index b49ac791..4ec98eeb 100644 --- a/graphene/relay/tests/test_query.py +++ b/graphene/relay/tests/test_query.py @@ -1,5 +1,5 @@ import pytest -from graphql.core.type import GraphQLID, GraphQLNonNull +from graphql.type import GraphQLID, GraphQLNonNull import graphene from graphene import relay diff --git a/graphene/relay/tests/test_types.py b/graphene/relay/tests/test_types.py index d9f64c00..ff510cab 100644 --- a/graphene/relay/tests/test_types.py +++ b/graphene/relay/tests/test_types.py @@ -1,4 +1,4 @@ -from graphql.core.type import GraphQLList +from graphql.type import GraphQLList from pytest import raises import graphene diff --git a/graphene/utils/misc.py b/graphene/utils/misc.py index e7d1cc07..9fc9d493 100644 --- a/graphene/utils/misc.py +++ b/graphene/utils/misc.py @@ -1,6 +1,6 @@ from collections import OrderedDict -from graphql.core.type import GraphQLEnumType, GraphQLEnumValue +from graphql.type import GraphQLEnumType, GraphQLEnumValue def enum_to_graphql_enum(enumeration): diff --git a/graphene/utils/tests/test_misc.py b/graphene/utils/tests/test_misc.py index 468c621c..7f5f596d 100644 --- a/graphene/utils/tests/test_misc.py +++ b/graphene/utils/tests/test_misc.py @@ -1,6 +1,6 @@ import collections -from graphql.core.type import GraphQLEnumType +from graphql.type import GraphQLEnumType from ..misc import enum_to_graphql_enum From 11a963d70a06d808bd33e4ab942f5a02836425e9 Mon Sep 17 00:00:00 2001 From: Alec Aivazis Date: Fri, 6 May 2016 08:58:50 -0700 Subject: [PATCH 2/5] bumped version number --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d0476511..54d69874 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ class PyTest(TestCommand): setup( name='graphene', - version='0.8.1', + version='0.8.2', description='GraphQL Framework for Python', long_description=open('README.rst').read(), From cff7666abeedaf1a2c31ab6108288457bb121f5b Mon Sep 17 00:00:00 2001 From: Alec Aivazis Date: Fri, 6 May 2016 10:12:52 -0700 Subject: [PATCH 3/5] dumped graphql-core dependency --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 54d69874..52b6f382 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,7 @@ setup( install_requires=[ 'six>=1.10.0', - 'graphql-core>=0.4.9', + 'graphql-core>=0.5.0', 'graphql-relay==0.3.3', 'iso8601', ], From 84834d1218d22120aad6fdf32cd73771d4f33e96 Mon Sep 17 00:00:00 2001 From: Alec Aivazis Date: Fri, 6 May 2016 10:16:42 -0700 Subject: [PATCH 4/5] fixed reference to sync executor --- graphene/core/schema.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/graphene/core/schema.py b/graphene/core/schema.py index c3d9752c..e8d6b15c 100644 --- a/graphene/core/schema.py +++ b/graphene/core/schema.py @@ -67,8 +67,7 @@ class Schema(object): @property def executor(self): if not self._executor: - self._executor = Executor( - [SynchronousExecutionMiddleware()], map_type=OrderedDict) + self._executor = SyncExecutor() return self._executor @executor.setter From 76ea7d763766ec4b4c61956d8cb82a9680109ce1 Mon Sep 17 00:00:00 2001 From: Alec Aivazis Date: Fri, 6 May 2016 23:25:47 -0700 Subject: [PATCH 5/5] schema now use default executor --- graphene/core/schema.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/graphene/core/schema.py b/graphene/core/schema.py index e8d6b15c..d2ce801b 100644 --- a/graphene/core/schema.py +++ b/graphene/core/schema.py @@ -66,8 +66,6 @@ class Schema(object): @property def executor(self): - if not self._executor: - self._executor = SyncExecutor() return self._executor @executor.setter