Support Python 3.10

Also restrict web frameworks to supported versions

Author: Cito

.github/workflows/deploy.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.8
+    - name: Set up Python 3.9
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
     - name: Build wheel and source tarball
       run: |
         pip install wheel
@@ -23,4 +23,4 @@ jobs:
       uses: pypa/[email protected]
       with:
         user: __token__
-        password: ${{ secrets.pypi_password }}
+        password: ${{ secrets.pypi_password }}

.github/workflows/lint.yml

@@ -8,15 +8,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.8
+    - name: Set up Python 3.9
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install tox
     - name: Run lint and static type checks
       run: tox
       env:
-        TOXENV: flake8,black,import-order,mypy,manifest
+        TOXENV: flake8,black,import-order,mypy,manifest

.github/workflows/tests.yml

@@ -8,15 +8,17 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
         os: [ubuntu-latest, windows-latest]
         exclude:
           - os: windows-latest
             python-version: "3.6"
           - os: windows-latest
             python-version: "3.7"
           - os: windows-latest
-            python-version: "3.9"
+            python-version: "3.8"
+          - os: windows-latest
+            python-version: "3.10"
 
     steps:
       - uses: actions/checkout@v2
@@ -38,10 +40,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install test dependencies
         run: |
           python -m pip install --upgrade pip

graphql_server/__init__.py

@@ -9,7 +9,17 @@
 import json
 from collections import namedtuple
 from collections.abc import MutableMapping
-from typing import Any, Callable, Collection, Dict, List, Optional, Type, Union
+from typing import (
+    Any,
+    Callable,
+    Collection,
+    Dict,
+    List,
+    Optional,
+    Type,
+    Union,
+    cast,
+)
 
 from graphql.error import GraphQLError
 from graphql.execution import ExecutionResult, execute
@@ -56,7 +66,7 @@
 
 def format_error_default(error: GraphQLError) -> Dict:
     """The default function for converting GraphQLError to a dictionary."""
-    return error.formatted
+    return cast(Dict, error.formatted)
 
 
 def run_http_query(

graphql_server/aiohttp/graphqlview.py

@@ -201,7 +201,9 @@ async def __call__(self, request):
                 return web.Response(text=source, content_type="text/html")
 
             return web.Response(
-                text=result, status=status_code, content_type="application/json",
+                text=result,
+                status=status_code,
+                content_type="application/json",
             )
 
         except HttpQueryError as err:

graphql_server/flask/graphqlview.py

@@ -5,9 +5,9 @@
 
 from flask import Response, render_template_string, request
 from flask.views import View
+from graphql import specified_rules
 from graphql.error import GraphQLError
 from graphql.type.schema import GraphQLSchema
-from graphql import specified_rules
 
 from graphql_server import (
     GraphQLParams,

graphql_server/sanic/graphqlview.py

@@ -212,8 +212,8 @@ def request_wants_html(request):
         return "text/html" in accept or "*/*" in accept
 
     def process_preflight(self, request):
-        """ Preflight request support for apollo-client
-        https://www.w3.org/TR/cors/#resource-preflight-requests """
+        """Preflight request support for apollo-client
+        https://www.w3.org/TR/cors/#resource-preflight-requests"""
         origin = request.headers.get("Origin", "")
         method = request.headers.get("Access-Control-Request-Method", "").upper()
 

graphql_server/webob/graphqlview.py

@@ -3,9 +3,9 @@
 from functools import partial
 from typing import List
 
+from graphql import specified_rules
 from graphql.error import GraphQLError
 from graphql.type.schema import GraphQLSchema
-from graphql import specified_rules
 from webob import Response
 
 from graphql_server import (

setup.py

@@ -24,7 +24,7 @@
 ]
 
 install_sanic_requires = [
-    "sanic>=21,<22",
+    "sanic>=20.3,<21",
 ]
 
 install_webob_requires = [
@@ -35,7 +35,7 @@
     "aiohttp>=3.8,<4",
 ]
 
-install_quart_requires = ["quart>=0.6.15,<1"]
+install_quart_requires = ["quart>=0.6.15,<0.15"]
 
 install_all_requires = (
     install_requires
@@ -71,6 +71,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "License :: OSI Approved :: MIT License",
     ],
     keywords="api graphql protocol rest",

tests/aiohttp/schema.py

@@ -18,7 +18,10 @@ def resolve_raises(*_):
 QueryRootType = GraphQLObjectType(
     name="QueryRoot",
     fields={
-        "thrower": GraphQLField(GraphQLNonNull(GraphQLString), resolve=resolve_raises,),
+        "thrower": GraphQLField(
+            GraphQLNonNull(GraphQLString),
+            resolve=resolve_raises,
+        ),
         "request": GraphQLField(
             GraphQLNonNull(GraphQLString),
             resolve=lambda obj, info, *args: info.context["request"].query.get("q"),

tests/aiohttp/test_graphiqlview.py

@@ -52,7 +52,8 @@ async def test_graphiql_is_enabled(app, client):
 @pytest.mark.parametrize("app", [create_app(graphiql=True)])
 async def test_graphiql_simple_renderer(app, client, pretty_response):
     response = await client.get(
-        url_string(query="{test}"), headers={"Accept": "text/html"},
+        url_string(query="{test}"),
+        headers={"Accept": "text/html"},
     )
     assert response.status == 200
     assert pretty_response in await response.text()
@@ -65,15 +66,19 @@ class TestJinjaEnv:
     )
     async def test_graphiql_jinja_renderer_async(self, app, client, pretty_response):
         response = await client.get(
-            url_string(query="{test}"), headers={"Accept": "text/html"},
+            url_string(query="{test}"),
+            headers={"Accept": "text/html"},
         )
         assert response.status == 200
         assert pretty_response in await response.text()
 
 
 @pytest.mark.asyncio
 async def test_graphiql_html_is_not_accepted(client):
-    response = await client.get("/graphql", headers={"Accept": "application/json"},)
+    response = await client.get(
+        "/graphql",
+        headers={"Accept": "application/json"},
+    )
     assert response.status == 400
 
 
@@ -107,7 +112,8 @@ async def test_graphiql_get_subscriptions(app, client):
 )
 async def test_graphiql_enabled_async_schema(app, client):
     response = await client.get(
-        url_string(query="{a,b,c}"), headers={"Accept": "text/html"},
+        url_string(query="{a,b,c}"),
+        headers={"Accept": "text/html"},
     )
 
     expected_response = (
@@ -133,7 +139,8 @@ async def test_graphiql_enabled_async_schema(app, client):
 )
 async def test_graphiql_enabled_sync_schema(app, client):
     response = await client.get(
-        url_string(query="{a,b}"), headers={"Accept": "text/html"},
+        url_string(query="{a,b}"),
+        headers={"Accept": "text/html"},
     )
 
     expected_response = (

tests/quart/test_graphiqlview.py

@@ -1,5 +1,3 @@
-import sys
-
 import pytest
 from quart import Quart, Response, url_for
 from quart.testing import QuartClient
@@ -32,10 +30,7 @@ async def execute_client(
     headers: Headers = None,
     **extra_params
 ) -> Response:
-    if sys.version_info >= (3, 7):
-        test_request_context = app.test_request_context("/", method=method)
-    else:
-        test_request_context = app.test_request_context(method, "/")
+    test_request_context = app.test_request_context(path="/", method=method)
     async with test_request_context:
         string = url_for("graphql", **extra_params)
     return await client.get(string, headers=headers)

tests/quart/test_graphqlview.py

@@ -1,7 +1,4 @@
 import json
-import sys
-
-# from io import StringIO
 from urllib.parse import urlencode
 
 import pytest
@@ -37,10 +34,7 @@ async def execute_client(
     headers: Headers = None,
     **url_params,
 ) -> Response:
-    if sys.version_info >= (3, 7):
-        test_request_context = app.test_request_context("/", method=method)
-    else:
-        test_request_context = app.test_request_context(method, "/")
+    test_request_context = app.test_request_context(path="/", method=method)
     async with test_request_context:
         string = url_for("graphql")
 

tests/sanic/app.py

@@ -7,7 +7,6 @@
 
 from .schema import Schema
 
-
 Sanic.test_mode = True
 
 

tox.ini

@@ -1,7 +1,7 @@
 [tox]
-envlist = 
+envlist =
     black,flake8,import-order,mypy,manifest,
-    py{36,37,38,39}
+    py{36,37,38,39,310}
 ; requires = tox-conda
 
 [gh-actions]
@@ -10,6 +10,7 @@ python =
     3.7: py37
     3.8: py38
     3.9: py39
+    3.10: py310
 
 [testenv]
 conda_channels = conda-forge
@@ -26,31 +27,31 @@ commands =
     py{38}: pytest tests --cov-report=term-missing --cov=graphql_server {posargs}
 
 [testenv:black]
-basepython = python3.8
+basepython = python3.9
 deps = -e.[dev]
 commands =
     black --check graphql_server tests
 
 [testenv:flake8]
-basepython = python3.8
+basepython = python3.9
 deps = -e.[dev]
 commands =
     flake8 setup.py graphql_server tests
 
 [testenv:import-order]
-basepython = python3.8
+basepython = python3.9
 deps = -e.[dev]
 commands =
-    isort -rc graphql_server/ tests/
+    isort graphql_server/ tests/
 
 [testenv:mypy]
-basepython = python3.8
+basepython = python3.9
 deps = -e.[dev]
 commands =
     mypy graphql_server tests --ignore-missing-imports
 
 [testenv:manifest]
-basepython = python3.8
+basepython = python3.9
 deps = -e.[dev]
 commands =
     check-manifest -v