Update GitHub actions, add PyPy 3.9 to test matrix

Author: Cito

.github/workflows/lint.yml

@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: 3.9
 

.github/workflows/publish.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: 3.9
 

.github/workflows/test.yml

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

src/graphql/pyutils/is_iterable.py

@@ -1,11 +1,17 @@
+from array import array
 from typing import Any, ByteString, Collection, Iterable, Mapping, Text, ValuesView
 
 
 __all__ = ["is_collection", "is_iterable"]
 
-collection_types: Any = Collection
+collection_types: Any = [Collection]
 if not isinstance({}.values(), Collection):  # Python < 3.7.2
-    collection_types = (Collection, ValuesView)
+    collection_types.append(ValuesView)
+if not isinstance(array, Collection):  # PyPy issue 3820
+    collection_types.append(array)
+collection_types = (
+    collection_types[0] if len(collection_types) == 1 else tuple(collection_types)
+)
 iterable_types: Any = Iterable
 not_iterable_types: Any = (ByteString, Mapping, Text)
 

tests/execution/test_map_async_iterator.py

@@ -1,3 +1,4 @@
+import platform
 import sys
 from asyncio import CancelledError, Event, ensure_future, sleep
 
@@ -6,6 +7,8 @@
 from graphql.execution import MapAsyncIterator
 
 
+is_pypy = platform.python_implementation() == "PyPy"
+
 try:  # pragma: no cover
     anext
 except NameError:  # pragma: no cover (Python < 3.10)
@@ -344,6 +347,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):

tox.ini

@@ -1,13 +1,16 @@
 [tox]
-envlist = py3{7,8,9,10}, black, flake8, isort, mypy, docs
+envlist = py3{7,8,9,10}, pypy39, black, flake8, isort, mypy, docs
 isolated_build = true
 
 [gh-actions]
 python =
+    3: py39
     3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310
+    pypy3: pypy39
+    pypy3.9: pypy39
 
 [testenv:black]
 basepython = python3.9