v2.1.9

Co-authored-by: Cyrille Pontvieux <cyrille@enialis.net>

.github/workflows/deploy.yml

@@ -0,0 +1,26 @@
+name: 🚀 Deploy to PyPI
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.9
+    - name: Build wheel and source tarball
+      run: |
+        pip install wheel
+        python setup.py sdist bdist_wheel
+    - name: Publish a Python distribution to PyPI
+      uses: pypa/gh-action-pypi-publish@v1.1.0
+      with:
+        user: __token__
+        password: ${{ secrets.pypi_password }}

.github/workflows/lint.yml

@@ -0,0 +1,26 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.9
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox
+    - name: Run lint 💅
+      run: tox
+      env:
+        TOXENV: pre-commit
+    - name: Run mypy
+      run: tox
+      env:
+        TOXENV: mypy

.github/workflows/tests.yml

@@ -0,0 +1,26 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10-dev"]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox tox-gh-actions
+    - name: Test with tox
+      run: tox
+      env:
+        TOXENV: ${{ matrix.toxenv }}

.pre-commit-config.yaml

@@ -18,11 +18,11 @@ repos:
     hooks:
     -   id: pyupgrade
 -   repo: https://github.com/ambv/black
-    rev: 18.9b0
+    rev: 21.6b0
     hooks:
     - id: black
       language_version: python3
 -   repo: https://github.com/PyCQA/flake8
-    rev: 3.7.7
+    rev: 3.9.2
     hooks:
     -   id: flake8

CODEOWNERS

@@ -1,3 +0,0 @@
-* @ekampf @dan98765 @projectcheshire @jkimbo
-/docs/ @dvndrsn @phalt @changeling
-/examples/ @dvndrsn @phalt @changeling

graphene/__init__.py

@@ -43,7 +43,7 @@ from .utils.resolve_only_args import resolve_only_args
 from .utils.module_loading import lazy_import
 
 
-VERSION = (2, 1, 8, "final", 0)
+VERSION = (2, 1, 9, "final", 0)
 
 __version__ = get_version(VERSION)
 

graphene/relay/connection.py

@@ -1,5 +1,11 @@
 import re
-from collections import Iterable, OrderedDict
+from collections import OrderedDict
+
+try:
+    from collections.abc import Iterable
+except ImportError:
+    from collections import Iterable
+
 from functools import partial
 
 from graphql_relay import connection_from_list

graphene/relay/node.py

@@ -48,7 +48,7 @@ class GlobalID(Field):
 
 
 class NodeField(Field):
-    def __init__(self, node, type=False, deprecation_reason=None, name=None, **kwargs):
+    def __init__(self, node, type=False, **kwargs):
         assert issubclass(node, Node), "NodeField can only operate in Nodes"
         self.node_type = node
         self.field_type = type
@@ -57,8 +57,8 @@ class NodeField(Field):
             # If we don's specify a type, the field type will be the node
             # interface
             type or node,
-            description="The ID of the object",
+            id=ID(required=True, description="The ID of the object"),
-            id=ID(required=True),
+            **kwargs
         )
 
     def get_resolver(self, parent_resolver):

graphene/relay/tests/test_connection_query.py

@@ -54,10 +54,10 @@ for i, letter in enumerate(letter_chars):
 def edges(selected_letters):
     return [
         {
-            "node": {"id": base64("Letter:%s" % l.id), "letter": l.letter},
+            "node": {"id": base64("Letter:%s" % letter.id), "letter": letter.letter},
-            "cursor": base64("arrayconnection:%s" % l.id),
+            "cursor": base64("arrayconnection:%s" % letter.id),
         }
-        for l in [letters[i] for i in selected_letters]
+        for letter in [letters[i] for i in selected_letters]
     ]
 
 

graphene/relay/tests/test_node.py

@@ -110,6 +110,17 @@ def test_node_field_custom():
     assert node_field.node_type == Node
 
 
+def test_node_field_args():
+    field_args = {
+        "name": "my_custom_name",
+        "description": "my_custom_description",
+        "deprecation_reason": "my_custom_deprecation_reason",
+    }
+    node_field = Node.Field(**field_args)
+    for field_arg, value in field_args.items():
+        assert getattr(node_field, field_arg) == value
+
+
 def test_node_field_only_type():
     executed = schema.execute(
         '{ onlyNode(id:"%s") { __typename, name } } ' % Node.to_global_id("MyNode", 1)

graphene/types/field.py

@@ -1,5 +1,11 @@
 import inspect
-from collections import Mapping, OrderedDict
+from collections import OrderedDict
+
+try:
+    from collections.abc import Mapping
+except ImportError:
+    from collections import Mapping
+
 from functools import partial
 
 from .argument import Argument, to_arguments

graphene/types/mutation.py

@@ -135,7 +135,7 @@ class Mutation(ObjectType):
     def Field(
         cls, name=None, description=None, deprecation_reason=None, required=False
     ):
-        """ Mount instance of mutation Field. """
+        """Mount instance of mutation Field."""
         return Field(
             cls._meta.output,
             args=cls._meta.arguments,

graphene/types/tests/test_query.py

@@ -399,7 +399,7 @@ def test_big_list_of_containers_multiple_fields_query_benchmark(benchmark):
 
 
 def test_big_list_of_containers_multiple_fields_custom_resolvers_query_benchmark(
-    benchmark
+    benchmark,
 ):
     class Container(ObjectType):
         x = Int()

graphene/utils/crunch.py

@@ -1,5 +1,9 @@
 import json
-from collections import Mapping
+
+try:
+    from collections.abc import Mapping
+except ImportError:
+    from collections import Mapping
 
 
 def to_key(value):

graphene/utils/deduplicator.py

@@ -1,4 +1,9 @@
-from collections import Mapping, OrderedDict
+from collections import OrderedDict
+
+try:
+    from collections.abc import Mapping
+except ImportError:
+    from collections import Mapping
 
 
 def deflate(node, index=None, path=None):

setup.py

@@ -49,6 +49,9 @@ tests_require = [
     "pytest-benchmark",
     "pytest-cov",
     "pytest-mock",
+    # pinning fastdiff dep (required by snapshottest) because later versions
+    # require wasmer 1.0.0 which is not compatible with Python 2.7
+    "fastdiff==0.2.0",
     "snapshottest",
     "coveralls",
     "promise",

tests_asyncio/test_relay_connection.py

@@ -56,10 +56,10 @@ for i, letter in enumerate(letter_chars):
 def edges(selected_letters):
     return [
         {
-            "node": {"id": base64("Letter:%s" % l.id), "letter": l.letter},
+            "node": {"id": base64("Letter:%s" % letter.id), "letter": letter.letter},
-            "cursor": base64("arrayconnection:%s" % l.id),
+            "cursor": base64("arrayconnection:%s" % letter.id),
         }
-        for l in [letters[i] for i in selected_letters]
+        for letter in [letters[i] for i in selected_letters]
     ]
 
 

tox.ini

@@ -1,20 +1,28 @@
 [tox]
-envlist = flake8,py27,py34,py35,py36,py37,pre-commit,pypy,mypy
+envlist = py{27,36,37,38,39,310},flake8,pre-commit,mypy
-skipsdist = true
+
+[gh-actions]
+python =
+    2.7: py27
+    3.6: py36
+    3.7: py37
+    3.8: py38
+    3.9: py39
+    3.10-dev: py310
 
 [testenv]
+passenv = *
+usedevelop = True
 deps =
-    .[test]
+    -e.[test]
-    py{35,36,37}: pytest-asyncio
+    py{36,37,38,39,310}: pytest-asyncio
 setenv =
      PYTHONPATH = .:{envdir}
 commands =
-    py{27,py}: py.test --cov=graphene graphene examples {posargs}
+    py{27}: py.test --cov=graphene graphene examples {posargs}
-    py{35}: py.test --cov=graphene graphene examples tests_asyncio {posargs}
+    py{36,37,38,39,310}: py.test --cov=graphene graphene examples tests_asyncio tests_py36 {posargs}
-    py{36,37}: py.test --cov=graphene graphene examples tests_asyncio tests_py36 {posargs}
 
 [testenv:pre-commit]
-basepython=python3.7
 deps =
     pre-commit>0.12.0
 setenv =
@@ -23,9 +31,9 @@ commands =
     pre-commit {posargs:run --all-files}
 
 [testenv:mypy]
-basepython=python3.7
 deps =
     mypy
+    types-six
 commands =
     mypy graphene
 
@@ -34,5 +42,3 @@ deps = flake8
 commands =
     pip install -e .
     flake8 graphene
-
-[pytest]