Update to latest versions of reqs, bump own version

Omit default event_loop in fixtures.
Add tox configuration for testing.

Author: Cito

.flake8

@@ -0,0 +1,4 @@
+[flake8]
+ignore = E203,E501,W503,W504
+exclude = .git,.pytest_cache,.tox,.venv,__pycache__,build,dist
+max-line-length = 88

.gitignore

@@ -1,13 +1,15 @@
-# Byte-compiled / optimized / DLL files
+# Compiled Python files
 __pycache__/
 *.py[cod]
-*$py.class
-
-# C extensions
-*.so
 
 # Distribution / packaging
 .Python
+venv
+venv3[3-9]
+.venv
+.venv3[3-9]
+env
+.env
 build/
 develop-eggs/
 dist/
@@ -24,6 +26,10 @@ wheels/
 .installed.cfg
 *.egg
 
+# PyInstaller
+*.manifest
+*.spec
+
 # Installer logs
 pip-log.txt
 pip-delete-this-directory.txt
@@ -36,13 +42,15 @@ htmlcov/
 .cache
 coverage.xml
 *.cover
+.pytest_cache/
+.python-version
 
-# Rope project settings
-.ropeproject
+# IntelliJ
+.idea
+*.iml
 
-# Translations
-*.mo
-*.pot
+# Visual Studio
+/.vscode
 
-# Environments
-env
+# OS X
+.DS_Store

LICENSE.txt renamed to LICENSE

@@ -1,2 +1,14 @@
+include MANIFEST.in
+
+include LICENSE
 include README.md
 
+include .flake8
+include .pylintrc
+
+include tox.ini
+
+graft aiohttp_graphql
+graft tests
+
+global-exclude *.py[co] __pycache__

MANIFEST.in

@@ -1,9 +1,8 @@
-from collections import Mapping
+from collections.abc import Mapping
 from functools import partial
 
-from aiohttp import web
 from promise import Promise
-
+from aiohttp import web
 from graphql.type.schema import GraphQLSchema
 from graphql.execution.executors.asyncio import AsyncioExecutor
 from graphql_server import (
@@ -18,7 +17,7 @@
 from .render_graphiql import render_graphiql
 
 
-class GraphQLView: # pylint: disable = too-many-instance-attributes
+class GraphQLView:  # pylint: disable = too-many-instance-attributes
     def __init__(
             self,
             schema=None,
@@ -35,8 +34,7 @@ def __init__(
             max_age=86400,
             encoder=None,
             error_formatter=None,
-            enable_async=True,
-        ):
+            enable_async=True):
         # pylint: disable=too-many-arguments
         # pylint: disable=too-many-locals
 
@@ -55,9 +53,7 @@ def __init__(
         self.encoder = encoder or json_encode
         self.error_formatter = error_formatter or default_format_error
         self.enable_async = enable_async and isinstance(
-            self.executor,
-            AsyncioExecutor,
-        )
+            self.executor, AsyncioExecutor)
         assert isinstance(self.schema, GraphQLSchema), \
             'A Schema is required to be provided to GraphQLView.'
 
@@ -76,14 +72,13 @@ async def parse_body(self, request):
             r_text = await request.text()
             return {'query': r_text}
 
-        elif request.content_type == 'application/json':
+        if request.content_type == 'application/json':
             text = await request.text()
             return load_json_body(text)
 
-        elif request.content_type in (
+        if request.content_type in (
                 'application/x-www-form-urlencoded',
-                'multipart/form-data',
-            ):
+                'multipart/form-data'):
             # TODO: seems like a multidict would be more appropriate
             # than casting it and de-duping variables. Alas, it's what
             # graphql-python wants.
@@ -143,6 +138,11 @@ async def __call__(self, request):
                 executor=self.executor,
             )
 
+            if is_graphiql and self.enable_async:
+                # catch errors like run_http_query does when async
+                execution_results = [
+                    result.catch(lambda value: None)
+                    for result in execution_results]
             awaited_execution_results = await Promise.all(execution_results)
             result, status_code = encode_execution_results(
                 awaited_execution_results,

aiohttp_graphql/graphqlview.py

@@ -131,7 +131,7 @@ def escape_js_value(value):
     quotation = False
     if value.startswith('"') and value.endswith('"'):
         quotation = True
-        value = value[1:len(value)-1]
+        value = value[1:-1]
 
     value = value.replace('\\\\n', '\\\\\\n').replace('\\n', '\\\\n')
     if quotation:
@@ -167,8 +167,7 @@ async def render_graphiql(
         graphiql_version=None,
         graphiql_template=None,
         params=None,
-        result=None,
-    ):
+        result=None):
     graphiql_version = graphiql_version or GRAPHIQL_VERSION
     template = graphiql_template or TEMPLATE
     template_vars = {

aiohttp_graphql/render_graphiql.py

@@ -2,37 +2,38 @@
 
 setup(
     name='aiohttp-graphql',
-    version='1.0.0',
+    version='1.1.0',
     description='Adds GraphQL support to your aiohttp application',
     long_description=open('README.md').read(),
-    url='https://github.com/dfee/aiohttp-graphql',
-    download_url='https://github.com/dfee/aiohttp-graphql/releases',
+    long_description_content_type='text/markdown',
+    url='https://github.com/graphql-python/aiohttp-graphql',
+    download_url='https://github.com/graphql-python/aiohttp-graphql/releases',
     author='Devin Fee',
     author_email='devin@devinfee.com',
     license='MIT',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'Topic :: Software Development :: Libraries',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'License :: OSI Approved :: MIT License',
     ],
     keywords='api graphql protocol aiohttp',
     packages=find_packages(exclude=['tests']),
     install_requires=[
-        'graphql-core>=2.0.dev,<3',
-        'graphql-server-core>=1.0.dev,<2',
-        'aiohttp>=2.0.0',
-        'pytest-runner',
+        'graphql-core>=2.3,<3',
+        'graphql-server-core>=1.2,<2',
+        'aiohttp>=3,<4',
     ],
     extras_require={
         'test': [
-            'pylint>=1.7.2',
-            'pytest>=2.7.3',
-            'pytest-asyncio>=0.7.0',
-            'jinja2>=2.9.0',
-            'yarl>=0.9.6',
+            'pytest>=5.3,<5.4',
+            'pytest-asyncio>=0.10,<0.11',
+            'pytest-cov>=2.8,<3',
+            'jinja2>=2.10,<3',
+            'yarl>1.4,<1.5',
         ],
     },
     include_package_data=True,

setup.py

@@ -0,0 +1 @@
+# aiohttp-graphql tests

tests/__init__.py

@@ -1,9 +1,10 @@
 from urllib.parse import urlencode
 
+import pytest
+
 from aiohttp import web
-import aiohttp.test_utils
+from aiohttp.test_utils import TestClient, TestServer
 from graphql.execution.executors.asyncio import AsyncioExecutor
-import pytest
 
 from aiohttp_graphql import GraphQLView
 
@@ -12,9 +13,9 @@
 
 # GraphQL Fixtures
 @pytest.fixture(params=[True, False], ids=['async', 'sync'])
-def executor(request, event_loop):
+def executor(request):
     if request.param:
-        return AsyncioExecutor(event_loop)
+        return AsyncioExecutor()
     return None
 
 
@@ -26,21 +27,20 @@ def view_kwargs():
 
 # aiohttp Fixtures
 @pytest.fixture
-def app(event_loop, executor, view_kwargs):
-    app = web.Application(loop=event_loop)
+def app(executor, view_kwargs):
+    app = web.Application()
     GraphQLView.attach(app, executor=executor, **view_kwargs)
     return app
 
 
 @pytest.fixture
-async def client(event_loop, app):
-    client = aiohttp.test_utils.TestClient(app, loop=event_loop)
+async def client(app):
+    client = TestClient(TestServer(app))
     await client.start_server()
     yield client
     await client.close()
 
 
-
 # URL Fixtures
 @pytest.fixture
 def base_url():

tests/conftest.py

@@ -25,19 +25,18 @@ def resolve_raises(*args):
         ),
         'request': GraphQLField(
             GraphQLNonNull(GraphQLString),
-            resolver=lambda obj, info, *args: \
-                info.context['request'].query.get('q'),
-            ),
+            resolver=lambda obj, info, *args:
+            info.context['request'].query.get('q'),
+        ),
         'context': GraphQLField(
             GraphQLNonNull(GraphQLString),
             resolver=lambda obj, info, *args: info.context,
         ),
         'test': GraphQLField(
             type=GraphQLString,
             args={'who': GraphQLArgument(GraphQLString)},
-            # resolver=lambda obj, args, context, info: \
-            resolver=lambda obj, info, **args: \
-                'Hello %s' % (args.get('who') or 'World'),
+            resolver=lambda obj, info, **args:
+            'Hello %s' % (args.get('who') or 'World'),
         ),
     },
 )
@@ -63,11 +62,13 @@ async def resolver(context, *args):
     await asyncio.sleep(0.001)
     return 'hey'
 
+
 async def resolver_2(context, *args):
     # pylint: disable=unused-argument
     await asyncio.sleep(0.003)
     return 'hey2'
 
+
 def resolver_3(context, *args):
     # pylint: disable=unused-argument
     return 'hey3'

tests/schema.py

@@ -1,5 +1,7 @@
 from graphql.execution.executors.asyncio import AsyncioExecutor
+
 from jinja2 import Environment
+
 import pytest
 
 from .schema import (
@@ -29,6 +31,7 @@ def view_kwargs():
         'graphiql': True,
     }
 
+
 @pytest.mark.asyncio
 async def test_graphiql_is_enabled(client, base_url):
     response = await client.get(base_url, headers={'Accept': 'text/html'})