Bump version, update and fix test setup

Author: Cito

gql/__init__.py

@@ -1,4 +1,4 @@
-from .gql import gql
 from .client import Client
+from .gql import gql
 
 __all__ = ["gql", "Client"]

setup.cfg

@@ -5,7 +5,15 @@ universal=1
 max-line-length = 120
 
 [isort]
-known_first_party=gql
+known_standard_library = ssl
+known_first_party = gql
+multi_line_output = 3
+include_trailing_comma = True
+line_length = 88
+not_skip = __init__.py
+
+[mypy]
+ignore_missing_imports = true
 
 [tool:pytest]
 norecursedirs = venv .venv .tox .git .cache .mypy_cache .pytest_cache

setup.py

@@ -29,16 +29,16 @@
 )
 
 dev_requires = [
-    "flake8==3.7.9",
-    "isort<4.0.0",
+    "flake8==3.8.1",
+    "isort==4.3.21",
     "black==19.10b0",
     "mypy==0.770",
-    "check-manifest>=0.40,<1",
+    "check-manifest>=0.42,<1",
 ] + tests_require
 
 setup(
     name="gql",
-    version="0.5.0",
+    version="2.0.0",
     description="GraphQL client for Python",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",
@@ -63,7 +63,7 @@
     packages=find_packages(include=["gql*"]),
     install_requires=install_requires,
     tests_require=tests_require,
-    extras_require={"test": tests_require, "dev": dev_requires,},
+    extras_require={"test": tests_require, "dev": dev_requires},
     include_package_data=True,
     zip_safe=False,
     platforms="any",

tests_py36/schema.py

@@ -1,28 +1,34 @@
-from graphql import GraphQLField, GraphQLArgument, GraphQLObjectType, GraphQLSchema
+from graphql import GraphQLArgument, GraphQLField, GraphQLObjectType, GraphQLSchema
 
-from tests.starwars.schema import reviewType, episodeEnum, queryType, mutationType, humanType, droidType, \
-    reviewInputType
+from tests.starwars.schema import (
+    droidType,
+    episodeEnum,
+    humanType,
+    mutationType,
+    queryType,
+    reviewInputType,
+    reviewType,
+)
 from tests_py36.fixtures import reviewAdded
 
 subscriptionType = GraphQLObjectType(
-    'Subscription',
+    "Subscription",
     fields=lambda: {
-        'reviewAdded': GraphQLField(
+        "reviewAdded": GraphQLField(
             reviewType,
             args={
-                'episode': GraphQLArgument(
-                    description='Episode to review',
-                    type_=episodeEnum,
+                "episode": GraphQLArgument(
+                    description="Episode to review", type_=episodeEnum,  # type: ignore
                 )
             },
-            resolver=lambda root, info, **args: reviewAdded(args.get('episode')),
+            resolver=lambda root, info, **args: reviewAdded(args.get("episode")),
         )
-    }
+    },
 )
 
 StarWarsSchema = GraphQLSchema(
     query=queryType,
     mutation=mutationType,
     subscription=subscriptionType,
-    types=[humanType, droidType, reviewType, reviewInputType]
+    types=[humanType, droidType, reviewType, reviewInputType],
 )

tests_py36/test_query.py

@@ -20,15 +20,15 @@ def __aiter__(self):
 
     async def __anext__(self):
         type_, val = await self.queue.get()
-        if type_ in ('E', 'C'):
+        if type_ in ("E", "C"):
             raise StopAsyncIteration()
         return val
 
     async def __aenter__(self):
         self.disposable = self.observable.subscribe(
-            on_next=lambda val: self.queue.put_nowait(('N', val)),
-            on_error=lambda exc: self.queue.put_nowait(('E', exc)),
-            on_completed=lambda: self.queue.put_nowait(('C', None)),
+            on_next=lambda val: self.queue.put_nowait(("N", val)),
+            on_error=lambda exc: self.queue.put_nowait(("E", exc)),
+            on_completed=lambda: self.queue.put_nowait(("C", None)),
         )
         return self
 
@@ -38,27 +38,27 @@ async def __aexit__(self, exc_type, exc_value, traceback):
 
 @pytest.mark.asyncio
 async def test_subscription_support():
-    subs = gql('''
+    subs = gql(
+        """
         subscription ListenEpisodeReviews($ep: Episode!) {
           reviewAdded(episode: $ep) {
             stars,
             commentary,
             episode
           }
         }
-    ''')
-    params = {
-        'ep': 'JEDI'
-    }
+    """
+    )
+    params = {"ep": "JEDI"}
     expected_one = {
-        'stars': 3,
-        'commentary': 'Was expecting more stuff',
-        'episode': 'JEDI'
+        "stars": 3,
+        "commentary": "Was expecting more stuff",
+        "episode": "JEDI",
     }
     expected_two = {
-        'stars': 5,
-        'commentary': 'This is a great movie!',
-        'episode': 'JEDI'
+        "stars": 5,
+        "commentary": "This is a great movie!",
+        "episode": "JEDI",
     }
     # For asyncio, requires set return_promise=True as stated on the following comment
     # https://github.com/graphql-python/graphql-core/issues/63#issuecomment-568270864
@@ -68,12 +68,12 @@ async def test_subscription_support():
         document_ast=subs,
         return_promise=True,
         variable_values=params,
-        executor=AsyncioExecutor(loop=loop)
+        executor=AsyncioExecutor(loop=loop),
     )
     expected = []
     async with ObservableAsyncIterable(execution_result) as oai:
         async for i in oai:
             review = i.to_dict()
-            expected.append(review['data']['reviewAdded'])
+            expected.append(review["data"]["reviewAdded"])
     assert expected[0] == expected_one
     assert expected[1] == expected_two

tox.ini

@@ -28,25 +28,25 @@ commands =
 basepython=python3.8
 deps = -e.[dev]
 commands =
-    black --check gql tests
+    black --check gql tests tests_py36
 
 [testenv:flake8]
 basepython = python3.8
 deps = -e.[dev]
 commands =
-    flake8 gql tests
+    flake8 gql tests tests_py36
 
 [testenv:import-order]
 basepython=python3.8
 deps = -e.[dev]
 commands =
-    isort -rc gql/ tests/
+    isort --recursive --check-only --diff gql tests tests_py36
 
 [testenv:mypy]
 basepython=python3.8
 deps = -e.[dev]
 commands =
-    mypy gql tests --ignore-missing-imports
+    mypy gql tests tests_py36
 
 [testenv:manifest]
 basepython = python3.8