Update dependencies and support newer Python versions

Remove dev-dependencies because they cannot be installed together with poetry.
The test requirements are specified in tox.ini instead.

Author: Cito

.github/workflows/lint.yml

@@ -7,12 +7,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.9
+        python-version: 3.11
 
     - name: Install dependencies
       run: |

.github/workflows/publish.yml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.9
+        python-version: 3.11
 
     - name: Build wheel and source tarball
       run: |

.github/workflows/test.yml

@@ -8,13 +8,13 @@ jobs:
 
     strategy:
       matrix:
-        python: ['3.6', '3.7', '3.8', '3.9', '3.10', 'pypy3']
+        python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', 'pypy3.9', 'pypy3.10']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python Debugger: Current File with Arguments",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal",
+            "args": "${command:pickArgs}"
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,21 @@
+{
+    "editor.rulers": [88],
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter",
+        "editor.formatOnSave": true,
+    },
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true,
+    "pythonTestExplorer.testFramework": "pytest",
+    "testExplorer.useNativeTesting": false,
+    "testExplorer.sort": "byLocationWithSuitesFirst",
+    "testExplorer.showExpandButton": 5,
+    "testExplorer.addToEditorContextMenu": true,
+    "rust-analyzer.testExplorer": false,
+    "pythonTestExplorer.testplanUseLegacyDiscovery": false,
+    "testExplorer.mergeSuites": false,
+    "python.analysis.typeCheckingMode": "off"
+}

poetry.lock

@@ -22,7 +22,9 @@ classifiers = [
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10"
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12"
 ]
 packages = [
     { include = "graphql", from = "src" },
@@ -45,44 +47,11 @@ packages = [
 [tool.poetry.dependencies]
 python = "^3.6"
 typing-extensions = [
-    { version = "^4.3", python = ">=3.7,<3.8" },
-    { version = "^4.1", python = "<3.7" }
-]
-
-[tool.poetry.dev-dependencies]
-pytest = "^6.2"
-pytest-asyncio = [
-    {version=">=0.19,<1", python = ">=3.7" },
-    {version=">=0.16,<0.17", python = "<3.7" },
-]
-pytest-benchmark = "^3.4"
-pytest-cov = "^3.0"
-pytest-describe = "^2.0"
-pytest-timeout = "^2.1"
-black = [
-    {version = "22.8.0", python = ">=3.6.2"},
-    {version = "20.8b1", python = "<3.6.2"}
-]
-flake8 = [
-    {version = "^5.0", python = ">=3.6.1"},
-    {version = "^4.0", python = "<3.6.1"}
-]
-mypy = "0.971"
-sphinx = "^4.3"
-sphinx_rtd_theme = ">=1,<2"
-check-manifest = ">=0.48,<1"
-bump2version = ">=1.0,<2"
-tomli = [
-    {version="^2", python = ">=3.7"},
-    {version="^1.2", python = "<3.7"}
-]
-tox = [
-    {version = "^3.26", python = ">=3.7"},
-    {version = "3.25", python = "<3.7"}
+    { version = ">=4,<5", python = "<3.10" }
 ]
 
 [tool.black]
-target-version = ['py36', 'py37', 'py38', 'py39', 'py310']
+target-version = ['py36', 'py37', 'py38', 'py39', 'py310', 'py311', 'py312']
 
 [build-system]
 requires = ["poetry_core>=1,<2", "setuptools>=59,<70"]

pyproject.toml

@@ -1,10 +1,11 @@
+import platform
 import sys
 from asyncio import CancelledError, Event, ensure_future, sleep
 
-from pytest import mark, raises
-
 from graphql.execution import MapAsyncIterator
+from pytest import mark, raises
 
+is_pypy = platform.python_implementation() == "PyPy"
 
 try:  # pragma: no cover
     anext
@@ -344,6 +345,10 @@ def double(x):
             with raises(StopAsyncIteration):
                 await anext(doubles)
 
+            # no more exceptions should be thrown
+            if is_pypy:
+                # need to investigate why this is needed with PyPy
+                await doubles.aclose()  # pragma: no cover
             await doubles.athrow(RuntimeError("no more ouch"))
 
             with raises(StopAsyncIteration):

tests/execution/test_map_async_iterator.py

@@ -1,9 +1,8 @@
 from copy import copy, deepcopy
 
+from graphql.pyutils import FrozenDict, FrozenError
 from pytest import raises
 
-from graphql.pyutils import FrozenError, FrozenDict
-
 
 def describe_frozen_list():
     def can_read():
@@ -59,7 +58,7 @@ def can_hash():
         fd2 = FrozenDict({1: 2, 3: 4})
         assert fd2 == fd1
         assert fd2 is not fd1
-        assert hash(fd2) is not hash(fd1)
+        assert hash(fd2) == hash(fd1)
         fd3 = FrozenDict({1: 2, 3: 5})
         assert fd3 != fd1
         assert hash(fd3) != hash(fd1)

tests/pyutils/test_frozen_dict.py

@@ -1,9 +1,9 @@
 import asyncio
+import sys
 from inspect import isawaitable
 
-from pytest import mark
-
 from graphql.pyutils import is_awaitable
+from pytest import mark
 
 
 def describe_is_awaitable():
@@ -76,7 +76,11 @@ async def some_coroutine():
         assert is_awaitable(some_coroutine())
 
     @mark.filterwarnings("ignore::Warning")  # Deprecation and Runtime
-    def recognizes_an_old_style_coroutine():
+    @mark.skipif(
+        sys.version_info >= (3, 11),
+        reason="Generator-based coroutines not supported after Python 3.11",
+    )
+    def recognizes_an_old_style_coroutine():  # pragma: no cover
         @asyncio.coroutine
         def some_old_style_coroutine():
             yield False  # pragma: no cover

tests/pyutils/test_is_awaitable.py

@@ -1,59 +1,66 @@
 [tox]
-envlist = py3{6,7,8,9,10}, black, flake8, mypy, docs, manifest
+envlist = py3{6,7,8,9,10,11,12}, pypy3{9,10}, black, flake8, mypy, docs, manifest
 isolated_build = true
 
 [gh-actions]
 python =
+    3: py310
     3.6: py36
     3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310
+    3.11: py311
+    3.12: py312
+    pypy3.9: pypy39
+    pypy3.10: pypy310
 
 [testenv:black]
-basepython = python3.9
-deps = black==22.8.0
+basepython = python3.11
+deps = black==24.8.0
 commands  =
-    black src tests setup.py -t py39 --check
+    black src tests setup.py -t py311 --check
 
 [testenv:flake8]
-basepython = python3.9
-deps = flake8>=5,<6
+basepython = python3.11
+deps = flake8>=7,<8
 commands =
     flake8 src tests setup.py
 
 [testenv:mypy]
-basepython = python3.9
+basepython = python3.11
 deps =
-    mypy==0.971
-    pytest>=6.2,<7
+    mypy>=1.11,<2
+    pytest>=8.3,<9
 commands =
     mypy src tests
 
 [testenv:docs]
-basepython = python3.9
+basepython = python3.11
 deps =
-    sphinx>=4.3,<5
-    sphinx_rtd_theme>=1,<2
+    sphinx>=7,<8
+    sphinx_rtd_theme>=2.0,<3
 commands =
     sphinx-build -b html -nEW docs docs/_build/html
 
 [testenv:manifest]
-basepython = python3.9
-deps = check-manifest>=0.48,<1
+basepython = python3.11
+deps = check-manifest>=0.49,<1
 commands =
     check-manifest -v
 
 [testenv]
 deps =
-    py37,py38,py39,py310: pytest>=7.1,<8
-    py36: pytest>=6.2,<7
-    pytest-asyncio>=0.16,<1
-    pytest-benchmark>=3.4,<4
-    pytest-cov>=3,<4
+    pytest>=6.2,<9
+    pytest-asyncio>=0.16,<0.24
+    pytest-benchmark>=3.4,<5
+    pytest-cov>=4,<6
     pytest-describe>=2,<3
     pytest-timeout>=2,<3
-    py37: typing-extensions>=4.3,<5
-    py36: typing-extensions>=4.1,<5
+    py36,py37,38,py39,py310: typing-extensions>=4,<5
 commands =
-    pytest tests {posargs: --cov-report=term-missing --cov=graphql --cov=tests --cov-fail-under=100}
+    # to also run the time-consuming tests: tox -e py311 -- --run-slow
+    # to run the benchmarks: tox -e py311 -- -k benchmarks --benchmark-enable
+    py37,py38,py39,py310,py311,pypy39,pypy310: pytest tests {posargs}
+    py312: pytest tests {posargs: --cov-report=term-missing --cov=graphql --cov=tests --cov-fail-under=100}
+