Skip to content

Commit a6efe00

Browse files
committed
Improve experimental imports and install cyordereddict for travis tests
1 parent 2ab068c commit a6efe00

File tree

4 files changed

+7
-16
lines changed

4 files changed

+7
-16
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ before_install:
2121
source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
2222
fi
2323
install:
24-
- pip install pytest-cov pytest-mock coveralls flake8 isort==3.9.6 gevent==1.1b5 six>=1.10.0 promise>=0.4.2 pytest-benchmark
24+
- pip install pytest-cov pytest-mock coveralls flake8 isort==3.9.6 gevent==1.1b5 six>=1.10.0 promise>=0.4.2 pytest-benchmark cyordereddict
2525
- pip install pytest==2.9.2
2626
- pip install -e .
2727
script:

graphql/execution/experimental/executor.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
import logging
22

3-
from promise import Promise, promise_for_dict, promisify
4-
5-
from ...error import GraphQLError, GraphQLLocatedError
6-
from ...pyutils.default_ordered_dict import DefaultOrderedDict
7-
from ...pyutils.ordereddict import OrderedDict
8-
from ...type import (GraphQLEnumType, GraphQLInterfaceType, GraphQLList,
9-
GraphQLNonNull, GraphQLObjectType, GraphQLScalarType,
10-
GraphQLSchema, GraphQLUnionType)
11-
from ..base import (ExecutionContext, ExecutionResult, ResolveInfo, Undefined,
12-
collect_fields, default_resolve_fn, get_field_def,
13-
get_operation_root_type)
3+
from promise import Promise
4+
5+
from ...type import GraphQLSchema
6+
from ..base import ExecutionContext, ExecutionResult, get_operation_root_type
147
from ..executors.sync import SyncExecutor
158
from ..middleware import MiddlewareManager
169
from .fragment import Fragment
17-
from .resolver import type_resolver
1810

1911
logger = logging.getLogger(__name__)
2012

graphql/execution/experimental/fragment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
GraphQLObjectType, GraphQLUnionType)
1010
from ..base import ResolveInfo, Undefined, collect_fields, get_field_def
1111
from ..executor import is_promise
12-
from ..values import get_argument_values, get_variable_values
12+
from ..values import get_argument_values
1313

1414

1515
def get_base_type(type):

graphql/execution/experimental/resolver.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
from ...error import GraphQLError, GraphQLLocatedError
88
from ...type import (GraphQLEnumType, GraphQLInterfaceType, GraphQLList,
99
GraphQLNonNull, GraphQLObjectType, GraphQLScalarType,
10-
GraphQLSchema, GraphQLUnionType)
10+
GraphQLUnionType)
1111
from ..base import default_resolve_fn
12-
from .fragment import Fragment
1312

1413

1514
def is_promise(value):

0 commit comments

Comments
 (0)