Merge branch 'master' into patch-1

Author: leszekhanusz

README.md

@@ -1,6 +1,6 @@
 # GQL
 
-This is a GraphQL client for Python 3.7+.
+This is a GraphQL client for Python 3.8+.
 Plays nicely with `graphene`, `graphql-core`, `graphql-js` and any other GraphQL implementation compatible with the spec.
 
 GQL architecture is inspired by `React-Relay` and `Apollo-Client`.

docs/gql-cli/intro.rst

@@ -3,7 +3,7 @@
 gql-cli
 =======
 
-GQL provides a python 3.7+ script, called `gql-cli` which allows you to execute
+GQL provides a python script, called `gql-cli` which allows you to execute
 GraphQL queries directly from the terminal.
 
 This script supports http(s) or websockets protocols.

docs/intro.rst

@@ -1,7 +1,7 @@
 Introduction
 ============
 
-`GQL 3`_ is a `GraphQL`_ Client for Python 3.7+ which plays nicely with other
+`GQL 3`_ is a `GraphQL`_ Client for Python 3.8+ which plays nicely with other
 graphql implementations compatible with the spec.
 
 Under the hood, it uses `GraphQL-core`_ which is a Python port of `GraphQL.js`_,

gql/client.py

@@ -1,6 +1,5 @@
 import asyncio
 import logging
-import sys
 import time
 import warnings
 from concurrent.futures import Future
@@ -13,6 +12,7 @@
     Dict,
     Generator,
     List,
+    Literal,
     Optional,
     Tuple,
     TypeVar,
@@ -44,17 +44,6 @@
 from .utilities import serialize_variable_values
 from .utils import str_first_element
 
-"""
-Load the appropriate instance of the Literal type
-Note: we cannot use try: except ImportError because of the following mypy issue:
-https://github.com/python/mypy/issues/8520
-"""
-if sys.version_info[:2] >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal  # pragma: no cover
-
-
 log = logging.getLogger(__name__)
 
 
@@ -1368,8 +1357,8 @@ async def _subscribe(
             **kwargs,
         )
 
-        # Keep a reference to the inner generator to allow the user to call aclose()
-        # before a break if python version is too old (pypy3 py 3.6.1)
+        # Keep a reference to the inner generator
+        # This is only used for the tests to simulate a KeyboardInterrupt event
         self._generator = inner_generator
 
         try:

gql/transport/aiohttp_websockets.py

@@ -1,7 +1,6 @@
 import asyncio
 import json
 import logging
-import sys
 import warnings
 from contextlib import suppress
 from ssl import SSLContext
@@ -10,6 +9,7 @@
     AsyncGenerator,
     Collection,
     Dict,
+    Literal,
     Mapping,
     Optional,
     Tuple,
@@ -32,16 +32,6 @@
     TransportServerError,
 )
 
-"""
-Load the appropriate instance of the Literal type
-Note: we cannot use try: except ImportError because of the following mypy issue:
-https://github.com/python/mypy/issues/8520
-"""
-if sys.version_info[:2] >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal  # pragma: no cover
-
 log = logging.getLogger("gql.transport.aiohttp_websockets")
 
 ParsedAnswer = Tuple[str, Optional[ExecutionResult]]
@@ -1124,11 +1114,6 @@ async def execute(
 
         async for result in generator:
             first_result = result
-
-            # Note: we need to run generator.aclose() here or the finally block in
-            # the subscribe will not be reached in pypy3 (python version 3.6.1)
-            await generator.aclose()
-
             break
 
         if first_result is None:

gql/transport/websockets_base.py

@@ -431,11 +431,6 @@ async def execute(
 
         async for result in generator:
             first_result = result
-
-            # Note: we need to run generator.aclose() here or the finally block in
-            # the subscribe will not be reached in pypy3 (python version 3.6.1)
-            await generator.aclose()
-
             break
 
         if first_result is None:

tests/custom_scalars/test_datetime.py

@@ -1,7 +1,6 @@
 from datetime import datetime, timedelta
 from typing import Any, Dict, Optional
 
-import pytest
 from graphql.error import GraphQLError
 from graphql.language import ValueNode
 from graphql.pyutils import inspect
@@ -110,9 +109,6 @@ def resolve_seconds(root, _info, interval):
 schema = GraphQLSchema(query=queryType)
 
 
-@pytest.mark.skipif(
-    not hasattr(datetime, "fromisoformat"), reason="fromisoformat is new in Python 3.7+"
-)
 def test_shift_days():
 
     client = Client(schema=schema, parse_results=True, serialize_variables=True)
@@ -132,9 +128,6 @@ def test_shift_days():
     assert result["shiftDays"] == datetime.fromisoformat("2021-11-17T11:58:13.461161")
 
 
-@pytest.mark.skipif(
-    not hasattr(datetime, "fromisoformat"), reason="fromisoformat is new in Python 3.7+"
-)
 def test_shift_days_serialized_manually_in_query():
 
     client = Client(schema=schema)
@@ -152,9 +145,6 @@ def test_shift_days_serialized_manually_in_query():
     assert result["shiftDays"] == datetime.fromisoformat("2021-11-17T11:58:13.461161")
 
 
-@pytest.mark.skipif(
-    not hasattr(datetime, "fromisoformat"), reason="fromisoformat is new in Python 3.7+"
-)
 def test_shift_days_serialized_manually_in_variables():
 
     client = Client(schema=schema, parse_results=True)
@@ -172,9 +162,6 @@ def test_shift_days_serialized_manually_in_variables():
     assert result["shiftDays"] == datetime.fromisoformat("2021-11-17T11:58:13.461161")
 
 
-@pytest.mark.skipif(
-    not hasattr(datetime, "fromisoformat"), reason="fromisoformat is new in Python 3.7+"
-)
 def test_latest():
 
     client = Client(schema=schema, parse_results=True)
@@ -197,9 +184,6 @@ def test_latest():
     assert result["latest"] == in_five_days
 
 
-@pytest.mark.skipif(
-    not hasattr(datetime, "fromisoformat"), reason="fromisoformat is new in Python 3.7+"
-)
 def test_seconds():
     client = Client(schema=schema)
 
@@ -221,9 +205,6 @@ def test_seconds():
     assert result["seconds"] == 432000
 
 
-@pytest.mark.skipif(
-    not hasattr(datetime, "fromisoformat"), reason="fromisoformat is new in Python 3.7+"
-)
 def test_seconds_omit_optional_start_argument():
     client = Client(schema=schema)
 

tests/test_aiohttp_websocket_graphqlws_subscription.py

@@ -268,9 +268,6 @@ async def test_aiohttp_websocket_graphqlws_subscription_break(
         assert number == count
 
         if count <= 5:
-            # Note: the following line is only necessary for pypy3 v3.6.1
-            if sys.version_info < (3, 7):
-                await session._generator.aclose()
             break
 
         count -= 1

tests/test_aiohttp_websocket_subscription.py

@@ -258,9 +258,6 @@ async def test_aiohttp_websocket_subscription_break(
         assert number == count
 
         if count <= 5:
-            # Note: the following line is only necessary for pypy3 v3.6.1
-            if sys.version_info < (3, 7):
-                await session._generator.aclose()
             break
 
         count -= 1

tests/test_graphqlws_subscription.py

@@ -268,9 +268,6 @@ async def test_graphqlws_subscription_break(
         assert number == count
 
         if count <= 5:
-            # Note: the following line is only necessary for pypy3 v3.6.1
-            if sys.version_info < (3, 7):
-                await session._generator.aclose()
             break
 
         count -= 1