From 9d245287a4bd8a001df54cdbfc14f04e0e0d293a Mon Sep 17 00:00:00 2001
From: A C SREEDHAR REDDY <acreddysreedharreddy@gmail.com>
Date: Fri, 16 Aug 2019 19:03:59 +0530
Subject: [PATCH 001/116] is_authenticated is bool not callable. (#749)

---
 docs/authorization.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/authorization.rst b/docs/authorization.rst
index 2c38fa4..5199081 100644
--- a/docs/authorization.rst
+++ b/docs/authorization.rst
@@ -84,7 +84,7 @@ with the context argument.
 
         def resolve_my_posts(self, info):
             # context will reference to the Django request
-            if not info.context.user.is_authenticated():
+            if not info.context.user.is_authenticated:
                 return Post.objects.none()
             else:
                 return Post.objects.filter(owner=info.context.user)

From 1b8184ece14689d33c613092db49bf57206bbd6b Mon Sep 17 00:00:00 2001
From: A C SREEDHAR REDDY <acreddysreedharreddy@gmail.com>
Date: Fri, 16 Aug 2019 19:04:28 +0530
Subject: [PATCH 002/116] make Mutation class  ObjectType. (#748)

---
 docs/mutations.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/mutations.rst b/docs/mutations.rst
index 362df58..aef32eb 100644
--- a/docs/mutations.rst
+++ b/docs/mutations.rst
@@ -44,7 +44,7 @@ Simple example
             return QuestionMutation(question=question)
 
 
-    class Mutation:
+    class Mutation(graphene.ObjectType):
         update_question = QuestionMutation.Field()
 
 

From ac79b38cf0e51183c624b403379904cf91f2b161 Mon Sep 17 00:00:00 2001
From: Semyon Pupkov <mail@semyonpupkov.com>
Date: Sat, 7 Sep 2019 21:49:41 +0500
Subject: [PATCH 003/116] Use field and exclude in docs instead deprecated
 attrs (#740)

---
 docs/authorization.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/authorization.rst b/docs/authorization.rst
index 5199081..ebc9795 100644
--- a/docs/authorization.rst
+++ b/docs/authorization.rst
@@ -20,7 +20,7 @@ Let's use a simple example model.
 Limiting Field Access
 ---------------------
 
-To limit fields in a GraphQL query simply use the ``only_fields`` meta attribute.
+To limit fields in a GraphQL query simply use the ``fields`` meta attribute.
 
 .. code:: python
 
@@ -31,10 +31,10 @@ To limit fields in a GraphQL query simply use the ``only_fields`` meta attribute
     class PostNode(DjangoObjectType):
         class Meta:
             model = Post
-            only_fields = ('title', 'content')
+            fields = ('title', 'content')
             interfaces = (relay.Node, )
 
-conversely you can use ``exclude_fields`` meta attribute.
+conversely you can use ``exclude`` meta attribute.
 
 .. code:: python
 
@@ -45,7 +45,7 @@ conversely you can use ``exclude_fields`` meta attribute.
     class PostNode(DjangoObjectType):
         class Meta:
             model = Post
-            exclude_fields = ('published', 'owner')
+            exclude = ('published', 'owner')
             interfaces = (relay.Node, )
 
 Queryset Filtering On Lists
@@ -133,7 +133,7 @@ method to your ``DjangoObjectType``.
     class PostNode(DjangoObjectType):
         class Meta:
             model = Post
-            only_fields = ('title', 'content')
+            fields = ('title', 'content')
             interfaces = (relay.Node, )
 
         @classmethod

From 254e59c36fa289ddf86b32b528afeae54dfa1bb1 Mon Sep 17 00:00:00 2001
From: Talley Lambert <talley.lambert@gmail.com>
Date: Sat, 7 Sep 2019 14:49:29 -0400
Subject: [PATCH 004/116] Adds variables arg to GraphQLTestCase.query (#699)

* add variables arg in GraphQLTestCase.query

* update GraphQLTestCase.query docstring and remove type check
---
 docs/testing.rst                 | 22 ++++++++++++++++++++++
 graphene_django/utils/testing.py | 15 ++++++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/docs/testing.rst b/docs/testing.rst
index b111642..031cf6b 100644
--- a/docs/testing.rst
+++ b/docs/testing.rst
@@ -37,6 +37,28 @@ Usage:
             # Add some more asserts if you like
             ...
 
+        def test_query_with_variables(self):
+            response = self.query(
+                '''
+                query myModel($id: Int!){
+                    myModel(id: $id) {
+                        id
+                        name
+                    }
+                }
+                ''',
+                op_name='myModel',
+                variables={'id': 1}
+            )
+
+            content = json.loads(response.content)
+
+            # This validates the status code and if you get errors
+            self.assertResponseNoErrors(response)
+
+            # Add some more asserts if you like
+            ...
+
         def test_some_mutation(self):
             response = self.query(
                 '''
diff --git a/graphene_django/utils/testing.py b/graphene_django/utils/testing.py
index 0fdac7e..5b694b2 100644
--- a/graphene_django/utils/testing.py
+++ b/graphene_django/utils/testing.py
@@ -24,7 +24,7 @@ class GraphQLTestCase(TestCase):
 
         cls._client = Client()
 
-    def query(self, query, op_name=None, input_data=None):
+    def query(self, query, op_name=None, input_data=None, variables=None):
         """
         Args:
             query (string)    - GraphQL query to run
@@ -32,7 +32,11 @@ class GraphQLTestCase(TestCase):
                                 supply the op_name.  For annon queries ("{ ... }"),
                                 should be None (default).
             input_data (dict) - If provided, the $input variable in GraphQL will be set
-                                to this value
+                                to this value. If both ``input_data`` and ``variables``, 
+                                are provided, the ``input`` field in the ``variables``
+                                dict will be overwritten with this value.
+            variables (dict)  - If provided, the "variables" field in GraphQL will be
+                                set to this value. 
 
         Returns:
             Response object from client
@@ -40,8 +44,13 @@ class GraphQLTestCase(TestCase):
         body = {"query": query}
         if op_name:
             body["operation_name"] = op_name
+        if variables:
+            body["variables"] = variables
         if input_data:
-            body["variables"] = {"input": input_data}
+            if variables in body:
+                body["variables"]["input"] = input_data
+            else:
+                body["variables"] = {"input": input_data}
 
         resp = self._client.post(
             self.GRAPHQL_URL, json.dumps(body), content_type="application/json"

From 4bbc0824a623c874dd2726b7aed5bdeb563dda3b Mon Sep 17 00:00:00 2001
From: Tyler Kennedy <tk@tkte.ch>
Date: Tue, 17 Sep 2019 12:13:47 -0400
Subject: [PATCH 005/116] Fix a small typo, filerset_class -> filterset_class
 (#762)

---
 docs/filtering.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/filtering.rst b/docs/filtering.rst
index 7661928..6fe7cab 100644
--- a/docs/filtering.rst
+++ b/docs/filtering.rst
@@ -127,7 +127,7 @@ create your own ``FilterSet``. You can pass it directly as follows:
         all_animals = DjangoFilterConnectionField(AnimalNode,
                                                   filterset_class=AnimalFilter)
 
-You can also specify the ``FilterSet`` class using the ``filerset_class``
+You can also specify the ``FilterSet`` class using the ``filterset_class``
 parameter when defining your ``DjangoObjectType``, however, this can't be used
 in unison  with the ``filter_fields`` parameter:
 
@@ -218,4 +218,4 @@ with this set up, you can now order the users under group:
           xxx
         }
       }
-    }
\ No newline at end of file
+    }

From fea9b5b194c9ec7dc864143b918c73931f652ef4 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Tue, 17 Sep 2019 17:14:18 +0100
Subject: [PATCH 006/116] Extend DjangoListField to use model queryset if none
 defined (#732)

* Fix model property

* Only allow DjangoObjectTypes to DjangoListField

* Resolve model queryset by default

* Add some more tests to check behaviour
---
 graphene_django/fields.py            |  39 ++++--
 graphene_django/tests/test_fields.py | 199 +++++++++++++++++++++++++++
 2 files changed, 230 insertions(+), 8 deletions(-)
 create mode 100644 graphene_django/tests/test_fields.py

diff --git a/graphene_django/fields.py b/graphene_django/fields.py
index eb1215e..e6daa88 100644
--- a/graphene_django/fields.py
+++ b/graphene_django/fields.py
@@ -1,13 +1,12 @@
 from functools import partial
 
 from django.db.models.query import QuerySet
-from graphene import NonNull
-
+from graphql_relay.connection.arrayconnection import connection_from_list_slice
 from promise import Promise
 
-from graphene.types import Field, List
+from graphene import NonNull
 from graphene.relay import ConnectionField, PageInfo
-from graphql_relay.connection.arrayconnection import connection_from_list_slice
+from graphene.types import Field, List
 
 from .settings import graphene_settings
 from .utils import maybe_queryset
@@ -15,19 +14,43 @@ from .utils import maybe_queryset
 
 class DjangoListField(Field):
     def __init__(self, _type, *args, **kwargs):
+        from .types import DjangoObjectType
+
+        if isinstance(_type, NonNull):
+            _type = _type.of_type
+
+        assert issubclass(
+            _type, DjangoObjectType
+        ), "DjangoListField only accepts DjangoObjectType types"
+
         # Django would never return a Set of None  vvvvvvv
         super(DjangoListField, self).__init__(List(NonNull(_type)), *args, **kwargs)
 
     @property
     def model(self):
-        return self.type.of_type._meta.node._meta.model
+        _type = self.type.of_type
+        if isinstance(_type, NonNull):
+            _type = _type.of_type
+        return _type._meta.model
 
     @staticmethod
-    def list_resolver(resolver, root, info, **args):
-        return maybe_queryset(resolver(root, info, **args))
+    def list_resolver(django_object_type, resolver, root, info, **args):
+        queryset = maybe_queryset(resolver(root, info, **args))
+        if queryset is None:
+            # Default to Django Model queryset
+            # N.B. This happens if DjangoListField is used in the top level Query object
+            model = django_object_type._meta.model
+            queryset = maybe_queryset(
+                django_object_type.get_queryset(model.objects, info)
+            )
+        return queryset
 
     def get_resolver(self, parent_resolver):
-        return partial(self.list_resolver, parent_resolver)
+        _type = self.type
+        if isinstance(_type, NonNull):
+            _type = _type.of_type
+        django_object_type = _type.of_type.of_type
+        return partial(self.list_resolver, django_object_type, parent_resolver)
 
 
 class DjangoConnectionField(ConnectionField):
diff --git a/graphene_django/tests/test_fields.py b/graphene_django/tests/test_fields.py
new file mode 100644
index 0000000..f6abf00
--- /dev/null
+++ b/graphene_django/tests/test_fields.py
@@ -0,0 +1,199 @@
+import datetime
+
+import pytest
+
+from graphene import List, NonNull, ObjectType, Schema, String
+
+from ..fields import DjangoListField
+from ..types import DjangoObjectType
+from .models import Article as ArticleModel
+from .models import Reporter as ReporterModel
+
+
+@pytest.mark.django_db
+class TestDjangoListField:
+    def test_only_django_object_types(self):
+        class TestType(ObjectType):
+            foo = String()
+
+        with pytest.raises(AssertionError):
+            list_field = DjangoListField(TestType)
+
+    def test_non_null_type(self):
+        class Reporter(DjangoObjectType):
+            class Meta:
+                model = ReporterModel
+                fields = ("first_name",)
+
+        list_field = DjangoListField(NonNull(Reporter))
+
+        assert isinstance(list_field.type, List)
+        assert isinstance(list_field.type.of_type, NonNull)
+        assert list_field.type.of_type.of_type is Reporter
+
+    def test_get_django_model(self):
+        class Reporter(DjangoObjectType):
+            class Meta:
+                model = ReporterModel
+                fields = ("first_name",)
+
+        list_field = DjangoListField(Reporter)
+        assert list_field.model is ReporterModel
+
+    def test_list_field_default_queryset(self):
+        class Reporter(DjangoObjectType):
+            class Meta:
+                model = ReporterModel
+                fields = ("first_name",)
+
+        class Query(ObjectType):
+            reporters = DjangoListField(Reporter)
+
+        schema = Schema(query=Query)
+
+        query = """
+            query {
+                reporters {
+                    firstName
+                }
+            }
+        """
+
+        ReporterModel.objects.create(first_name="Tara", last_name="West")
+        ReporterModel.objects.create(first_name="Debra", last_name="Payne")
+
+        result = schema.execute(query)
+
+        assert not result.errors
+        assert result.data == {
+            "reporters": [{"firstName": "Tara"}, {"firstName": "Debra"}]
+        }
+
+    def test_override_resolver(self):
+        class Reporter(DjangoObjectType):
+            class Meta:
+                model = ReporterModel
+                fields = ("first_name",)
+
+        class Query(ObjectType):
+            reporters = DjangoListField(Reporter)
+
+            def resolve_reporters(_, info):
+                return ReporterModel.objects.filter(first_name="Tara")
+
+        schema = Schema(query=Query)
+
+        query = """
+            query {
+                reporters {
+                    firstName
+                }
+            }
+        """
+
+        ReporterModel.objects.create(first_name="Tara", last_name="West")
+        ReporterModel.objects.create(first_name="Debra", last_name="Payne")
+
+        result = schema.execute(query)
+
+        assert not result.errors
+        assert result.data == {"reporters": [{"firstName": "Tara"}]}
+
+    def test_nested_list_field(self):
+        class Article(DjangoObjectType):
+            class Meta:
+                model = ArticleModel
+                fields = ("headline",)
+
+        class Reporter(DjangoObjectType):
+            class Meta:
+                model = ReporterModel
+                fields = ("first_name", "articles")
+
+        class Query(ObjectType):
+            reporters = DjangoListField(Reporter)
+
+        schema = Schema(query=Query)
+
+        query = """
+            query {
+                reporters {
+                    firstName
+                    articles {
+                        headline
+                    }
+                }
+            }
+        """
+
+        r1 = ReporterModel.objects.create(first_name="Tara", last_name="West")
+        ReporterModel.objects.create(first_name="Debra", last_name="Payne")
+
+        ArticleModel.objects.create(
+            headline="Amazing news",
+            reporter=r1,
+            pub_date=datetime.date.today(),
+            pub_date_time=datetime.datetime.now(),
+            editor=r1,
+        )
+
+        result = schema.execute(query)
+
+        assert not result.errors
+        assert result.data == {
+            "reporters": [
+                {"firstName": "Tara", "articles": [{"headline": "Amazing news"}]},
+                {"firstName": "Debra", "articles": []},
+            ]
+        }
+
+    def test_override_resolver_nested_list_field(self):
+        class Article(DjangoObjectType):
+            class Meta:
+                model = ArticleModel
+                fields = ("headline",)
+
+        class Reporter(DjangoObjectType):
+            class Meta:
+                model = ReporterModel
+                fields = ("first_name", "articles")
+
+            def resolve_reporters(reporter, info):
+                return reporter.articles.all()
+
+        class Query(ObjectType):
+            reporters = DjangoListField(Reporter)
+
+        schema = Schema(query=Query)
+
+        query = """
+            query {
+                reporters {
+                    firstName
+                    articles {
+                        headline
+                    }
+                }
+            }
+        """
+
+        r1 = ReporterModel.objects.create(first_name="Tara", last_name="West")
+        ReporterModel.objects.create(first_name="Debra", last_name="Payne")
+
+        ArticleModel.objects.create(
+            headline="Amazing news",
+            reporter=r1,
+            pub_date=datetime.date.today(),
+            pub_date_time=datetime.datetime.now(),
+            editor=r1,
+        )
+
+        result = schema.execute(query)
+
+        assert not result.errors
+        assert result.data == {
+            "reporters": [
+                {"firstName": "Tara", "articles": [{"headline": "Amazing news"}]},
+                {"firstName": "Debra", "articles": []},
+            ]
+        }

From 4f21750fc227a0b339c932bdae651c22fe133ba8 Mon Sep 17 00:00:00 2001
From: Gilly Ames <gilly.ames@gmail.com>
Date: Sun, 22 Sep 2019 20:43:46 +0100
Subject: [PATCH 007/116] Upgrade graphiql version to fix history tool (#772)

Graphiql has a history tool that allows you to save and label favourites, but this version has a bug (fixed https://github.com/graphql/graphiql/issues/750). This change upgrades to the latest version.
---
 graphene_django/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/views.py b/graphene_django/views.py
index aefe114..d2c8324 100644
--- a/graphene_django/views.py
+++ b/graphene_django/views.py
@@ -51,7 +51,7 @@ def instantiate_middleware(middlewares):
 
 
 class GraphQLView(View):
-    graphiql_version = "0.13.0"
+    graphiql_version = "0.14.0"
     graphiql_template = "graphene/graphiql.html"
     react_version = "16.8.6"
 

From 0962db5aa60db972a48acd08cbe7ea0945357fce Mon Sep 17 00:00:00 2001
From: Mel van Londen <melvanlonden@gmail.com>
Date: Sun, 22 Sep 2019 13:09:57 -0700
Subject: [PATCH 008/116] =?UTF-8?q?Pin=20higher=20version=20of=20graphene?=
 =?UTF-8?q?=20for=20proper=20graphql-core=20version=20r=E2=80=A6=20(#768)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index bc7dcd3..a3d0b74 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,7 @@ setup(
     packages=find_packages(exclude=["tests"]),
     install_requires=[
         "six>=1.10.0",
-        "graphene>=2.1.3,<3",
+        "graphene>=2.1.7,<3",
         "graphql-core>=2.1.0,<3",
         "Django>=1.11",
         "singledispatch>=3.4.0.3",

From cd73cab6991940805372fa92d1c7b01ff9f81489 Mon Sep 17 00:00:00 2001
From: rishabh <eternal.blizzard23@gmail.com>
Date: Mon, 23 Sep 2019 01:40:21 +0530
Subject: [PATCH 009/116] converter.py: Fix typo posgres->postgres (#765)

Fixes typo for HStoreField and RangeField
converters.
---
 graphene_django/converter.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/graphene_django/converter.py b/graphene_django/converter.py
index 063d6be..d69c435 100644
--- a/graphene_django/converter.py
+++ b/graphene_django/converter.py
@@ -235,12 +235,12 @@ def convert_postgres_array_to_list(field, registry=None):
 
 @convert_django_field.register(HStoreField)
 @convert_django_field.register(JSONField)
-def convert_posgres_field_to_string(field, registry=None):
+def convert_postgres_field_to_string(field, registry=None):
     return JSONString(description=field.help_text, required=not field.null)
 
 
 @convert_django_field.register(RangeField)
-def convert_posgres_range_to_string(field, registry=None):
+def convert_postgres_range_to_string(field, registry=None):
     inner_type = convert_django_field(field.base_field)
     if not isinstance(inner_type, (List, NonNull)):
         inner_type = type(inner_type)

From a64ba65bef7b80b76c0960eb833a4cec83fb1a67 Mon Sep 17 00:00:00 2001
From: Jason Kraus <zbyte64@gmail.com>
Date: Sun, 22 Sep 2019 13:13:12 -0700
Subject: [PATCH 010/116] convert DRF ChoiceField to Enum (#537)

* convert DRF ChoiceField to Enum, also impacts FilePathField

* Pep8 fixes

* DRF multiple choices field converts to list of enum

* apply black formatting
---
 graphene_django/converter.py                  | 27 ++++++++++++-------
 .../rest_framework/serializer_converter.py    | 14 +++++++---
 .../tests/test_field_converter.py             | 19 +++++++++----
 3 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/graphene_django/converter.py b/graphene_django/converter.py
index d69c435..b59c906 100644
--- a/graphene_django/converter.py
+++ b/graphene_django/converter.py
@@ -1,3 +1,4 @@
+from collections import OrderedDict
 from django.db import models
 from django.utils.encoding import force_text
 
@@ -39,6 +40,8 @@ def convert_choice_name(name):
 
 def get_choices(choices):
     converted_names = []
+    if isinstance(choices, OrderedDict):
+        choices = choices.items()
     for value, help_text in choices:
         if isinstance(help_text, (tuple, list)):
             for choice in get_choices(help_text):
@@ -52,6 +55,19 @@ def get_choices(choices):
             yield name, value, description
 
 
+def convert_choices_to_named_enum_with_descriptions(name, choices):
+    choices = list(get_choices(choices))
+    named_choices = [(c[0], c[1]) for c in choices]
+    named_choices_descriptions = {c[0]: c[2] for c in choices}
+
+    class EnumWithDescriptionsType(object):
+        @property
+        def description(self):
+            return named_choices_descriptions[self.name]
+
+    return Enum(name, list(named_choices), type=EnumWithDescriptionsType)
+
+
 def convert_django_field_with_choices(
     field, registry=None, convert_choices_to_enum=True
 ):
@@ -63,16 +79,7 @@ def convert_django_field_with_choices(
     if choices and convert_choices_to_enum:
         meta = field.model._meta
         name = to_camel_case("{}_{}".format(meta.object_name, field.name))
-        choices = list(get_choices(choices))
-        named_choices = [(c[0], c[1]) for c in choices]
-        named_choices_descriptions = {c[0]: c[2] for c in choices}
-
-        class EnumWithDescriptionsType(object):
-            @property
-            def description(self):
-                return named_choices_descriptions[self.name]
-
-        enum = Enum(name, list(named_choices), type=EnumWithDescriptionsType)
+        enum = convert_choices_to_named_enum_with_descriptions(name, choices)
         required = not (field.blank or field.null)
         converted = enum(description=field.help_text, required=required)
     else:
diff --git a/graphene_django/rest_framework/serializer_converter.py b/graphene_django/rest_framework/serializer_converter.py
index c419419..caeb7dd 100644
--- a/graphene_django/rest_framework/serializer_converter.py
+++ b/graphene_django/rest_framework/serializer_converter.py
@@ -4,6 +4,7 @@ from rest_framework import serializers
 import graphene
 
 from ..registry import get_global_registry
+from ..converter import convert_choices_to_named_enum_with_descriptions
 from ..utils import import_single_dispatch
 from .types import DictType
 
@@ -130,7 +131,6 @@ def convert_serializer_field_to_time(field):
 @get_graphene_type_from_serializer_field.register(serializers.ListField)
 def convert_serializer_field_to_list(field, is_input=True):
     child_type = get_graphene_type_from_serializer_field(field.child)
-
     return (graphene.List, child_type)
 
 
@@ -145,5 +145,13 @@ def convert_serializer_field_to_jsonstring(field):
 
 
 @get_graphene_type_from_serializer_field.register(serializers.MultipleChoiceField)
-def convert_serializer_field_to_list_of_string(field):
-    return (graphene.List, graphene.String)
+def convert_serializer_field_to_list_of_enum(field):
+    child_type = convert_serializer_field_to_enum(field)
+    return (graphene.List, child_type)
+
+
+@get_graphene_type_from_serializer_field.register(serializers.ChoiceField)
+def convert_serializer_field_to_enum(field):
+    # enums require a name
+    name = field.field_name or field.source or "Choices"
+    return convert_choices_to_named_enum_with_descriptions(name, field.choices)
diff --git a/graphene_django/rest_framework/tests/test_field_converter.py b/graphene_django/rest_framework/tests/test_field_converter.py
index 6fa4ca8..82f5b63 100644
--- a/graphene_django/rest_framework/tests/test_field_converter.py
+++ b/graphene_django/rest_framework/tests/test_field_converter.py
@@ -60,8 +60,17 @@ def test_should_url_convert_string():
     assert_conversion(serializers.URLField, graphene.String)
 
 
-def test_should_choice_convert_string():
-    assert_conversion(serializers.ChoiceField, graphene.String, choices=[])
+def test_should_choice_convert_enum():
+    field = assert_conversion(
+        serializers.ChoiceField,
+        graphene.Enum,
+        choices=[("h", "Hello"), ("w", "World")],
+        source="word",
+    )
+    assert field._meta.enum.__members__["H"].value == "h"
+    assert field._meta.enum.__members__["H"].description == "Hello"
+    assert field._meta.enum.__members__["W"].value == "w"
+    assert field._meta.enum.__members__["W"].description == "World"
 
 
 def test_should_base_field_convert_string():
@@ -174,7 +183,7 @@ def test_should_file_convert_string():
 
 
 def test_should_filepath_convert_string():
-    assert_conversion(serializers.FilePathField, graphene.String, path="/")
+    assert_conversion(serializers.FilePathField, graphene.Enum, path="/")
 
 
 def test_should_ip_convert_string():
@@ -189,9 +198,9 @@ def test_should_json_convert_jsonstring():
     assert_conversion(serializers.JSONField, graphene.types.json.JSONString)
 
 
-def test_should_multiplechoicefield_convert_to_list_of_string():
+def test_should_multiplechoicefield_convert_to_list_of_enum():
     field = assert_conversion(
         serializers.MultipleChoiceField, graphene.List, choices=[1, 2, 3]
     )
 
-    assert field.of_type == graphene.String
+    assert issubclass(field.of_type, graphene.Enum)

From e4cf59ecec5a47c6986d36241d8e87acb25152ff Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sun, 22 Sep 2019 21:14:59 +0100
Subject: [PATCH 011/116] Handle isnull filters differently (#753)

* Handle isnull filters differently

* Change to rsplit
---
 graphene_django/filter/tests/test_fields.py | 54 ++++++++++++++++++++-
 graphene_django/filter/utils.py             | 11 ++++-
 2 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py
index aa6a903..1ffa0f4 100644
--- a/graphene_django/filter/tests/test_fields.py
+++ b/graphene_django/filter/tests/test_fields.py
@@ -56,8 +56,6 @@ if DJANGO_FILTER_INSTALLED:
             model = Pet
             interfaces = (Node,)
 
-    # schema = Schema()
-
 
 def get_args(field):
     return field.args
@@ -820,6 +818,58 @@ def test_integer_field_filter_type():
     )
 
 
+def test_other_filter_types():
+    class PetType(DjangoObjectType):
+        class Meta:
+            model = Pet
+            interfaces = (Node,)
+            filter_fields = {"age": ["exact", "isnull", "lt"]}
+            fields = ("age",)
+
+    class Query(ObjectType):
+        pets = DjangoFilterConnectionField(PetType)
+
+    schema = Schema(query=Query)
+
+    assert str(schema) == dedent(
+        """\
+        schema {
+          query: Query
+        }
+
+        interface Node {
+          id: ID!
+        }
+
+        type PageInfo {
+          hasNextPage: Boolean!
+          hasPreviousPage: Boolean!
+          startCursor: String
+          endCursor: String
+        }
+
+        type PetType implements Node {
+          age: Int!
+          id: ID!
+        }
+
+        type PetTypeConnection {
+          pageInfo: PageInfo!
+          edges: [PetTypeEdge]!
+        }
+
+        type PetTypeEdge {
+          node: PetType
+          cursor: String!
+        }
+
+        type Query {
+          pets(before: String, after: String, first: Int, last: Int, age: Int, age_Isnull: Boolean, age_Lt: Int): PetTypeConnection
+        }
+    """
+    )
+
+
 def test_filter_filterset_based_on_mixin():
     class ArticleFilterMixin(FilterSet):
         @classmethod
diff --git a/graphene_django/filter/utils.py b/graphene_django/filter/utils.py
index 81efb63..abb03a9 100644
--- a/graphene_django/filter/utils.py
+++ b/graphene_django/filter/utils.py
@@ -18,9 +18,16 @@ def get_filtering_args_from_filterset(filterset_class, type):
         if name in filterset_class.declared_filters:
             form_field = filter_field.field
         else:
-            field_name = name.split("__", 1)[0]
+            try:
+                field_name, filter_type = name.rsplit("__", 1)
+            except ValueError:
+                field_name = name
+                filter_type = None
 
-            if hasattr(model, field_name):
+            # If the filter type is `isnull` then use the filter provided by
+            # DjangoFilter (a BooleanFilter).
+            # Otherwise try and get a filter based on the actual model field
+            if filter_type != "isnull" and hasattr(model, field_name):
                 model_field = model._meta.get_field(field_name)
 
                 if hasattr(model_field, "formfield"):

From 5068ea05c323ad3962fb6d1d8e36c3b2b134e90f Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sun, 22 Sep 2019 21:17:44 +0100
Subject: [PATCH 012/116] v2.6.0

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index 659cc79..7650dd2 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,6 +1,6 @@
 from .types import DjangoObjectType
 from .fields import DjangoConnectionField
 
-__version__ = "2.5.0"
+__version__ = "2.6.0"
 
 __all__ = ["__version__", "DjangoObjectType", "DjangoConnectionField"]

From 8d95596ffbb10712e4911dae79ecb4703c743a13 Mon Sep 17 00:00:00 2001
From: Jens Diemer <github.com@jensdiemer.de>
Date: Tue, 1 Oct 2019 15:59:52 +0200
Subject: [PATCH 013/116] Note that release information are on github release
 page (#790)

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 33f71f3..0f1ee77 100644
--- a/README.md
+++ b/README.md
@@ -101,3 +101,7 @@ To learn more check out the following [examples](examples/):
 ## Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md)
+
+## Release Notes
+
+* See [Releases page on github](https://github.com/graphql-python/graphene-django/releases)

From e17582e1a1b8a9b595bf8aca295026db6ecd8c5e Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Fri, 18 Oct 2019 10:12:03 +0100
Subject: [PATCH 014/116] Update stale.yml

---
 .github/stale.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/stale.yml b/.github/stale.yml
index dc90e5a..c9418f6 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
+daysUntilStale: 90
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
+daysUntilClose: 14
 # Issues with these labels will never be considered stale
 exemptLabels:
   - pinned

From b085b5922a69f1cadfa2bb72519c19dafebb2e39 Mon Sep 17 00:00:00 2001
From: Misha K <mike.viburn@gmail.com>
Date: Fri, 18 Oct 2019 12:38:59 +0200
Subject: [PATCH 015/116] add Django 3.0 to the test matrix (#793)

* add Django 3.0 to the test matrix

* fix six imports
---
 .travis.yml                           | 4 ++++
 graphene_django/debug/sql/tracking.py | 2 +-
 graphene_django/settings.py           | 2 +-
 graphene_django/utils/utils.py        | 2 +-
 tox.ini                               | 3 +++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 871d4e3..3531b56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,8 @@ matrix:
       env: DJANGO=2.1
     - python: 3.6
       env: DJANGO=2.2
+    - python: 3.6
+      env: DJANGO=3.0
     - python: 3.6
       env: DJANGO=master
 
@@ -46,6 +48,8 @@ matrix:
       env: DJANGO=2.1
     - python: 3.7
       env: DJANGO=2.2
+    - python: 3.7
+      env: DJANGO=3.0
     - python: 3.7
       env: DJANGO=master
 
diff --git a/graphene_django/debug/sql/tracking.py b/graphene_django/debug/sql/tracking.py
index f96583b..8391eac 100644
--- a/graphene_django/debug/sql/tracking.py
+++ b/graphene_django/debug/sql/tracking.py
@@ -5,7 +5,7 @@ import json
 from threading import local
 from time import time
 
-from django.utils import six
+import six
 from django.utils.encoding import force_text
 
 from .types import DjangoDebugSQL
diff --git a/graphene_django/settings.py b/graphene_django/settings.py
index af63890..9a5e8a9 100644
--- a/graphene_django/settings.py
+++ b/graphene_django/settings.py
@@ -13,9 +13,9 @@ back to the defaults.
 """
 from __future__ import unicode_literals
 
+import six
 from django.conf import settings
 from django.test.signals import setting_changed
-from django.utils import six
 
 try:
     import importlib  # Available in Python 3.1+
diff --git a/graphene_django/utils/utils.py b/graphene_django/utils/utils.py
index 47c0c37..c1d3572 100644
--- a/graphene_django/utils/utils.py
+++ b/graphene_django/utils/utils.py
@@ -1,8 +1,8 @@
 import inspect
 
+import six
 from django.db import models
 from django.db.models.manager import Manager
-from django.utils import six
 from django.utils.encoding import force_text
 from django.utils.functional import Promise
 
diff --git a/tox.ini b/tox.ini
index a1b599a..e7287ff 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 envlist =
     py{27,35,36,37}-django{111,20,21,22,master},
+    py{36,37}-django30,
     black,flake8
 
 [travis:env]
@@ -9,6 +10,7 @@ DJANGO =
     2.0: django20
     2.1: django21
     2.2: django22
+    3.0: django30
     master: djangomaster
 
 [testenv]
@@ -23,6 +25,7 @@ deps =
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
     django22: Django>=2.2,<3.0
+    django30: Django>=3.0a1,<3.1
     djangomaster: https://github.com/django/django/archive/master.zip
 commands = {posargs:py.test --cov=graphene_django graphene_django examples}
 

From def6b15e5bf6bb0129932b2286938a2fbb45cfca Mon Sep 17 00:00:00 2001
From: Brett Jackson <brett@brettjackson.org>
Date: Sat, 19 Oct 2019 14:33:33 -0500
Subject: [PATCH 016/116] Update schema introspection docs to show
 SCHEMA_INDENT option (#802)

* Update schema introspection docs to show indent settings

* fix whitespace
---
 docs/introspection.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/introspection.rst b/docs/introspection.rst
index c1d6ede..dea55bd 100644
--- a/docs/introspection.rst
+++ b/docs/introspection.rst
@@ -44,7 +44,8 @@ specify the parameters in your settings.py:
 
     GRAPHENE = {
     	'SCHEMA': 'tutorial.quickstart.schema',
-    	'SCHEMA_OUTPUT': 'data/schema.json'  # defaults to schema.json
+    	'SCHEMA_OUTPUT': 'data/schema.json',  # defaults to schema.json,
+    	'SCHEMA_INDENT': 2,  # Defaults to None (displays all data on a single line)
     }
 
 

From e51e60209ac7331af669c8bb231c970a75ad1b72 Mon Sep 17 00:00:00 2001
From: Athul Cyriac Ajay <athul8720@gmail.com>
Date: Fri, 1 Nov 2019 05:01:31 +0530
Subject: [PATCH 017/116] Updated Tutorial with Highlights (#801)

---
 docs/schema.py          | 58 +++++++++++++++++++++++++++++++++++++
 docs/tutorial-plain.rst | 63 ++---------------------------------------
 2 files changed, 61 insertions(+), 60 deletions(-)
 create mode 100644 docs/schema.py

diff --git a/docs/schema.py b/docs/schema.py
new file mode 100644
index 0000000..3d9b2fa
--- /dev/null
+++ b/docs/schema.py
@@ -0,0 +1,58 @@
+  import graphene
+
+  from graphene_django.types import DjangoObjectType
+
+  from cookbook.ingredients.models import Category, Ingredient
+
+
+  class CategoryType(DjangoObjectType):
+      class Meta:
+          model = Category
+
+
+  class IngredientType(DjangoObjectType):
+      class Meta:
+          model = Ingredient
+
+
+  class Query(object):
+      category = graphene.Field(CategoryType,
+                                id=graphene.Int(),
+                                name=graphene.String())
+      all_categories = graphene.List(CategoryType)
+
+
+      ingredient = graphene.Field(IngredientType,
+                                  id=graphene.Int(),
+                                  name=graphene.String())
+      all_ingredients = graphene.List(IngredientType)
+
+      def resolve_all_categories(self, info, **kwargs):
+          return Category.objects.all()
+
+      def resolve_all_ingredients(self, info, **kwargs):
+          return Ingredient.objects.all()
+
+      def resolve_category(self, info, **kwargs):
+          id = kwargs.get('id')
+          name = kwargs.get('name')
+
+          if id is not None:
+              return Category.objects.get(pk=id)
+
+          if name is not None:
+              return Category.objects.get(name=name)
+
+          return None
+
+      def resolve_ingredient(self, info, **kwargs):
+          id = kwargs.get('id')
+          name = kwargs.get('name')
+
+          if id is not None:
+              return Ingredient.objects.get(pk=id)
+
+          if name is not None:
+              return Ingredient.objects.get(name=name)
+
+          return None
\ No newline at end of file
diff --git a/docs/tutorial-plain.rst b/docs/tutorial-plain.rst
index 29df56e..c3ee269 100644
--- a/docs/tutorial-plain.rst
+++ b/docs/tutorial-plain.rst
@@ -417,67 +417,10 @@ Getting single objects
 So far, we have been able to fetch list of objects and follow relation. But what about single objects?
 
 We can update our schema to support that, by adding new query for ``ingredient`` and ``category`` and adding arguments, so we can query for specific objects.
+Add the **Highlighted** lines to ``cookbook/ingredients/schema.py``
 
-.. code:: python
-
-  import graphene
-
-  from graphene_django.types import DjangoObjectType
-
-  from cookbook.ingredients.models import Category, Ingredient
-
-
-  class CategoryType(DjangoObjectType):
-      class Meta:
-          model = Category
-
-
-  class IngredientType(DjangoObjectType):
-      class Meta:
-          model = Ingredient
-
-
-  class Query(object):
-      category = graphene.Field(CategoryType,
-                                id=graphene.Int(),
-                                name=graphene.String())
-      all_categories = graphene.List(CategoryType)
-
-
-      ingredient = graphene.Field(IngredientType,
-                                  id=graphene.Int(),
-                                  name=graphene.String())
-      all_ingredients = graphene.List(IngredientType)
-
-      def resolve_all_categories(self, info, **kwargs):
-          return Category.objects.all()
-
-      def resolve_all_ingredients(self, info, **kwargs):
-          return Ingredient.objects.all()
-
-      def resolve_category(self, info, **kwargs):
-          id = kwargs.get('id')
-          name = kwargs.get('name')
-
-          if id is not None:
-              return Category.objects.get(pk=id)
-
-          if name is not None:
-              return Category.objects.get(name=name)
-
-          return None
-
-      def resolve_ingredient(self, info, **kwargs):
-          id = kwargs.get('id')
-          name = kwargs.get('name')
-
-          if id is not None:
-              return Ingredient.objects.get(pk=id)
-
-          if name is not None:
-              return Ingredient.objects.get(name=name)
-
-          return None
+.. literalinclude:: schema.py
+  :emphasize-lines: 19-21,25-27,36-58
 
 Now, with the code in place, we can query for single objects.
 

From 3ce44908c9ddfcf6a7b603acc6ee7aefb64ce03c Mon Sep 17 00:00:00 2001
From: Jason Kraus <zbyte64@gmail.com>
Date: Thu, 28 Nov 2019 02:48:03 -0800
Subject: [PATCH 018/116] =?UTF-8?q?django-filter:=20resolve=20field=20alon?=
 =?UTF-8?q?g=20with=20lookup=20expression=20to=20pro=E2=80=A6=20(#805)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* django-filter: resolve field along with lookup expression to properly resolve field

* bring back django-filter with method test

* remove dangling comment

* refactor based on better knowledge of django-filters
---
 graphene_django/filter/utils.py | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/graphene_django/filter/utils.py b/graphene_django/filter/utils.py
index abb03a9..c5f18e2 100644
--- a/graphene_django/filter/utils.py
+++ b/graphene_django/filter/utils.py
@@ -1,5 +1,6 @@
 import six
 
+from django_filters.utils import get_model_field
 from .filterset import custom_filterset_factory, setup_filterset
 
 
@@ -18,22 +19,12 @@ def get_filtering_args_from_filterset(filterset_class, type):
         if name in filterset_class.declared_filters:
             form_field = filter_field.field
         else:
-            try:
-                field_name, filter_type = name.rsplit("__", 1)
-            except ValueError:
-                field_name = name
-                filter_type = None
-
-            # If the filter type is `isnull` then use the filter provided by
-            # DjangoFilter (a BooleanFilter).
-            # Otherwise try and get a filter based on the actual model field
-            if filter_type != "isnull" and hasattr(model, field_name):
-                model_field = model._meta.get_field(field_name)
-
-                if hasattr(model_field, "formfield"):
-                    form_field = model_field.formfield(
-                        required=filter_field.extra.get("required", False)
-                    )
+            model_field = get_model_field(model, filter_field.field_name)
+            filter_type = filter_field.lookup_expr
+            if filter_type != "isnull" and hasattr(model_field, "formfield"):
+                form_field = model_field.formfield(
+                    required=filter_field.extra.get("required", False)
+                )
 
         # Fallback to field defined on filter if we can't get it from the
         # model field

From a818ec9017c82105d2dcfb605946b890b319fa97 Mon Sep 17 00:00:00 2001
From: Jason Kraus <zbyte64@gmail.com>
Date: Thu, 28 Nov 2019 02:49:37 -0800
Subject: [PATCH 019/116] replace merge_queryset with resolve_queryset pattern
 (#796)

* replace merge_queryset with resolve_queryset pattern

* skip double limit test

* Update graphene_django/fields.py

Co-Authored-By: Jonathan Kim <jkimbo@gmail.com>

* yank skipped test

* fix bad variable ref

* add test for annotations

* add test for using  queryset with django filters

* document ththat one should use defer instead of values with queysets and DjangoObjectTypes
---
 docs/queries.rst                            |  7 ++
 graphene_django/fields.py                   | 35 ++++----
 graphene_django/filter/fields.py            | 68 ++-------------
 graphene_django/filter/tests/test_fields.py | 96 +++++++++------------
 graphene_django/tests/test_query.py         | 58 ++++++++++++-
 5 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/docs/queries.rst b/docs/queries.rst
index 67ebb06..36cdab1 100644
--- a/docs/queries.rst
+++ b/docs/queries.rst
@@ -282,6 +282,13 @@ of Django's ``HTTPRequest`` in your resolve methods, such as checking for authen
             return Question.objects.none()
 
 
+DjangoObjectTypes
+~~~~~~~~~~~~~~~~~
+
+A Resolver that maps to a defined `DjangoObjectType` should only use methods that return a queryset.
+Queryset methods like `values` will return dictionaries, use `defer` instead.
+
+
 Plain ObjectTypes
 -----------------
 
diff --git a/graphene_django/fields.py b/graphene_django/fields.py
index e6daa88..47b44f6 100644
--- a/graphene_django/fields.py
+++ b/graphene_django/fields.py
@@ -39,9 +39,9 @@ class DjangoListField(Field):
         if queryset is None:
             # Default to Django Model queryset
             # N.B. This happens if DjangoListField is used in the top level Query object
-            model = django_object_type._meta.model
+            model_manager = django_object_type._meta.model.objects
             queryset = maybe_queryset(
-                django_object_type.get_queryset(model.objects, info)
+                django_object_type.get_queryset(model_manager, info)
             )
         return queryset
 
@@ -108,25 +108,13 @@ class DjangoConnectionField(ConnectionField):
 
     @classmethod
     def resolve_queryset(cls, connection, queryset, info, args):
+        # queryset is the resolved iterable from ObjectType
         return connection._meta.node.get_queryset(queryset, info)
 
     @classmethod
-    def merge_querysets(cls, default_queryset, queryset):
-        if default_queryset.query.distinct and not queryset.query.distinct:
-            queryset = queryset.distinct()
-        elif queryset.query.distinct and not default_queryset.query.distinct:
-            default_queryset = default_queryset.distinct()
-        return queryset & default_queryset
-
-    @classmethod
-    def resolve_connection(cls, connection, default_manager, args, iterable):
-        if iterable is None:
-            iterable = default_manager
+    def resolve_connection(cls, connection, args, iterable):
         iterable = maybe_queryset(iterable)
         if isinstance(iterable, QuerySet):
-            if iterable.model.objects is not default_manager:
-                default_queryset = maybe_queryset(default_manager)
-                iterable = cls.merge_querysets(default_queryset, iterable)
             _len = iterable.count()
         else:
             _len = len(iterable)
@@ -150,6 +138,7 @@ class DjangoConnectionField(ConnectionField):
         resolver,
         connection,
         default_manager,
+        queryset_resolver,
         max_limit,
         enforce_first_or_last,
         root,
@@ -177,9 +166,15 @@ class DjangoConnectionField(ConnectionField):
                 ).format(last, info.field_name, max_limit)
                 args["last"] = min(last, max_limit)
 
+        # eventually leads to DjangoObjectType's get_queryset (accepts queryset)
+        # or a resolve_foo (does not accept queryset)
         iterable = resolver(root, info, **args)
-        queryset = cls.resolve_queryset(connection, default_manager, info, args)
-        on_resolve = partial(cls.resolve_connection, connection, queryset, args)
+        if iterable is None:
+            iterable = default_manager
+        # thus the iterable gets refiltered by resolve_queryset
+        # but iterable might be promise
+        iterable = queryset_resolver(connection, iterable, info, args)
+        on_resolve = partial(cls.resolve_connection, connection, args)
 
         if Promise.is_thenable(iterable):
             return Promise.resolve(iterable).then(on_resolve)
@@ -192,6 +187,10 @@ class DjangoConnectionField(ConnectionField):
             parent_resolver,
             self.connection_type,
             self.get_manager(),
+            self.get_queryset_resolver(),
             self.max_limit,
             self.enforce_first_or_last,
         )
+
+    def get_queryset_resolver(self):
+        return self.resolve_queryset
diff --git a/graphene_django/filter/fields.py b/graphene_django/filter/fields.py
index 338becb..9943346 100644
--- a/graphene_django/filter/fields.py
+++ b/graphene_django/filter/fields.py
@@ -52,69 +52,17 @@ class DjangoFilterConnectionField(DjangoConnectionField):
         return get_filtering_args_from_filterset(self.filterset_class, self.node_type)
 
     @classmethod
-    def merge_querysets(cls, default_queryset, queryset):
-        # There could be the case where the default queryset (returned from the filterclass)
-        # and the resolver queryset have some limits on it.
-        # We only would be able to apply one of those, but not both
-        # at the same time.
-
-        # See related PR: https://github.com/graphql-python/graphene-django/pull/126
-
-        assert not (
-            default_queryset.query.low_mark and queryset.query.low_mark
-        ), "Received two sliced querysets (low mark) in the connection, please slice only in one."
-        assert not (
-            default_queryset.query.high_mark and queryset.query.high_mark
-        ), "Received two sliced querysets (high mark) in the connection, please slice only in one."
-        low = default_queryset.query.low_mark or queryset.query.low_mark
-        high = default_queryset.query.high_mark or queryset.query.high_mark
-        default_queryset.query.clear_limits()
-        queryset = super(DjangoFilterConnectionField, cls).merge_querysets(
-            default_queryset, queryset
-        )
-        queryset.query.set_limits(low, high)
-        return queryset
-
-    @classmethod
-    def connection_resolver(
-        cls,
-        resolver,
-        connection,
-        default_manager,
-        max_limit,
-        enforce_first_or_last,
-        filterset_class,
-        filtering_args,
-        root,
-        info,
-        **args
+    def resolve_queryset(
+        cls, connection, iterable, info, args, filtering_args, filterset_class
     ):
         filter_kwargs = {k: v for k, v in args.items() if k in filtering_args}
-        qs = filterset_class(
-            data=filter_kwargs,
-            queryset=default_manager.get_queryset(),
-            request=info.context,
+        return filterset_class(
+            data=filter_kwargs, queryset=iterable, request=info.context
         ).qs
 
-        return super(DjangoFilterConnectionField, cls).connection_resolver(
-            resolver,
-            connection,
-            qs,
-            max_limit,
-            enforce_first_or_last,
-            root,
-            info,
-            **args
-        )
-
-    def get_resolver(self, parent_resolver):
+    def get_queryset_resolver(self):
         return partial(
-            self.connection_resolver,
-            parent_resolver,
-            self.connection_type,
-            self.get_manager(),
-            self.max_limit,
-            self.enforce_first_or_last,
-            self.filterset_class,
-            self.filtering_args,
+            self.resolve_queryset,
+            filterset_class=self.filterset_class,
+            filtering_args=self.filtering_args,
         )
diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py
index 1ffa0f4..1eba601 100644
--- a/graphene_django/filter/tests/test_fields.py
+++ b/graphene_django/filter/tests/test_fields.py
@@ -608,58 +608,6 @@ def test_should_query_filter_node_limit():
     assert result.data == expected
 
 
-def test_should_query_filter_node_double_limit_raises():
-    class ReporterFilter(FilterSet):
-        limit = NumberFilter(method="filter_limit")
-
-        def filter_limit(self, queryset, name, value):
-            return queryset[:value]
-
-        class Meta:
-            model = Reporter
-            fields = ["first_name"]
-
-    class ReporterType(DjangoObjectType):
-        class Meta:
-            model = Reporter
-            interfaces = (Node,)
-
-    class Query(ObjectType):
-        all_reporters = DjangoFilterConnectionField(
-            ReporterType, filterset_class=ReporterFilter
-        )
-
-        def resolve_all_reporters(self, info, **args):
-            return Reporter.objects.order_by("a_choice")[:2]
-
-    Reporter.objects.create(
-        first_name="Bob", last_name="Doe", email="bobdoe@example.com", a_choice=2
-    )
-    Reporter.objects.create(
-        first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
-    )
-
-    schema = Schema(query=Query)
-    query = """
-        query NodeFilteringQuery {
-            allReporters(limit: 1) {
-                edges {
-                    node {
-                        id
-                        firstName
-                    }
-                }
-            }
-        }
-    """
-
-    result = schema.execute(query)
-    assert len(result.errors) == 1
-    assert str(result.errors[0]) == (
-        "Received two sliced querysets (high mark) in the connection, please slice only in one."
-    )
-
-
 def test_order_by_is_perserved():
     class ReporterType(DjangoObjectType):
         class Meta:
@@ -721,7 +669,7 @@ def test_order_by_is_perserved():
     assert reverse_result.data == reverse_expected
 
 
-def test_annotation_is_perserved():
+def test_annotation_is_preserved():
     class ReporterType(DjangoObjectType):
         full_name = String()
 
@@ -766,6 +714,48 @@ def test_annotation_is_perserved():
     assert result.data == expected
 
 
+def test_annotation_with_only():
+    class ReporterType(DjangoObjectType):
+        full_name = String()
+
+        class Meta:
+            model = Reporter
+            interfaces = (Node,)
+            filter_fields = ()
+
+    class Query(ObjectType):
+        all_reporters = DjangoFilterConnectionField(ReporterType)
+
+        def resolve_all_reporters(self, info, **args):
+            return Reporter.objects.only("first_name", "last_name").annotate(
+                full_name=Concat(
+                    "first_name", Value(" "), "last_name", output_field=TextField()
+                )
+            )
+
+    Reporter.objects.create(first_name="John", last_name="Doe")
+
+    schema = Schema(query=Query)
+
+    query = """
+        query NodeFilteringQuery {
+            allReporters(first: 1) {
+                edges {
+                    node {
+                        fullName
+                    }
+                }
+            }
+        }
+    """
+    expected = {"allReporters": {"edges": [{"node": {"fullName": "John Doe"}}]}}
+
+    result = schema.execute(query)
+
+    assert not result.errors
+    assert result.data == expected
+
+
 def test_integer_field_filter_type():
     class PetType(DjangoObjectType):
         class Meta:
diff --git a/graphene_django/tests/test_query.py b/graphene_django/tests/test_query.py
index f24f84b..95db2d1 100644
--- a/graphene_django/tests/test_query.py
+++ b/graphene_django/tests/test_query.py
@@ -638,6 +638,8 @@ def test_should_error_if_first_is_greater_than_max():
     class Query(graphene.ObjectType):
         all_reporters = DjangoConnectionField(ReporterType)
 
+    assert Query.all_reporters.max_limit == 100
+
     r = Reporter.objects.create(
         first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
     )
@@ -679,6 +681,8 @@ def test_should_error_if_last_is_greater_than_max():
     class Query(graphene.ObjectType):
         all_reporters = DjangoConnectionField(ReporterType)
 
+    assert Query.all_reporters.max_limit == 100
+
     r = Reporter.objects.create(
         first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
     )
@@ -804,7 +808,7 @@ def test_should_query_connectionfields_with_manager():
     schema = graphene.Schema(query=Query)
     query = """
         query ReporterLastQuery {
-            allReporters(first: 2) {
+            allReporters(first: 1) {
                 edges {
                     node {
                         id
@@ -1116,3 +1120,55 @@ def test_should_preserve_prefetch_related(django_assert_num_queries):
     with django_assert_num_queries(3) as captured:
         result = schema.execute(query)
     assert not result.errors
+
+
+def test_should_preserve_annotations():
+    class ReporterType(DjangoObjectType):
+        class Meta:
+            model = Reporter
+            interfaces = (graphene.relay.Node,)
+
+    class FilmType(DjangoObjectType):
+        reporters = DjangoConnectionField(ReporterType)
+        reporters_count = graphene.Int()
+
+        class Meta:
+            model = Film
+            interfaces = (graphene.relay.Node,)
+
+    class Query(graphene.ObjectType):
+        films = DjangoConnectionField(FilmType)
+
+        def resolve_films(root, info):
+            qs = Film.objects.prefetch_related("reporters")
+            return qs.annotate(reporters_count=models.Count("reporters"))
+
+    r1 = Reporter.objects.create(first_name="Dave", last_name="Smith")
+    r2 = Reporter.objects.create(first_name="Jane", last_name="Doe")
+
+    f1 = Film.objects.create()
+    f1.reporters.set([r1, r2])
+    f2 = Film.objects.create()
+    f2.reporters.set([r2])
+
+    query = """
+        query {
+            films {
+                edges {
+                    node {
+                        reportersCount
+                    }
+                }
+            }
+        }
+    """
+    schema = graphene.Schema(query=Query)
+    result = schema.execute(query)
+    assert not result.errors, str(result)
+
+    expected = {
+        "films": {
+            "edges": [{"node": {"reportersCount": 2}}, {"node": {"reportersCount": 1}}]
+        }
+    }
+    assert result.data == expected, str(result.data)

From e82a2d75c645989ade5c51b578230f5d313e6a7c Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Thu, 28 Nov 2019 19:23:31 +0000
Subject: [PATCH 020/116] v2.7.0

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index 7650dd2..bc01752 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,6 +1,6 @@
 from .types import DjangoObjectType
 from .fields import DjangoConnectionField
 
-__version__ = "2.6.0"
+__version__ = "2.7.0"
 
 __all__ = ["__version__", "DjangoObjectType", "DjangoConnectionField"]

From 7e7f18ee0e96562f57628c2cd5cbd9a5a6941f57 Mon Sep 17 00:00:00 2001
From: Thiago Bellini Ribeiro <hackedbellini@gmail.com>
Date: Fri, 29 Nov 2019 06:13:16 -0300
Subject: [PATCH 021/116] Keep original queryset on DjangoFilterConnectionField
 (#816)

* Keep original queryset on DjangoFilterConnectionField

The PR #796 broke DjangoFilterConnectionField making it always get the
raw queryset from the model to apply the filters in it.

This makes sure that the DjangoObjectType's .get_queryset is called,
keeping any filtering it might have made.

* Add regression test
---
 graphene_django/filter/fields.py            |  7 ++--
 graphene_django/filter/tests/test_fields.py | 38 +++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/graphene_django/filter/fields.py b/graphene_django/filter/fields.py
index 9943346..a46a4b7 100644
--- a/graphene_django/filter/fields.py
+++ b/graphene_django/filter/fields.py
@@ -55,10 +55,11 @@ class DjangoFilterConnectionField(DjangoConnectionField):
     def resolve_queryset(
         cls, connection, iterable, info, args, filtering_args, filterset_class
     ):
+        qs = super(DjangoFilterConnectionField, cls).resolve_queryset(
+            connection, iterable, info, args
+        )
         filter_kwargs = {k: v for k, v in args.items() if k in filtering_args}
-        return filterset_class(
-            data=filter_kwargs, queryset=iterable, request=info.context
-        ).qs
+        return filterset_class(data=filter_kwargs, queryset=qs, request=info.context).qs
 
     def get_queryset_resolver(self):
         return partial(
diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py
index 1eba601..de366ba 100644
--- a/graphene_django/filter/tests/test_fields.py
+++ b/graphene_django/filter/tests/test_fields.py
@@ -756,6 +756,44 @@ def test_annotation_with_only():
     assert result.data == expected
 
 
+def test_node_get_queryset_is_called():
+    class ReporterType(DjangoObjectType):
+        class Meta:
+            model = Reporter
+            interfaces = (Node,)
+            filter_fields = ()
+
+        @classmethod
+        def get_queryset(cls, queryset, info):
+            return queryset.filter(first_name="b")
+
+    class Query(ObjectType):
+        all_reporters = DjangoFilterConnectionField(
+            ReporterType, reverse_order=Boolean()
+        )
+
+    Reporter.objects.create(first_name="b")
+    Reporter.objects.create(first_name="a")
+
+    schema = Schema(query=Query)
+    query = """
+        query NodeFilteringQuery {
+            allReporters(first: 10) {
+                edges {
+                    node {
+                        firstName
+                    }
+                }
+            }
+        }
+    """
+    expected = {"allReporters": {"edges": [{"node": {"firstName": "b"}}]}}
+
+    result = schema.execute(query)
+    assert not result.errors
+    assert result.data == expected
+
+
 def test_integer_field_filter_type():
     class PetType(DjangoObjectType):
         class Meta:

From 374d8a8a9e6fd2f2fdd373183f35d75229617768 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Fri, 29 Nov 2019 09:13:36 +0000
Subject: [PATCH 022/116] v2.7.1

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index bc01752..df58a5a 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,6 +1,6 @@
 from .types import DjangoObjectType
 from .fields import DjangoConnectionField
 
-__version__ = "2.7.0"
+__version__ = "2.7.1"
 
 __all__ = ["__version__", "DjangoObjectType", "DjangoConnectionField"]

From a73d6532744fac27af049d3aa6fbf7e1acc831fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 7 Dec 2019 19:56:40 +0000
Subject: [PATCH 023/116] Bump django from 2.2.4 to 2.2.8 in
 /examples/cookbook-plain (#822)

Bumps [django](https://github.com/django/django) from 2.2.4 to 2.2.8.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/2.2.4...2.2.8)

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/cookbook-plain/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/cookbook-plain/requirements.txt b/examples/cookbook-plain/requirements.txt
index 802aa37..beed53b 100644
--- a/examples/cookbook-plain/requirements.txt
+++ b/examples/cookbook-plain/requirements.txt
@@ -1,4 +1,4 @@
 graphene
 graphene-django
 graphql-core>=2.1rc1
-django==2.2.4
+django==2.2.8

From 968002f1554e3a7a1c0617682be64b67823b2581 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 7 Dec 2019 19:56:57 +0000
Subject: [PATCH 024/116] Bump django from 2.2.4 to 2.2.8 in /examples/cookbook
 (#821)

Bumps [django](https://github.com/django/django) from 2.2.4 to 2.2.8.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/2.2.4...2.2.8)

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/cookbook/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/cookbook/requirements.txt b/examples/cookbook/requirements.txt
index 0537103..3209a5e 100644
--- a/examples/cookbook/requirements.txt
+++ b/examples/cookbook/requirements.txt
@@ -1,5 +1,5 @@
 graphene
 graphene-django
 graphql-core>=2.1rc1
-django==2.2.4
+django==2.2.8
 django-filter>=2

From b66a3f347947804d0ab7d9763309e2977b5bcd5a Mon Sep 17 00:00:00 2001
From: Chibuotu Amadi <chibuotu@gmail.com>
Date: Thu, 26 Dec 2019 12:45:18 +0100
Subject: [PATCH 025/116] Add headers arg to GraphQLTestCase.query (#827)

* Add headers arg to GraphQLTestCase.query

* fix headers NoneType case in GraphQLTestCase.query

* Run format

Co-authored-by: Jonathan Kim <jkimbo@gmail.com>
---
 graphene_django/utils/testing.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/graphene_django/utils/testing.py b/graphene_django/utils/testing.py
index 5b694b2..8a9b994 100644
--- a/graphene_django/utils/testing.py
+++ b/graphene_django/utils/testing.py
@@ -24,7 +24,7 @@ class GraphQLTestCase(TestCase):
 
         cls._client = Client()
 
-    def query(self, query, op_name=None, input_data=None, variables=None):
+    def query(self, query, op_name=None, input_data=None, variables=None, headers=None):
         """
         Args:
             query (string)    - GraphQL query to run
@@ -36,7 +36,9 @@ class GraphQLTestCase(TestCase):
                                 are provided, the ``input`` field in the ``variables``
                                 dict will be overwritten with this value.
             variables (dict)  - If provided, the "variables" field in GraphQL will be
-                                set to this value. 
+                                set to this value.
+            headers (dict)    - If provided, the headers in POST request to GRAPHQL_URL
+                                will be set to this value. 
 
         Returns:
             Response object from client
@@ -51,10 +53,17 @@ class GraphQLTestCase(TestCase):
                 body["variables"]["input"] = input_data
             else:
                 body["variables"] = {"input": input_data}
-
-        resp = self._client.post(
-            self.GRAPHQL_URL, json.dumps(body), content_type="application/json"
-        )
+        if headers:
+            resp = self._client.post(
+                self.GRAPHQL_URL,
+                json.dumps(body),
+                content_type="application/json",
+                **headers
+            )
+        else:
+            resp = self._client.post(
+                self.GRAPHQL_URL, json.dumps(body), content_type="application/json"
+            )
         return resp
 
     def assertResponseNoErrors(self, resp):

From 3d01acf169601c7c644da45c2b608a7c125003f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Dec 2019 14:25:34 +0000
Subject: [PATCH 026/116] Bump django from 2.2.8 to 3.0 in /examples/cookbook
 (#825)

Bumps [django](https://github.com/django/django) from 2.2.8 to 3.0.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/2.2.8...3.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/cookbook/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/cookbook/requirements.txt b/examples/cookbook/requirements.txt
index 3209a5e..b1baa57 100644
--- a/examples/cookbook/requirements.txt
+++ b/examples/cookbook/requirements.txt
@@ -1,5 +1,5 @@
 graphene
 graphene-django
 graphql-core>=2.1rc1
-django==2.2.8
+django==3.0
 django-filter>=2

From 45df7445f4dd21d08a6bddd084a113b73c957091 Mon Sep 17 00:00:00 2001
From: cbergmiller <christian@bergmiller.de>
Date: Fri, 27 Dec 2019 15:26:42 +0100
Subject: [PATCH 027/116] Read csrftoken from DOM if no cookie is set (#826)

---
 graphene_django/static/graphene_django/graphiql.js | 5 ++++-
 graphene_django/templates/graphene/graphiql.html   | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/graphene_django/static/graphene_django/graphiql.js b/graphene_django/static/graphene_django/graphiql.js
index 2be7e3c..e38cd62 100644
--- a/graphene_django/static/graphene_django/graphiql.js
+++ b/graphene_django/static/graphene_django/graphiql.js
@@ -3,8 +3,11 @@
   // Parse the cookie value for a CSRF token
   var csrftoken;
   var cookies = ('; ' + document.cookie).split('; csrftoken=');
-  if (cookies.length == 2)
+  if (cookies.length == 2) {
     csrftoken = cookies.pop().split(';').shift();
+  } else {
+    csrftoken = document.querySelector("[name=csrfmiddlewaretoken]").value;
+  }
 
   // Collect the URL parameters
   var parameters = {};
diff --git a/graphene_django/templates/graphene/graphiql.html b/graphene_django/templates/graphene/graphiql.html
index d0fb5a8..a0d0e1a 100644
--- a/graphene_django/templates/graphene/graphiql.html
+++ b/graphene_django/templates/graphene/graphiql.html
@@ -31,6 +31,7 @@ add "&raw" to the end of the URL within a browser.
           crossorigin="anonymous"></script>
 </head>
 <body>
+  {% csrf_token %}
   <script src="{% static 'graphene_django/graphiql.js' %}"></script>
 </body>
 </html>

From 7940a7b954ef56fa9e538c3d0ff0cecb3ff54d42 Mon Sep 17 00:00:00 2001
From: dan-klasson <dan-klasson@users.noreply.github.com>
Date: Fri, 27 Dec 2019 15:46:48 +0100
Subject: [PATCH 028/116] added support for partial updates in serializers
 (#731)

* added support for partial updates in serializers

* Add test to verify partial updates

Co-authored-by: Jonathan Kim <jkimbo@gmail.com>
---
 graphene_django/rest_framework/mutation.py            |  3 +++
 graphene_django/rest_framework/tests/test_mutation.py | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/graphene_django/rest_framework/mutation.py b/graphene_django/rest_framework/mutation.py
index d9c695e..060b370 100644
--- a/graphene_django/rest_framework/mutation.py
+++ b/graphene_django/rest_framework/mutation.py
@@ -102,8 +102,10 @@ class SerializerMutation(ClientIDMutation):
                 instance = get_object_or_404(
                     model_class, **{lookup_field: input[lookup_field]}
                 )
+                partial = True
             elif "create" in cls._meta.model_operations:
                 instance = None
+                partial = False
             else:
                 raise Exception(
                     'Invalid update operation. Input parameter "{}" required.'.format(
@@ -115,6 +117,7 @@ class SerializerMutation(ClientIDMutation):
                 "instance": instance,
                 "data": input,
                 "context": {"request": info.context},
+                "partial": partial,
             }
 
         return {"data": input, "context": {"request": info.context}}
diff --git a/graphene_django/rest_framework/tests/test_mutation.py b/graphene_django/rest_framework/tests/test_mutation.py
index 9d8b950..bfb247d 100644
--- a/graphene_django/rest_framework/tests/test_mutation.py
+++ b/graphene_django/rest_framework/tests/test_mutation.py
@@ -183,6 +183,16 @@ def test_model_update_mutate_and_get_payload_success():
     assert result.cool_name == "New Narf"
 
 
+@mark.django_db
+def test_model_partial_update_mutate_and_get_payload_success():
+    instance = MyFakeModel.objects.create(cool_name="Narf")
+    result = MyModelMutation.mutate_and_get_payload(
+        None, mock_info(), **{"id": instance.id}
+    )
+    assert result.errors is None
+    assert result.cool_name == "Narf"
+
+
 @mark.django_db
 def test_model_invalid_update_mutate_and_get_payload_success():
     class InvalidModelMutation(SerializerMutation):

From f661cf83355fb41e78625ecaae857fc4a609be13 Mon Sep 17 00:00:00 2001
From: Vyacheslav Matyukhin <me@berekuk.ru>
Date: Mon, 30 Dec 2019 17:14:41 +0300
Subject: [PATCH 029/116] Fix typo in exclude type checking test (#841)

---
 graphene_django/tests/test_types.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/tests/test_types.py b/graphene_django/tests/test_types.py
index 5e9d1c2..5186623 100644
--- a/graphene_django/tests/test_types.py
+++ b/graphene_django/tests/test_types.py
@@ -315,7 +315,7 @@ def test_django_objecttype_fields_exclude_type_checking():
         class Reporter2(DjangoObjectType):
             class Meta:
                 model = ReporterModel
-                fields = "foo"
+                exclude = "foo"
 
 
 class TestDjangoObjectType:

From efe210f8acda0d88a9763a3805959e4e7317b5c3 Mon Sep 17 00:00:00 2001
From: Vyacheslav Matyukhin <me@berekuk.ru>
Date: Tue, 31 Dec 2019 16:55:45 +0300
Subject: [PATCH 030/116] Validate Meta.fields and Meta.exclude on
 DjangoObjectType (#842)

Resolves #840
---
 graphene_django/tests/models.py     |  3 +++
 graphene_django/tests/test_types.py | 24 ++++++++++++++++++++++++
 graphene_django/types.py            | 18 ++++++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/graphene_django/tests/models.py b/graphene_django/tests/models.py
index 14a8367..44a5d8a 100644
--- a/graphene_django/tests/models.py
+++ b/graphene_django/tests/models.py
@@ -64,6 +64,9 @@ class Reporter(models.Model):
         if self.reporter_type == 2:  # quick and dirty way without enums
             self.__class__ = CNNReporter
 
+    def some_method(self):
+        return 123
+
 
 class CNNReporterManager(models.Manager):
     def get_queryset(self):
diff --git a/graphene_django/tests/test_types.py b/graphene_django/tests/test_types.py
index 5186623..cb31a9c 100644
--- a/graphene_django/tests/test_types.py
+++ b/graphene_django/tests/test_types.py
@@ -318,6 +318,30 @@ def test_django_objecttype_fields_exclude_type_checking():
                 exclude = "foo"
 
 
+@with_local_registry
+def test_django_objecttype_fields_exclude_exist_on_model():
+    with pytest.raises(Exception, match=r"Field .* doesn't exist"):
+
+        class Reporter(DjangoObjectType):
+            class Meta:
+                model = ReporterModel
+                fields = ["first_name", "foo", "email"]
+
+    with pytest.raises(Exception, match=r"Field .* doesn't exist"):
+
+        class Reporter2(DjangoObjectType):
+            class Meta:
+                model = ReporterModel
+                exclude = ["first_name", "foo", "email"]
+
+    with pytest.raises(Exception, match=r".* exists on model .* but it's not a field"):
+
+        class Reporter3(DjangoObjectType):
+            class Meta:
+                model = ReporterModel
+                fields = ["first_name", "some_method", "email"]
+
+
 class TestDjangoObjectType:
     @pytest.fixture
     def PetModel(self):
diff --git a/graphene_django/types.py b/graphene_django/types.py
index ec426f1..4824c45 100644
--- a/graphene_django/types.py
+++ b/graphene_django/types.py
@@ -33,6 +33,24 @@ def construct_fields(
 ):
     _model_fields = get_model_fields(model)
 
+    # Validate the given fields against the model's fields.
+    model_field_names = set(field[0] for field in _model_fields)
+    for fields_list in (only_fields, exclude_fields):
+        if not fields_list:
+            continue
+        for name in fields_list:
+            if name in model_field_names:
+                continue
+
+            if hasattr(model, name):
+                raise Exception(
+                    '"{}" exists on model {} but it\'s not a field.'.format(name, model)
+                )
+            else:
+                raise Exception(
+                    'Field "{}" doesn\'t exist on model {}.'.format(name, model)
+                )
+
     fields = OrderedDict()
     for name, field in _model_fields:
         is_not_in_only = only_fields and name not in only_fields

From 3dd04f68ab4b4dab0116b2f0b8d230581b96519d Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Tue, 31 Dec 2019 13:56:04 +0000
Subject: [PATCH 031/116] Update travis config to only run deploy once (#837)

---
 .travis.yml | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3531b56..1718d79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,17 @@ after_success:
   - pip install coveralls
   - coveralls
 
-matrix:
+stages:
+  - test
+  - name: deploy
+    if: tag IS present
+
+jobs:
   fast_finish: true
+
+  allow_failures:
+    - env: DJANGO=master
+
   include:
     - python: 2.7
       env: DJANGO=1.11
@@ -56,14 +65,14 @@ matrix:
     - python: 3.7
       env: TOXENV=black,flake8
 
-  allow_failures:
-    - env: DJANGO=master
-
-deploy:
-  provider: pypi
-  user: syrusakbary
-  on:
-    tags: true
-  password:
-    secure: kymIFCEPUbkgRqe2NAXkWfxMmGRfWvWBOP6LIXdVdkOOkm91fU7bndPGrAjos+/7gN0Org609ZmHSlVXNMJUWcsL2or/x5LcADJ4cZDe+79qynuoRb9xs1Ri4O4SBAuVMZxuVJvs8oUzT2R11ql5vASSMtXgbX+ZDGpmPRVZStkCuXgOc4LBhbPKyl3OFy7UQFPgAEmy3Yjh4ZSKzlXheK+S6mmr60+DCIjpaA0BWPxYK9FUE0qm7JJbHLUbwsUP/QMp5MmGjwFisXCNsIe686B7QKRaiOw62eJc2R7He8AuEC8T9OM4kRwDlecSn8mMpkoSB7QWtlJ+6XdLrJFPNvtrOfgfzS9/96Qrw9WlOslk68hMlhJeRb0s2YUD8tiV3UUkvbL1mfFoS4SI9U+rojS55KhUEJWHg1w7DjoOPoZmaIL2ChRupmvrFYNAGae1cxwG3Urh+t3wYlN3gpKsRDe5GOT7Wm2tr0ad3McCpDGUwSChX59BAJXe/MoLxkKScTrMyR8yMxHOF0b4zpVn5l7xB/o2Ik4zavx5q/0rGBMK2D+5d+gpQogKShoquTPsZUwO7sB5hYeH2hqGqpeGzZtb76E2zZYd18pJ0FsBudm5+KWjYdZ+vbtGrLxdTXJ1EEtzVXm0lscykTpqUucbXSa51dhStJvW2xEEz6p3rHo=
-  distributions: "sdist bdist_wheel"
+    - stage: deploy
+      python: 3.7
+      after_success: true
+      deploy:
+        provider: pypi
+        user: syrusakbary
+        on:
+          tags: true
+        password:
+          secure: kymIFCEPUbkgRqe2NAXkWfxMmGRfWvWBOP6LIXdVdkOOkm91fU7bndPGrAjos+/7gN0Org609ZmHSlVXNMJUWcsL2or/x5LcADJ4cZDe+79qynuoRb9xs1Ri4O4SBAuVMZxuVJvs8oUzT2R11ql5vASSMtXgbX+ZDGpmPRVZStkCuXgOc4LBhbPKyl3OFy7UQFPgAEmy3Yjh4ZSKzlXheK+S6mmr60+DCIjpaA0BWPxYK9FUE0qm7JJbHLUbwsUP/QMp5MmGjwFisXCNsIe686B7QKRaiOw62eJc2R7He8AuEC8T9OM4kRwDlecSn8mMpkoSB7QWtlJ+6XdLrJFPNvtrOfgfzS9/96Qrw9WlOslk68hMlhJeRb0s2YUD8tiV3UUkvbL1mfFoS4SI9U+rojS55KhUEJWHg1w7DjoOPoZmaIL2ChRupmvrFYNAGae1cxwG3Urh+t3wYlN3gpKsRDe5GOT7Wm2tr0ad3McCpDGUwSChX59BAJXe/MoLxkKScTrMyR8yMxHOF0b4zpVn5l7xB/o2Ik4zavx5q/0rGBMK2D+5d+gpQogKShoquTPsZUwO7sB5hYeH2hqGqpeGzZtb76E2zZYd18pJ0FsBudm5+KWjYdZ+vbtGrLxdTXJ1EEtzVXm0lscykTpqUucbXSa51dhStJvW2xEEz6p3rHo=
+        distributions: "sdist bdist_wheel"

From 399ad13a705db243f3add181ef5a5bc95123b506 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Tue, 31 Dec 2019 14:10:18 +0000
Subject: [PATCH 032/116] v2.8.0

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index df58a5a..1ddc2cb 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,6 +1,6 @@
 from .types import DjangoObjectType
 from .fields import DjangoConnectionField
 
-__version__ = "2.7.1"
+__version__ = "2.8.0"
 
 __all__ = ["__version__", "DjangoObjectType", "DjangoConnectionField"]

From b8a2d5953a32c3bbd31fd7799271e879384ca000 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Tue, 31 Dec 2019 14:34:47 +0000
Subject: [PATCH 033/116] Don't run tests during deploy stage

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 1718d79..bbeeb80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,6 +66,7 @@ jobs:
       env: TOXENV=black,flake8
 
     - stage: deploy
+      script: skip
       python: 3.7
       after_success: true
       deploy:

From de87573e0c6c5f70c756e4b7eedfd90ba8945593 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sat, 11 Jan 2020 14:49:17 +0100
Subject: [PATCH 034/116] Add information on how to deal with CSRF protection
 (#838)

---
 docs/installation.rst | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/docs/installation.rst b/docs/installation.rst
index a2dc665..52f2520 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -66,4 +66,26 @@ The most basic ``schema.py`` looks like this:
     schema = graphene.Schema(query=Query)
 
 
-To learn how to extend the schema object for your project, read the basic tutorial.
\ No newline at end of file
+To learn how to extend the schema object for your project, read the basic tutorial.
+
+CSRF exempt
+-----------
+
+If have enabled `CSRF protection <https://docs.djangoproject.com/en/3.0/ref/csrf/>`_ in your Django app
+you will find that it prevents your API clients from POSTing to the ``graphql`` endpoint. You can either
+update your API client to pass the CSRF token with each request (the Django docs have a guide on how to do that: https://docs.djangoproject.com/en/3.0/ref/csrf/#ajax) or you can exempt your Graphql endpoint from CSRF protection by wrapping the ``GraphQLView`` with the ``csrf_exempt``
+decorator:
+
+.. code:: python
+
+    # urls.py
+
+    from django.urls import path
+    from django.views.decorators.csrf import csrf_exempt
+
+    from graphene_django.views import GraphQLView
+
+    urlpatterns = [
+        # ...
+        path("graphql", csrf_exempt(GraphQLView.as_view(graphiql=True))),
+    ]

From 96c38b4349f5c9680531c301e3f2baf2d05b7fc9 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sat, 11 Jan 2020 14:49:44 +0100
Subject: [PATCH 035/116] Update Django model form tests (#839)

* Clean up code and raise an exception if the model type is not found

* Update tests

* Fix tests
---
 graphene_django/forms/mutation.py            | 26 +------
 graphene_django/forms/tests/test_mutation.py | 74 ++++++++++++++++++--
 2 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/graphene_django/forms/mutation.py b/graphene_django/forms/mutation.py
index f5921e8..1eeeb97 100644
--- a/graphene_django/forms/mutation.py
+++ b/graphene_django/forms/mutation.py
@@ -66,28 +66,6 @@ class BaseDjangoFormMutation(ClientIDMutation):
         return kwargs
 
 
-# class DjangoFormInputObjectTypeOptions(InputObjectTypeOptions):
-#     form_class = None
-
-
-# class DjangoFormInputObjectType(InputObjectType):
-#     class Meta:
-#         abstract = True
-
-#     @classmethod
-#     def __init_subclass_with_meta__(cls, form_class=None,
-#                                     only_fields=(), exclude_fields=(), _meta=None, **options):
-#         if not _meta:
-#             _meta = DjangoFormInputObjectTypeOptions(cls)
-#         assert isinstance(form_class, forms.Form), (
-#             'form_class must be an instance of django.forms.Form'
-#         )
-#         _meta.form_class = form_class
-#         form = form_class()
-#         fields = fields_for_form(form, only_fields, exclude_fields)
-#         super(DjangoFormInputObjectType, cls).__init_subclass_with_meta__(_meta=_meta, fields=fields, **options)
-
-
 class DjangoFormMutationOptions(MutationOptions):
     form_class = None
 
@@ -163,7 +141,9 @@ class DjangoModelFormMutation(BaseDjangoFormMutation):
 
         registry = get_global_registry()
         model_type = registry.get_type_for_model(model)
-        return_field_name = return_field_name
+        if not model_type:
+            raise Exception("No type registered for model: {}".format(model.__name__))
+
         if not return_field_name:
             model_name = model.__name__
             return_field_name = model_name[:1].lower() + model_name[1:]
diff --git a/graphene_django/forms/tests/test_mutation.py b/graphene_django/forms/tests/test_mutation.py
index 2de5113..494c77c 100644
--- a/graphene_django/forms/tests/test_mutation.py
+++ b/graphene_django/forms/tests/test_mutation.py
@@ -2,6 +2,8 @@ from django import forms
 from django.test import TestCase
 from py.test import raises
 
+from graphene import ObjectType, Schema, String, Field
+from graphene_django import DjangoObjectType
 from graphene_django.tests.models import Film, FilmDetails, Pet
 
 from ...settings import graphene_settings
@@ -18,6 +20,24 @@ class PetForm(forms.ModelForm):
         fields = "__all__"
 
 
+class PetType(DjangoObjectType):
+    class Meta:
+        model = Pet
+        fields = "__all__"
+
+
+class FilmType(DjangoObjectType):
+    class Meta:
+        model = Film
+        fields = "__all__"
+
+
+class FilmDetailsType(DjangoObjectType):
+    class Meta:
+        model = FilmDetails
+        fields = "__all__"
+
+
 def test_needs_form_class():
     with raises(Exception) as exc:
 
@@ -59,6 +79,10 @@ def test_mutation_error_camelcased():
     graphene_settings.CAMELCASE_ERRORS = False
 
 
+class MockQuery(ObjectType):
+    a = String()
+
+
 class ModelFormMutationTests(TestCase):
     def test_default_meta_fields(self):
         class PetMutation(DjangoModelFormMutation):
@@ -113,34 +137,70 @@ class ModelFormMutationTests(TestCase):
         self.assertEqual(PetMutation._meta.return_field_name, "animal")
         self.assertIn("animal", PetMutation._meta.fields)
 
-    def test_model_form_mutation_mutate(self):
+    def test_model_form_mutation_mutate_existing(self):
         class PetMutation(DjangoModelFormMutation):
+            pet = Field(PetType)
+
             class Meta:
                 form_class = PetForm
 
+        class Mutation(ObjectType):
+            pet_mutation = PetMutation.Field()
+
+        schema = Schema(query=MockQuery, mutation=Mutation)
+
         pet = Pet.objects.create(name="Axel", age=10)
 
-        result = PetMutation.mutate_and_get_payload(
-            None, None, id=pet.pk, name="Mia", age=10
+        result = schema.execute(
+            """ mutation PetMutation($pk: ID!) {
+                petMutation(input: { id: $pk, name: "Mia", age: 10 }) {
+                    pet {
+                        name
+                        age
+                    }
+                }
+            }
+            """,
+            variables={"pk": pet.pk},
         )
 
+        self.assertIs(result.errors, None)
+        self.assertEqual(result.data["petMutation"]["pet"], {"name": "Mia", "age": 10})
+
         self.assertEqual(Pet.objects.count(), 1)
         pet.refresh_from_db()
         self.assertEqual(pet.name, "Mia")
-        self.assertEqual(result.errors, [])
 
-    def test_model_form_mutation_updates_existing_(self):
+    def test_model_form_mutation_creates_new(self):
         class PetMutation(DjangoModelFormMutation):
+            pet = Field(PetType)
+
             class Meta:
                 form_class = PetForm
 
-        result = PetMutation.mutate_and_get_payload(None, None, name="Mia", age=10)
+        class Mutation(ObjectType):
+            pet_mutation = PetMutation.Field()
+
+        schema = Schema(query=MockQuery, mutation=Mutation)
+
+        result = schema.execute(
+            """ mutation PetMutation {
+                petMutation(input: { name: "Mia", age: 10 }) {
+                    pet {
+                        name
+                        age
+                    }
+                }
+            }
+            """
+        )
+        self.assertIs(result.errors, None)
+        self.assertEqual(result.data["petMutation"]["pet"], {"name": "Mia", "age": 10})
 
         self.assertEqual(Pet.objects.count(), 1)
         pet = Pet.objects.get()
         self.assertEqual(pet.name, "Mia")
         self.assertEqual(pet.age, 10)
-        self.assertEqual(result.errors, [])
 
     def test_model_form_mutation_mutate_invalid_form(self):
         class PetMutation(DjangoModelFormMutation):

From 08f67797d8080765cd5069861bb10054f5f48289 Mon Sep 17 00:00:00 2001
From: luto <m@luto.at>
Date: Sat, 11 Jan 2020 14:52:41 +0100
Subject: [PATCH 036/116] resolve django translation deprecation warnings
 (#847)

https://docs.djangoproject.com/en/3.0/releases/3.0/#id3
---
 graphene_django/forms/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/forms/forms.py b/graphene_django/forms/forms.py
index 14e68c8..4b81859 100644
--- a/graphene_django/forms/forms.py
+++ b/graphene_django/forms/forms.py
@@ -2,7 +2,7 @@ import binascii
 
 from django.core.exceptions import ValidationError
 from django.forms import CharField, Field, MultipleChoiceField
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from graphql_relay import from_global_id
 

From 62ecbae61449c080d0651895840dea1ed079cf0a Mon Sep 17 00:00:00 2001
From: luto <m@luto.at>
Date: Mon, 20 Jan 2020 22:05:20 +0100
Subject: [PATCH 037/116] resolve django encoding deprecation warnings (#853)

https://docs.djangoproject.com/en/3.0/ref/utils/#django.utils.encoding.force_text
---
 graphene_django/debug/sql/tracking.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/graphene_django/debug/sql/tracking.py b/graphene_django/debug/sql/tracking.py
index 8391eac..a7c9d8d 100644
--- a/graphene_django/debug/sql/tracking.py
+++ b/graphene_django/debug/sql/tracking.py
@@ -6,7 +6,7 @@ from threading import local
 from time import time
 
 import six
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 from .types import DjangoDebugSQL
 
@@ -78,7 +78,7 @@ class NormalCursorWrapper(object):
 
     def _quote_expr(self, element):
         if isinstance(element, six.string_types):
-            return "'%s'" % force_text(element).replace("'", "''")
+            return "'%s'" % force_str(element).replace("'", "''")
         else:
             return repr(element)
 
@@ -91,7 +91,7 @@ class NormalCursorWrapper(object):
 
     def _decode(self, param):
         try:
-            return force_text(param, strings_only=True)
+            return force_str(param, strings_only=True)
         except UnicodeDecodeError:
             return "(encoded string)"
 

From 8ec456285bb84fad6e1ee6644543140335f613af Mon Sep 17 00:00:00 2001
From: Ilya Zhelyabuzhsky <zhelyabuzhsky@icloud.com>
Date: Wed, 29 Jan 2020 15:06:38 +0500
Subject: [PATCH 038/116] Fix force_str deprecation warning (#858)

---
 graphene_django/converter.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/graphene_django/converter.py b/graphene_django/converter.py
index b59c906..8b93d17 100644
--- a/graphene_django/converter.py
+++ b/graphene_django/converter.py
@@ -1,6 +1,6 @@
 from collections import OrderedDict
 from django.db import models
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 
 from graphene import (
     ID,
@@ -30,7 +30,7 @@ singledispatch = import_single_dispatch()
 
 
 def convert_choice_name(name):
-    name = to_const(force_text(name))
+    name = to_const(force_str(name))
     try:
         assert_valid_name(name)
     except AssertionError:

From 5c3199883f72279b5f453cd27378521d4589d72e Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Fri, 31 Jan 2020 14:20:18 +0000
Subject: [PATCH 039/116] Fix dependencies for examples (#861)

---
 examples/cookbook-plain/requirements.txt | 8 ++++----
 examples/cookbook/requirements.txt       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/cookbook-plain/requirements.txt b/examples/cookbook-plain/requirements.txt
index beed53b..abbe96b 100644
--- a/examples/cookbook-plain/requirements.txt
+++ b/examples/cookbook-plain/requirements.txt
@@ -1,4 +1,4 @@
-graphene
-graphene-django
-graphql-core>=2.1rc1
-django==2.2.8
+graphene>=2.1,<3
+graphene-django>=2.1,<3
+graphql-core>=2.1,<3
+django==3.0
diff --git a/examples/cookbook/requirements.txt b/examples/cookbook/requirements.txt
index b1baa57..c062358 100644
--- a/examples/cookbook/requirements.txt
+++ b/examples/cookbook/requirements.txt
@@ -1,5 +1,5 @@
-graphene
-graphene-django
-graphql-core>=2.1rc1
+graphene>=2.1,<3
+graphene-django>=2.1,<3
+graphql-core>=2.1,<3
 django==3.0
 django-filter>=2

From 1310509fa150088660783db80b2fc1eafe3ffc44 Mon Sep 17 00:00:00 2001
From: Jason Kraus <zbyte64@gmail.com>
Date: Wed, 5 Feb 2020 14:16:51 -0800
Subject: [PATCH 040/116] feature(stalebot): bug, documentation, help wanted,
 and enhancement added to exempt labels (#869)

---
 .github/stale.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/stale.yml b/.github/stale.yml
index c9418f6..dab9fb3 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -6,6 +6,10 @@ daysUntilClose: 14
 exemptLabels:
   - pinned
   - security
+  - 🐛bug
+  - 📖 documentation
+  - help wanted
+  - ✨enhancement
 # Label to use when marking an issue as stale
 staleLabel: wontfix
 # Comment to post when marking an issue as stale. Set to `false` to disable

From 280b38f804f4619066062e28bcbaba9914e54ab2 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Fri, 7 Feb 2020 09:55:38 +0000
Subject: [PATCH 041/116] Only warn if a field doesn't exist on the Django
 model (#862)

* Only warn if a field doesn't exist on the Django model

Also don't warn if the field name matches a custom field.

* Expand warning messages
---
 graphene_django/tests/test_types.py | 18 ++++++---
 graphene_django/types.py            | 59 ++++++++++++++++++++---------
 2 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/graphene_django/tests/test_types.py b/graphene_django/tests/test_types.py
index cb31a9c..a25383f 100644
--- a/graphene_django/tests/test_types.py
+++ b/graphene_django/tests/test_types.py
@@ -320,26 +320,34 @@ def test_django_objecttype_fields_exclude_type_checking():
 
 @with_local_registry
 def test_django_objecttype_fields_exclude_exist_on_model():
-    with pytest.raises(Exception, match=r"Field .* doesn't exist"):
+    with pytest.warns(UserWarning, match=r"Field name .* doesn't exist"):
 
         class Reporter(DjangoObjectType):
             class Meta:
                 model = ReporterModel
                 fields = ["first_name", "foo", "email"]
 
-    with pytest.raises(Exception, match=r"Field .* doesn't exist"):
+    with pytest.warns(
+        UserWarning,
+        match=r"Field name .* matches an attribute on Django model .* but it's not a model field",
+    ) as record:
 
         class Reporter2(DjangoObjectType):
             class Meta:
                 model = ReporterModel
-                exclude = ["first_name", "foo", "email"]
+                fields = ["first_name", "some_method", "email"]
 
-    with pytest.raises(Exception, match=r".* exists on model .* but it's not a field"):
+    # Don't warn if selecting a custom field
+    with pytest.warns(None) as record:
 
         class Reporter3(DjangoObjectType):
+            custom_field = String()
+
             class Meta:
                 model = ReporterModel
-                fields = ["first_name", "some_method", "email"]
+                fields = ["first_name", "custom_field", "email"]
+
+    assert len(record) == 0
 
 
 class TestDjangoObjectType:
diff --git a/graphene_django/types.py b/graphene_django/types.py
index 4824c45..129dbe1 100644
--- a/graphene_django/types.py
+++ b/graphene_django/types.py
@@ -33,24 +33,6 @@ def construct_fields(
 ):
     _model_fields = get_model_fields(model)
 
-    # Validate the given fields against the model's fields.
-    model_field_names = set(field[0] for field in _model_fields)
-    for fields_list in (only_fields, exclude_fields):
-        if not fields_list:
-            continue
-        for name in fields_list:
-            if name in model_field_names:
-                continue
-
-            if hasattr(model, name):
-                raise Exception(
-                    '"{}" exists on model {} but it\'s not a field.'.format(name, model)
-                )
-            else:
-                raise Exception(
-                    'Field "{}" doesn\'t exist on model {}.'.format(name, model)
-                )
-
     fields = OrderedDict()
     for name, field in _model_fields:
         is_not_in_only = only_fields and name not in only_fields
@@ -80,6 +62,44 @@ def construct_fields(
     return fields
 
 
+def validate_fields(type_, model, fields, only_fields, exclude_fields):
+    # Validate the given fields against the model's fields and custom fields
+    all_field_names = set(fields.keys())
+    for fields_list in (only_fields, exclude_fields):
+        if not fields_list:
+            continue
+        for name in fields_list:
+            if name in all_field_names:
+                continue
+
+            if hasattr(model, name):
+                warnings.warn(
+                    (
+                        'Field name "{field_name}" matches an attribute on Django model "{app_label}.{object_name}" '
+                        "but it's not a model field so Graphene cannot determine what type it should be. "
+                        'Either define the type of the field on DjangoObjectType "{type_}" or remove it from the "fields" list.'
+                    ).format(
+                        field_name=name,
+                        app_label=model._meta.app_label,
+                        object_name=model._meta.object_name,
+                        type_=type_,
+                    )
+                )
+
+            else:
+                warnings.warn(
+                    (
+                        'Field name "{field_name}" doesn\'t exist on Django model "{app_label}.{object_name}". '
+                        'Consider removing the field from the "fields" list of DjangoObjectType "{type_}" because it has no effect.'
+                    ).format(
+                        field_name=name,
+                        app_label=model._meta.app_label,
+                        object_name=model._meta.object_name,
+                        type_=type_,
+                    )
+                )
+
+
 class DjangoObjectTypeOptions(ObjectTypeOptions):
     model = None  # type: Model
     registry = None  # type: Registry
@@ -211,6 +231,9 @@ class DjangoObjectType(ObjectType):
             _meta=_meta, interfaces=interfaces, **options
         )
 
+        # Validate fields
+        validate_fields(cls, model, _meta.fields, fields, exclude)
+
         if not skip_registry:
             registry.register(cls)
 

From f3f06086065831704093543a7728cc7852cfcf59 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Fri, 7 Feb 2020 09:59:05 +0000
Subject: [PATCH 042/116] v2.8.1

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index 1ddc2cb..f8a942d 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,6 +1,6 @@
 from .types import DjangoObjectType
 from .fields import DjangoConnectionField
 
-__version__ = "2.8.0"
+__version__ = "2.8.1"
 
 __all__ = ["__version__", "DjangoObjectType", "DjangoConnectionField"]

From 6b8c5bdefc20dca773f8321774a94e627b5abca5 Mon Sep 17 00:00:00 2001
From: Ben Howes <ben@ben-howes.co.uk>
Date: Fri, 7 Feb 2020 10:16:11 +0000
Subject: [PATCH 043/116] Allow for easier template overrides in graphiql
 (#863)

* don't replace <body>

* Update graphene_django/templates/graphene/graphiql.html

Co-Authored-By: Jonathan Kim <jkimbo@gmail.com>

* Fix editor styling and initialisation

Co-authored-by: Jonathan Kim <jkimbo@gmail.com>
---
 graphene_django/static/graphene_django/graphiql.js | 2 +-
 graphene_django/templates/graphene/graphiql.html   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/graphene_django/static/graphene_django/graphiql.js b/graphene_django/static/graphene_django/graphiql.js
index e38cd62..c939216 100644
--- a/graphene_django/static/graphene_django/graphiql.js
+++ b/graphene_django/static/graphene_django/graphiql.js
@@ -97,6 +97,6 @@
   // Render <GraphiQL /> into the body.
   ReactDOM.render(
     React.createElement(GraphiQL, options),
-    document.body
+    document.getElementById("editor")
   );
 })();
diff --git a/graphene_django/templates/graphene/graphiql.html b/graphene_django/templates/graphene/graphiql.html
index a0d0e1a..d0546bd 100644
--- a/graphene_django/templates/graphene/graphiql.html
+++ b/graphene_django/templates/graphene/graphiql.html
@@ -10,7 +10,7 @@ add "&raw" to the end of the URL within a browser.
 <html>
 <head>
   <style>
-    html, body {
+    html, body, #editor {
       height: 100%;
       margin: 0;
       overflow: hidden;
@@ -31,6 +31,7 @@ add "&raw" to the end of the URL within a browser.
           crossorigin="anonymous"></script>
 </head>
 <body>
+  <div id="editor"></div>
   {% csrf_token %}
   <script src="{% static 'graphene_django/graphiql.js' %}"></script>
 </body>

From 83bc32bc9d49c6f13bcac30463c244e4fa31403d Mon Sep 17 00:00:00 2001
From: Leeward Bound <395107+leewardbound@users.noreply.github.com>
Date: Fri, 7 Feb 2020 17:17:56 +0700
Subject: [PATCH 044/116] Adding support for disabling enum creation on
 SerializerMutation (#851)

---
 graphene_django/rest_framework/mutation.py    | 25 ++++++++++++++++---
 .../rest_framework/serializer_converter.py    |  7 ++++--
 .../tests/test_field_converter.py             | 18 +++++++++++--
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/graphene_django/rest_framework/mutation.py b/graphene_django/rest_framework/mutation.py
index 060b370..cba6b47 100644
--- a/graphene_django/rest_framework/mutation.py
+++ b/graphene_django/rest_framework/mutation.py
@@ -19,7 +19,13 @@ class SerializerMutationOptions(MutationOptions):
     serializer_class = None
 
 
-def fields_for_serializer(serializer, only_fields, exclude_fields, is_input=False):
+def fields_for_serializer(
+    serializer,
+    only_fields,
+    exclude_fields,
+    is_input=False,
+    convert_choices_to_enum=True,
+):
     fields = OrderedDict()
     for name, field in serializer.fields.items():
         is_not_in_only = only_fields and name not in only_fields
@@ -34,7 +40,9 @@ def fields_for_serializer(serializer, only_fields, exclude_fields, is_input=Fals
         if is_not_in_only or is_excluded:
             continue
 
-        fields[name] = convert_serializer_field(field, is_input=is_input)
+        fields[name] = convert_serializer_field(
+            field, is_input=is_input, convert_choices_to_enum=convert_choices_to_enum
+        )
     return fields
 
 
@@ -55,6 +63,7 @@ class SerializerMutation(ClientIDMutation):
         model_operations=("create", "update"),
         only_fields=(),
         exclude_fields=(),
+        convert_choices_to_enum=True,
         **options
     ):
 
@@ -74,10 +83,18 @@ class SerializerMutation(ClientIDMutation):
             lookup_field = model_class._meta.pk.name
 
         input_fields = fields_for_serializer(
-            serializer, only_fields, exclude_fields, is_input=True
+            serializer,
+            only_fields,
+            exclude_fields,
+            is_input=True,
+            convert_choices_to_enum=convert_choices_to_enum,
         )
         output_fields = fields_for_serializer(
-            serializer, only_fields, exclude_fields, is_input=False
+            serializer,
+            only_fields,
+            exclude_fields,
+            is_input=False,
+            convert_choices_to_enum=convert_choices_to_enum,
         )
 
         _meta = SerializerMutationOptions(cls)
diff --git a/graphene_django/rest_framework/serializer_converter.py b/graphene_django/rest_framework/serializer_converter.py
index caeb7dd..82a113a 100644
--- a/graphene_django/rest_framework/serializer_converter.py
+++ b/graphene_django/rest_framework/serializer_converter.py
@@ -19,14 +19,17 @@ def get_graphene_type_from_serializer_field(field):
     )
 
 
-def convert_serializer_field(field, is_input=True):
+def convert_serializer_field(field, is_input=True, convert_choices_to_enum=True):
     """
     Converts a django rest frameworks field to a graphql field
     and marks the field as required if we are creating an input type
     and the field itself is required
     """
 
-    graphql_type = get_graphene_type_from_serializer_field(field)
+    if isinstance(field, serializers.ChoiceField) and not convert_choices_to_enum:
+        graphql_type = graphene.String
+    else:
+        graphql_type = get_graphene_type_from_serializer_field(field)
 
     args = []
     kwargs = {"description": field.help_text, "required": is_input and field.required}
diff --git a/graphene_django/rest_framework/tests/test_field_converter.py b/graphene_django/rest_framework/tests/test_field_converter.py
index 82f5b63..daa8349 100644
--- a/graphene_django/rest_framework/tests/test_field_converter.py
+++ b/graphene_django/rest_framework/tests/test_field_converter.py
@@ -10,7 +10,9 @@ from ..serializer_converter import convert_serializer_field
 from ..types import DictType
 
 
-def _get_type(rest_framework_field, is_input=True, **kwargs):
+def _get_type(
+    rest_framework_field, is_input=True, convert_choices_to_enum=True, **kwargs
+):
     # prevents the following error:
     # AssertionError: The `source` argument is not meaningful when applied to a `child=` field.
     # Remove `source=` from the field declaration.
@@ -21,7 +23,9 @@ def _get_type(rest_framework_field, is_input=True, **kwargs):
 
     field = rest_framework_field(**kwargs)
 
-    return convert_serializer_field(field, is_input=is_input)
+    return convert_serializer_field(
+        field, is_input=is_input, convert_choices_to_enum=convert_choices_to_enum
+    )
 
 
 def assert_conversion(rest_framework_field, graphene_field, **kwargs):
@@ -73,6 +77,16 @@ def test_should_choice_convert_enum():
     assert field._meta.enum.__members__["W"].description == "World"
 
 
+def test_should_choice_convert_string_if_enum_disabled():
+    assert_conversion(
+        serializers.ChoiceField,
+        graphene.String,
+        choices=[("h", "Hello"), ("w", "World")],
+        source="word",
+        convert_choices_to_enum=False,
+    )
+
+
 def test_should_base_field_convert_string():
     assert_conversion(serializers.Field, graphene.String)
 

From bbf119cd3bea7deb72e9f86e82c538fef5f9d3f1 Mon Sep 17 00:00:00 2001
From: Manuel Bojato <30560560+KingDarBoja@users.noreply.github.com>
Date: Sat, 8 Feb 2020 15:28:50 -0500
Subject: [PATCH 045/116] Add anacounda cloud badge to graphene-django (#874)

---
 README.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0f1ee77..2a5237b 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,25 @@ Please read [UPGRADE-v2.0.md](https://github.com/graphql-python/graphene/blob/ma
 
 ---
 
-# ![Graphene Logo](http://graphene-python.org/favicon.png) Graphene-Django [![Build Status](https://travis-ci.org/graphql-python/graphene-django.svg?branch=master)](https://travis-ci.org/graphql-python/graphene-django) [![PyPI version](https://badge.fury.io/py/graphene-django.svg)](https://badge.fury.io/py/graphene-django) [![Coverage Status](https://coveralls.io/repos/graphql-python/graphene-django/badge.svg?branch=master&service=github)](https://coveralls.io/github/graphql-python/graphene-django?branch=master)
+# ![Graphene Logo](http://graphene-python.org/favicon.png) Graphene-Django
 
 
 A [Django](https://www.djangoproject.com/) integration for [Graphene](http://graphene-python.org/).
 
+[![travis][travis-image]][travis-url]
+[![pypi][pypi-image]][pypi-url]
+[![Anaconda-Server Badge][conda-image]][conda-url]
+[![coveralls][coveralls-image]][coveralls-url]
+
+[travis-image]: https://travis-ci.org/graphql-python/graphene-django.svg?style=flat
+[travis-url]: https://travis-ci.org/graphql-python/graphene-django
+[pypi-image]: https://img.shields.io/pypi/v/graphene-django.svg?style=flat
+[pypi-url]: https://pypi.org/project/graphene-django/
+[coveralls-image]: https://coveralls.io/repos/graphql-python/graphene-django/badge.svg?branch=master&service=github
+[coveralls-url]: https://coveralls.io/github/graphql-python/graphene-django?branch=master
+[conda-image]: https://img.shields.io/conda/vn/conda-forge/graphene-django.svg
+[conda-url]: https://anaconda.org/conda-forge/graphene-django
+
 ## Documentation
 
 [Visit the documentation to get started!](https://docs.graphene-python.org/projects/django/en/latest/)

From 4e1b82a8d85f75bccb03ab6db769293831a26020 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Mon, 17 Feb 2020 11:08:45 +0000
Subject: [PATCH 046/116] Check exclude fields correctly (#873)

---
 graphene_django/tests/test_types.py | 38 ++++++++++++++++-
 graphene_django/types.py            | 66 ++++++++++++++++++++---------
 2 files changed, 83 insertions(+), 21 deletions(-)

diff --git a/graphene_django/tests/test_types.py b/graphene_django/tests/test_types.py
index a25383f..c32f46c 100644
--- a/graphene_django/tests/test_types.py
+++ b/graphene_django/tests/test_types.py
@@ -319,7 +319,7 @@ def test_django_objecttype_fields_exclude_type_checking():
 
 
 @with_local_registry
-def test_django_objecttype_fields_exclude_exist_on_model():
+def test_django_objecttype_fields_exist_on_model():
     with pytest.warns(UserWarning, match=r"Field name .* doesn't exist"):
 
         class Reporter(DjangoObjectType):
@@ -350,6 +350,42 @@ def test_django_objecttype_fields_exclude_exist_on_model():
     assert len(record) == 0
 
 
+@with_local_registry
+def test_django_objecttype_exclude_fields_exist_on_model():
+    with pytest.warns(
+        UserWarning,
+        match=r"Django model .* does not have a field or attribute named .*",
+    ):
+
+        class Reporter(DjangoObjectType):
+            class Meta:
+                model = ReporterModel
+                exclude = ["foo"]
+
+    # Don't warn if selecting a custom field
+    with pytest.warns(
+        UserWarning,
+        match=r"Excluding the custom field .* on DjangoObjectType .* has no effect.",
+    ):
+
+        class Reporter3(DjangoObjectType):
+            custom_field = String()
+
+            class Meta:
+                model = ReporterModel
+                exclude = ["custom_field"]
+
+    # Don't warn on exclude fields
+    with pytest.warns(None) as record:
+
+        class Reporter4(DjangoObjectType):
+            class Meta:
+                model = ReporterModel
+                exclude = ["email", "first_name"]
+
+    assert len(record) == 0
+
+
 class TestDjangoObjectType:
     @pytest.fixture
     def PetModel(self):
diff --git a/graphene_django/types.py b/graphene_django/types.py
index 129dbe1..922790c 100644
--- a/graphene_django/types.py
+++ b/graphene_django/types.py
@@ -65,32 +65,58 @@ def construct_fields(
 def validate_fields(type_, model, fields, only_fields, exclude_fields):
     # Validate the given fields against the model's fields and custom fields
     all_field_names = set(fields.keys())
-    for fields_list in (only_fields, exclude_fields):
-        if not fields_list:
+    for name in only_fields or ():
+        if name in all_field_names:
             continue
-        for name in fields_list:
-            if name in all_field_names:
-                continue
 
-            if hasattr(model, name):
-                warnings.warn(
-                    (
-                        'Field name "{field_name}" matches an attribute on Django model "{app_label}.{object_name}" '
-                        "but it's not a model field so Graphene cannot determine what type it should be. "
-                        'Either define the type of the field on DjangoObjectType "{type_}" or remove it from the "fields" list.'
-                    ).format(
-                        field_name=name,
-                        app_label=model._meta.app_label,
-                        object_name=model._meta.object_name,
-                        type_=type_,
-                    )
+        if hasattr(model, name):
+            warnings.warn(
+                (
+                    'Field name "{field_name}" matches an attribute on Django model "{app_label}.{object_name}" '
+                    "but it's not a model field so Graphene cannot determine what type it should be. "
+                    'Either define the type of the field on DjangoObjectType "{type_}" or remove it from the "fields" list.'
+                ).format(
+                    field_name=name,
+                    app_label=model._meta.app_label,
+                    object_name=model._meta.object_name,
+                    type_=type_,
                 )
+            )
 
-            else:
+        else:
+            warnings.warn(
+                (
+                    'Field name "{field_name}" doesn\'t exist on Django model "{app_label}.{object_name}". '
+                    'Consider removing the field from the "fields" list of DjangoObjectType "{type_}" because it has no effect.'
+                ).format(
+                    field_name=name,
+                    app_label=model._meta.app_label,
+                    object_name=model._meta.object_name,
+                    type_=type_,
+                )
+            )
+
+    # Validate exclude fields
+    for name in exclude_fields or ():
+        if name in all_field_names:
+            # Field is a custom field
+            warnings.warn(
+                (
+                    'Excluding the custom field "{field_name} on DjangoObjectType "{type_}" has no effect. '
+                    'Either remove the custom field or remove the field from the "exclude" list.'
+                ).format(
+                    field_name=name,
+                    app_label=model._meta.app_label,
+                    object_name=model._meta.object_name,
+                    type_=type_,
+                )
+            )
+        else:
+            if not hasattr(model, name):
                 warnings.warn(
                     (
-                        'Field name "{field_name}" doesn\'t exist on Django model "{app_label}.{object_name}". '
-                        'Consider removing the field from the "fields" list of DjangoObjectType "{type_}" because it has no effect.'
+                        'Django model "{app_label}.{object_name}" does not have a field or attribute named "{field_name}". '
+                        'Consider removing the field from the "exclude" list of DjangoObjectType "{type_}" because it has no effect'
                     ).format(
                         field_name=name,
                         app_label=model._meta.app_label,

From 11dafd4c4887a6112bd2c6e93e90b145ff0e101a Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Mon, 17 Feb 2020 11:09:11 +0000
Subject: [PATCH 047/116] v2.8.2

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index f8a942d..dbdc201 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,6 +1,6 @@
 from .types import DjangoObjectType
 from .fields import DjangoConnectionField
 
-__version__ = "2.8.1"
+__version__ = "2.8.2"
 
 __all__ = ["__version__", "DjangoObjectType", "DjangoConnectionField"]

From b222caa901bc2a80044047c3501cc3e204c518af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2020 17:40:18 +0000
Subject: [PATCH 048/116] Bump django from 3.0 to 3.0.3 in
 /examples/cookbook-plain (#877)

Bumps [django](https://github.com/django/django) from 3.0 to 3.0.3.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.0...3.0.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/cookbook-plain/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/cookbook-plain/requirements.txt b/examples/cookbook-plain/requirements.txt
index abbe96b..480f757 100644
--- a/examples/cookbook-plain/requirements.txt
+++ b/examples/cookbook-plain/requirements.txt
@@ -1,4 +1,4 @@
 graphene>=2.1,<3
 graphene-django>=2.1,<3
 graphql-core>=2.1,<3
-django==3.0
+django==3.0.3

From d1a9444401554ea6bb44026a0459a7b1839f75e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2020 17:40:34 +0000
Subject: [PATCH 049/116] Bump django from 3.0 to 3.0.3 in /examples/cookbook
 (#876)

Bumps [django](https://github.com/django/django) from 3.0 to 3.0.3.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.0...3.0.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/cookbook/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/cookbook/requirements.txt b/examples/cookbook/requirements.txt
index c062358..4375fcc 100644
--- a/examples/cookbook/requirements.txt
+++ b/examples/cookbook/requirements.txt
@@ -1,5 +1,5 @@
 graphene>=2.1,<3
 graphene-django>=2.1,<3
 graphql-core>=2.1,<3
-django==3.0
+django==3.0.3
 django-filter>=2

From 6a19ab5a4b7f3cfdb8882cf3de379c0c5b23fdab Mon Sep 17 00:00:00 2001
From: B4rtware <34386047+B4rtware@users.noreply.github.com>
Date: Fri, 21 Feb 2020 18:42:47 +0100
Subject: [PATCH 050/116] use to_representation in favor of get_attribute
 (#848)

* use `to_represenation` in favor of `get_attribute`

* fix datetime type does get converted to a string

to_representation will convert the datetime field into a string representation. However the to_representation on the method field will only call its underlying method.

* fix add missing import

* apply black formatter

* add test for serializer method field

* apply black format

* improve backward compatibility

by using date's class contructor instead of fromisostring

* apply black format

* fix black format issue
---
 graphene_django/rest_framework/models.py      |  5 +++
 graphene_django/rest_framework/mutation.py    |  6 +++-
 .../rest_framework/tests/test_mutation.py     | 31 ++++++++++++++++++-
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/graphene_django/rest_framework/models.py b/graphene_django/rest_framework/models.py
index 06d9b60..bd84ce5 100644
--- a/graphene_django/rest_framework/models.py
+++ b/graphene_django/rest_framework/models.py
@@ -9,3 +9,8 @@ class MyFakeModel(models.Model):
 class MyFakeModelWithPassword(models.Model):
     cool_name = models.CharField(max_length=50)
     password = models.CharField(max_length=50)
+
+
+class MyFakeModelWithDate(models.Model):
+    cool_name = models.CharField(max_length=50)
+    last_edited = models.DateField()
diff --git a/graphene_django/rest_framework/mutation.py b/graphene_django/rest_framework/mutation.py
index cba6b47..1365b5c 100644
--- a/graphene_django/rest_framework/mutation.py
+++ b/graphene_django/rest_framework/mutation.py
@@ -1,6 +1,7 @@
 from collections import OrderedDict
 
 from django.shortcuts import get_object_or_404
+from rest_framework import serializers
 
 import graphene
 from graphene.relay.mutation import ClientIDMutation
@@ -158,6 +159,9 @@ class SerializerMutation(ClientIDMutation):
         kwargs = {}
         for f, field in serializer.fields.items():
             if not field.write_only:
-                kwargs[f] = field.get_attribute(obj)
+                if isinstance(field, serializers.SerializerMethodField):
+                    kwargs[f] = field.to_representation(obj)
+                else:
+                    kwargs[f] = field.get_attribute(obj)
 
         return cls(errors=None, **kwargs)
diff --git a/graphene_django/rest_framework/tests/test_mutation.py b/graphene_django/rest_framework/tests/test_mutation.py
index bfb247d..32f1e28 100644
--- a/graphene_django/rest_framework/tests/test_mutation.py
+++ b/graphene_django/rest_framework/tests/test_mutation.py
@@ -8,7 +8,7 @@ from graphene.types.inputobjecttype import InputObjectType
 
 from ...settings import graphene_settings
 from ...types import DjangoObjectType
-from ..models import MyFakeModel, MyFakeModelWithPassword
+from ..models import MyFakeModel, MyFakeModelWithPassword, MyFakeModelWithDate
 from ..mutation import SerializerMutation
 
 
@@ -33,6 +33,18 @@ class MyModelSerializer(serializers.ModelSerializer):
         fields = "__all__"
 
 
+class MyModelSerializerWithMethod(serializers.ModelSerializer):
+    days_since_last_edit = serializers.SerializerMethodField()
+
+    class Meta:
+        model = MyFakeModelWithDate
+        fields = "__all__"
+
+    def get_days_since_last_edit(self, obj):
+        now = datetime.date(2020, 1, 8)
+        return (now - obj.last_edited).days
+
+
 class MyModelMutation(SerializerMutation):
     class Meta:
         serializer_class = MyModelSerializer
@@ -208,6 +220,23 @@ def test_model_invalid_update_mutate_and_get_payload_success():
     assert '"id" required' in str(exc.value)
 
 
+@mark.django_db
+def test_perform_mutate_success():
+    class MyMethodMutation(SerializerMutation):
+        class Meta:
+            serializer_class = MyModelSerializerWithMethod
+
+    result = MyMethodMutation.mutate_and_get_payload(
+        None,
+        mock_info(),
+        **{"cool_name": "Narf", "last_edited": datetime.date(2020, 1, 4)}
+    )
+
+    assert result.errors is None
+    assert result.cool_name == "Narf"
+    assert result.days_since_last_edit == 4
+
+
 def test_mutate_and_get_payload_error():
     class MyMutation(SerializerMutation):
         class Meta:

From 7a14b77a415df75829b7c8a8f324478ee6a0d06a Mon Sep 17 00:00:00 2001
From: Gabor Markowski <gabor94@gmail.com>
Date: Sun, 23 Feb 2020 09:47:41 +0000
Subject: [PATCH 051/116] fix a typo in the warning (#884)

---
 graphene_django/types.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/types.py b/graphene_django/types.py
index 922790c..0c0cb1c 100644
--- a/graphene_django/types.py
+++ b/graphene_django/types.py
@@ -102,7 +102,7 @@ def validate_fields(type_, model, fields, only_fields, exclude_fields):
             # Field is a custom field
             warnings.warn(
                 (
-                    'Excluding the custom field "{field_name} on DjangoObjectType "{type_}" has no effect. '
+                    'Excluding the custom field "{field_name}" on DjangoObjectType "{type_}" has no effect. '
                     'Either remove the custom field or remove the field from the "exclude" list.'
                 ).format(
                     field_name=name,

From a12fc9299adcc74a1813c1820d57f84a7e615e55 Mon Sep 17 00:00:00 2001
From: Amim Knabben <amim.knabben@gmail.com>
Date: Sun, 23 Feb 2020 04:48:33 -0500
Subject: [PATCH 052/116] Exclude read_only fields from input (#882)

---
 graphene_django/rest_framework/mutation.py    | 13 +++++++------
 .../rest_framework/tests/test_mutation.py     | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/graphene_django/rest_framework/mutation.py b/graphene_django/rest_framework/mutation.py
index 1365b5c..592f8b3 100644
--- a/graphene_django/rest_framework/mutation.py
+++ b/graphene_django/rest_framework/mutation.py
@@ -30,12 +30,13 @@ def fields_for_serializer(
     fields = OrderedDict()
     for name, field in serializer.fields.items():
         is_not_in_only = only_fields and name not in only_fields
-        is_excluded = (
-            name
-            in exclude_fields  # or
-            # name in already_created_fields
-        ) or (
-            field.write_only and not is_input  # don't show write_only fields in Query
+        is_excluded = any(
+            [
+                name in exclude_fields,
+                field.write_only
+                and not is_input,  # don't show write_only fields in Query
+                field.read_only and is_input,  # don't show read_only fields in Input
+            ]
         )
 
         if is_not_in_only or is_excluded:
diff --git a/graphene_django/rest_framework/tests/test_mutation.py b/graphene_django/rest_framework/tests/test_mutation.py
index 32f1e28..5bf3bc1 100644
--- a/graphene_django/rest_framework/tests/test_mutation.py
+++ b/graphene_django/rest_framework/tests/test_mutation.py
@@ -144,6 +144,25 @@ def test_write_only_field_using_extra_kwargs():
     ), "'password' is write_only field and shouldn't be visible"
 
 
+@mark.django_db
+def test_read_only_fields():
+    class ReadOnlyFieldModelSerializer(serializers.ModelSerializer):
+        cool_name = serializers.CharField(read_only=True)
+
+        class Meta:
+            model = MyFakeModelWithPassword
+            fields = ["cool_name", "password"]
+
+    class MyMutation(SerializerMutation):
+        class Meta:
+            serializer_class = ReadOnlyFieldModelSerializer
+
+    assert "password" in MyMutation.Input._meta.fields
+    assert (
+        "cool_name" not in MyMutation.Input._meta.fields
+    ), "'cool_name' is read_only field and shouldn't be on arguments"
+
+
 def test_nested_model():
     class MyFakeModelGrapheneType(DjangoObjectType):
         class Meta:

From 235096362f78133058663025060e1019c1ea26cc Mon Sep 17 00:00:00 2001
From: Sergey Protasov <protasovse@gmail.com>
Date: Sun, 23 Feb 2020 14:49:39 +0500
Subject: [PATCH 053/116] Update mutation.py (#811)

* Update mutation.py

* Add tests

Co-authored-by: Jonathan Kim <jkimbo@gmail.com>
---
 graphene_django/forms/mutation.py            |  4 +-
 graphene_django/forms/tests/test_mutation.py | 68 ++++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/graphene_django/forms/mutation.py b/graphene_django/forms/mutation.py
index 1eeeb97..b7bf049 100644
--- a/graphene_django/forms/mutation.py
+++ b/graphene_django/forms/mutation.py
@@ -47,7 +47,7 @@ class BaseDjangoFormMutation(ClientIDMutation):
         else:
             errors = ErrorType.from_errors(form.errors)
 
-            return cls(errors=errors)
+            return cls(errors=errors, **form.data)
 
     @classmethod
     def get_form(cls, root, info, **input):
@@ -100,7 +100,7 @@ class DjangoFormMutation(BaseDjangoFormMutation):
     @classmethod
     def perform_mutate(cls, form, info):
         form.save()
-        return cls(errors=[])
+        return cls(errors=[], **form.cleaned_data)
 
 
 class DjangoModelDjangoFormMutationOptions(DjangoFormMutationOptions):
diff --git a/graphene_django/forms/tests/test_mutation.py b/graphene_django/forms/tests/test_mutation.py
index 494c77c..cafec90 100644
--- a/graphene_django/forms/tests/test_mutation.py
+++ b/graphene_django/forms/tests/test_mutation.py
@@ -1,5 +1,6 @@
 from django import forms
 from django.test import TestCase
+from django.core.exceptions import ValidationError
 from py.test import raises
 
 from graphene import ObjectType, Schema, String, Field
@@ -13,6 +14,15 @@ from ..mutation import DjangoFormMutation, DjangoModelFormMutation
 class MyForm(forms.Form):
     text = forms.CharField()
 
+    def clean_text(self):
+        text = self.cleaned_data["text"]
+        if text == "INVALID_INPUT":
+            raise ValidationError("Invalid input")
+        return text
+
+    def save(self):
+        pass
+
 
 class PetForm(forms.ModelForm):
     class Meta:
@@ -83,6 +93,64 @@ class MockQuery(ObjectType):
     a = String()
 
 
+class FormMutationTests(TestCase):
+    def test_form_invalid_form(self):
+        class MyMutation(DjangoFormMutation):
+            class Meta:
+                form_class = MyForm
+
+        class Mutation(ObjectType):
+            my_mutation = MyMutation.Field()
+
+        schema = Schema(query=MockQuery, mutation=Mutation)
+
+        result = schema.execute(
+            """ mutation MyMutation {
+                myMutation(input: { text: "INVALID_INPUT" }) {
+                    errors {
+                        field
+                        messages
+                    }
+                    text
+                }
+            }
+            """
+        )
+
+        self.assertIs(result.errors, None)
+        self.assertEqual(
+            result.data["myMutation"]["errors"],
+            [{"field": "text", "messages": ["Invalid input"]}],
+        )
+
+    def test_form_valid_input(self):
+        class MyMutation(DjangoFormMutation):
+            class Meta:
+                form_class = MyForm
+
+        class Mutation(ObjectType):
+            my_mutation = MyMutation.Field()
+
+        schema = Schema(query=MockQuery, mutation=Mutation)
+
+        result = schema.execute(
+            """ mutation MyMutation {
+                myMutation(input: { text: "VALID_INPUT" }) {
+                    errors {
+                        field
+                        messages
+                    }
+                    text
+                }
+            }
+            """
+        )
+
+        self.assertIs(result.errors, None)
+        self.assertEqual(result.data["myMutation"]["errors"], [])
+        self.assertEqual(result.data["myMutation"]["text"], "VALID_INPUT")
+
+
 class ModelFormMutationTests(TestCase):
     def test_default_meta_fields(self):
         class PetMutation(DjangoModelFormMutation):

From aeb04d5b5cc914a6906ae17a52714edf483811e8 Mon Sep 17 00:00:00 2001
From: Sergey Fursov <GeyseR85@gmail.com>
Date: Sun, 23 Feb 2020 12:50:40 +0300
Subject: [PATCH 054/116] use actual root/variables/context args of the execute
 method (#878)

---
 graphene_django/filter/tests/test_fields.py  | 2 +-
 graphene_django/forms/tests/test_mutation.py | 2 +-
 graphene_django/views.py                     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py
index de366ba..a0f7d96 100644
--- a/graphene_django/filter/tests/test_fields.py
+++ b/graphene_django/filter/tests/test_fields.py
@@ -180,7 +180,7 @@ def test_filter_shortcut_filterset_context():
     }
     """
     schema = Schema(query=Query)
-    result = schema.execute(query, context=context())
+    result = schema.execute(query, context_value=context())
     assert not result.errors
 
     assert len(result.data["contextArticles"]["edges"]) == 1
diff --git a/graphene_django/forms/tests/test_mutation.py b/graphene_django/forms/tests/test_mutation.py
index cafec90..f648330 100644
--- a/graphene_django/forms/tests/test_mutation.py
+++ b/graphene_django/forms/tests/test_mutation.py
@@ -229,7 +229,7 @@ class ModelFormMutationTests(TestCase):
                 }
             }
             """,
-            variables={"pk": pet.pk},
+            variable_values={"pk": pet.pk},
         )
 
         self.assertIs(result.errors, None)
diff --git a/graphene_django/views.py b/graphene_django/views.py
index d2c8324..4c58839 100644
--- a/graphene_django/views.py
+++ b/graphene_django/views.py
@@ -274,10 +274,10 @@ class GraphQLView(View):
                 extra_options["executor"] = self.executor
 
             return document.execute(
-                root=self.get_root_value(request),
-                variables=variables,
+                root_value=self.get_root_value(request),
+                variable_values=variables,
                 operation_name=operation_name,
-                context=self.get_context(request),
+                context_value=self.get_context(request),
                 middleware=self.get_middleware(request),
                 **extra_options
             )

From 13352216a47ba2ce8d9d1329d5bb16593bd1d16c Mon Sep 17 00:00:00 2001
From: Akhil Gopi <akhilrrocks@gmail.com>
Date: Sat, 7 Mar 2020 21:47:45 +0530
Subject: [PATCH 055/116] Improv/documentation fixes (#895)

* Bump up the minimum support Django version.

* Update documentation to mention support for Django 1.11.

Co-authored-by: Akhil <akhil@healthifyme.com>
---
 docs/authorization.rst  |  2 +-
 docs/installation.rst   | 16 +++++++++++++++-
 docs/tutorial-plain.rst |  2 +-
 docs/tutorial-relay.rst |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/authorization.rst b/docs/authorization.rst
index ebc9795..63123b0 100644
--- a/docs/authorization.rst
+++ b/docs/authorization.rst
@@ -166,7 +166,7 @@ To restrict users from accessing the GraphQL API page the standard Django LoginR
 
 After this, you can use the new ``PrivateGraphQLView`` in the project's URL Configuration file ``url.py``:
 
-For Django 1.9 and below:
+For Django 1.11:
 
 .. code:: python
 
diff --git a/docs/installation.rst b/docs/installation.rst
index 52f2520..048a994 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -8,7 +8,7 @@ Requirements
 
 Graphene-Django currently supports the following versions of Django:
 
-* Django 2.X
+* >= Django 1.11
 
 Installation
 ------------
@@ -32,6 +32,20 @@ Add ``graphene_django`` to the ``INSTALLED_APPS`` in the ``settings.py`` file of
 
 We need to add a ``graphql`` URL to the ``urls.py`` of your Django project:
 
+For Django 1.11:
+
+.. code:: python
+
+    from django.conf.urls import url
+    from graphene_django.views import GraphQLView
+
+    urlpatterns = [
+        # ...
+        url(r"graphql", GraphQLView.as_view(graphiql=True)),
+    ]
+
+For Django 2.0 and above:
+
 .. code:: python
 
     from django.urls import path
diff --git a/docs/tutorial-plain.rst b/docs/tutorial-plain.rst
index c3ee269..e80f9ab 100644
--- a/docs/tutorial-plain.rst
+++ b/docs/tutorial-plain.rst
@@ -286,7 +286,7 @@ from the command line.
     $ python ./manage.py runserver
 
     Performing system checks...
-    Django version 1.9, using settings 'cookbook.settings'
+    Django version 1.11, using settings 'cookbook.settings'
     Starting development server at http://127.0.0.1:8000/
     Quit the server with CONTROL-C.
 
diff --git a/docs/tutorial-relay.rst b/docs/tutorial-relay.rst
index 5f8bd64..e900ea1 100644
--- a/docs/tutorial-relay.rst
+++ b/docs/tutorial-relay.rst
@@ -277,7 +277,7 @@ from the command line.
     $ python ./manage.py runserver
 
     Performing system checks...
-    Django version 1.9, using settings 'cookbook.settings'
+    Django version 1.11, using settings 'cookbook.settings'
     Starting development server at http://127.0.0.1:8000/
     Quit the server with CONTROL-C.
 

From b8e598d66d87e291591bc65be41bad2087d788d3 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Fri, 13 Mar 2020 10:04:25 +0000
Subject: [PATCH 056/116] =?UTF-8?q?Add=20options=20to=20override=20how=20D?=
 =?UTF-8?q?jango=20Choice=20fields=20are=20converted=20t=E2=80=A6=20(#860)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add new setting to create unique enum names

* Add specific tests for name generation

* Add schema test

* Rename settings field

* Rename setting

* Add custom function setting

* Add documentation

* Use format instead of f strings

* Update graphene_django/converter.py

Co-Authored-By: Syrus Akbary <me@syrusakbary.com>

* Fix tests

* Update docs

* Import function through import_string function

Co-authored-by: Syrus Akbary <me@syrusakbary.com>
---
 docs/settings.rst                       | 30 +++++++++
 graphene_django/converter.py            | 31 +++++++++-
 graphene_django/settings.py             |  3 +
 graphene_django/tests/test_converter.py | 30 ++++++++-
 graphene_django/tests/test_types.py     | 81 +++++++++++++++++++++++++
 5 files changed, 171 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 4776ce0..5a7e4c9 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -140,3 +140,33 @@ Default: ``False``
    #         'messages': ['This field is required.'],
    #     }
    # ]
+
+
+``DJANGO_CHOICE_FIELD_ENUM_V3_NAMING``
+--------------------------------------
+
+Set to ``True`` to use the new naming format for the auto generated Enum types from Django choice fields. The new format looks like this: ``{app_label}{object_name}{field_name}Choices``
+
+Default: ``False``
+
+
+``DJANGO_CHOICE_FIELD_ENUM_CUSTOM_NAME``
+--------------------------------------
+
+Define the path of a function that takes the Django choice field and returns a string to completely customise the naming for the Enum type.
+
+If set to a function then the ``DJANGO_CHOICE_FIELD_ENUM_V3_NAMING`` setting is ignored.
+
+Default: ``None``
+
+.. code:: python
+
+   # myapp.utils
+   def enum_naming(field):
+      if isinstance(field.model, User):
+         return f"CustomUserEnum{field.name.title()}"
+      return f"CustomEnum{field.name.title()}"
+
+   GRAPHENE = {
+      'DJANGO_CHOICE_FIELD_ENUM_CUSTOM_NAME': "myapp.utils.enum_naming"
+   }
diff --git a/graphene_django/converter.py b/graphene_django/converter.py
index 8b93d17..bd8f79d 100644
--- a/graphene_django/converter.py
+++ b/graphene_django/converter.py
@@ -1,6 +1,7 @@
 from collections import OrderedDict
 from django.db import models
 from django.utils.encoding import force_str
+from django.utils.module_loading import import_string
 
 from graphene import (
     ID,
@@ -22,6 +23,7 @@ from graphene.types.json import JSONString
 from graphene.utils.str_converters import to_camel_case, to_const
 from graphql import assert_valid_name
 
+from .settings import graphene_settings
 from .compat import ArrayField, HStoreField, JSONField, RangeField
 from .fields import DjangoListField, DjangoConnectionField
 from .utils import import_single_dispatch
@@ -68,6 +70,31 @@ def convert_choices_to_named_enum_with_descriptions(name, choices):
     return Enum(name, list(named_choices), type=EnumWithDescriptionsType)
 
 
+def generate_enum_name(django_model_meta, field):
+    if graphene_settings.DJANGO_CHOICE_FIELD_ENUM_CUSTOM_NAME:
+        # Try and import custom function
+        custom_func = import_string(
+            graphene_settings.DJANGO_CHOICE_FIELD_ENUM_CUSTOM_NAME
+        )
+        name = custom_func(field)
+    elif graphene_settings.DJANGO_CHOICE_FIELD_ENUM_V3_NAMING is True:
+        name = "{app_label}{object_name}{field_name}Choices".format(
+            app_label=to_camel_case(django_model_meta.app_label.title()),
+            object_name=django_model_meta.object_name,
+            field_name=to_camel_case(field.name.title()),
+        )
+    else:
+        name = to_camel_case("{}_{}".format(django_model_meta.object_name, field.name))
+    return name
+
+
+def convert_choice_field_to_enum(field, name=None):
+    if name is None:
+        name = generate_enum_name(field.model._meta, field)
+    choices = field.choices
+    return convert_choices_to_named_enum_with_descriptions(name, choices)
+
+
 def convert_django_field_with_choices(
     field, registry=None, convert_choices_to_enum=True
 ):
@@ -77,9 +104,7 @@ def convert_django_field_with_choices(
             return converted
     choices = getattr(field, "choices", None)
     if choices and convert_choices_to_enum:
-        meta = field.model._meta
-        name = to_camel_case("{}_{}".format(meta.object_name, field.name))
-        enum = convert_choices_to_named_enum_with_descriptions(name, choices)
+        enum = convert_choice_field_to_enum(field)
         required = not (field.blank or field.null)
         converted = enum(description=field.help_text, required=required)
     else:
diff --git a/graphene_django/settings.py b/graphene_django/settings.py
index 9a5e8a9..666ad8a 100644
--- a/graphene_django/settings.py
+++ b/graphene_django/settings.py
@@ -36,6 +36,9 @@ DEFAULTS = {
     # Max items returned in ConnectionFields / FilterConnectionFields
     "RELAY_CONNECTION_MAX_LIMIT": 100,
     "CAMELCASE_ERRORS": False,
+    # Set to True to enable v3 naming convention for choice field Enum's
+    "DJANGO_CHOICE_FIELD_ENUM_V3_NAMING": False,
+    "DJANGO_CHOICE_FIELD_ENUM_CUSTOM_NAME": None,
 }
 
 if settings.DEBUG:
diff --git a/graphene_django/tests/test_converter.py b/graphene_django/tests/test_converter.py
index 3790c4a..7f84de3 100644
--- a/graphene_django/tests/test_converter.py
+++ b/graphene_django/tests/test_converter.py
@@ -1,4 +1,5 @@
 import pytest
+from collections import namedtuple
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from graphene import NonNull
@@ -10,9 +11,14 @@ from graphene.types.datetime import DateTime, Date, Time
 from graphene.types.json import JSONString
 
 from ..compat import JSONField, ArrayField, HStoreField, RangeField, MissingType
-from ..converter import convert_django_field, convert_django_field_with_choices
+from ..converter import (
+    convert_django_field,
+    convert_django_field_with_choices,
+    generate_enum_name,
+)
 from ..registry import Registry
 from ..types import DjangoObjectType
+from ..settings import graphene_settings
 from .models import Article, Film, FilmDetails, Reporter
 
 
@@ -325,3 +331,25 @@ def test_should_postgres_range_convert_list():
     assert isinstance(field.type, graphene.NonNull)
     assert isinstance(field.type.of_type, graphene.List)
     assert field.type.of_type.of_type == graphene.Int
+
+
+def test_generate_enum_name():
+    MockDjangoModelMeta = namedtuple("DjangoMeta", ["app_label", "object_name"])
+    graphene_settings.DJANGO_CHOICE_FIELD_ENUM_V3_NAMING = True
+
+    # Simple case
+    field = graphene.Field(graphene.String, name="type")
+    model_meta = MockDjangoModelMeta(app_label="users", object_name="User")
+    assert generate_enum_name(model_meta, field) == "UsersUserTypeChoices"
+
+    # More complicated multiple work case
+    field = graphene.Field(graphene.String, name="fizz_buzz")
+    model_meta = MockDjangoModelMeta(
+        app_label="some_long_app_name", object_name="SomeObject"
+    )
+    assert (
+        generate_enum_name(model_meta, field)
+        == "SomeLongAppNameSomeObjectFizzBuzzChoices"
+    )
+
+    graphene_settings.DJANGO_CHOICE_FIELD_ENUM_V3_NAMING = False
diff --git a/graphene_django/tests/test_types.py b/graphene_django/tests/test_types.py
index c32f46c..888521f 100644
--- a/graphene_django/tests/test_types.py
+++ b/graphene_django/tests/test_types.py
@@ -9,7 +9,9 @@ from graphene import Connection, Field, Interface, ObjectType, Schema, String
 from graphene.relay import Node
 
 from .. import registry
+from ..settings import graphene_settings
 from ..types import DjangoObjectType, DjangoObjectTypeOptions
+from ..converter import convert_choice_field_to_enum
 from .models import Article as ArticleModel
 from .models import Reporter as ReporterModel
 
@@ -386,6 +388,10 @@ def test_django_objecttype_exclude_fields_exist_on_model():
     assert len(record) == 0
 
 
+def custom_enum_name(field):
+    return "CustomEnum{}".format(field.name.title())
+
+
 class TestDjangoObjectType:
     @pytest.fixture
     def PetModel(self):
@@ -492,3 +498,78 @@ class TestDjangoObjectType:
         }
         """
         )
+
+    def test_django_objecttype_convert_choices_enum_naming_collisions(self, PetModel):
+        graphene_settings.DJANGO_CHOICE_FIELD_ENUM_V3_NAMING = True
+
+        class PetModelKind(DjangoObjectType):
+            class Meta:
+                model = PetModel
+                fields = ["id", "kind"]
+
+        class Query(ObjectType):
+            pet = Field(PetModelKind)
+
+        schema = Schema(query=Query)
+
+        assert str(schema) == dedent(
+            """\
+        schema {
+          query: Query
+        }
+
+        type PetModelKind {
+          id: ID!
+          kind: TestsPetModelKindChoices!
+        }
+
+        type Query {
+          pet: PetModelKind
+        }
+
+        enum TestsPetModelKindChoices {
+          CAT
+          DOG
+        }
+        """
+        )
+        graphene_settings.DJANGO_CHOICE_FIELD_ENUM_V3_NAMING = False
+
+    def test_django_objecttype_choices_custom_enum_name(self, PetModel):
+        graphene_settings.DJANGO_CHOICE_FIELD_ENUM_CUSTOM_NAME = (
+            "graphene_django.tests.test_types.custom_enum_name"
+        )
+
+        class PetModelKind(DjangoObjectType):
+            class Meta:
+                model = PetModel
+                fields = ["id", "kind"]
+
+        class Query(ObjectType):
+            pet = Field(PetModelKind)
+
+        schema = Schema(query=Query)
+
+        assert str(schema) == dedent(
+            """\
+        schema {
+          query: Query
+        }
+
+        enum CustomEnumKind {
+          CAT
+          DOG
+        }
+
+        type PetModelKind {
+          id: ID!
+          kind: CustomEnumKind!
+        }
+
+        type Query {
+          pet: PetModelKind
+        }
+        """
+        )
+
+        graphene_settings.DJANGO_CHOICE_FIELD_ENUM_CUSTOM_NAME = None

From 348fcf37a0e90744321d231a1909ab6a44ecab18 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Fri, 13 Mar 2020 10:04:55 +0000
Subject: [PATCH 057/116] Detect format from output file path (#868)

* Detect format from output file path

* Fix tests

* Add test for exporting graphql file

* Add some documentation
---
 docs/introspection.rst                        | 14 ++++++
 .../management/commands/graphql_schema.py     | 26 +++++++++--
 graphene_django/tests/test_command.py         | 43 +++++++++++++++++--
 3 files changed, 75 insertions(+), 8 deletions(-)

diff --git a/docs/introspection.rst b/docs/introspection.rst
index dea55bd..2097c30 100644
--- a/docs/introspection.rst
+++ b/docs/introspection.rst
@@ -29,6 +29,20 @@ you're ready to use Relay with Graphene GraphQL implementation.
 
 The schema file is sorted to create a reproducible canonical representation.
 
+GraphQL SDL Representation
+--------------------------
+
+The schema can also be exported as a GraphQL SDL file by changing the file
+extension :
+
+.. code:: bash
+
+    ./manage.py graphql_schema --schema tutorial.quickstart.schema --out schema.graphql
+
+When exporting the schema as a ``.graphql`` file the ``--indent`` option is
+ignored.
+
+
 Advanced Usage
 --------------
 
diff --git a/graphene_django/management/commands/graphql_schema.py b/graphene_django/management/commands/graphql_schema.py
index 1e8baf6..751a385 100644
--- a/graphene_django/management/commands/graphql_schema.py
+++ b/graphene_django/management/commands/graphql_schema.py
@@ -1,3 +1,4 @@
+import os
 import importlib
 import json
 import functools
@@ -5,6 +6,7 @@ import functools
 from django.core.management.base import BaseCommand, CommandError
 from django.utils import autoreload
 
+from graphql import print_schema
 from graphene_django.settings import graphene_settings
 
 
@@ -44,24 +46,40 @@ class CommandArguments(BaseCommand):
 
 
 class Command(CommandArguments):
-    help = "Dump Graphene schema JSON to file"
+    help = "Dump Graphene schema as a JSON or GraphQL file"
     can_import_settings = True
 
-    def save_file(self, out, schema_dict, indent):
+    def save_json_file(self, out, schema_dict, indent):
         with open(out, "w") as outfile:
             json.dump(schema_dict, outfile, indent=indent, sort_keys=True)
 
+    def save_graphql_file(self, out, schema):
+        with open(out, "w") as outfile:
+            outfile.write(print_schema(schema))
+
     def get_schema(self, schema, out, indent):
         schema_dict = {"data": schema.introspect()}
         if out == "-":
             self.stdout.write(json.dumps(schema_dict, indent=indent, sort_keys=True))
         else:
-            self.save_file(out, schema_dict, indent)
+            # Determine format
+            _, file_extension = os.path.splitext(out)
+
+            if file_extension == ".graphql":
+                self.save_graphql_file(out, schema)
+            elif file_extension == ".json":
+                self.save_json_file(out, schema_dict, indent)
+            else:
+                raise CommandError(
+                    'Unrecognised file format "{}"'.format(file_extension)
+                )
 
             style = getattr(self, "style", None)
             success = getattr(style, "SUCCESS", lambda x: x)
 
-            self.stdout.write(success("Successfully dumped GraphQL schema to %s" % out))
+            self.stdout.write(
+                success("Successfully dumped GraphQL schema to {}".format(out))
+            )
 
     def handle(self, *args, **options):
         options_schema = options.get("schema")
diff --git a/graphene_django/tests/test_command.py b/graphene_django/tests/test_command.py
index dbabafa..8b0a8e6 100644
--- a/graphene_django/tests/test_command.py
+++ b/graphene_django/tests/test_command.py
@@ -1,17 +1,21 @@
+from textwrap import dedent
+
 from django.core import management
-from mock import patch, mock_open
+from mock import mock_open, patch
 from six import StringIO
 
+from graphene import ObjectType, Schema, String
 
-@patch("graphene_django.management.commands.graphql_schema.Command.save_file")
-def test_generate_file_on_call_graphql_schema(savefile_mock, settings):
+
+@patch("graphene_django.management.commands.graphql_schema.Command.save_json_file")
+def test_generate_json_file_on_call_graphql_schema(savefile_mock, settings):
     out = StringIO()
     management.call_command("graphql_schema", schema="", stdout=out)
     assert "Successfully dumped GraphQL schema to schema.json" in out.getvalue()
 
 
 @patch("json.dump")
-def test_files_are_canonical(dump_mock):
+def test_json_files_are_canonical(dump_mock):
     open_mock = mock_open()
     with patch("graphene_django.management.commands.graphql_schema.open", open_mock):
         management.call_command("graphql_schema", schema="")
@@ -25,3 +29,34 @@ def test_files_are_canonical(dump_mock):
     assert (
         dump_mock.call_args[1]["indent"] > 0
     ), "output should be pretty-printed by default"
+
+
+def test_generate_graphql_file_on_call_graphql_schema():
+    class Query(ObjectType):
+        hi = String()
+
+    mock_schema = Schema(query=Query)
+
+    open_mock = mock_open()
+    with patch("graphene_django.management.commands.graphql_schema.open", open_mock):
+        management.call_command(
+            "graphql_schema", schema=mock_schema, out="schema.graphql"
+        )
+
+    open_mock.assert_called_once()
+
+    handle = open_mock()
+    assert handle.write.called_once()
+
+    schema_output = handle.write.call_args[0][0]
+    assert schema_output == dedent(
+        """\
+        schema {
+          query: Query
+        }
+
+        type Query {
+          hi: String
+        }
+    """
+    )

From c8a56f8857af5d992649d791b27f0139be046563 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Fri, 13 Mar 2020 10:05:35 +0000
Subject: [PATCH 058/116] Allow string references in DjangoListField (#885)

* Allow passing string references to DjangoListField

* Refactor logic to work with string imports
---
 graphene_django/fields.py            | 21 +++++++++++++--------
 graphene_django/tests/test_fields.py |  6 ++++++
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/graphene_django/fields.py b/graphene_django/fields.py
index 47b44f6..fb6b98a 100644
--- a/graphene_django/fields.py
+++ b/graphene_django/fields.py
@@ -1,5 +1,6 @@
 from functools import partial
 
+import six
 from django.db.models.query import QuerySet
 from graphql_relay.connection.arrayconnection import connection_from_list_slice
 from promise import Promise
@@ -19,19 +20,23 @@ class DjangoListField(Field):
         if isinstance(_type, NonNull):
             _type = _type.of_type
 
-        assert issubclass(
-            _type, DjangoObjectType
-        ), "DjangoListField only accepts DjangoObjectType types"
-
         # Django would never return a Set of None  vvvvvvv
         super(DjangoListField, self).__init__(List(NonNull(_type)), *args, **kwargs)
 
+        assert issubclass(
+            self._underlying_type, DjangoObjectType
+        ), "DjangoListField only accepts DjangoObjectType types"
+
+    @property
+    def _underlying_type(self):
+        _type = self._type
+        while hasattr(_type, "of_type"):
+            _type = _type.of_type
+        return _type
+
     @property
     def model(self):
-        _type = self.type.of_type
-        if isinstance(_type, NonNull):
-            _type = _type.of_type
-        return _type._meta.model
+        return self._underlying_type._meta.model
 
     @staticmethod
     def list_resolver(django_object_type, resolver, root, info, **args):
diff --git a/graphene_django/tests/test_fields.py b/graphene_django/tests/test_fields.py
index f6abf00..8ea1901 100644
--- a/graphene_django/tests/test_fields.py
+++ b/graphene_django/tests/test_fields.py
@@ -19,6 +19,12 @@ class TestDjangoListField:
         with pytest.raises(AssertionError):
             list_field = DjangoListField(TestType)
 
+    def test_only_import_paths(self):
+        list_field = DjangoListField("graphene_django.tests.schema.Human")
+        from .schema import Human
+
+        assert list_field._type.of_type.of_type is Human
+
     def test_non_null_type(self):
         class Reporter(DjangoObjectType):
             class Meta:

From 150008aae57f063f8a3c79a0958e46798a600a07 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Fri, 13 Mar 2020 10:13:46 +0000
Subject: [PATCH 059/116] v2.9.0

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index dbdc201..6574745 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,6 +1,6 @@
 from .types import DjangoObjectType
 from .fields import DjangoConnectionField
 
-__version__ = "2.8.2"
+__version__ = "2.9.0"
 
 __all__ = ["__version__", "DjangoObjectType", "DjangoConnectionField"]

From cf9f59071ea3570bc7c631cd91723e6a73ceec9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Clgen=20Sar=C4=B1kavak?=
 <ulgens@users.noreply.github.com>
Date: Sat, 14 Mar 2020 13:40:41 +0300
Subject: [PATCH 060/116] Update dev dependencies (#903)

---
 setup.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index a3d0b74..560549a 100644
--- a/setup.py
+++ b/setup.py
@@ -26,10 +26,10 @@ tests_require = [
 
 
 dev_requires = [
-    "black==19.3b0",
-    "flake8==3.7.7",
-    "flake8-black==0.1.0",
-    "flake8-bugbear==19.3.0",
+    "black==19.10b0",
+    "flake8==3.7.9",
+    "flake8-black==0.1.1",
+    "flake8-bugbear==20.1.4",
 ] + tests_require
 
 setup(

From 0da06d4d54d3e73d43d88534259f55733ab7609b Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Wed, 18 Mar 2020 12:59:32 +0000
Subject: [PATCH 061/116] Update stale.yml

---
 .github/stale.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/stale.yml b/.github/stale.yml
index dab9fb3..d066ca6 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 90
+daysUntilStale: 120
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 14
+daysUntilClose: 30
 # Issues with these labels will never be considered stale
 exemptLabels:
   - pinned

From 63418666d90dd60ec8557e6e0ec35a455452f6f5 Mon Sep 17 00:00:00 2001
From: Roy Segall <roy@segall.io>
Date: Mon, 6 Apr 2020 11:15:35 +0300
Subject: [PATCH 062/116] Adding Django filter as an installed app (#899)

---
 examples/cookbook/cookbook/settings.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/cookbook/cookbook/settings.py b/examples/cookbook/cookbook/settings.py
index 7eb9d56..3e941b8 100644
--- a/examples/cookbook/cookbook/settings.py
+++ b/examples/cookbook/cookbook/settings.py
@@ -41,6 +41,7 @@ INSTALLED_APPS = [
     "graphene_django",
     "cookbook.ingredients.apps.IngredientsConfig",
     "cookbook.recipes.apps.RecipesConfig",
+    "django_filters",
 ]
 
 MIDDLEWARE = [

From b84f61afab5922f7a330b2f09bdf540b40b44e86 Mon Sep 17 00:00:00 2001
From: fneitzel <frederic.neitzel@gmx.de>
Date: Mon, 6 Apr 2020 10:58:55 +0200
Subject: [PATCH 063/116] Documentation missing endpoint explanation (#918)

* Documentation missing endpoint explanation

Add some information about GRAPHQL_URL. Otherwise people run into ERROR 400 problems, if they have a different endpoint.

* Update docs/testing.rst

Co-Authored-By: Jonathan Kim <jkimbo@gmail.com>

Co-authored-by: Jonathan Kim <jkimbo@gmail.com>
---
 docs/testing.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/testing.rst b/docs/testing.rst
index 031cf6b..473a9ba 100644
--- a/docs/testing.rst
+++ b/docs/testing.rst
@@ -3,6 +3,8 @@ Testing API calls with django
 
 If you want to unittest your API calls derive your test case from the class `GraphQLTestCase`.
 
+Your endpoint is set through the `GRAPHQL_URL` attribute on `GraphQLTestCase`. The default endpoint is `GRAPHQL_URL = "/graphql/"`.
+
 Usage:
 
 .. code:: python

From 613e1e31f427c1da62e918d8ed20346ac7d382a5 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Tue, 7 Apr 2020 11:05:17 +0100
Subject: [PATCH 064/116] Add slack link

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 2a5237b..7e228c5 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,8 @@ A [Django](https://www.djangoproject.com/) integration for [Graphene](http://gra
 [conda-image]: https://img.shields.io/conda/vn/conda-forge/graphene-django.svg
 [conda-url]: https://anaconda.org/conda-forge/graphene-django
 
+[💬 Join the community on Slack](https://join.slack.com/t/graphenetools/shared_invite/enQtOTE2MDQ1NTg4MDM1LTA4Nzk0MGU0NGEwNzUxZGNjNDQ4ZjAwNDJjMjY0OGE1ZDgxZTg4YjM2ZTc4MjE2ZTAzZjE2ZThhZTQzZTkyMmM)
+
 ## Documentation
 
 [Visit the documentation to get started!](https://docs.graphene-python.org/projects/django/en/latest/)

From 3483428f70efc619b7f138a709486c91ba67abe8 Mon Sep 17 00:00:00 2001
From: Roy Segall <roy@segall.io>
Date: Sun, 12 Apr 2020 14:57:11 +0300
Subject: [PATCH 065/116] Adding documentation for installing django-filter
 (#928)

---
 docs/filtering.rst | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/filtering.rst b/docs/filtering.rst
index 6fe7cab..0d37f46 100644
--- a/docs/filtering.rst
+++ b/docs/filtering.rst
@@ -14,8 +14,17 @@ You will need to install it manually, which can be done as follows:
 
 .. code:: bash
 
-    # You'll need to django-filter
+    # You'll need to install django-filter
     pip install django-filter>=2
+    
+After installing ``django-filter`` you'll need to add the application in the ``settings.py`` file:
+
+.. code:: python
+
+    INSTALLED_APPS = [
+        # ...
+        "django_filters",
+    ]
 
 Note: The techniques below are demoed in the `cookbook example
 app <https://github.com/graphql-python/graphene-django/tree/master/examples/cookbook>`__.

From 9d9a14c36df49a7a569f7f074ae343584f08e865 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sun, 12 Apr 2020 16:18:41 +0100
Subject: [PATCH 066/116] Fix failing tests (#931)

* Use proper model

* Remove failing test

* Add python 3.8 to test list
---
 .travis.yml                                  | 13 ++++++++++++
 graphene_django/forms/tests/test_mutation.py | 21 +++-----------------
 tox.ini                                      |  4 ++--
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bbeeb80..4b44f60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,6 +62,19 @@ jobs:
     - python: 3.7
       env: DJANGO=master
 
+    - python: 3.8
+      env: DJANGO=1.11
+    - python: 3.8
+      env: DJANGO=2.0
+    - python: 3.8
+      env: DJANGO=2.1
+    - python: 3.8
+      env: DJANGO=2.2
+    - python: 3.8
+      env: DJANGO=3.0
+    - python: 3.8
+      env: DJANGO=master
+
     - python: 3.7
       env: TOXENV=black,flake8
 
diff --git a/graphene_django/forms/tests/test_mutation.py b/graphene_django/forms/tests/test_mutation.py
index f648330..e7dbbdf 100644
--- a/graphene_django/forms/tests/test_mutation.py
+++ b/graphene_django/forms/tests/test_mutation.py
@@ -5,7 +5,7 @@ from py.test import raises
 
 from graphene import ObjectType, Schema, String, Field
 from graphene_django import DjangoObjectType
-from graphene_django.tests.models import Film, FilmDetails, Pet
+from graphene_django.tests.models import Film, Pet
 
 from ...settings import graphene_settings
 from ..mutation import DjangoFormMutation, DjangoModelFormMutation
@@ -42,12 +42,6 @@ class FilmType(DjangoObjectType):
         fields = "__all__"
 
 
-class FilmDetailsType(DjangoObjectType):
-    class Meta:
-        model = FilmDetails
-        fields = "__all__"
-
-
 def test_needs_form_class():
     with raises(Exception) as exc:
 
@@ -185,23 +179,14 @@ class ModelFormMutationTests(TestCase):
         self.assertIn("client_mutation_id", PetMutation.Input._meta.fields)
         self.assertNotIn("id", PetMutation.Input._meta.fields)
 
-    def test_return_field_name_is_camelcased(self):
-        class PetMutation(DjangoModelFormMutation):
-            class Meta:
-                form_class = PetForm
-                model = FilmDetails
-
-        self.assertEqual(PetMutation._meta.model, FilmDetails)
-        self.assertEqual(PetMutation._meta.return_field_name, "filmDetails")
-
     def test_custom_return_field_name(self):
         class PetMutation(DjangoModelFormMutation):
             class Meta:
                 form_class = PetForm
-                model = Film
+                model = Pet
                 return_field_name = "animal"
 
-        self.assertEqual(PetMutation._meta.model, Film)
+        self.assertEqual(PetMutation._meta.model, Pet)
         self.assertEqual(PetMutation._meta.return_field_name, "animal")
         self.assertIn("animal", PetMutation._meta.fields)
 
diff --git a/tox.ini b/tox.ini
index e7287ff..feeacfd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    py{27,35,36,37}-django{111,20,21,22,master},
-    py{36,37}-django30,
+    py{27,35,36,37,38}-django{111,20,21,22,master},
+    py{36,37,38}-django30,
     black,flake8
 
 [travis:env]

From 481d3ff35d459587fb8114f40d69aecede3677a1 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sun, 12 Apr 2020 20:01:30 +0100
Subject: [PATCH 067/116] Fix DjangoModelFormMutation (#915)

* Fix DjangoModelFormMutation

* Try and fix tests

* Remove unused form
---
 graphene_django/forms/mutation.py            | 11 +++++
 graphene_django/forms/tests/test_mutation.py | 46 ++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/graphene_django/forms/mutation.py b/graphene_django/forms/mutation.py
index b7bf049..692f8d5 100644
--- a/graphene_django/forms/mutation.py
+++ b/graphene_django/forms/mutation.py
@@ -162,6 +162,17 @@ class DjangoModelFormMutation(BaseDjangoFormMutation):
             _meta=_meta, input_fields=input_fields, **options
         )
 
+    @classmethod
+    def mutate_and_get_payload(cls, root, info, **input):
+        form = cls.get_form(root, info, **input)
+
+        if form.is_valid():
+            return cls.perform_mutate(form, info)
+        else:
+            errors = ErrorType.from_errors(form.errors)
+
+            return cls(errors=errors)
+
     @classmethod
     def perform_mutate(cls, form, info):
         obj = form.save()
diff --git a/graphene_django/forms/tests/test_mutation.py b/graphene_django/forms/tests/test_mutation.py
index e7dbbdf..093f398 100644
--- a/graphene_django/forms/tests/test_mutation.py
+++ b/graphene_django/forms/tests/test_mutation.py
@@ -29,6 +29,12 @@ class PetForm(forms.ModelForm):
         model = Pet
         fields = "__all__"
 
+    def clean_age(self):
+        age = self.cleaned_data["age"]
+        if age >= 99:
+            raise ValidationError("Too old")
+        return age
+
 
 class PetType(DjangoObjectType):
     class Meta:
@@ -243,6 +249,10 @@ class ModelFormMutationTests(TestCase):
                         name
                         age
                     }
+                    errors {
+                        field
+                        messages
+                    }
                 }
             }
             """
@@ -255,6 +265,42 @@ class ModelFormMutationTests(TestCase):
         self.assertEqual(pet.name, "Mia")
         self.assertEqual(pet.age, 10)
 
+    def test_model_form_mutation_invalid_input(self):
+        class PetMutation(DjangoModelFormMutation):
+            pet = Field(PetType)
+
+            class Meta:
+                form_class = PetForm
+
+        class Mutation(ObjectType):
+            pet_mutation = PetMutation.Field()
+
+        schema = Schema(query=MockQuery, mutation=Mutation)
+
+        result = schema.execute(
+            """ mutation PetMutation {
+                petMutation(input: { name: "Mia", age: 99 }) {
+                    pet {
+                        name
+                        age
+                    }
+                    errors {
+                        field
+                        messages
+                    }
+                }
+            }
+            """
+        )
+        self.assertIs(result.errors, None)
+        self.assertEqual(result.data["petMutation"]["pet"], None)
+        self.assertEqual(
+            result.data["petMutation"]["errors"],
+            [{"field": "age", "messages": ["Too old"],}],
+        )
+
+        self.assertEqual(Pet.objects.count(), 0)
+
     def test_model_form_mutation_mutate_invalid_form(self):
         class PetMutation(DjangoModelFormMutation):
             class Meta:

From e1cfc0a80b25d1625650104863c16d7b83c5054c Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sun, 12 Apr 2020 20:01:56 +0100
Subject: [PATCH 068/116] v2.9.1

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index 6574745..38f8d8a 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,6 +1,6 @@
 from .types import DjangoObjectType
 from .fields import DjangoConnectionField
 
-__version__ = "2.9.0"
+__version__ = "2.9.1"
 
 __all__ = ["__version__", "DjangoObjectType", "DjangoConnectionField"]

From cfc8fea7f52fa625c8b3e110ac16953a5ea7208c Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Mon, 13 Apr 2020 11:53:06 +0100
Subject: [PATCH 069/116] Update README.md

---
 README.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 7e228c5..92b5b65 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-Please read [UPGRADE-v2.0.md](https://github.com/graphql-python/graphene/blob/master/UPGRADE-v2.0.md) to learn how to upgrade to Graphene `2.0`.
-
----
-
 # ![Graphene Logo](http://graphene-python.org/favicon.png) Graphene-Django
 
 
@@ -12,7 +8,7 @@ A [Django](https://www.djangoproject.com/) integration for [Graphene](http://gra
 [![Anaconda-Server Badge][conda-image]][conda-url]
 [![coveralls][coveralls-image]][coveralls-url]
 
-[travis-image]: https://travis-ci.org/graphql-python/graphene-django.svg?style=flat
+[travis-image]: https://travis-ci.org/graphql-python/graphene-django.svg?branch=master&style=flat
 [travis-url]: https://travis-ci.org/graphql-python/graphene-django
 [pypi-image]: https://img.shields.io/pypi/v/graphene-django.svg?style=flat
 [pypi-url]: https://pypi.org/project/graphene-django/
@@ -94,7 +90,7 @@ class Query(graphene.ObjectType):
 schema = graphene.Schema(query=Query)
 ```
 
-Then you can simply query the schema:
+Then you can query the schema:
 
 ```python
 query = '''

From fba6de41dd698ae2b944d368de7b3f961288fc6f Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Mon, 13 Apr 2020 11:54:17 +0100
Subject: [PATCH 070/116] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 92b5b65..8605065 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ A [Django](https://www.djangoproject.com/) integration for [Graphene](http://gra
 [travis-url]: https://travis-ci.org/graphql-python/graphene-django
 [pypi-image]: https://img.shields.io/pypi/v/graphene-django.svg?style=flat
 [pypi-url]: https://pypi.org/project/graphene-django/
-[coveralls-image]: https://coveralls.io/repos/graphql-python/graphene-django/badge.svg?branch=master&service=github
+[coveralls-image]: https://coveralls.io/repos/github/graphql-python/graphene-django/badge.svg?branch=master
 [coveralls-url]: https://coveralls.io/github/graphql-python/graphene-django?branch=master
 [conda-image]: https://img.shields.io/conda/vn/conda-forge/graphene-django.svg
 [conda-url]: https://anaconda.org/conda-forge/graphene-django

From 23b6419b428a0f1b4bd3a8124e49d899b86800a7 Mon Sep 17 00:00:00 2001
From: Sam Millar <sam@millar.io>
Date: Sun, 19 Apr 2020 20:42:00 +0100
Subject: [PATCH 071/116] Disable system checks for graphql_schema management
 command (#939)

---
 graphene_django/management/commands/graphql_schema.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/graphene_django/management/commands/graphql_schema.py b/graphene_django/management/commands/graphql_schema.py
index 751a385..dcef73c 100644
--- a/graphene_django/management/commands/graphql_schema.py
+++ b/graphene_django/management/commands/graphql_schema.py
@@ -48,6 +48,7 @@ class CommandArguments(BaseCommand):
 class Command(CommandArguments):
     help = "Dump Graphene schema as a JSON or GraphQL file"
     can_import_settings = True
+    requires_system_checks = False
 
     def save_json_file(self, out, schema_dict, indent):
         with open(out, "w") as outfile:

From dc5c97149899a272d95aee98b66e072314cd5a5b Mon Sep 17 00:00:00 2001
From: Noelle Leigh <noelle_leigh@fastmail.com>
Date: Sun, 19 Apr 2020 16:11:33 -0400
Subject: [PATCH 072/116] Switch `operation_name` to `operationName` in
 GraphQLTestCase (#936)

* Add op_name test

* Replace "operation_name" with "operationName"

* Improve test comments

* Add method for Python 2.7
---
 graphene_django/tests/test_utils.py | 32 +++++++++++++++++++++++++++--
 graphene_django/utils/testing.py    |  6 +++---
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/graphene_django/tests/test_utils.py b/graphene_django/tests/test_utils.py
index 55cfd4f..c0d376b 100644
--- a/graphene_django/tests/test_utils.py
+++ b/graphene_django/tests/test_utils.py
@@ -1,6 +1,10 @@
-from django.utils.translation import gettext_lazy
+import json
 
-from ..utils import camelize, get_model_fields
+import pytest
+from django.utils.translation import gettext_lazy
+from mock import patch
+
+from ..utils import camelize, get_model_fields, GraphQLTestCase
 from .models import Film, Reporter
 
 
@@ -30,3 +34,27 @@ def test_camelize():
         "valueA": "value_b"
     }
     assert camelize({0: {"field_a": ["errors"]}}) == {0: {"fieldA": ["errors"]}}
+
+
+@pytest.mark.django_db
+@patch("graphene_django.utils.testing.Client.post")
+def test_graphql_test_case_op_name(post_mock):
+    """
+    Test that `GraphQLTestCase.query()`'s `op_name` argument produces an `operationName` field.
+    """
+
+    class TestClass(GraphQLTestCase):
+        GRAPHQL_SCHEMA = True
+
+        def runTest(self):
+            pass
+
+    tc = TestClass()
+    tc.setUpClass()
+    tc.query("query { }", op_name="QueryName")
+    body = json.loads(post_mock.call_args.args[1])
+    # `operationName` field from https://graphql.org/learn/serving-over-http/#post-request
+    assert (
+        "operationName",
+        "QueryName",
+    ) in body.items(), "Field 'operationName' is not present in the final request."
diff --git a/graphene_django/utils/testing.py b/graphene_django/utils/testing.py
index 8a9b994..0f68a51 100644
--- a/graphene_django/utils/testing.py
+++ b/graphene_django/utils/testing.py
@@ -32,20 +32,20 @@ class GraphQLTestCase(TestCase):
                                 supply the op_name.  For annon queries ("{ ... }"),
                                 should be None (default).
             input_data (dict) - If provided, the $input variable in GraphQL will be set
-                                to this value. If both ``input_data`` and ``variables``, 
+                                to this value. If both ``input_data`` and ``variables``,
                                 are provided, the ``input`` field in the ``variables``
                                 dict will be overwritten with this value.
             variables (dict)  - If provided, the "variables" field in GraphQL will be
                                 set to this value.
             headers (dict)    - If provided, the headers in POST request to GRAPHQL_URL
-                                will be set to this value. 
+                                will be set to this value.
 
         Returns:
             Response object from client
         """
         body = {"query": query}
         if op_name:
-            body["operation_name"] = op_name
+            body["operationName"] = op_name
         if variables:
             body["variables"] = variables
         if input_data:

From b9f0e4f9aef32bbc238a880012c86aa0b6b32134 Mon Sep 17 00:00:00 2001
From: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
Date: Mon, 20 Apr 2020 14:23:20 +0200
Subject: [PATCH 073/116] Make tests order independent (#932)

* Reset the global registry after each test (teardown)

* Create a settings fixtures that returns graphene_settings and resets
  the graphene_settings after use (teardown)

* Convert test_mutation tests from unittests.TestCase to pytest

* Convert test_mutation PetType to a pet_type fixtures that reregisters
  the type
---
 graphene_django/conftest.py                   |  18 +
 graphene_django/debug/tests/test_query.py     |   7 -
 graphene_django/filter/tests/test_fields.py   |   3 -
 graphene_django/forms/tests/test_mutation.py  | 430 +++++++++---------
 .../tests/test_multiple_model_serializers.py  |   7 +-
 .../rest_framework/tests/test_mutation.py     |  16 +-
 graphene_django/tests/test_command.py         |   2 +-
 graphene_django/tests/test_converter.py       |  15 +-
 graphene_django/tests/test_fields.py          |   1 -
 graphene_django/tests/test_query.py           |  28 +-
 graphene_django/tests/test_types.py           |  16 +-
 11 files changed, 259 insertions(+), 284 deletions(-)
 create mode 100644 graphene_django/conftest.py

diff --git a/graphene_django/conftest.py b/graphene_django/conftest.py
new file mode 100644
index 0000000..509a84c
--- /dev/null
+++ b/graphene_django/conftest.py
@@ -0,0 +1,18 @@
+import pytest
+
+from graphene_django.settings import graphene_settings as gsettings
+
+from .registry import reset_global_registry
+
+
+@pytest.fixture(autouse=True)
+def reset_registry_fixture(db):
+    yield None
+    reset_global_registry()
+
+
+@pytest.fixture()
+def graphene_settings():
+    settings = dict(gsettings.__dict__)
+    yield gsettings
+    gsettings.__dict__ = settings
diff --git a/graphene_django/debug/tests/test_query.py b/graphene_django/debug/tests/test_query.py
index db8f275..7226f9b 100644
--- a/graphene_django/debug/tests/test_query.py
+++ b/graphene_django/debug/tests/test_query.py
@@ -1,5 +1,3 @@
-import pytest
-
 import graphene
 from graphene.relay import Node
 from graphene_django import DjangoConnectionField, DjangoObjectType
@@ -13,11 +11,6 @@ class context(object):
     pass
 
 
-# from examples.starwars_django.models import Character
-
-pytestmark = pytest.mark.django_db
-
-
 def test_should_query_field():
     r1 = Reporter(last_name="ABA")
     r1.save()
diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py
index a0f7d96..166d806 100644
--- a/graphene_django/filter/tests/test_fields.py
+++ b/graphene_django/filter/tests/test_fields.py
@@ -35,9 +35,6 @@ else:
         )
     )
 
-pytestmark.append(pytest.mark.django_db)
-
-
 if DJANGO_FILTER_INSTALLED:
 
     class ArticleNode(DjangoObjectType):
diff --git a/graphene_django/forms/tests/test_mutation.py b/graphene_django/forms/tests/test_mutation.py
index 093f398..a455a0a 100644
--- a/graphene_django/forms/tests/test_mutation.py
+++ b/graphene_django/forms/tests/test_mutation.py
@@ -1,16 +1,25 @@
+import pytest
 from django import forms
-from django.test import TestCase
 from django.core.exceptions import ValidationError
 from py.test import raises
 
-from graphene import ObjectType, Schema, String, Field
+from graphene import Field, ObjectType, Schema, String
 from graphene_django import DjangoObjectType
-from graphene_django.tests.models import Film, Pet
+from graphene_django.tests.models import Pet
 
-from ...settings import graphene_settings
 from ..mutation import DjangoFormMutation, DjangoModelFormMutation
 
 
+@pytest.fixture()
+def pet_type():
+    class PetType(DjangoObjectType):
+        class Meta:
+            model = Pet
+            fields = "__all__"
+
+    return PetType
+
+
 class MyForm(forms.Form):
     text = forms.CharField()
 
@@ -36,18 +45,6 @@ class PetForm(forms.ModelForm):
         return age
 
 
-class PetType(DjangoObjectType):
-    class Meta:
-        model = Pet
-        fields = "__all__"
-
-
-class FilmType(DjangoObjectType):
-    class Meta:
-        model = Film
-        fields = "__all__"
-
-
 def test_needs_form_class():
     with raises(Exception) as exc:
 
@@ -73,7 +70,7 @@ def test_has_input_fields():
     assert "text" in MyMutation.Input._meta.fields
 
 
-def test_mutation_error_camelcased():
+def test_mutation_error_camelcased(pet_type, graphene_settings):
     class ExtraPetForm(PetForm):
         test_field = forms.CharField(required=True)
 
@@ -86,234 +83,237 @@ def test_mutation_error_camelcased():
     graphene_settings.CAMELCASE_ERRORS = True
     result = PetMutation.mutate_and_get_payload(None, None)
     assert {f.field for f in result.errors} == {"name", "age", "testField"}
-    graphene_settings.CAMELCASE_ERRORS = False
 
 
 class MockQuery(ObjectType):
     a = String()
 
 
-class FormMutationTests(TestCase):
-    def test_form_invalid_form(self):
-        class MyMutation(DjangoFormMutation):
-            class Meta:
-                form_class = MyForm
+def test_form_invalid_form():
+    class MyMutation(DjangoFormMutation):
+        class Meta:
+            form_class = MyForm
 
-        class Mutation(ObjectType):
-            my_mutation = MyMutation.Field()
+    class Mutation(ObjectType):
+        my_mutation = MyMutation.Field()
 
-        schema = Schema(query=MockQuery, mutation=Mutation)
+    schema = Schema(query=MockQuery, mutation=Mutation)
 
-        result = schema.execute(
-            """ mutation MyMutation {
-                myMutation(input: { text: "INVALID_INPUT" }) {
-                    errors {
-                        field
-                        messages
-                    }
-                    text
+    result = schema.execute(
+        """ mutation MyMutation {
+            myMutation(input: { text: "INVALID_INPUT" }) {
+                errors {
+                    field
+                    messages
+                }
+                text
+            }
+        }
+        """
+    )
+
+    assert result.errors is None
+    assert result.data["myMutation"]["errors"] == [
+        {"field": "text", "messages": ["Invalid input"]}
+    ]
+
+
+def test_form_valid_input():
+    class MyMutation(DjangoFormMutation):
+        class Meta:
+            form_class = MyForm
+
+    class Mutation(ObjectType):
+        my_mutation = MyMutation.Field()
+
+    schema = Schema(query=MockQuery, mutation=Mutation)
+
+    result = schema.execute(
+        """ mutation MyMutation {
+            myMutation(input: { text: "VALID_INPUT" }) {
+                errors {
+                    field
+                    messages
+                }
+                text
+            }
+        }
+        """
+    )
+
+    assert result.errors is None
+    assert result.data["myMutation"]["errors"] == []
+    assert result.data["myMutation"]["text"] == "VALID_INPUT"
+
+
+def test_default_meta_fields(pet_type):
+    class PetMutation(DjangoModelFormMutation):
+        class Meta:
+            form_class = PetForm
+
+    assert PetMutation._meta.model is Pet
+    assert PetMutation._meta.return_field_name == "pet"
+    assert "pet" in PetMutation._meta.fields
+
+
+def test_default_input_meta_fields(pet_type):
+    class PetMutation(DjangoModelFormMutation):
+        class Meta:
+            form_class = PetForm
+
+    assert PetMutation._meta.model is Pet
+    assert PetMutation._meta.return_field_name == "pet"
+    assert "name" in PetMutation.Input._meta.fields
+    assert "client_mutation_id" in PetMutation.Input._meta.fields
+    assert "id" in PetMutation.Input._meta.fields
+
+
+def test_exclude_fields_input_meta_fields(pet_type):
+    class PetMutation(DjangoModelFormMutation):
+        class Meta:
+            form_class = PetForm
+            exclude_fields = ["id"]
+
+    assert PetMutation._meta.model is Pet
+    assert PetMutation._meta.return_field_name == "pet"
+    assert "name" in PetMutation.Input._meta.fields
+    assert "age" in PetMutation.Input._meta.fields
+    assert "client_mutation_id" in PetMutation.Input._meta.fields
+    assert "id" not in PetMutation.Input._meta.fields
+
+
+def test_custom_return_field_name(pet_type):
+    class PetMutation(DjangoModelFormMutation):
+        class Meta:
+            form_class = PetForm
+            model = Pet
+            return_field_name = "animal"
+
+    assert PetMutation._meta.model is Pet
+    assert PetMutation._meta.return_field_name == "animal"
+    assert "animal" in PetMutation._meta.fields
+
+
+def test_model_form_mutation_mutate_existing(pet_type):
+    class PetMutation(DjangoModelFormMutation):
+        pet = Field(pet_type)
+
+        class Meta:
+            form_class = PetForm
+
+    class Mutation(ObjectType):
+        pet_mutation = PetMutation.Field()
+
+    schema = Schema(query=MockQuery, mutation=Mutation)
+
+    pet = Pet.objects.create(name="Axel", age=10)
+
+    result = schema.execute(
+        """ mutation PetMutation($pk: ID!) {
+            petMutation(input: { id: $pk, name: "Mia", age: 10 }) {
+                pet {
+                    name
+                    age
                 }
             }
-            """
-        )
+        }
+        """,
+        variable_values={"pk": pet.pk},
+    )
 
-        self.assertIs(result.errors, None)
-        self.assertEqual(
-            result.data["myMutation"]["errors"],
-            [{"field": "text", "messages": ["Invalid input"]}],
-        )
+    assert result.errors is None
+    assert result.data["petMutation"]["pet"] == {"name": "Mia", "age": 10}
 
-    def test_form_valid_input(self):
-        class MyMutation(DjangoFormMutation):
-            class Meta:
-                form_class = MyForm
+    assert Pet.objects.count() == 1
+    pet.refresh_from_db()
+    assert pet.name == "Mia"
 
-        class Mutation(ObjectType):
-            my_mutation = MyMutation.Field()
 
-        schema = Schema(query=MockQuery, mutation=Mutation)
+def test_model_form_mutation_creates_new(pet_type):
+    class PetMutation(DjangoModelFormMutation):
+        pet = Field(pet_type)
 
-        result = schema.execute(
-            """ mutation MyMutation {
-                myMutation(input: { text: "VALID_INPUT" }) {
-                    errors {
-                        field
-                        messages
-                    }
-                    text
+        class Meta:
+            form_class = PetForm
+
+    class Mutation(ObjectType):
+        pet_mutation = PetMutation.Field()
+
+    schema = Schema(query=MockQuery, mutation=Mutation)
+
+    result = schema.execute(
+        """ mutation PetMutation {
+            petMutation(input: { name: "Mia", age: 10 }) {
+                pet {
+                    name
+                    age
+                }
+                errors {
+                    field
+                    messages
                 }
             }
-            """
-        )
+        }
+        """
+    )
+    assert result.errors is None
+    assert result.data["petMutation"]["pet"] == {"name": "Mia", "age": 10}
 
-        self.assertIs(result.errors, None)
-        self.assertEqual(result.data["myMutation"]["errors"], [])
-        self.assertEqual(result.data["myMutation"]["text"], "VALID_INPUT")
+    assert Pet.objects.count() == 1
+    pet = Pet.objects.get()
+    assert pet.name == "Mia"
+    assert pet.age == 10
 
 
-class ModelFormMutationTests(TestCase):
-    def test_default_meta_fields(self):
-        class PetMutation(DjangoModelFormMutation):
-            class Meta:
-                form_class = PetForm
+def test_model_form_mutation_invalid_input(pet_type):
+    class PetMutation(DjangoModelFormMutation):
+        pet = Field(pet_type)
 
-        self.assertEqual(PetMutation._meta.model, Pet)
-        self.assertEqual(PetMutation._meta.return_field_name, "pet")
-        self.assertIn("pet", PetMutation._meta.fields)
+        class Meta:
+            form_class = PetForm
 
-    def test_default_input_meta_fields(self):
-        class PetMutation(DjangoModelFormMutation):
-            class Meta:
-                form_class = PetForm
+    class Mutation(ObjectType):
+        pet_mutation = PetMutation.Field()
 
-        self.assertEqual(PetMutation._meta.model, Pet)
-        self.assertEqual(PetMutation._meta.return_field_name, "pet")
-        self.assertIn("name", PetMutation.Input._meta.fields)
-        self.assertIn("client_mutation_id", PetMutation.Input._meta.fields)
-        self.assertIn("id", PetMutation.Input._meta.fields)
+    schema = Schema(query=MockQuery, mutation=Mutation)
 
-    def test_exclude_fields_input_meta_fields(self):
-        class PetMutation(DjangoModelFormMutation):
-            class Meta:
-                form_class = PetForm
-                exclude_fields = ["id"]
-
-        self.assertEqual(PetMutation._meta.model, Pet)
-        self.assertEqual(PetMutation._meta.return_field_name, "pet")
-        self.assertIn("name", PetMutation.Input._meta.fields)
-        self.assertIn("age", PetMutation.Input._meta.fields)
-        self.assertIn("client_mutation_id", PetMutation.Input._meta.fields)
-        self.assertNotIn("id", PetMutation.Input._meta.fields)
-
-    def test_custom_return_field_name(self):
-        class PetMutation(DjangoModelFormMutation):
-            class Meta:
-                form_class = PetForm
-                model = Pet
-                return_field_name = "animal"
-
-        self.assertEqual(PetMutation._meta.model, Pet)
-        self.assertEqual(PetMutation._meta.return_field_name, "animal")
-        self.assertIn("animal", PetMutation._meta.fields)
-
-    def test_model_form_mutation_mutate_existing(self):
-        class PetMutation(DjangoModelFormMutation):
-            pet = Field(PetType)
-
-            class Meta:
-                form_class = PetForm
-
-        class Mutation(ObjectType):
-            pet_mutation = PetMutation.Field()
-
-        schema = Schema(query=MockQuery, mutation=Mutation)
-
-        pet = Pet.objects.create(name="Axel", age=10)
-
-        result = schema.execute(
-            """ mutation PetMutation($pk: ID!) {
-                petMutation(input: { id: $pk, name: "Mia", age: 10 }) {
-                    pet {
-                        name
-                        age
-                    }
+    result = schema.execute(
+        """ mutation PetMutation {
+            petMutation(input: { name: "Mia", age: 99 }) {
+                pet {
+                    name
+                    age
+                }
+                errors {
+                    field
+                    messages
                 }
             }
-            """,
-            variable_values={"pk": pet.pk},
-        )
+        }
+        """
+    )
+    assert result.errors is None
+    assert result.data["petMutation"]["pet"] is None
+    assert result.data["petMutation"]["errors"] == [
+        {"field": "age", "messages": ["Too old"]}
+    ]
 
-        self.assertIs(result.errors, None)
-        self.assertEqual(result.data["petMutation"]["pet"], {"name": "Mia", "age": 10})
+    assert Pet.objects.count() == 0
 
-        self.assertEqual(Pet.objects.count(), 1)
-        pet.refresh_from_db()
-        self.assertEqual(pet.name, "Mia")
 
-    def test_model_form_mutation_creates_new(self):
-        class PetMutation(DjangoModelFormMutation):
-            pet = Field(PetType)
+def test_model_form_mutation_mutate_invalid_form(pet_type):
+    class PetMutation(DjangoModelFormMutation):
+        class Meta:
+            form_class = PetForm
 
-            class Meta:
-                form_class = PetForm
+    result = PetMutation.mutate_and_get_payload(None, None)
 
-        class Mutation(ObjectType):
-            pet_mutation = PetMutation.Field()
+    # A pet was not created
+    Pet.objects.count() == 0
 
-        schema = Schema(query=MockQuery, mutation=Mutation)
-
-        result = schema.execute(
-            """ mutation PetMutation {
-                petMutation(input: { name: "Mia", age: 10 }) {
-                    pet {
-                        name
-                        age
-                    }
-                    errors {
-                        field
-                        messages
-                    }
-                }
-            }
-            """
-        )
-        self.assertIs(result.errors, None)
-        self.assertEqual(result.data["petMutation"]["pet"], {"name": "Mia", "age": 10})
-
-        self.assertEqual(Pet.objects.count(), 1)
-        pet = Pet.objects.get()
-        self.assertEqual(pet.name, "Mia")
-        self.assertEqual(pet.age, 10)
-
-    def test_model_form_mutation_invalid_input(self):
-        class PetMutation(DjangoModelFormMutation):
-            pet = Field(PetType)
-
-            class Meta:
-                form_class = PetForm
-
-        class Mutation(ObjectType):
-            pet_mutation = PetMutation.Field()
-
-        schema = Schema(query=MockQuery, mutation=Mutation)
-
-        result = schema.execute(
-            """ mutation PetMutation {
-                petMutation(input: { name: "Mia", age: 99 }) {
-                    pet {
-                        name
-                        age
-                    }
-                    errors {
-                        field
-                        messages
-                    }
-                }
-            }
-            """
-        )
-        self.assertIs(result.errors, None)
-        self.assertEqual(result.data["petMutation"]["pet"], None)
-        self.assertEqual(
-            result.data["petMutation"]["errors"],
-            [{"field": "age", "messages": ["Too old"],}],
-        )
-
-        self.assertEqual(Pet.objects.count(), 0)
-
-    def test_model_form_mutation_mutate_invalid_form(self):
-        class PetMutation(DjangoModelFormMutation):
-            class Meta:
-                form_class = PetForm
-
-        result = PetMutation.mutate_and_get_payload(None, None)
-
-        # A pet was not created
-        self.assertEqual(Pet.objects.count(), 0)
-
-        fields_w_error = [e.field for e in result.errors]
-        self.assertEqual(len(result.errors), 2)
-        self.assertIn("name", fields_w_error)
-        self.assertEqual(result.errors[0].messages, ["This field is required."])
-        self.assertIn("age", fields_w_error)
-        self.assertEqual(result.errors[1].messages, ["This field is required."])
+    fields_w_error = [e.field for e in result.errors]
+    assert len(result.errors) == 2
+    assert result.errors[0].messages == ["This field is required."]
+    assert result.errors[1].messages == ["This field is required."]
+    assert "age" in fields_w_error
+    assert "name" in fields_w_error
diff --git a/graphene_django/rest_framework/tests/test_multiple_model_serializers.py b/graphene_django/rest_framework/tests/test_multiple_model_serializers.py
index c1f4626..1676b62 100644
--- a/graphene_django/rest_framework/tests/test_multiple_model_serializers.py
+++ b/graphene_django/rest_framework/tests/test_multiple_model_serializers.py
@@ -1,14 +1,11 @@
-import graphene
-import pytest
 from django.db import models
-from graphene import Schema
 from rest_framework import serializers
 
+import graphene
+from graphene import Schema
 from graphene_django import DjangoObjectType
 from graphene_django.rest_framework.mutation import SerializerMutation
 
-pytestmark = pytest.mark.django_db
-
 
 class MyFakeChildModel(models.Model):
     name = models.CharField(max_length=50)
diff --git a/graphene_django/rest_framework/tests/test_mutation.py b/graphene_django/rest_framework/tests/test_mutation.py
index 5bf3bc1..1599fea 100644
--- a/graphene_django/rest_framework/tests/test_mutation.py
+++ b/graphene_django/rest_framework/tests/test_mutation.py
@@ -1,14 +1,13 @@
 import datetime
 
-from py.test import mark, raises
+from py.test import raises
 from rest_framework import serializers
 
 from graphene import Field, ResolveInfo
 from graphene.types.inputobjecttype import InputObjectType
 
-from ...settings import graphene_settings
 from ...types import DjangoObjectType
-from ..models import MyFakeModel, MyFakeModelWithPassword, MyFakeModelWithDate
+from ..models import MyFakeModel, MyFakeModelWithDate, MyFakeModelWithPassword
 from ..mutation import SerializerMutation
 
 
@@ -99,7 +98,6 @@ def test_exclude_fields():
     assert "created" not in MyMutation.Input._meta.fields
 
 
-@mark.django_db
 def test_write_only_field():
     class WriteOnlyFieldModelSerializer(serializers.ModelSerializer):
         password = serializers.CharField(write_only=True)
@@ -122,7 +120,6 @@ def test_write_only_field():
     ), "'password' is write_only field and shouldn't be visible"
 
 
-@mark.django_db
 def test_write_only_field_using_extra_kwargs():
     class WriteOnlyFieldModelSerializer(serializers.ModelSerializer):
         class Meta:
@@ -144,7 +141,6 @@ def test_write_only_field_using_extra_kwargs():
     ), "'password' is write_only field and shouldn't be visible"
 
 
-@mark.django_db
 def test_read_only_fields():
     class ReadOnlyFieldModelSerializer(serializers.ModelSerializer):
         cool_name = serializers.CharField(read_only=True)
@@ -194,7 +190,6 @@ def test_mutate_and_get_payload_success():
     assert result.errors is None
 
 
-@mark.django_db
 def test_model_add_mutate_and_get_payload_success():
     result = MyModelMutation.mutate_and_get_payload(
         None, mock_info(), **{"cool_name": "Narf"}
@@ -204,7 +199,6 @@ def test_model_add_mutate_and_get_payload_success():
     assert isinstance(result.created, datetime.datetime)
 
 
-@mark.django_db
 def test_model_update_mutate_and_get_payload_success():
     instance = MyFakeModel.objects.create(cool_name="Narf")
     result = MyModelMutation.mutate_and_get_payload(
@@ -214,7 +208,6 @@ def test_model_update_mutate_and_get_payload_success():
     assert result.cool_name == "New Narf"
 
 
-@mark.django_db
 def test_model_partial_update_mutate_and_get_payload_success():
     instance = MyFakeModel.objects.create(cool_name="Narf")
     result = MyModelMutation.mutate_and_get_payload(
@@ -224,7 +217,6 @@ def test_model_partial_update_mutate_and_get_payload_success():
     assert result.cool_name == "Narf"
 
 
-@mark.django_db
 def test_model_invalid_update_mutate_and_get_payload_success():
     class InvalidModelMutation(SerializerMutation):
         class Meta:
@@ -239,7 +231,6 @@ def test_model_invalid_update_mutate_and_get_payload_success():
     assert '"id" required' in str(exc.value)
 
 
-@mark.django_db
 def test_perform_mutate_success():
     class MyMethodMutation(SerializerMutation):
         class Meta:
@@ -272,11 +263,10 @@ def test_model_mutate_and_get_payload_error():
     assert len(result.errors) > 0
 
 
-def test_mutation_error_camelcased():
+def test_mutation_error_camelcased(graphene_settings):
     graphene_settings.CAMELCASE_ERRORS = True
     result = MyModelMutation.mutate_and_get_payload(None, mock_info(), **{})
     assert result.errors[0].field == "coolName"
-    graphene_settings.CAMELCASE_ERRORS = False
 
 
 def test_invalid_serializer_operations():
diff --git a/graphene_django/tests/test_command.py b/graphene_django/tests/test_command.py
index 8b0a8e6..297e461 100644
--- a/graphene_django/tests/test_command.py
+++ b/graphene_django/tests/test_command.py
@@ -8,7 +8,7 @@ from graphene import ObjectType, Schema, String
 
 
 @patch("graphene_django.management.commands.graphql_schema.Command.save_json_file")
-def test_generate_json_file_on_call_graphql_schema(savefile_mock, settings):
+def test_generate_json_file_on_call_graphql_schema(savefile_mock):
     out = StringIO()
     management.call_command("graphql_schema", schema="", stdout=out)
     assert "Successfully dumped GraphQL schema to schema.json" in out.getvalue()
diff --git a/graphene_django/tests/test_converter.py b/graphene_django/tests/test_converter.py
index 7f84de3..6227326 100644
--- a/graphene_django/tests/test_converter.py
+++ b/graphene_django/tests/test_converter.py
@@ -1,16 +1,17 @@
-import pytest
 from collections import namedtuple
+
+import pytest
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
-from graphene import NonNull
 from py.test import raises
 
 import graphene
+from graphene import NonNull
 from graphene.relay import ConnectionField, Node
-from graphene.types.datetime import DateTime, Date, Time
+from graphene.types.datetime import Date, DateTime, Time
 from graphene.types.json import JSONString
 
-from ..compat import JSONField, ArrayField, HStoreField, RangeField, MissingType
+from ..compat import ArrayField, HStoreField, JSONField, MissingType, RangeField
 from ..converter import (
     convert_django_field,
     convert_django_field_with_choices,
@@ -18,10 +19,8 @@ from ..converter import (
 )
 from ..registry import Registry
 from ..types import DjangoObjectType
-from ..settings import graphene_settings
 from .models import Article, Film, FilmDetails, Reporter
 
-
 # from graphene.core.types.custom_scalars import DateTime, Time, JSONString
 
 
@@ -333,7 +332,7 @@ def test_should_postgres_range_convert_list():
     assert field.type.of_type.of_type == graphene.Int
 
 
-def test_generate_enum_name():
+def test_generate_enum_name(graphene_settings):
     MockDjangoModelMeta = namedtuple("DjangoMeta", ["app_label", "object_name"])
     graphene_settings.DJANGO_CHOICE_FIELD_ENUM_V3_NAMING = True
 
@@ -351,5 +350,3 @@ def test_generate_enum_name():
         generate_enum_name(model_meta, field)
         == "SomeLongAppNameSomeObjectFizzBuzzChoices"
     )
-
-    graphene_settings.DJANGO_CHOICE_FIELD_ENUM_V3_NAMING = False
diff --git a/graphene_django/tests/test_fields.py b/graphene_django/tests/test_fields.py
index 8ea1901..67b3a35 100644
--- a/graphene_django/tests/test_fields.py
+++ b/graphene_django/tests/test_fields.py
@@ -10,7 +10,6 @@ from .models import Article as ArticleModel
 from .models import Reporter as ReporterModel
 
 
-@pytest.mark.django_db
 class TestDjangoListField:
     def test_only_django_object_types(self):
         class TestType(ObjectType):
diff --git a/graphene_django/tests/test_query.py b/graphene_django/tests/test_query.py
index 95db2d1..698ca23 100644
--- a/graphene_django/tests/test_query.py
+++ b/graphene_django/tests/test_query.py
@@ -1,25 +1,20 @@
-import base64
 import datetime
 
 import pytest
 from django.db import models
+from django.db.models import Q
 from django.utils.functional import SimpleLazyObject
+from graphql_relay import to_global_id
 from py.test import raises
 
-from django.db.models import Q
-
-from graphql_relay import to_global_id
 import graphene
 from graphene.relay import Node
 
-from ..utils import DJANGO_FILTER_INSTALLED
-from ..compat import MissingType, JSONField
+from ..compat import JSONField, MissingType
 from ..fields import DjangoConnectionField
 from ..types import DjangoObjectType
-from ..settings import graphene_settings
-from .models import Article, CNNReporter, Reporter, Film, FilmDetails
-
-pytestmark = pytest.mark.django_db
+from ..utils import DJANGO_FILTER_INSTALLED
+from .models import Article, CNNReporter, Film, FilmDetails, Reporter
 
 
 def test_should_query_only_fields():
@@ -147,9 +142,6 @@ def test_should_query_postgres_fields():
 
 
 def test_should_node():
-    # reset_global_registry()
-    # Node._meta.registry = get_global_registry()
-
     class ReporterNode(DjangoObjectType):
         class Meta:
             model = Reporter
@@ -588,7 +580,7 @@ def test_should_query_node_multiple_filtering():
     assert result.data == expected
 
 
-def test_should_enforce_first_or_last():
+def test_should_enforce_first_or_last(graphene_settings):
     graphene_settings.RELAY_CONNECTION_ENFORCE_FIRST_OR_LAST = True
 
     class ReporterType(DjangoObjectType):
@@ -627,7 +619,7 @@ def test_should_enforce_first_or_last():
     assert result.data == expected
 
 
-def test_should_error_if_first_is_greater_than_max():
+def test_should_error_if_first_is_greater_than_max(graphene_settings):
     graphene_settings.RELAY_CONNECTION_MAX_LIMIT = 100
 
     class ReporterType(DjangoObjectType):
@@ -667,10 +659,8 @@ def test_should_error_if_first_is_greater_than_max():
     )
     assert result.data == expected
 
-    graphene_settings.RELAY_CONNECTION_ENFORCE_FIRST_OR_LAST = False
 
-
-def test_should_error_if_last_is_greater_than_max():
+def test_should_error_if_last_is_greater_than_max(graphene_settings):
     graphene_settings.RELAY_CONNECTION_MAX_LIMIT = 100
 
     class ReporterType(DjangoObjectType):
@@ -710,8 +700,6 @@ def test_should_error_if_last_is_greater_than_max():
     )
     assert result.data == expected
 
-    graphene_settings.RELAY_CONNECTION_ENFORCE_FIRST_OR_LAST = False
-
 
 def test_should_query_promise_connectionfields():
     from promise import Promise
diff --git a/graphene_django/tests/test_types.py b/graphene_django/tests/test_types.py
index 888521f..9b3ceb6 100644
--- a/graphene_django/tests/test_types.py
+++ b/graphene_django/tests/test_types.py
@@ -9,14 +9,10 @@ from graphene import Connection, Field, Interface, ObjectType, Schema, String
 from graphene.relay import Node
 
 from .. import registry
-from ..settings import graphene_settings
 from ..types import DjangoObjectType, DjangoObjectTypeOptions
-from ..converter import convert_choice_field_to_enum
 from .models import Article as ArticleModel
 from .models import Reporter as ReporterModel
 
-registry.reset_global_registry()
-
 
 class Reporter(DjangoObjectType):
     """Reporter description"""
@@ -198,7 +194,6 @@ type RootQuery {
 def with_local_registry(func):
     def inner(*args, **kwargs):
         old = registry.get_global_registry()
-        registry.reset_global_registry()
         try:
             retval = func(*args, **kwargs)
         except Exception as e:
@@ -499,7 +494,9 @@ class TestDjangoObjectType:
         """
         )
 
-    def test_django_objecttype_convert_choices_enum_naming_collisions(self, PetModel):
+    def test_django_objecttype_convert_choices_enum_naming_collisions(
+        self, PetModel, graphene_settings
+    ):
         graphene_settings.DJANGO_CHOICE_FIELD_ENUM_V3_NAMING = True
 
         class PetModelKind(DjangoObjectType):
@@ -533,9 +530,10 @@ class TestDjangoObjectType:
         }
         """
         )
-        graphene_settings.DJANGO_CHOICE_FIELD_ENUM_V3_NAMING = False
 
-    def test_django_objecttype_choices_custom_enum_name(self, PetModel):
+    def test_django_objecttype_choices_custom_enum_name(
+        self, PetModel, graphene_settings
+    ):
         graphene_settings.DJANGO_CHOICE_FIELD_ENUM_CUSTOM_NAME = (
             "graphene_django.tests.test_types.custom_enum_name"
         )
@@ -571,5 +569,3 @@ class TestDjangoObjectType:
         }
         """
         )
-
-        graphene_settings.DJANGO_CHOICE_FIELD_ENUM_CUSTOM_NAME = None

From b8d8508d1f9a7cb8a25150645e23a1e60c6a6837 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Fri, 1 May 2020 14:04:36 +0100
Subject: [PATCH 074/116] Add GitHub actions (#947)

---
 .github/workflows/deploy.yml | 25 ++++++++++
 .github/workflows/lint.yml   | 22 +++++++++
 .github/workflows/tests.yml  | 31 ++++++++++++
 .travis.yml                  | 92 ------------------------------------
 tox.ini                      | 15 ++++--
 5 files changed, 89 insertions(+), 96 deletions(-)
 create mode 100644 .github/workflows/deploy.yml
 create mode 100644 .github/workflows/lint.yml
 create mode 100644 .github/workflows/tests.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 0000000..5dd418e
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,25 @@
+name: 🚀 Deploy to PyPI
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.8
+    - name: Build wheel and source tarball
+      run: |
+        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 }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 0000000..20cf7fb
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,22 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.8
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox
+    - name: Run lint 💅
+      run: tox
+      env:
+        TOXENV: flake8
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000..37453f0
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,31 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        django: ["1.11", "2.2", "3.0"]
+        python-version: ["3.6", "3.7", "3.8"]
+        include:
+          - django: "1.11"
+            python-version: "2.7"
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      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:
+        DJANGO: ${{ matrix.django }}
+        TOXENV: ${{ matrix.toxenv }}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 4b44f60..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-language: python
-cache: pip
-dist: xenial
-
-install:
-  - pip install tox tox-travis
-
-script: 
-  - tox
-
-after_success: 
-  - pip install coveralls
-  - coveralls
-
-stages:
-  - test
-  - name: deploy
-    if: tag IS present
-
-jobs:
-  fast_finish: true
-
-  allow_failures:
-    - env: DJANGO=master
-
-  include:
-    - python: 2.7
-      env: DJANGO=1.11
-
-    - python: 3.5
-      env: DJANGO=1.11
-    - python: 3.5
-      env: DJANGO=2.0
-    - python: 3.5
-      env: DJANGO=2.1
-    - python: 3.5
-      env: DJANGO=2.2
-
-    - python: 3.6
-      env: DJANGO=1.11
-    - python: 3.6
-      env: DJANGO=2.0
-    - python: 3.6
-      env: DJANGO=2.1
-    - python: 3.6
-      env: DJANGO=2.2
-    - python: 3.6
-      env: DJANGO=3.0
-    - python: 3.6
-      env: DJANGO=master
-
-    - python: 3.7
-      env: DJANGO=1.11
-    - python: 3.7
-      env: DJANGO=2.0
-    - python: 3.7
-      env: DJANGO=2.1
-    - python: 3.7
-      env: DJANGO=2.2
-    - python: 3.7
-      env: DJANGO=3.0
-    - python: 3.7
-      env: DJANGO=master
-
-    - python: 3.8
-      env: DJANGO=1.11
-    - python: 3.8
-      env: DJANGO=2.0
-    - python: 3.8
-      env: DJANGO=2.1
-    - python: 3.8
-      env: DJANGO=2.2
-    - python: 3.8
-      env: DJANGO=3.0
-    - python: 3.8
-      env: DJANGO=master
-
-    - python: 3.7
-      env: TOXENV=black,flake8
-
-    - stage: deploy
-      script: skip
-      python: 3.7
-      after_success: true
-      deploy:
-        provider: pypi
-        user: syrusakbary
-        on:
-          tags: true
-        password:
-          secure: kymIFCEPUbkgRqe2NAXkWfxMmGRfWvWBOP6LIXdVdkOOkm91fU7bndPGrAjos+/7gN0Org609ZmHSlVXNMJUWcsL2or/x5LcADJ4cZDe+79qynuoRb9xs1Ri4O4SBAuVMZxuVJvs8oUzT2R11ql5vASSMtXgbX+ZDGpmPRVZStkCuXgOc4LBhbPKyl3OFy7UQFPgAEmy3Yjh4ZSKzlXheK+S6mmr60+DCIjpaA0BWPxYK9FUE0qm7JJbHLUbwsUP/QMp5MmGjwFisXCNsIe686B7QKRaiOw62eJc2R7He8AuEC8T9OM4kRwDlecSn8mMpkoSB7QWtlJ+6XdLrJFPNvtrOfgfzS9/96Qrw9WlOslk68hMlhJeRb0s2YUD8tiV3UUkvbL1mfFoS4SI9U+rojS55KhUEJWHg1w7DjoOPoZmaIL2ChRupmvrFYNAGae1cxwG3Urh+t3wYlN3gpKsRDe5GOT7Wm2tr0ad3McCpDGUwSChX59BAJXe/MoLxkKScTrMyR8yMxHOF0b4zpVn5l7xB/o2Ik4zavx5q/0rGBMK2D+5d+gpQogKShoquTPsZUwO7sB5hYeH2hqGqpeGzZtb76E2zZYd18pJ0FsBudm5+KWjYdZ+vbtGrLxdTXJ1EEtzVXm0lscykTpqUucbXSa51dhStJvW2xEEz6p3rHo=
-        distributions: "sdist bdist_wheel"
diff --git a/tox.ini b/tox.ini
index feeacfd..c932c4d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,14 @@ envlist =
     py{36,37,38}-django30,
     black,flake8
 
-[travis:env]
+[gh-actions]
+python =
+    2.7: py27
+    3.6: py36
+    3.7: py37
+    3.8: py38
+
+[gh-actions:env]
 DJANGO =
     1.11: django111
     2.0: django20
@@ -30,13 +37,13 @@ deps =
 commands = {posargs:py.test --cov=graphene_django graphene_django examples}
 
 [testenv:black]
-basepython = python3.7
+basepython = python3.8
 deps = -e.[dev]
 commands  =
     black --exclude "/migrations/" graphene_django examples setup.py --check
 
 [testenv:flake8]
-basepython = python3.7
+basepython = python3.8
 deps = -e.[dev]
 commands =
-    flake8 graphene_django examples
+    flake8 graphene_django examples setup.py

From 894c564ab717f9b71ec6f73cd11fcd37da521596 Mon Sep 17 00:00:00 2001
From: Jack W <jackweatherilt@outlook.com>
Date: Sat, 9 May 2020 12:09:17 +0100
Subject: [PATCH 075/116] Convert nullable BooleanField to nullable Boolean.
 (#777)

---
 graphene_django/converter.py            |  6 +-----
 graphene_django/tests/test_converter.py | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/graphene_django/converter.py b/graphene_django/converter.py
index bd8f79d..c84b61a 100644
--- a/graphene_django/converter.py
+++ b/graphene_django/converter.py
@@ -152,13 +152,9 @@ def convert_field_to_int(field, registry=None):
     return Int(description=field.help_text, required=not field.null)
 
 
+@convert_django_field.register(models.NullBooleanField)
 @convert_django_field.register(models.BooleanField)
 def convert_field_to_boolean(field, registry=None):
-    return NonNull(Boolean, description=field.help_text)
-
-
-@convert_django_field.register(models.NullBooleanField)
-def convert_field_to_nullboolean(field, registry=None):
     return Boolean(description=field.help_text, required=not field.null)
 
 
diff --git a/graphene_django/tests/test_converter.py b/graphene_django/tests/test_converter.py
index 6227326..8e4495a 100644
--- a/graphene_django/tests/test_converter.py
+++ b/graphene_django/tests/test_converter.py
@@ -25,12 +25,19 @@ from .models import Article, Film, FilmDetails, Reporter
 
 
 def assert_conversion(django_field, graphene_field, *args, **kwargs):
-    field = django_field(help_text="Custom Help Text", null=True, *args, **kwargs)
+    _kwargs = kwargs.copy()
+    if "null" not in kwargs:
+        _kwargs["null"] = True
+    field = django_field(help_text="Custom Help Text", *args, **_kwargs)
     graphene_type = convert_django_field(field)
     assert isinstance(graphene_type, graphene_field)
     field = graphene_type.Field()
     assert field.description == "Custom Help Text"
-    nonnull_field = django_field(null=False, *args, **kwargs)
+
+    _kwargs = kwargs.copy()
+    if "null" not in kwargs:
+        _kwargs["null"] = False
+    nonnull_field = django_field(*args, **_kwargs)
     if not nonnull_field.null:
         nonnull_graphene_type = convert_django_field(nonnull_field)
         nonnull_field = nonnull_graphene_type.Field()
@@ -126,7 +133,12 @@ def test_should_integer_convert_int():
 
 
 def test_should_boolean_convert_boolean():
-    field = assert_conversion(models.BooleanField, graphene.NonNull)
+    assert_conversion(models.BooleanField, graphene.Boolean, null=True)
+
+
+def test_should_boolean_convert_non_null_boolean():
+    field = assert_conversion(models.BooleanField, graphene.Boolean, null=False)
+    assert isinstance(field.type, graphene.NonNull)
     assert field.type.of_type == graphene.Boolean
 
 

From 975f45ed1ab2387ef9b70231441bade209f2370e Mon Sep 17 00:00:00 2001
From: Marc Simon <marc.simon42@gmail.com>
Date: Sat, 9 May 2020 13:15:16 +0200
Subject: [PATCH 076/116] GraphQlView: Do not 'instantiate_middleware' if
 middleware is already a MiddlewareManager (#952)

---
 graphene_django/views.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/graphene_django/views.py b/graphene_django/views.py
index 4c58839..16bf34b 100644
--- a/graphene_django/views.py
+++ b/graphene_django/views.py
@@ -15,6 +15,7 @@ from graphql.error import format_error as format_graphql_error
 from graphql.error import GraphQLError
 from graphql.execution import ExecutionResult
 from graphql.type.schema import GraphQLSchema
+from graphql.execution.middleware import MiddlewareManager
 
 from .settings import graphene_settings
 
@@ -86,7 +87,10 @@ class GraphQLView(View):
 
         self.schema = self.schema or schema
         if middleware is not None:
-            self.middleware = list(instantiate_middleware(middleware))
+            if isinstance(middleware, MiddlewareManager):
+                self.middleware = middleware
+            else:
+                self.middleware = list(instantiate_middleware(middleware))
         self.executor = executor
         self.root_value = root_value
         self.pretty = self.pretty or pretty

From 8990e173ac5501f62773b8596da93f7c0789acbd Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sat, 9 May 2020 12:19:02 +0100
Subject: [PATCH 077/116] Add extra types documentation (#902)

---
 docs/extra-types.rst | 12 ++++++++++++
 docs/index.rst       |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 docs/extra-types.rst

diff --git a/docs/extra-types.rst b/docs/extra-types.rst
new file mode 100644
index 0000000..22927d6
--- /dev/null
+++ b/docs/extra-types.rst
@@ -0,0 +1,12 @@
+Extra Types
+===========
+
+Here are some libraries that provide common types for Django specific fields.
+
+
+GeoDjango
+---------
+
+Use the graphene-gis_ library to add GeoDjango types to your Schema.
+
+.. _graphene-gis: https://github.com/EverWinter23/graphene-gis
diff --git a/docs/index.rst b/docs/index.rst
index 602f8dd..93f37db 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -25,6 +25,7 @@ For more advanced use, check out the Relay tutorial.
    tutorial-relay
    schema
    queries
+   extra-types
    mutations
    filtering
    authorization

From b4e34a5794edd430f25048c7665e689ab0c085b4 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sat, 9 May 2020 12:28:03 +0100
Subject: [PATCH 078/116] Improve DjangoListField (#929)

---
 docs/fields.rst                      |  83 +++++++++++++
 docs/filtering.rst                   |   2 +-
 docs/index.rst                       |   1 +
 docs/queries.rst                     |   4 +
 graphene_django/__init__.py          |   9 +-
 graphene_django/fields.py            |  26 ++--
 graphene_django/tests/test_fields.py | 179 ++++++++++++++++++++++++++-
 7 files changed, 290 insertions(+), 14 deletions(-)
 create mode 100644 docs/fields.rst

diff --git a/docs/fields.rst b/docs/fields.rst
new file mode 100644
index 0000000..1a8afc3
--- /dev/null
+++ b/docs/fields.rst
@@ -0,0 +1,83 @@
+Fields
+======
+
+Graphene-Django provides some useful fields to help integrate Django with your GraphQL
+Schema.
+
+DjangoListField
+---------------
+
+``DjangoListField`` allows you to define a list of :ref:`DjangoObjectType<queries-objecttypes>`'s. By default it will resolve the default queryset of the Django model.
+
+.. code:: python
+
+   from graphene import ObjectType, Schema
+   from graphene_django import DjangoListField
+
+   class RecipeType(DjangoObjectType):
+      class Meta:
+         model = Recipe
+         fields = ("title", "instructions")
+
+   class Query(ObjectType):
+      recipes = DjangoListField(RecipeType)
+
+   schema = Schema(query=Query)
+
+The above code results in the following schema definition:
+
+.. code::
+
+   schema {
+     query: Query
+   }
+
+   type Query {
+     recipes: [RecipeType!]
+   }
+
+   type RecipeType {
+     title: String!
+     instructions: String!
+   }
+
+Custom resolvers
+****************
+
+If your ``DjangoObjectType`` has defined a custom
+:ref:`get_queryset<django-objecttype-get-queryset>` method, when resolving a
+``DjangoListField`` it will be called with either the return of the field
+resolver (if one is defined) or the default queryeset from the Django model.
+
+For example the following schema will only resolve recipes which have been
+published and have a title:
+
+.. code:: python
+
+   from graphene import ObjectType, Schema
+   from graphene_django import DjangoListField
+
+   class RecipeType(DjangoObjectType):
+      class Meta:
+         model = Recipe
+         fields = ("title", "instructions")
+
+      @classmethod
+      def get_queryset(cls, queryset, info):
+         # Filter out recipes that have no title
+         return queryset.exclude(title__exact="")
+
+   class Query(ObjectType):
+      recipes = DjangoListField(RecipeType)
+
+      def resolve_recipes(parent, info):
+         # Only get recipes that have been published
+         return Recipe.objects.filter(published=True)
+
+   schema = Schema(query=Query)
+
+
+DjangoConnectionField
+---------------------
+
+*TODO*
diff --git a/docs/filtering.rst b/docs/filtering.rst
index 0d37f46..dbbab9d 100644
--- a/docs/filtering.rst
+++ b/docs/filtering.rst
@@ -1,7 +1,7 @@
 Filtering
 =========
 
-Graphene integrates with
+Graphene-Django integrates with
 `django-filter <https://django-filter.readthedocs.io/en/master/>`__ (2.x for
 Python 3 or 1.x for Python 2) to provide filtering of results. See the `usage
 documentation <https://django-filter.readthedocs.io/en/master/guide/usage.html#the-filter>`__
diff --git a/docs/index.rst b/docs/index.rst
index 93f37db..f4f718c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -25,6 +25,7 @@ For more advanced use, check out the Relay tutorial.
    tutorial-relay
    schema
    queries
+   fields
    extra-types
    mutations
    filtering
diff --git a/docs/queries.rst b/docs/queries.rst
index 36cdab1..4b3f718 100644
--- a/docs/queries.rst
+++ b/docs/queries.rst
@@ -1,3 +1,5 @@
+.. _queries-objecttypes:
+
 Queries & ObjectTypes
 =====================
 
@@ -205,6 +207,8 @@ need to create the most basic class for this to work:
         class Meta:
             model = Category
 
+.. _django-objecttype-get-queryset:
+
 Default QuerySet
 -----------------
 
diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index 38f8d8a..62318e9 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,6 +1,11 @@
+from .fields import DjangoConnectionField, DjangoListField
 from .types import DjangoObjectType
-from .fields import DjangoConnectionField
 
 __version__ = "2.9.1"
 
-__all__ = ["__version__", "DjangoObjectType", "DjangoConnectionField"]
+__all__ = [
+    "__version__",
+    "DjangoObjectType",
+    "DjangoListField",
+    "DjangoConnectionField",
+]
diff --git a/graphene_django/fields.py b/graphene_django/fields.py
index fb6b98a..7539cf2 100644
--- a/graphene_django/fields.py
+++ b/graphene_django/fields.py
@@ -38,16 +38,21 @@ class DjangoListField(Field):
     def model(self):
         return self._underlying_type._meta.model
 
+    def get_default_queryset(self):
+        return self.model._default_manager.get_queryset()
+
     @staticmethod
-    def list_resolver(django_object_type, resolver, root, info, **args):
+    def list_resolver(
+        django_object_type, resolver, default_queryset, root, info, **args
+    ):
         queryset = maybe_queryset(resolver(root, info, **args))
         if queryset is None:
-            # Default to Django Model queryset
-            # N.B. This happens if DjangoListField is used in the top level Query object
-            model_manager = django_object_type._meta.model.objects
-            queryset = maybe_queryset(
-                django_object_type.get_queryset(model_manager, info)
-            )
+            queryset = default_queryset
+
+        if isinstance(queryset, QuerySet):
+            # Pass queryset to the DjangoObjectType get_queryset method
+            queryset = maybe_queryset(django_object_type.get_queryset(queryset, info))
+
         return queryset
 
     def get_resolver(self, parent_resolver):
@@ -55,7 +60,12 @@ class DjangoListField(Field):
         if isinstance(_type, NonNull):
             _type = _type.of_type
         django_object_type = _type.of_type.of_type
-        return partial(self.list_resolver, django_object_type, parent_resolver)
+        return partial(
+            self.list_resolver,
+            django_object_type,
+            parent_resolver,
+            self.get_default_queryset(),
+        )
 
 
 class DjangoConnectionField(ConnectionField):
diff --git a/graphene_django/tests/test_fields.py b/graphene_django/tests/test_fields.py
index 67b3a35..cd5bd1b 100644
--- a/graphene_django/tests/test_fields.py
+++ b/graphene_django/tests/test_fields.py
@@ -1,4 +1,5 @@
 import datetime
+from django.db.models import Count
 
 import pytest
 
@@ -141,13 +142,26 @@ class TestDjangoListField:
             pub_date_time=datetime.datetime.now(),
             editor=r1,
         )
+        ArticleModel.objects.create(
+            headline="Not so good news",
+            reporter=r1,
+            pub_date=datetime.date.today(),
+            pub_date_time=datetime.datetime.now(),
+            editor=r1,
+        )
 
         result = schema.execute(query)
 
         assert not result.errors
         assert result.data == {
             "reporters": [
-                {"firstName": "Tara", "articles": [{"headline": "Amazing news"}]},
+                {
+                    "firstName": "Tara",
+                    "articles": [
+                        {"headline": "Amazing news"},
+                        {"headline": "Not so good news"},
+                    ],
+                },
                 {"firstName": "Debra", "articles": []},
             ]
         }
@@ -163,8 +177,8 @@ class TestDjangoListField:
                 model = ReporterModel
                 fields = ("first_name", "articles")
 
-            def resolve_reporters(reporter, info):
-                return reporter.articles.all()
+            def resolve_articles(reporter, info):
+                return reporter.articles.filter(headline__contains="Amazing")
 
         class Query(ObjectType):
             reporters = DjangoListField(Reporter)
@@ -192,6 +206,13 @@ class TestDjangoListField:
             pub_date_time=datetime.datetime.now(),
             editor=r1,
         )
+        ArticleModel.objects.create(
+            headline="Not so good news",
+            reporter=r1,
+            pub_date=datetime.date.today(),
+            pub_date_time=datetime.datetime.now(),
+            editor=r1,
+        )
 
         result = schema.execute(query)
 
@@ -202,3 +223,155 @@ class TestDjangoListField:
                 {"firstName": "Debra", "articles": []},
             ]
         }
+
+    def test_get_queryset_filter(self):
+        class Reporter(DjangoObjectType):
+            class Meta:
+                model = ReporterModel
+                fields = ("first_name", "articles")
+
+            @classmethod
+            def get_queryset(cls, queryset, info):
+                # Only get reporters with at least 1 article
+                return queryset.annotate(article_count=Count("articles")).filter(
+                    article_count__gt=0
+                )
+
+        class Query(ObjectType):
+            reporters = DjangoListField(Reporter)
+
+            def resolve_reporters(_, info):
+                return ReporterModel.objects.all()
+
+        schema = Schema(query=Query)
+
+        query = """
+            query {
+                reporters {
+                    firstName
+                }
+            }
+        """
+
+        r1 = ReporterModel.objects.create(first_name="Tara", last_name="West")
+        ReporterModel.objects.create(first_name="Debra", last_name="Payne")
+
+        ArticleModel.objects.create(
+            headline="Amazing news",
+            reporter=r1,
+            pub_date=datetime.date.today(),
+            pub_date_time=datetime.datetime.now(),
+            editor=r1,
+        )
+
+        result = schema.execute(query)
+
+        assert not result.errors
+        assert result.data == {"reporters": [{"firstName": "Tara"},]}
+
+    def test_resolve_list(self):
+        """Resolving a plain list should work (and not call get_queryset)"""
+
+        class Reporter(DjangoObjectType):
+            class Meta:
+                model = ReporterModel
+                fields = ("first_name", "articles")
+
+            @classmethod
+            def get_queryset(cls, queryset, info):
+                # Only get reporters with at least 1 article
+                return queryset.annotate(article_count=Count("articles")).filter(
+                    article_count__gt=0
+                )
+
+        class Query(ObjectType):
+            reporters = DjangoListField(Reporter)
+
+            def resolve_reporters(_, info):
+                return [ReporterModel.objects.get(first_name="Debra")]
+
+        schema = Schema(query=Query)
+
+        query = """
+            query {
+                reporters {
+                    firstName
+                }
+            }
+        """
+
+        r1 = ReporterModel.objects.create(first_name="Tara", last_name="West")
+        ReporterModel.objects.create(first_name="Debra", last_name="Payne")
+
+        ArticleModel.objects.create(
+            headline="Amazing news",
+            reporter=r1,
+            pub_date=datetime.date.today(),
+            pub_date_time=datetime.datetime.now(),
+            editor=r1,
+        )
+
+        result = schema.execute(query)
+
+        assert not result.errors
+        assert result.data == {"reporters": [{"firstName": "Debra"},]}
+
+    def test_get_queryset_foreign_key(self):
+        class Article(DjangoObjectType):
+            class Meta:
+                model = ArticleModel
+                fields = ("headline",)
+
+            @classmethod
+            def get_queryset(cls, queryset, info):
+                # Rose tinted glasses
+                return queryset.exclude(headline__contains="Not so good")
+
+        class Reporter(DjangoObjectType):
+            class Meta:
+                model = ReporterModel
+                fields = ("first_name", "articles")
+
+        class Query(ObjectType):
+            reporters = DjangoListField(Reporter)
+
+        schema = Schema(query=Query)
+
+        query = """
+            query {
+                reporters {
+                    firstName
+                    articles {
+                        headline
+                    }
+                }
+            }
+        """
+
+        r1 = ReporterModel.objects.create(first_name="Tara", last_name="West")
+        ReporterModel.objects.create(first_name="Debra", last_name="Payne")
+
+        ArticleModel.objects.create(
+            headline="Amazing news",
+            reporter=r1,
+            pub_date=datetime.date.today(),
+            pub_date_time=datetime.datetime.now(),
+            editor=r1,
+        )
+        ArticleModel.objects.create(
+            headline="Not so good news",
+            reporter=r1,
+            pub_date=datetime.date.today(),
+            pub_date_time=datetime.datetime.now(),
+            editor=r1,
+        )
+
+        result = schema.execute(query)
+
+        assert not result.errors
+        assert result.data == {
+            "reporters": [
+                {"firstName": "Tara", "articles": [{"headline": "Amazing news"},],},
+                {"firstName": "Debra", "articles": []},
+            ]
+        }

From 5867331c7bea315f40ba304656639ae5d6816987 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sat, 9 May 2020 12:28:19 +0100
Subject: [PATCH 079/116] Allow defining fields as an empty list (#871)

---
 graphene_django/tests/test_types.py | 11 +++++++++++
 graphene_django/types.py            | 22 +++++++++++++---------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/graphene_django/tests/test_types.py b/graphene_django/tests/test_types.py
index 9b3ceb6..4d14749 100644
--- a/graphene_django/tests/test_types.py
+++ b/graphene_django/tests/test_types.py
@@ -230,6 +230,17 @@ def test_django_objecttype_fields():
     assert fields == ["id", "email", "films"]
 
 
+@with_local_registry
+def test_django_objecttype_fields_empty():
+    class Reporter(DjangoObjectType):
+        class Meta:
+            model = ReporterModel
+            fields = ()
+
+    fields = list(Reporter._meta.fields.keys())
+    assert fields == []
+
+
 @with_local_registry
 def test_django_objecttype_only_fields_and_fields():
     with pytest.raises(Exception):
diff --git a/graphene_django/types.py b/graphene_django/types.py
index 0c0cb1c..18dccb2 100644
--- a/graphene_django/types.py
+++ b/graphene_django/types.py
@@ -35,9 +35,15 @@ def construct_fields(
 
     fields = OrderedDict()
     for name, field in _model_fields:
-        is_not_in_only = only_fields and name not in only_fields
+        is_not_in_only = (
+            only_fields is not None
+            and only_fields != ALL_FIELDS
+            and name not in only_fields
+        )
         # is_already_created = name in options.fields
-        is_excluded = name in exclude_fields  # or is_already_created
+        is_excluded = (
+            exclude_fields is not None and name in exclude_fields
+        )  # or is_already_created
         # https://docs.djangoproject.com/en/1.10/ref/models/fields/#django.db.models.ForeignKey.related_query_name
         is_no_backref = str(name).endswith("+")
         if is_not_in_only or is_excluded or is_no_backref:
@@ -65,6 +71,7 @@ def construct_fields(
 def validate_fields(type_, model, fields, only_fields, exclude_fields):
     # Validate the given fields against the model's fields and custom fields
     all_field_names = set(fields.keys())
+    only_fields = only_fields if only_fields is not ALL_FIELDS else ()
     for name in only_fields or ():
         if name in all_field_names:
             continue
@@ -142,10 +149,10 @@ class DjangoObjectType(ObjectType):
         model=None,
         registry=None,
         skip_registry=False,
-        only_fields=(),  # deprecated in favour of `fields`
-        fields=(),
-        exclude_fields=(),  # deprecated in favour of `exclude`
-        exclude=(),
+        only_fields=None,  # deprecated in favour of `fields`
+        fields=None,
+        exclude_fields=None,  # deprecated in favour of `exclude`
+        exclude=None,
         filter_fields=None,
         filterset_class=None,
         connection=None,
@@ -200,9 +207,6 @@ class DjangoObjectType(ObjectType):
                 "Got %s." % type(fields).__name__
             )
 
-        if fields == ALL_FIELDS:
-            fields = None
-
         # Alias exclude_fields -> exclude
         if exclude_fields and exclude:
             raise Exception("Can't set both exclude_fields and exclude")

From b0613dd0e4b6323230a007ef004fd1f38d03471d Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sat, 9 May 2020 12:32:51 +0100
Subject: [PATCH 080/116] Update __init__.py

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index 62318e9..b090aff 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,7 +1,7 @@
 from .fields import DjangoConnectionField, DjangoListField
 from .types import DjangoObjectType
 
-__version__ = "2.9.1"
+__version__ = "2.10.0"
 
 __all__ = [
     "__version__",

From 709611b5771e23223d8fe0a1cfe485e2e3179303 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sat, 9 May 2020 12:37:47 +0100
Subject: [PATCH 081/116] Install wheel before creating distribution

---
 .github/workflows/deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5dd418e..1cd1011 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -17,6 +17,7 @@ jobs:
         python-version: 3.8
     - 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

From 72375b2d149d4c3a27573d5b4d97f86db51c8d6a Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sat, 9 May 2020 13:28:01 +0100
Subject: [PATCH 082/116] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md | 34 ++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..126ed39
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: "\U0001F41Bbug"
+assignees: ''
+
+---
+
+**Note: for support questions, please use stackoverflow**. This repository's issues are reserved for feature requests and bug reports.
+
+* **What is the current behavior?**
+
+
+
+* **If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem** via
+a github repot, https://repl.it or similar (you can use this template as a starting point: https://repl.it/@jkimbo/Graphene-Django-Example).
+
+
+
+* **What is the expected behavior?**
+
+
+
+* **What is the motivation / use case for changing the behavior?**
+
+
+
+* **Please tell us about your environment:**
+  
+  - Version: 
+  - Platform: 
+
+* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow, gitter, etc)

From 079da60c8f885ad2dcea6b1d5731e831d43abd78 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sat, 9 May 2020 13:28:56 +0100
Subject: [PATCH 083/116] Create config.yml

---
 .github/ISSUE_TEMPLATE/config.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..3ba13e0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false

From 0c900065202869cbc97b8dfc209b6822620f61d2 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sat, 9 May 2020 13:29:37 +0100
Subject: [PATCH 084/116] Update issue templates

---
 .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..bbcbbe7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

From b0901104d8aab43a6e8f24895434f20916da8dc8 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sat, 9 May 2020 13:30:35 +0100
Subject: [PATCH 085/116] Update issue templates

---
 .github/ISSUE_TEMPLATE/feature_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bbcbbe7..99daca0 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: ''
+labels: "✨enhancement"
 assignees: ''
 
 ---

From ed4937f9df61091dc24e8194e0c22d2966726ef0 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Sat, 9 May 2020 13:32:20 +0100
Subject: [PATCH 086/116] Update bug_report.md

---
 .github/ISSUE_TEMPLATE/bug_report.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 126ed39..2c933d7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -14,7 +14,7 @@ assignees: ''
 
 
 * **If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem** via
-a github repot, https://repl.it or similar (you can use this template as a starting point: https://repl.it/@jkimbo/Graphene-Django-Example).
+a github repo, https://repl.it or similar (you can use this template as a starting point: https://repl.it/@jkimbo/Graphene-Django-Example).
 
 
 
@@ -31,4 +31,4 @@ a github repot, https://repl.it or similar (you can use this template as a start
   - Version: 
   - Platform: 
 
-* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow, gitter, etc)
+* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow)

From 2225ed62e1fd05f11fc0f0939e864351e1e53aa7 Mon Sep 17 00:00:00 2001
From: Paul Craciunoiu <paul@uplift.ltd>
Date: Sat, 9 May 2020 10:35:09 -0600
Subject: [PATCH 087/116] Do not access the internals of `SimpleLazyObject`
 (#945)

---
 graphene_django/tests/test_query.py | 25 +++++++++++++++++++++++++
 graphene_django/types.py            |  5 +----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/graphene_django/tests/test_query.py b/graphene_django/tests/test_query.py
index 698ca23..bb9cc88 100644
--- a/graphene_django/tests/test_query.py
+++ b/graphene_django/tests/test_query.py
@@ -60,6 +60,31 @@ def test_should_query_simplelazy_objects():
     assert result.data == {"reporter": {"id": "1"}}
 
 
+def test_should_query_wrapped_simplelazy_objects():
+    class ReporterType(DjangoObjectType):
+        class Meta:
+            model = Reporter
+            fields = ("id",)
+
+    class Query(graphene.ObjectType):
+        reporter = graphene.Field(ReporterType)
+
+        def resolve_reporter(self, info):
+            return SimpleLazyObject(lambda: SimpleLazyObject(lambda: Reporter(id=1)))
+
+    schema = graphene.Schema(query=Query)
+    query = """
+        query {
+          reporter {
+            id
+          }
+        }
+    """
+    result = schema.execute(query)
+    assert not result.errors
+    assert result.data == {"reporter": {"id": "1"}}
+
+
 def test_should_query_well():
     class ReporterType(DjangoObjectType):
         class Meta:
diff --git a/graphene_django/types.py b/graphene_django/types.py
index 18dccb2..b31fd0f 100644
--- a/graphene_django/types.py
+++ b/graphene_django/types.py
@@ -272,12 +272,9 @@ class DjangoObjectType(ObjectType):
 
     @classmethod
     def is_type_of(cls, root, info):
-        if isinstance(root, SimpleLazyObject):
-            root._setup()
-            root = root._wrapped
         if isinstance(root, cls):
             return True
-        if not is_valid_django_model(type(root)):
+        if not is_valid_django_model(root.__class__):
             raise Exception(('Received incompatible instance "{}".').format(root))
 
         if cls._meta.model._meta.proxy:

From a987035ef36d1612df9ad51a2a02de12272b4d26 Mon Sep 17 00:00:00 2001
From: vineethvanga18 <44473939+vineethvanga18@users.noreply.github.com>
Date: Tue, 12 May 2020 01:33:17 +0530
Subject: [PATCH 088/116] fix typo (#959)

---
 docs/fields.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/fields.rst b/docs/fields.rst
index 1a8afc3..32ca26c 100644
--- a/docs/fields.rst
+++ b/docs/fields.rst
@@ -47,7 +47,7 @@ Custom resolvers
 If your ``DjangoObjectType`` has defined a custom
 :ref:`get_queryset<django-objecttype-get-queryset>` method, when resolving a
 ``DjangoListField`` it will be called with either the return of the field
-resolver (if one is defined) or the default queryeset from the Django model.
+resolver (if one is defined) or the default queryset from the Django model.
 
 For example the following schema will only resolve recipes which have been
 published and have a title:

From d804fe48f23dc51c88a45cdac38d3a672858acc3 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Mon, 18 May 2020 20:20:01 +0100
Subject: [PATCH 089/116] v2.10.1

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index b090aff..dcd0ba7 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,7 +1,7 @@
 from .fields import DjangoConnectionField, DjangoListField
 from .types import DjangoObjectType
 
-__version__ = "2.10.0"
+__version__ = "2.10.1"
 
 __all__ = [
     "__version__",

From ee120c48e16dda818cb253fdc36b7053402956b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=9Clgen=20Sar=C4=B1kavak?=
 <ulgens@users.noreply.github.com>
Date: Thu, 21 May 2020 15:18:43 +0300
Subject: [PATCH 090/116] Use psycopg2-binary in tox (#964)

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index c932c4d..6744c5b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,7 @@ setenv =
     DJANGO_SETTINGS_MODULE=django_test_settings
 deps =
     -e.[test]
-    psycopg2
+    psycopg2-binary
     django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2

From d07642afe685ac7d7eede94f67c1cc951fa5c903 Mon Sep 17 00:00:00 2001
From: Padraic Harley <padraic@thelodgeronline.com>
Date: Thu, 21 May 2020 16:16:14 +0100
Subject: [PATCH 091/116] Error in signature of callproc() and execute() (#966)

---
 graphene_django/debug/sql/tracking.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/graphene_django/debug/sql/tracking.py b/graphene_django/debug/sql/tracking.py
index a7c9d8d..dc0f2df 100644
--- a/graphene_django/debug/sql/tracking.py
+++ b/graphene_django/debug/sql/tracking.py
@@ -148,10 +148,10 @@ class NormalCursorWrapper(object):
             # We keep `sql` to maintain backwards compatibility
             self.logger.object.sql.append(_sql)
 
-    def callproc(self, procname, params=()):
+    def callproc(self, procname, params=None):
         return self._record(self.cursor.callproc, procname, params)
 
-    def execute(self, sql, params=()):
+    def execute(self, sql, params=None):
         return self._record(self.cursor.execute, sql, params)
 
     def executemany(self, sql, param_list):

From b1f6d412092eb9e3f76243b513c6f985cd5f7a26 Mon Sep 17 00:00:00 2001
From: Chris Hart <chrstphrhrt@users.noreply.github.com>
Date: Fri, 22 May 2020 06:12:27 -0400
Subject: [PATCH 092/116] fixes minor typo in docs index (#969)

---
 docs/index.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index f4f718c..be6065c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -9,8 +9,8 @@ Graphene-Django provides some additional abstractions that make it easy to add G
 First time? We recommend you start with the installation guide to get set up and the basic tutorial.
 It is worth reading the `core graphene docs <https://docs.graphene-python.org/en/latest/>`__ to familiarize yourself with the basic utilities.
 
-Core tenants
-------------
+Core tenets
+-----------
 
 If you want to expose your data through GraphQL - read the ``Installation``, ``Schema`` and ``Queries`` section.
 

From 5ff40d2d148f1c8be3463e3920ff84c983e585b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 12:48:01 +0100
Subject: [PATCH 093/116] Bump django from 3.0.3 to 3.0.7 in
 /examples/cookbook-plain (#978)

Bumps [django](https://github.com/django/django) from 3.0.3 to 3.0.7.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.0.3...3.0.7)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/cookbook-plain/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/cookbook-plain/requirements.txt b/examples/cookbook-plain/requirements.txt
index 480f757..ae9ecc9 100644
--- a/examples/cookbook-plain/requirements.txt
+++ b/examples/cookbook-plain/requirements.txt
@@ -1,4 +1,4 @@
 graphene>=2.1,<3
 graphene-django>=2.1,<3
 graphql-core>=2.1,<3
-django==3.0.3
+django==3.0.7

From 40e9c66db38c59d849f1c8556624b96e5fb5e298 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 12:48:19 +0100
Subject: [PATCH 094/116] Bump django from 3.0.3 to 3.0.7 in /examples/cookbook
 (#979)

Bumps [django](https://github.com/django/django) from 3.0.3 to 3.0.7.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.0.3...3.0.7)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 examples/cookbook/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/cookbook/requirements.txt b/examples/cookbook/requirements.txt
index 4375fcc..7ae2d89 100644
--- a/examples/cookbook/requirements.txt
+++ b/examples/cookbook/requirements.txt
@@ -1,5 +1,5 @@
 graphene>=2.1,<3
 graphene-django>=2.1,<3
 graphql-core>=2.1,<3
-django==3.0.3
+django==3.0.7
 django-filter>=2

From c00203499b00d40a696a092ab3c64759eddad0f8 Mon Sep 17 00:00:00 2001
From: Paul Craciunoiu <paul@craciunoiu.net>
Date: Sat, 6 Jun 2020 12:00:21 -0600
Subject: [PATCH 095/116] DjangoConnectionField slice: use max_limit first, if
 set (#965)

---
 graphene_django/debug/tests/test_query.py | 81 ++++++++++++++++-------
 graphene_django/fields.py                 | 13 ++--
 graphene_django/tests/test_query.py       | 44 +++++++++++-
 3 files changed, 109 insertions(+), 29 deletions(-)

diff --git a/graphene_django/debug/tests/test_query.py b/graphene_django/debug/tests/test_query.py
index 7226f9b..4c057ed 100644
--- a/graphene_django/debug/tests/test_query.py
+++ b/graphene_django/debug/tests/test_query.py
@@ -1,4 +1,5 @@
 import graphene
+import pytest
 from graphene.relay import Node
 from graphene_django import DjangoConnectionField, DjangoObjectType
 
@@ -24,7 +25,7 @@ def test_should_query_field():
 
     class Query(graphene.ObjectType):
         reporter = graphene.Field(ReporterType)
-        debug = graphene.Field(DjangoDebug, name="_debug")
+        debug = graphene.Field(DjangoDebug, name="__debug")
 
         def resolve_reporter(self, info, **args):
             return Reporter.objects.first()
@@ -34,7 +35,7 @@ def test_should_query_field():
           reporter {
             lastName
           }
-          _debug {
+          __debug {
             sql {
               rawSql
             }
@@ -43,7 +44,9 @@ def test_should_query_field():
     """
     expected = {
         "reporter": {"lastName": "ABA"},
-        "_debug": {"sql": [{"rawSql": str(Reporter.objects.order_by("pk")[:1].query)}]},
+        "__debug": {
+            "sql": [{"rawSql": str(Reporter.objects.order_by("pk")[:1].query)}]
+        },
     }
     schema = graphene.Schema(query=Query)
     result = schema.execute(
@@ -53,7 +56,10 @@ def test_should_query_field():
     assert result.data == expected
 
 
-def test_should_query_nested_field():
+@pytest.mark.parametrize("max_limit,does_count", [(None, True), (100, False)])
+def test_should_query_nested_field(graphene_settings, max_limit, does_count):
+    graphene_settings.RELAY_CONNECTION_MAX_LIMIT = max_limit
+
     r1 = Reporter(last_name="ABA")
     r1.save()
     r2 = Reporter(last_name="Griffin")
@@ -111,11 +117,18 @@ def test_should_query_nested_field():
     assert not result.errors
     query = str(Reporter.objects.order_by("pk")[:1].query)
     assert result.data["__debug"]["sql"][0]["rawSql"] == query
-    assert "COUNT" in result.data["__debug"]["sql"][1]["rawSql"]
-    assert "tests_reporter_pets" in result.data["__debug"]["sql"][2]["rawSql"]
-    assert "COUNT" in result.data["__debug"]["sql"][3]["rawSql"]
-    assert "tests_reporter_pets" in result.data["__debug"]["sql"][4]["rawSql"]
-    assert len(result.data["__debug"]["sql"]) == 5
+    if does_count:
+        assert "COUNT" in result.data["__debug"]["sql"][1]["rawSql"]
+        assert "tests_reporter_pets" in result.data["__debug"]["sql"][2]["rawSql"]
+        assert "COUNT" in result.data["__debug"]["sql"][3]["rawSql"]
+        assert "tests_reporter_pets" in result.data["__debug"]["sql"][4]["rawSql"]
+        assert len(result.data["__debug"]["sql"]) == 5
+    else:
+        assert len(result.data["__debug"]["sql"]) == 3
+        for i in range(len(result.data["__debug"]["sql"])):
+            assert "COUNT" not in result.data["__debug"]["sql"][i]["rawSql"]
+        assert "tests_reporter_pets" in result.data["__debug"]["sql"][1]["rawSql"]
+        assert "tests_reporter_pets" in result.data["__debug"]["sql"][2]["rawSql"]
 
     assert result.data["reporter"] == expected["reporter"]
 
@@ -133,7 +146,7 @@ def test_should_query_list():
 
     class Query(graphene.ObjectType):
         all_reporters = graphene.List(ReporterType)
-        debug = graphene.Field(DjangoDebug, name="_debug")
+        debug = graphene.Field(DjangoDebug, name="__debug")
 
         def resolve_all_reporters(self, info, **args):
             return Reporter.objects.all()
@@ -143,7 +156,7 @@ def test_should_query_list():
           allReporters {
             lastName
           }
-          _debug {
+          __debug {
             sql {
               rawSql
             }
@@ -152,7 +165,7 @@ def test_should_query_list():
     """
     expected = {
         "allReporters": [{"lastName": "ABA"}, {"lastName": "Griffin"}],
-        "_debug": {"sql": [{"rawSql": str(Reporter.objects.all().query)}]},
+        "__debug": {"sql": [{"rawSql": str(Reporter.objects.all().query)}]},
     }
     schema = graphene.Schema(query=Query)
     result = schema.execute(
@@ -162,7 +175,10 @@ def test_should_query_list():
     assert result.data == expected
 
 
-def test_should_query_connection():
+@pytest.mark.parametrize("max_limit,does_count", [(None, True), (100, False)])
+def test_should_query_connection(graphene_settings, max_limit, does_count):
+    graphene_settings.RELAY_CONNECTION_MAX_LIMIT = max_limit
+
     r1 = Reporter(last_name="ABA")
     r1.save()
     r2 = Reporter(last_name="Griffin")
@@ -175,7 +191,7 @@ def test_should_query_connection():
 
     class Query(graphene.ObjectType):
         all_reporters = DjangoConnectionField(ReporterType)
-        debug = graphene.Field(DjangoDebug, name="_debug")
+        debug = graphene.Field(DjangoDebug, name="__debug")
 
         def resolve_all_reporters(self, info, **args):
             return Reporter.objects.all()
@@ -189,7 +205,7 @@ def test_should_query_connection():
               }
             }
           }
-          _debug {
+          __debug {
             sql {
               rawSql
             }
@@ -203,12 +219,22 @@ def test_should_query_connection():
     )
     assert not result.errors
     assert result.data["allReporters"] == expected["allReporters"]
-    assert "COUNT" in result.data["_debug"]["sql"][0]["rawSql"]
-    query = str(Reporter.objects.all()[:1].query)
-    assert result.data["_debug"]["sql"][1]["rawSql"] == query
+    if does_count:
+        assert len(result.data["__debug"]["sql"]) == 2
+        assert "COUNT" in result.data["__debug"]["sql"][0]["rawSql"]
+        query = str(Reporter.objects.all()[:1].query)
+        assert result.data["__debug"]["sql"][1]["rawSql"] == query
+    else:
+        assert len(result.data["__debug"]["sql"]) == 1
+        assert "COUNT" not in result.data["__debug"]["sql"][0]["rawSql"]
+        query = str(Reporter.objects.all()[:1].query)
+        assert result.data["__debug"]["sql"][0]["rawSql"] == query
 
 
-def test_should_query_connectionfilter():
+@pytest.mark.parametrize("max_limit,does_count", [(None, True), (100, False)])
+def test_should_query_connectionfilter(graphene_settings, max_limit, does_count):
+    graphene_settings.RELAY_CONNECTION_MAX_LIMIT = max_limit
+
     from ...filter import DjangoFilterConnectionField
 
     r1 = Reporter(last_name="ABA")
@@ -224,7 +250,7 @@ def test_should_query_connectionfilter():
     class Query(graphene.ObjectType):
         all_reporters = DjangoFilterConnectionField(ReporterType, fields=["last_name"])
         s = graphene.String(resolver=lambda *_: "S")
-        debug = graphene.Field(DjangoDebug, name="_debug")
+        debug = graphene.Field(DjangoDebug, name="__debug")
 
         def resolve_all_reporters(self, info, **args):
             return Reporter.objects.all()
@@ -238,7 +264,7 @@ def test_should_query_connectionfilter():
               }
             }
           }
-          _debug {
+          __debug {
             sql {
               rawSql
             }
@@ -252,6 +278,13 @@ def test_should_query_connectionfilter():
     )
     assert not result.errors
     assert result.data["allReporters"] == expected["allReporters"]
-    assert "COUNT" in result.data["_debug"]["sql"][0]["rawSql"]
-    query = str(Reporter.objects.all()[:1].query)
-    assert result.data["_debug"]["sql"][1]["rawSql"] == query
+    if does_count:
+        assert len(result.data["__debug"]["sql"]) == 2
+        assert "COUNT" in result.data["__debug"]["sql"][0]["rawSql"]
+        query = str(Reporter.objects.all()[:1].query)
+        assert result.data["__debug"]["sql"][1]["rawSql"] == query
+    else:
+        assert len(result.data["__debug"]["sql"]) == 1
+        assert "COUNT" not in result.data["__debug"]["sql"][0]["rawSql"]
+        query = str(Reporter.objects.all()[:1].query)
+        assert result.data["__debug"]["sql"][0]["rawSql"] == query
diff --git a/graphene_django/fields.py b/graphene_django/fields.py
index 7539cf2..9b102bd 100644
--- a/graphene_django/fields.py
+++ b/graphene_django/fields.py
@@ -127,12 +127,15 @@ class DjangoConnectionField(ConnectionField):
         return connection._meta.node.get_queryset(queryset, info)
 
     @classmethod
-    def resolve_connection(cls, connection, args, iterable):
+    def resolve_connection(cls, connection, args, iterable, max_limit=None):
         iterable = maybe_queryset(iterable)
+        # When slicing from the end, need to retrieve the iterable length.
+        if args.get("last"):
+            max_limit = None
         if isinstance(iterable, QuerySet):
-            _len = iterable.count()
+            _len = max_limit or iterable.count()
         else:
-            _len = len(iterable)
+            _len = max_limit or len(iterable)
         connection = connection_from_list_slice(
             iterable,
             args,
@@ -189,7 +192,9 @@ class DjangoConnectionField(ConnectionField):
         # thus the iterable gets refiltered by resolve_queryset
         # but iterable might be promise
         iterable = queryset_resolver(connection, iterable, info, args)
-        on_resolve = partial(cls.resolve_connection, connection, args)
+        on_resolve = partial(
+            cls.resolve_connection, connection, args, max_limit=max_limit
+        )
 
         if Promise.is_thenable(iterable):
             return Promise.resolve(iterable).then(on_resolve)
diff --git a/graphene_django/tests/test_query.py b/graphene_django/tests/test_query.py
index bb9cc88..e6ed49e 100644
--- a/graphene_django/tests/test_query.py
+++ b/graphene_django/tests/test_query.py
@@ -1084,6 +1084,48 @@ def test_should_resolve_get_queryset_connectionfields():
     assert result.data == expected
 
 
+REPORTERS = [
+    dict(
+        first_name="First {}".format(i),
+        last_name="Last {}".format(i),
+        email="johndoe+{}@example.com".format(i),
+        a_choice=1,
+    )
+    for i in range(6)
+]
+
+
+def test_should_return_max_limit(graphene_settings):
+    graphene_settings.RELAY_CONNECTION_MAX_LIMIT = 4
+    reporters = [Reporter(**kwargs) for kwargs in REPORTERS]
+    Reporter.objects.bulk_create(reporters)
+
+    class ReporterType(DjangoObjectType):
+        class Meta:
+            model = Reporter
+            interfaces = (Node,)
+
+    class Query(graphene.ObjectType):
+        all_reporters = DjangoConnectionField(ReporterType)
+
+    schema = graphene.Schema(query=Query)
+    query = """
+        query AllReporters {
+            allReporters {
+                edges {
+                    node {
+                        id
+                    }
+                }
+            }
+        }
+    """
+
+    result = schema.execute(query)
+    assert not result.errors
+    assert len(result.data["allReporters"]["edges"]) == 4
+
+
 def test_should_preserve_prefetch_related(django_assert_num_queries):
     class ReporterType(DjangoObjectType):
         class Meta:
@@ -1130,7 +1172,7 @@ def test_should_preserve_prefetch_related(django_assert_num_queries):
         }
     """
     schema = graphene.Schema(query=Query)
-    with django_assert_num_queries(3) as captured:
+    with django_assert_num_queries(2) as captured:
         result = schema.execute(query)
     assert not result.errors
 

From 56f1db80cf7a731d31cd5318f9cbb040f4e4fffd Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Wed, 10 Jun 2020 17:41:11 +0100
Subject: [PATCH 096/116] Update setup.py classifiers (#987)

Fixes https://github.com/graphql-python/graphene-django/issues/985
---
 setup.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 560549a..affaec0 100644
--- a/setup.py
+++ b/setup.py
@@ -48,10 +48,14 @@ setup(
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: Implementation :: PyPy",
+        "Framework :: Django",
+        "Framework :: Django :: 1.11",
+        "Framework :: Django :: 2.2",
+        "Framework :: Django :: 3.0",
     ],
     keywords="api graphql protocol rest relay graphene",
     packages=find_packages(exclude=["tests"]),

From 48bfc395ee0716caa066c1fc2b764be83090c821 Mon Sep 17 00:00:00 2001
From: "Yuyang Zhang(helloqiu)" <mail@helloqiu.pro>
Date: Wed, 10 Jun 2020 17:52:45 +0100
Subject: [PATCH 097/116] fix(converter): wrap field with NonNull if it is
 required (#545)

Co-authored-by: Jonathan Kim <jkimbo@gmail.com>
---
 graphene_django/converter.py            | 18 +++++++++++++-----
 graphene_django/tests/test_converter.py | 22 +++++++++++++++++++++-
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/graphene_django/converter.py b/graphene_django/converter.py
index c84b61a..92963d6 100644
--- a/graphene_django/converter.py
+++ b/graphene_django/converter.py
@@ -255,10 +255,14 @@ def convert_field_to_djangomodel(field, registry=None):
 
 @convert_django_field.register(ArrayField)
 def convert_postgres_array_to_list(field, registry=None):
-    base_type = convert_django_field(field.base_field)
-    if not isinstance(base_type, (List, NonNull)):
-        base_type = type(base_type)
-    return List(base_type, description=field.help_text, required=not field.null)
+    inner_type = convert_django_field(field.base_field)
+    if not isinstance(inner_type, (List, NonNull)):
+        inner_type = (
+            NonNull(type(inner_type))
+            if inner_type.kwargs["required"]
+            else type(inner_type)
+        )
+    return List(inner_type, description=field.help_text, required=not field.null)
 
 
 @convert_django_field.register(HStoreField)
@@ -271,5 +275,9 @@ def convert_postgres_field_to_string(field, registry=None):
 def convert_postgres_range_to_string(field, registry=None):
     inner_type = convert_django_field(field.base_field)
     if not isinstance(inner_type, (List, NonNull)):
-        inner_type = type(inner_type)
+        inner_type = (
+            NonNull(type(inner_type))
+            if inner_type.kwargs["required"]
+            else type(inner_type)
+        )
     return List(inner_type, description=field.help_text, required=not field.null)
diff --git a/graphene_django/tests/test_converter.py b/graphene_django/tests/test_converter.py
index 8e4495a..f6e3606 100644
--- a/graphene_django/tests/test_converter.py
+++ b/graphene_django/tests/test_converter.py
@@ -310,6 +310,14 @@ def test_should_postgres_array_convert_list():
     )
     assert isinstance(field.type, graphene.NonNull)
     assert isinstance(field.type.of_type, graphene.List)
+    assert isinstance(field.type.of_type.of_type, graphene.NonNull)
+    assert field.type.of_type.of_type.of_type == graphene.String
+
+    field = assert_conversion(
+        ArrayField, graphene.List, models.CharField(max_length=100, null=True)
+    )
+    assert isinstance(field.type, graphene.NonNull)
+    assert isinstance(field.type.of_type, graphene.List)
     assert field.type.of_type.of_type == graphene.String
 
 
@@ -321,6 +329,17 @@ def test_should_postgres_array_multiple_convert_list():
     assert isinstance(field.type, graphene.NonNull)
     assert isinstance(field.type.of_type, graphene.List)
     assert isinstance(field.type.of_type.of_type, graphene.List)
+    assert isinstance(field.type.of_type.of_type.of_type, graphene.NonNull)
+    assert field.type.of_type.of_type.of_type.of_type == graphene.String
+
+    field = assert_conversion(
+        ArrayField,
+        graphene.List,
+        ArrayField(models.CharField(max_length=100, null=True)),
+    )
+    assert isinstance(field.type, graphene.NonNull)
+    assert isinstance(field.type.of_type, graphene.List)
+    assert isinstance(field.type.of_type.of_type, graphene.List)
     assert field.type.of_type.of_type.of_type == graphene.String
 
 
@@ -341,7 +360,8 @@ def test_should_postgres_range_convert_list():
     field = assert_conversion(IntegerRangeField, graphene.List)
     assert isinstance(field.type, graphene.NonNull)
     assert isinstance(field.type.of_type, graphene.List)
-    assert field.type.of_type.of_type == graphene.Int
+    assert isinstance(field.type.of_type.of_type, graphene.NonNull)
+    assert field.type.of_type.of_type.of_type == graphene.Int
 
 
 def test_generate_enum_name(graphene_settings):

From 3c6733e1215680485a372e3b34ee8af9548bfc72 Mon Sep 17 00:00:00 2001
From: Hubert Siuzdak <35269911+hubertsiuzdak@users.noreply.github.com>
Date: Thu, 25 Jun 2020 13:56:06 +0200
Subject: [PATCH 098/116] Fix filtering with GlobalIDFilter (#977)

---
 graphene_django/filter/fields.py            |   8 +-
 graphene_django/filter/tests/test_fields.py | 108 ++++++++++++++++++++
 2 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/graphene_django/filter/fields.py b/graphene_django/filter/fields.py
index a46a4b7..3a98e8d 100644
--- a/graphene_django/filter/fields.py
+++ b/graphene_django/filter/fields.py
@@ -1,6 +1,7 @@
 from collections import OrderedDict
 from functools import partial
 
+from django.core.exceptions import ValidationError
 from graphene.types.argument import to_arguments
 from ..fields import DjangoConnectionField
 from .utils import get_filtering_args_from_filterset, get_filterset_class
@@ -59,7 +60,12 @@ class DjangoFilterConnectionField(DjangoConnectionField):
             connection, iterable, info, args
         )
         filter_kwargs = {k: v for k, v in args.items() if k in filtering_args}
-        return filterset_class(data=filter_kwargs, queryset=qs, request=info.context).qs
+        filterset = filterset_class(
+            data=filter_kwargs, queryset=qs, request=info.context
+        )
+        if filterset.form.is_valid():
+            return filterset.qs
+        raise ValidationError(filterset.form.errors.as_json())
 
     def get_queryset_resolver(self):
         return partial(
diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py
index 166d806..b8ae6fe 100644
--- a/graphene_django/filter/tests/test_fields.py
+++ b/graphene_django/filter/tests/test_fields.py
@@ -400,6 +400,114 @@ def test_global_id_field_relation():
     assert id_filter.field_class == GlobalIDFormField
 
 
+def test_global_id_field_relation_with_filter():
+    class ReporterFilterNode(DjangoObjectType):
+        class Meta:
+            model = Reporter
+            interfaces = (Node,)
+            filter_fields = ["first_name", "articles"]
+
+    class ArticleFilterNode(DjangoObjectType):
+        class Meta:
+            model = Article
+            interfaces = (Node,)
+            filter_fields = ["headline", "reporter"]
+
+    class Query(ObjectType):
+        all_reporters = DjangoFilterConnectionField(ReporterFilterNode)
+        all_articles = DjangoFilterConnectionField(ArticleFilterNode)
+        reporter = Field(ReporterFilterNode)
+        article = Field(ArticleFilterNode)
+
+    r1 = Reporter.objects.create(first_name="r1", last_name="r1", email="r1@test.com")
+    r2 = Reporter.objects.create(first_name="r2", last_name="r2", email="r2@test.com")
+    Article.objects.create(
+        headline="a1",
+        pub_date=datetime.now(),
+        pub_date_time=datetime.now(),
+        reporter=r1,
+        editor=r1,
+    )
+    Article.objects.create(
+        headline="a2",
+        pub_date=datetime.now(),
+        pub_date_time=datetime.now(),
+        reporter=r2,
+        editor=r2,
+    )
+
+    # Query articles created by the reporter `r1`
+    query = """
+    query {
+        allArticles (reporter: "UmVwb3J0ZXJGaWx0ZXJOb2RlOjE=") {
+            edges {
+                node {
+                    id
+                }
+            }
+        }
+    }
+    """
+    schema = Schema(query=Query)
+    result = schema.execute(query)
+    assert not result.errors
+    # We should only get back a single article
+    assert len(result.data["allArticles"]["edges"]) == 1
+
+
+def test_global_id_field_relation_with_filter_not_valid_id():
+    class ReporterFilterNode(DjangoObjectType):
+        class Meta:
+            model = Reporter
+            interfaces = (Node,)
+            filter_fields = ["first_name", "articles"]
+
+    class ArticleFilterNode(DjangoObjectType):
+        class Meta:
+            model = Article
+            interfaces = (Node,)
+            filter_fields = ["headline", "reporter"]
+
+    class Query(ObjectType):
+        all_reporters = DjangoFilterConnectionField(ReporterFilterNode)
+        all_articles = DjangoFilterConnectionField(ArticleFilterNode)
+        reporter = Field(ReporterFilterNode)
+        article = Field(ArticleFilterNode)
+
+    r1 = Reporter.objects.create(first_name="r1", last_name="r1", email="r1@test.com")
+    r2 = Reporter.objects.create(first_name="r2", last_name="r2", email="r2@test.com")
+    Article.objects.create(
+        headline="a1",
+        pub_date=datetime.now(),
+        pub_date_time=datetime.now(),
+        reporter=r1,
+        editor=r1,
+    )
+    Article.objects.create(
+        headline="a2",
+        pub_date=datetime.now(),
+        pub_date_time=datetime.now(),
+        reporter=r2,
+        editor=r2,
+    )
+
+    # Filter by the global ID that does not exist
+    query = """
+    query {
+        allArticles (reporter: "fake_global_id") {
+            edges {
+                node {
+                    id
+                }
+            }
+        }
+    }
+    """
+    schema = Schema(query=Query)
+    result = schema.execute(query)
+    assert "Invalid ID specified." in result.errors[0].message
+
+
 def test_global_id_multiple_field_implicit():
     field = DjangoFilterConnectionField(ReporterNode, fields=["pets"])
     filterset_class = field.filterset_class

From 3c229b619efb546971c3df46e30a9ff18aca5721 Mon Sep 17 00:00:00 2001
From: Paul Craciunoiu <paul@craciunoiu.net>
Date: Thu, 25 Jun 2020 06:00:24 -0600
Subject: [PATCH 099/116] Fix hasNextPage - revert to count. Fix after (#986)

Co-authored-by: Jonathan Kim <jkimbo@gmail.com>
---
 graphene_django/debug/tests/test_query.py | 57 ++++++++---------------
 graphene_django/fields.py                 | 32 ++++++++-----
 graphene_django/tests/test_query.py       | 55 +++++++++++++++++++++-
 3 files changed, 94 insertions(+), 50 deletions(-)

diff --git a/graphene_django/debug/tests/test_query.py b/graphene_django/debug/tests/test_query.py
index 4c057ed..d71c3fb 100644
--- a/graphene_django/debug/tests/test_query.py
+++ b/graphene_django/debug/tests/test_query.py
@@ -56,8 +56,8 @@ def test_should_query_field():
     assert result.data == expected
 
 
-@pytest.mark.parametrize("max_limit,does_count", [(None, True), (100, False)])
-def test_should_query_nested_field(graphene_settings, max_limit, does_count):
+@pytest.mark.parametrize("max_limit", [None, 100])
+def test_should_query_nested_field(graphene_settings, max_limit):
     graphene_settings.RELAY_CONNECTION_MAX_LIMIT = max_limit
 
     r1 = Reporter(last_name="ABA")
@@ -117,18 +117,11 @@ def test_should_query_nested_field(graphene_settings, max_limit, does_count):
     assert not result.errors
     query = str(Reporter.objects.order_by("pk")[:1].query)
     assert result.data["__debug"]["sql"][0]["rawSql"] == query
-    if does_count:
-        assert "COUNT" in result.data["__debug"]["sql"][1]["rawSql"]
-        assert "tests_reporter_pets" in result.data["__debug"]["sql"][2]["rawSql"]
-        assert "COUNT" in result.data["__debug"]["sql"][3]["rawSql"]
-        assert "tests_reporter_pets" in result.data["__debug"]["sql"][4]["rawSql"]
-        assert len(result.data["__debug"]["sql"]) == 5
-    else:
-        assert len(result.data["__debug"]["sql"]) == 3
-        for i in range(len(result.data["__debug"]["sql"])):
-            assert "COUNT" not in result.data["__debug"]["sql"][i]["rawSql"]
-        assert "tests_reporter_pets" in result.data["__debug"]["sql"][1]["rawSql"]
-        assert "tests_reporter_pets" in result.data["__debug"]["sql"][2]["rawSql"]
+    assert "COUNT" in result.data["__debug"]["sql"][1]["rawSql"]
+    assert "tests_reporter_pets" in result.data["__debug"]["sql"][2]["rawSql"]
+    assert "COUNT" in result.data["__debug"]["sql"][3]["rawSql"]
+    assert "tests_reporter_pets" in result.data["__debug"]["sql"][4]["rawSql"]
+    assert len(result.data["__debug"]["sql"]) == 5
 
     assert result.data["reporter"] == expected["reporter"]
 
@@ -175,8 +168,8 @@ def test_should_query_list():
     assert result.data == expected
 
 
-@pytest.mark.parametrize("max_limit,does_count", [(None, True), (100, False)])
-def test_should_query_connection(graphene_settings, max_limit, does_count):
+@pytest.mark.parametrize("max_limit", [None, 100])
+def test_should_query_connection(graphene_settings, max_limit):
     graphene_settings.RELAY_CONNECTION_MAX_LIMIT = max_limit
 
     r1 = Reporter(last_name="ABA")
@@ -219,20 +212,14 @@ def test_should_query_connection(graphene_settings, max_limit, does_count):
     )
     assert not result.errors
     assert result.data["allReporters"] == expected["allReporters"]
-    if does_count:
-        assert len(result.data["__debug"]["sql"]) == 2
-        assert "COUNT" in result.data["__debug"]["sql"][0]["rawSql"]
-        query = str(Reporter.objects.all()[:1].query)
-        assert result.data["__debug"]["sql"][1]["rawSql"] == query
-    else:
-        assert len(result.data["__debug"]["sql"]) == 1
-        assert "COUNT" not in result.data["__debug"]["sql"][0]["rawSql"]
-        query = str(Reporter.objects.all()[:1].query)
-        assert result.data["__debug"]["sql"][0]["rawSql"] == query
+    assert len(result.data["__debug"]["sql"]) == 2
+    assert "COUNT" in result.data["__debug"]["sql"][0]["rawSql"]
+    query = str(Reporter.objects.all()[:1].query)
+    assert result.data["__debug"]["sql"][1]["rawSql"] == query
 
 
-@pytest.mark.parametrize("max_limit,does_count", [(None, True), (100, False)])
-def test_should_query_connectionfilter(graphene_settings, max_limit, does_count):
+@pytest.mark.parametrize("max_limit", [None, 100])
+def test_should_query_connectionfilter(graphene_settings, max_limit):
     graphene_settings.RELAY_CONNECTION_MAX_LIMIT = max_limit
 
     from ...filter import DjangoFilterConnectionField
@@ -278,13 +265,7 @@ def test_should_query_connectionfilter(graphene_settings, max_limit, does_count)
     )
     assert not result.errors
     assert result.data["allReporters"] == expected["allReporters"]
-    if does_count:
-        assert len(result.data["__debug"]["sql"]) == 2
-        assert "COUNT" in result.data["__debug"]["sql"][0]["rawSql"]
-        query = str(Reporter.objects.all()[:1].query)
-        assert result.data["__debug"]["sql"][1]["rawSql"] == query
-    else:
-        assert len(result.data["__debug"]["sql"]) == 1
-        assert "COUNT" not in result.data["__debug"]["sql"][0]["rawSql"]
-        query = str(Reporter.objects.all()[:1].query)
-        assert result.data["__debug"]["sql"][0]["rawSql"] == query
+    assert len(result.data["__debug"]["sql"]) == 2
+    assert "COUNT" in result.data["__debug"]["sql"][0]["rawSql"]
+    query = str(Reporter.objects.all()[:1].query)
+    assert result.data["__debug"]["sql"][1]["rawSql"] == query
diff --git a/graphene_django/fields.py b/graphene_django/fields.py
index 9b102bd..ac7ce45 100644
--- a/graphene_django/fields.py
+++ b/graphene_django/fields.py
@@ -2,7 +2,10 @@ from functools import partial
 
 import six
 from django.db.models.query import QuerySet
-from graphql_relay.connection.arrayconnection import connection_from_list_slice
+from graphql_relay.connection.arrayconnection import (
+    connection_from_list_slice,
+    get_offset_with_default,
+)
 from promise import Promise
 
 from graphene import NonNull
@@ -129,25 +132,32 @@ class DjangoConnectionField(ConnectionField):
     @classmethod
     def resolve_connection(cls, connection, args, iterable, max_limit=None):
         iterable = maybe_queryset(iterable)
-        # When slicing from the end, need to retrieve the iterable length.
-        if args.get("last"):
-            max_limit = None
+
         if isinstance(iterable, QuerySet):
-            _len = max_limit or iterable.count()
+            list_length = iterable.count()
+            list_slice_length = (
+                min(max_limit, list_length) if max_limit is not None else list_length
+            )
         else:
-            _len = max_limit or len(iterable)
+            list_length = len(iterable)
+            list_slice_length = (
+                min(max_limit, list_length) if max_limit is not None else list_length
+            )
+
+        after = get_offset_with_default(args.get("after"), -1) + 1
+
         connection = connection_from_list_slice(
-            iterable,
+            iterable[after:],
             args,
-            slice_start=0,
-            list_length=_len,
-            list_slice_length=_len,
+            slice_start=after,
+            list_length=list_length,
+            list_slice_length=list_slice_length,
             connection_type=connection,
             edge_type=connection.Edge,
             pageinfo_type=PageInfo,
         )
         connection.iterable = iterable
-        connection.length = _len
+        connection.length = list_length
         return connection
 
     @classmethod
diff --git a/graphene_django/tests/test_query.py b/graphene_django/tests/test_query.py
index e6ed49e..64f54bb 100644
--- a/graphene_django/tests/test_query.py
+++ b/graphene_django/tests/test_query.py
@@ -1126,6 +1126,59 @@ def test_should_return_max_limit(graphene_settings):
     assert len(result.data["allReporters"]["edges"]) == 4
 
 
+def test_should_have_next_page(graphene_settings):
+    graphene_settings.RELAY_CONNECTION_MAX_LIMIT = 6
+    reporters = [Reporter(**kwargs) for kwargs in REPORTERS]
+    Reporter.objects.bulk_create(reporters)
+    db_reporters = Reporter.objects.all()
+
+    class ReporterType(DjangoObjectType):
+        class Meta:
+            model = Reporter
+            interfaces = (Node,)
+
+    class Query(graphene.ObjectType):
+        all_reporters = DjangoConnectionField(ReporterType)
+
+    schema = graphene.Schema(query=Query)
+    # Need first: 4 here to trigger the `has_next_page` logic in graphql-relay
+    # See `arrayconnection.py::connection_from_list_slice`:
+    # has_next_page=isinstance(first, int) and end_offset < upper_bound
+    query = """
+        query AllReporters($first: Int, $after: String) {
+            allReporters(first: $first, after: $after) {
+                pageInfo {
+                    hasNextPage
+                    endCursor
+                }
+                edges {
+                    node {
+                        id
+                    }
+                }
+            }
+        }
+    """
+
+    result = schema.execute(query, variable_values=dict(first=4))
+    assert not result.errors
+    assert len(result.data["allReporters"]["edges"]) == 4
+    assert result.data["allReporters"]["pageInfo"]["hasNextPage"]
+
+    last_result = result.data["allReporters"]["pageInfo"]["endCursor"]
+    result2 = schema.execute(query, variable_values=dict(first=4, after=last_result))
+    assert not result2.errors
+    assert len(result2.data["allReporters"]["edges"]) == 2
+    assert not result2.data["allReporters"]["pageInfo"]["hasNextPage"]
+    gql_reporters = (
+        result.data["allReporters"]["edges"] + result2.data["allReporters"]["edges"]
+    )
+
+    assert {to_global_id("ReporterType", reporter.id) for reporter in db_reporters} == {
+        gql_reporter["node"]["id"] for gql_reporter in gql_reporters
+    }
+
+
 def test_should_preserve_prefetch_related(django_assert_num_queries):
     class ReporterType(DjangoObjectType):
         class Meta:
@@ -1172,7 +1225,7 @@ def test_should_preserve_prefetch_related(django_assert_num_queries):
         }
     """
     schema = graphene.Schema(query=Query)
-    with django_assert_num_queries(2) as captured:
+    with django_assert_num_queries(3) as captured:
         result = schema.execute(query)
     assert not result.errors
 

From 3026181b28acd6dddc8cc537636eb8283498d7f1 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Thu, 25 Jun 2020 15:10:56 +0100
Subject: [PATCH 100/116] Set first amount to max limit if not set (#993)

---
 graphene_django/fields.py           | 3 +++
 graphene_django/tests/test_query.py | 7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/graphene_django/fields.py b/graphene_django/fields.py
index ac7ce45..641f423 100644
--- a/graphene_django/fields.py
+++ b/graphene_django/fields.py
@@ -146,6 +146,9 @@ class DjangoConnectionField(ConnectionField):
 
         after = get_offset_with_default(args.get("after"), -1) + 1
 
+        if max_limit is not None and "first" not in args:
+            args["first"] = max_limit
+
         connection = connection_from_list_slice(
             iterable[after:],
             args,
diff --git a/graphene_django/tests/test_query.py b/graphene_django/tests/test_query.py
index 64f54bb..0860a4a 100644
--- a/graphene_django/tests/test_query.py
+++ b/graphene_django/tests/test_query.py
@@ -1127,7 +1127,7 @@ def test_should_return_max_limit(graphene_settings):
 
 
 def test_should_have_next_page(graphene_settings):
-    graphene_settings.RELAY_CONNECTION_MAX_LIMIT = 6
+    graphene_settings.RELAY_CONNECTION_MAX_LIMIT = 4
     reporters = [Reporter(**kwargs) for kwargs in REPORTERS]
     Reporter.objects.bulk_create(reporters)
     db_reporters = Reporter.objects.all()
@@ -1141,9 +1141,6 @@ def test_should_have_next_page(graphene_settings):
         all_reporters = DjangoConnectionField(ReporterType)
 
     schema = graphene.Schema(query=Query)
-    # Need first: 4 here to trigger the `has_next_page` logic in graphql-relay
-    # See `arrayconnection.py::connection_from_list_slice`:
-    # has_next_page=isinstance(first, int) and end_offset < upper_bound
     query = """
         query AllReporters($first: Int, $after: String) {
             allReporters(first: $first, after: $after) {
@@ -1160,7 +1157,7 @@ def test_should_have_next_page(graphene_settings):
         }
     """
 
-    result = schema.execute(query, variable_values=dict(first=4))
+    result = schema.execute(query, variable_values={})
     assert not result.errors
     assert len(result.data["allReporters"]["edges"]) == 4
     assert result.data["allReporters"]["pageInfo"]["hasNextPage"]

From 1bec8e44b76e0d830075bca81cb10966fffdbfa3 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Thu, 25 Jun 2020 15:11:18 +0100
Subject: [PATCH 101/116] Move to_const function from Graphene into
 Graphene-Django (#992)

---
 graphene_django/converter.py                       |  3 ++-
 graphene_django/utils/str_converters.py            |  6 ++++++
 graphene_django/utils/tests/__init__.py            |  0
 graphene_django/utils/tests/test_str_converters.py | 10 ++++++++++
 setup.py                                           |  1 +
 5 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 graphene_django/utils/str_converters.py
 create mode 100644 graphene_django/utils/tests/__init__.py
 create mode 100644 graphene_django/utils/tests/test_str_converters.py

diff --git a/graphene_django/converter.py b/graphene_django/converter.py
index 92963d6..ca524ff 100644
--- a/graphene_django/converter.py
+++ b/graphene_django/converter.py
@@ -20,13 +20,14 @@ from graphene import (
     Time,
 )
 from graphene.types.json import JSONString
-from graphene.utils.str_converters import to_camel_case, to_const
+from graphene.utils.str_converters import to_camel_case
 from graphql import assert_valid_name
 
 from .settings import graphene_settings
 from .compat import ArrayField, HStoreField, JSONField, RangeField
 from .fields import DjangoListField, DjangoConnectionField
 from .utils import import_single_dispatch
+from .utils.str_converters import to_const
 
 singledispatch = import_single_dispatch()
 
diff --git a/graphene_django/utils/str_converters.py b/graphene_django/utils/str_converters.py
new file mode 100644
index 0000000..f41e87a
--- /dev/null
+++ b/graphene_django/utils/str_converters.py
@@ -0,0 +1,6 @@
+import re
+from unidecode import unidecode
+
+
+def to_const(string):
+    return re.sub(r"[\W|^]+", "_", unidecode(string)).upper()
diff --git a/graphene_django/utils/tests/__init__.py b/graphene_django/utils/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/graphene_django/utils/tests/test_str_converters.py b/graphene_django/utils/tests/test_str_converters.py
new file mode 100644
index 0000000..24064b2
--- /dev/null
+++ b/graphene_django/utils/tests/test_str_converters.py
@@ -0,0 +1,10 @@
+# coding: utf-8
+from ..str_converters import to_const
+
+
+def test_to_const():
+    assert to_const('snakes $1. on a "#plane') == "SNAKES_1_ON_A_PLANE"
+
+
+def test_to_const_unicode():
+    assert to_const(u"Skoða þetta unicode stöff") == "SKODA_THETTA_UNICODE_STOFF"
diff --git a/setup.py b/setup.py
index affaec0..8a070a9 100644
--- a/setup.py
+++ b/setup.py
@@ -66,6 +66,7 @@ setup(
         "Django>=1.11",
         "singledispatch>=3.4.0.3",
         "promise>=2.1",
+        "unidecode>=1.1.1,<2",
     ],
     setup_requires=["pytest-runner"],
     tests_require=tests_require,

From 8ddad41bb7f536311487f8ededcbfc6dc4ecabac Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Thu, 25 Jun 2020 17:30:05 +0100
Subject: [PATCH 102/116] v2.11.0

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index dcd0ba7..155a3c6 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,7 +1,7 @@
 from .fields import DjangoConnectionField, DjangoListField
 from .types import DjangoObjectType
 
-__version__ = "2.10.1"
+__version__ = "2.11.0"
 
 __all__ = [
     "__version__",

From d50955a173782b98c61988a44ce795b757d1c281 Mon Sep 17 00:00:00 2001
From: Thiago Bellini Ribeiro <thiago@bellini.dev>
Date: Thu, 9 Jul 2020 14:01:22 -0300
Subject: [PATCH 103/116] Do not break when after is greater than list_length
 (#999)

---
 graphene_django/fields.py           |  5 +++-
 graphene_django/tests/test_query.py | 37 +++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/graphene_django/fields.py b/graphene_django/fields.py
index 641f423..67559aa 100644
--- a/graphene_django/fields.py
+++ b/graphene_django/fields.py
@@ -144,7 +144,10 @@ class DjangoConnectionField(ConnectionField):
                 min(max_limit, list_length) if max_limit is not None else list_length
             )
 
-        after = get_offset_with_default(args.get("after"), -1) + 1
+        # If after is higher than list_length, connection_from_list_slice
+        # would try to do a negative slicing which makes django throw an
+        # AssertionError
+        after = min(get_offset_with_default(args.get("after"), -1) + 1, list_length)
 
         if max_limit is not None and "first" not in args:
             args["first"] = max_limit
diff --git a/graphene_django/tests/test_query.py b/graphene_django/tests/test_query.py
index 0860a4a..3881ed8 100644
--- a/graphene_django/tests/test_query.py
+++ b/graphene_django/tests/test_query.py
@@ -1,4 +1,5 @@
 import datetime
+import base64
 
 import pytest
 from django.db import models
@@ -1084,6 +1085,42 @@ def test_should_resolve_get_queryset_connectionfields():
     assert result.data == expected
 
 
+def test_connection_should_limit_after_to_list_length():
+    reporter_1 = Reporter.objects.create(
+        first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
+    )
+    reporter_2 = Reporter.objects.create(
+        first_name="Some", last_name="Guy", email="someguy@cnn.com", a_choice=1
+    )
+
+    class ReporterType(DjangoObjectType):
+        class Meta:
+            model = Reporter
+            interfaces = (Node,)
+
+    class Query(graphene.ObjectType):
+        all_reporters = DjangoConnectionField(ReporterType)
+
+    schema = graphene.Schema(query=Query)
+    query = """
+        query ReporterPromiseConnectionQuery ($after: String) {
+            allReporters(first: 1 after: $after) {
+                edges {
+                    node {
+                        id
+                    }
+                }
+            }
+        }
+    """
+
+    after = base64.b64encode(b"arrayconnection:10").decode()
+    result = schema.execute(query, variable_values=dict(after=after))
+    expected = {"allReporters": {"edges": []}}
+    assert not result.errors
+    assert result.data == expected
+
+
 REPORTERS = [
     dict(
         first_name="First {}".format(i),

From 1205e29bef64d29f21e8a2ae6a4a8d0b33ce5e45 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Thu, 9 Jul 2020 18:02:01 +0100
Subject: [PATCH 104/116] v2.11.1

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index 155a3c6..8e83945 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,7 +1,7 @@
 from .fields import DjangoConnectionField, DjangoListField
 from .types import DjangoObjectType
 
-__version__ = "2.11.0"
+__version__ = "2.11.1"
 
 __all__ = [
     "__version__",

From 6aa6aaaa8c0f620986ff072b8e91d08bb7df7066 Mon Sep 17 00:00:00 2001
From: Eric Abruzzese <eric.abruzzese@gmail.com>
Date: Sun, 12 Jul 2020 09:42:31 -0400
Subject: [PATCH 105/116] Update GraphiQL, add GraphiQL subscription support
 (#1001)

---
 docs/index.rst                                |  1 +
 docs/settings.rst                             | 20 +++-
 docs/subscriptions.rst                        | 42 ++++++++
 graphene_django/settings.py                   |  2 +
 .../static/graphene_django/graphiql.js        | 97 +++++++++++++++++--
 .../templates/graphene/graphiql.html          |  9 ++
 graphene_django/views.py                      | 11 ++-
 7 files changed, 169 insertions(+), 13 deletions(-)
 create mode 100644 docs/subscriptions.rst

diff --git a/docs/index.rst b/docs/index.rst
index be6065c..373969e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -28,6 +28,7 @@ For more advanced use, check out the Relay tutorial.
    fields
    extra-types
    mutations
+   subscriptions
    filtering
    authorization
    debug
diff --git a/docs/settings.rst b/docs/settings.rst
index 5a7e4c9..c2f8600 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -104,7 +104,7 @@ Default: ``100``
 
 
 ``CAMELCASE_ERRORS``
-------------------------------------
+--------------------
 
 When set to ``True`` field names in the ``errors`` object will be camel case.
 By default they will be snake case.
@@ -151,7 +151,7 @@ Default: ``False``
 
 
 ``DJANGO_CHOICE_FIELD_ENUM_CUSTOM_NAME``
---------------------------------------
+----------------------------------------
 
 Define the path of a function that takes the Django choice field and returns a string to completely customise the naming for the Enum type.
 
@@ -170,3 +170,19 @@ Default: ``None``
    GRAPHENE = {
       'DJANGO_CHOICE_FIELD_ENUM_CUSTOM_NAME': "myapp.utils.enum_naming"
    }
+
+
+``SUBSCRIPTION_PATH``
+---------------------
+
+Define an alternative URL path where subscription operations should be routed.
+
+The GraphiQL interface will use this setting to intelligently route subscription operations. This is useful if you have more advanced infrastructure requirements that prevent websockets from being handled at the same path (e.g., a WSGI server listening at ``/graphql`` and an ASGI server listening at ``/ws/graphql``).
+
+Default: ``None``
+
+.. code:: python
+
+   GRAPHENE = {
+      'SUBSCRIPTION_PATH': "/ws/graphql"
+   }
diff --git a/docs/subscriptions.rst b/docs/subscriptions.rst
new file mode 100644
index 0000000..b1631c3
--- /dev/null
+++ b/docs/subscriptions.rst
@@ -0,0 +1,42 @@
+Subscriptions
+=============
+
+The ``graphene-django`` project does not currently support GraphQL subscriptions out of the box. However, there are
+several community-driven modules for adding subscription support, and the provided GraphiQL interface supports
+running subscription operations over a websocket.
+
+To implement websocket-based support for GraphQL subscriptions, you’ll need to do the following:
+
+1. Install and configure `django-channels <https://channels.readthedocs.io/en/latest/installation.html>`_.
+2. Install and configure* a third-party module for adding subscription support over websockets. A few options include:
+
+   -  `graphql-python/graphql-ws <https://github.com/graphql-python/graphql-ws>`_
+   -  `datavance/django-channels-graphql-ws <https://github.com/datadvance/DjangoChannelsGraphqlWs>`_
+   -  `jaydenwindle/graphene-subscriptions <https://github.com/jaydenwindle/graphene-subscriptions>`_
+
+3. Ensure that your application (or at least your GraphQL endpoint) is being served via an ASGI protocol server like
+   daphne (built in to ``django-channels``), `uvicorn <https://www.uvicorn.org/>`_, or
+   `hypercorn <https://pgjones.gitlab.io/hypercorn/>`_.
+
+..
+
+   *** Note:** By default, the GraphiQL interface that comes with
+   ``graphene-django`` assumes that you are handling subscriptions at
+   the same path as any other operation (i.e., you configured both
+   ``urls.py`` and ``routing.py`` to handle GraphQL operations at the
+   same path, like ``/graphql``).
+
+   If these URLs differ, GraphiQL will try to run your subscription over
+   HTTP, which will produce an error. If you need to use a different URL
+   for handling websocket connections, you can configure
+   ``SUBSCRIPTION_PATH`` in your ``settings.py``:
+
+   .. code:: python
+
+      GRAPHENE = {
+          # ...
+          "SUBSCRIPTION_PATH": "/ws/graphql"  # The path you configured in `routing.py`, including a leading slash.
+      }
+
+Once your application is properly configured to handle subscriptions, you can use the GraphiQL interface to test
+subscriptions like any other operation.
diff --git a/graphene_django/settings.py b/graphene_django/settings.py
index 666ad8a..52cca89 100644
--- a/graphene_django/settings.py
+++ b/graphene_django/settings.py
@@ -39,6 +39,8 @@ DEFAULTS = {
     # Set to True to enable v3 naming convention for choice field Enum's
     "DJANGO_CHOICE_FIELD_ENUM_V3_NAMING": False,
     "DJANGO_CHOICE_FIELD_ENUM_CUSTOM_NAME": None,
+    # Use a separate path for handling subscriptions.
+    "SUBSCRIPTION_PATH": None,
 }
 
 if settings.DEBUG:
diff --git a/graphene_django/static/graphene_django/graphiql.js b/graphene_django/static/graphene_django/graphiql.js
index c939216..1bc3255 100644
--- a/graphene_django/static/graphene_django/graphiql.js
+++ b/graphene_django/static/graphene_django/graphiql.js
@@ -1,5 +1,13 @@
-(function() {
-
+(function (
+  document,
+  GRAPHENE_SETTINGS,
+  GraphiQL,
+  React,
+  ReactDOM,
+  SubscriptionsTransportWs,
+  history,
+  location,
+) {
   // Parse the cookie value for a CSRF token
   var csrftoken;
   var cookies = ('; ' + document.cookie).split('; csrftoken=');
@@ -11,7 +19,7 @@
 
   // Collect the URL parameters
   var parameters = {};
-  window.location.hash.substr(1).split('&').forEach(function (entry) {
+  location.hash.substr(1).split('&').forEach(function (entry) {
     var eq = entry.indexOf('=');
     if (eq >= 0) {
       parameters[decodeURIComponent(entry.slice(0, eq))] =
@@ -41,7 +49,7 @@
   var fetchURL = locationQuery(otherParams);
 
   // Defines a GraphQL fetcher using the fetch API.
-  function graphQLFetcher(graphQLParams) {
+  function httpClient(graphQLParams) {
     var headers = {
       'Accept': 'application/json',
       'Content-Type': 'application/json'
@@ -64,6 +72,68 @@
       }
     });
   }
+
+  // Derive the subscription URL. If the SUBSCRIPTION_URL setting is specified, uses that value. Otherwise
+  // assumes the current window location with an appropriate websocket protocol.
+  var subscribeURL =
+    location.origin.replace(/^http/, "ws") +
+    (GRAPHENE_SETTINGS.subscriptionPath || location.pathname);
+
+  // Create a subscription client.
+  var subscriptionClient = new SubscriptionsTransportWs.SubscriptionClient(
+    subscribeURL,
+    {
+      // Reconnect after any interruptions.
+      reconnect: true,
+      // Delay socket initialization until the first subscription is started.
+      lazy: true,
+    },
+  );
+
+  // Keep a reference to the currently-active subscription, if available.
+  var activeSubscription = null;
+
+  // Define a GraphQL fetcher that can intelligently route queries based on the operation type.
+  function graphQLFetcher(graphQLParams) {
+    var operationType = getOperationType(graphQLParams);
+
+    // If we're about to execute a new operation, and we have an active subscription,
+    // unsubscribe before continuing.
+    if (activeSubscription) {
+      activeSubscription.unsubscribe();
+      activeSubscription = null;
+    }
+
+    if (operationType === "subscription") {
+      return {
+        subscribe: function (observer) {
+          subscriptionClient.request(graphQLParams).subscribe(observer);
+          activeSubscription = subscriptionClient;
+        },
+      };
+    } else {
+      return httpClient(graphQLParams);
+    }
+  }
+
+  // Determine the type of operation being executed for a given set of GraphQL parameters.
+  function getOperationType(graphQLParams) {
+    // Run a regex against the query to determine the operation type (query, mutation, subscription).
+    var operationRegex = new RegExp(
+      // Look for lines that start with an operation keyword, ignoring whitespace.
+      "^\\s*(query|mutation|subscription)\\s+" +
+        // The operation keyword should be followed by the operationName in the GraphQL parameters.
+        graphQLParams.operationName +
+        // The line should eventually encounter an opening curly brace.
+        "[^\\{]*\\{",
+      // Enable multiline matching.
+      "m",
+    );
+    var match = operationRegex.exec(graphQLParams.query);
+
+    return match[1];
+  }
+
   // When the query and variables string is edited, update the URL bar so
   // that it can be easily shared.
   function onEditQuery(newQuery) {
@@ -83,10 +153,10 @@
   }
   var options = {
     fetcher: graphQLFetcher,
-      onEditQuery: onEditQuery,
-      onEditVariables: onEditVariables,
-      onEditOperationName: onEditOperationName,
-      query: parameters.query,
+    onEditQuery: onEditQuery,
+    onEditVariables: onEditVariables,
+    onEditOperationName: onEditOperationName,
+    query: parameters.query,
   }
   if (parameters.variables) {
     options.variables = parameters.variables;
@@ -99,4 +169,13 @@
     React.createElement(GraphiQL, options),
     document.getElementById("editor")
   );
-})();
+})(
+  document,
+  window.GRAPHENE_SETTINGS,
+  window.GraphiQL,
+  window.React,
+  window.ReactDOM,
+  window.SubscriptionsTransportWs,
+  window.history,
+  window.location,
+);
diff --git a/graphene_django/templates/graphene/graphiql.html b/graphene_django/templates/graphene/graphiql.html
index d0546bd..20ac1d0 100644
--- a/graphene_django/templates/graphene/graphiql.html
+++ b/graphene_django/templates/graphene/graphiql.html
@@ -29,10 +29,19 @@ add "&raw" to the end of the URL within a browser.
           crossorigin="anonymous"></script>
   <script src="https://cdn.jsdelivr.net/npm/graphiql@{{graphiql_version}}/graphiql.min.js"
           crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/subscriptions-transport-ws@{{subscriptions_transport_ws_version}}/browser/client.js"
+          crossorigin="anonymous"></script>
 </head>
 <body>
   <div id="editor"></div>
   {% csrf_token %}
+  <script type="application/javascript">
+    window.GRAPHENE_SETTINGS = {
+    {% if subscription_path %}
+      subscriptionPath: "{{subscription_path}}",
+    {% endif %}
+    };
+  </script>
   <script src="{% static 'graphene_django/graphiql.js' %}"></script>
 </body>
 </html>
diff --git a/graphene_django/views.py b/graphene_django/views.py
index 16bf34b..22b4864 100644
--- a/graphene_django/views.py
+++ b/graphene_django/views.py
@@ -52,9 +52,10 @@ def instantiate_middleware(middlewares):
 
 
 class GraphQLView(View):
-    graphiql_version = "0.14.0"
+    graphiql_version = "1.0.3"
     graphiql_template = "graphene/graphiql.html"
-    react_version = "16.8.6"
+    react_version = "16.13.1"
+    subscriptions_transport_ws_version = "0.9.16"
 
     schema = None
     graphiql = False
@@ -64,6 +65,7 @@ class GraphQLView(View):
     root_value = None
     pretty = False
     batch = False
+    subscription_path = None
 
     def __init__(
         self,
@@ -75,6 +77,7 @@ class GraphQLView(View):
         pretty=False,
         batch=False,
         backend=None,
+        subscription_path=None,
     ):
         if not schema:
             schema = graphene_settings.SCHEMA
@@ -97,6 +100,8 @@ class GraphQLView(View):
         self.graphiql = self.graphiql or graphiql
         self.batch = self.batch or batch
         self.backend = backend
+        if subscription_path is None:
+            subscription_path = graphene_settings.SUBSCRIPTION_PATH
 
         assert isinstance(
             self.schema, GraphQLSchema
@@ -134,6 +139,8 @@ class GraphQLView(View):
                     request,
                     graphiql_version=self.graphiql_version,
                     react_version=self.react_version,
+                    subscriptions_transport_ws_version=self.subscriptions_transport_ws_version,
+                    subscription_path=self.subscription_path,
                 )
 
             if self.batch:

From 057b49117600fc65420dda13893297e3ee83ae69 Mon Sep 17 00:00:00 2001
From: Eric Abruzzese <eric.abruzzese@gmail.com>
Date: Sun, 12 Jul 2020 15:48:12 -0400
Subject: [PATCH 106/116] GraphiQL cleanup (#1002)

* Add integrity checks for GraphiQL CDN resources

Also fixes an erroneous assignment preventing a setting from getting to
the UI.

* Pass SRIs and new versions to the template

* Update hashes

* Use SRI-stable artifacts for GraphiQL resources
---
 .../static/graphene_django/graphiql.js        | 76 +++++++++++--------
 .../templates/graphene/graphiql.html          | 11 ++-
 graphene_django/views.py                      | 34 ++++++++-
 3 files changed, 84 insertions(+), 37 deletions(-)

diff --git a/graphene_django/static/graphene_django/graphiql.js b/graphene_django/static/graphene_django/graphiql.js
index 1bc3255..17836ef 100644
--- a/graphene_django/static/graphene_django/graphiql.js
+++ b/graphene_django/static/graphene_django/graphiql.js
@@ -1,43 +1,55 @@
 (function (
   document,
+
   GRAPHENE_SETTINGS,
   GraphiQL,
   React,
   ReactDOM,
   SubscriptionsTransportWs,
+  fetch,
   history,
   location,
 ) {
   // Parse the cookie value for a CSRF token
   var csrftoken;
-  var cookies = ('; ' + document.cookie).split('; csrftoken=');
+  var cookies = ("; " + document.cookie).split("; csrftoken=");
   if (cookies.length == 2) {
-    csrftoken = cookies.pop().split(';').shift();
+    csrftoken = cookies.pop().split(";").shift();
   } else {
     csrftoken = document.querySelector("[name=csrfmiddlewaretoken]").value;
   }
 
   // Collect the URL parameters
   var parameters = {};
-  location.hash.substr(1).split('&').forEach(function (entry) {
-    var eq = entry.indexOf('=');
-    if (eq >= 0) {
-      parameters[decodeURIComponent(entry.slice(0, eq))] =
-        decodeURIComponent(entry.slice(eq + 1));
-    }
-  });
+  location.hash
+    .substr(1)
+    .split("&")
+    .forEach(function (entry) {
+      var eq = entry.indexOf("=");
+      if (eq >= 0) {
+        parameters[decodeURIComponent(entry.slice(0, eq))] = decodeURIComponent(
+          entry.slice(eq + 1),
+        );
+      }
+    });
   // Produce a Location fragment string from a parameter object.
   function locationQuery(params) {
-    return '#' + Object.keys(params).map(function (key) {
-      return encodeURIComponent(key) + '=' +
-        encodeURIComponent(params[key]);
-    }).join('&');
+    return (
+      "#" +
+      Object.keys(params)
+        .map(function (key) {
+          return (
+            encodeURIComponent(key) + "=" + encodeURIComponent(params[key])
+          );
+        })
+        .join("&")
+    );
   }
   // Derive a fetch URL from the current URL, sans the GraphQL parameters.
   var graphqlParamNames = {
     query: true,
     variables: true,
-    operationName: true
+    operationName: true,
   };
   var otherParams = {};
   for (var k in parameters) {
@@ -51,26 +63,28 @@
   // Defines a GraphQL fetcher using the fetch API.
   function httpClient(graphQLParams) {
     var headers = {
-      'Accept': 'application/json',
-      'Content-Type': 'application/json'
+      Accept: "application/json",
+      "Content-Type": "application/json",
     };
     if (csrftoken) {
-      headers['X-CSRFToken'] = csrftoken;
+      headers["X-CSRFToken"] = csrftoken;
     }
     return fetch(fetchURL, {
-      method: 'post',
+      method: "post",
       headers: headers,
       body: JSON.stringify(graphQLParams),
-      credentials: 'include',
-    }).then(function (response) {
-      return response.text();
-    }).then(function (responseBody) {
-      try {
-        return JSON.parse(responseBody);
-      } catch (error) {
-        return responseBody;
-      }
-    });
+      credentials: "include",
+    })
+      .then(function (response) {
+        return response.text();
+      })
+      .then(function (responseBody) {
+        try {
+          return JSON.parse(responseBody);
+        } catch (error) {
+          return responseBody;
+        }
+      });
   }
 
   // Derive the subscription URL. If the SUBSCRIPTION_URL setting is specified, uses that value. Otherwise
@@ -157,7 +171,7 @@
     onEditVariables: onEditVariables,
     onEditOperationName: onEditOperationName,
     query: parameters.query,
-  }
+  };
   if (parameters.variables) {
     options.variables = parameters.variables;
   }
@@ -167,15 +181,17 @@
   // Render <GraphiQL /> into the body.
   ReactDOM.render(
     React.createElement(GraphiQL, options),
-    document.getElementById("editor")
+    document.getElementById("editor"),
   );
 })(
   document,
+
   window.GRAPHENE_SETTINGS,
   window.GraphiQL,
   window.React,
   window.ReactDOM,
   window.SubscriptionsTransportWs,
+  window.fetch,
   window.history,
   window.location,
 );
diff --git a/graphene_django/templates/graphene/graphiql.html b/graphene_django/templates/graphene/graphiql.html
index 20ac1d0..abc4b52 100644
--- a/graphene_django/templates/graphene/graphiql.html
+++ b/graphene_django/templates/graphene/graphiql.html
@@ -17,19 +17,24 @@ add "&raw" to the end of the URL within a browser.
       width: 100%;
     }
   </style>
-  <link href="https://cdn.jsdelivr.net/npm/graphiql@{{graphiql_version}}/graphiql.css"
+  <link href="https://cdn.jsdelivr.net/npm/graphiql@{{graphiql_version}}/graphiql.min.css"
+        integrity="{{graphiql_css_sri}}"
         rel="stylesheet"
         crossorigin="anonymous" />
-  <script src="https://cdn.jsdelivr.net/npm/whatwg-fetch@2.0.3/fetch.min.js"
-          integrity="sha384-dcF7KoWRaRpjcNbVPUFgatYgAijf8DqW6NWuqLdfB5Sb4Cdbb8iHX7bHsl9YhpKa"
+  <script src="https://cdn.jsdelivr.net/npm/whatwg-fetch@{{whatwg_fetch_version}}/dist/fetch.umd.js"
+          integrity="{{whatwg_fetch_sri}}"
           crossorigin="anonymous"></script>
   <script src="https://cdn.jsdelivr.net/npm/react@{{react_version}}/umd/react.production.min.js"
+          integrity="{{react_sri}}"
           crossorigin="anonymous"></script>
   <script src="https://cdn.jsdelivr.net/npm/react-dom@{{react_version}}/umd/react-dom.production.min.js"
+          integrity="{{react_dom_sri}}"
           crossorigin="anonymous"></script>
   <script src="https://cdn.jsdelivr.net/npm/graphiql@{{graphiql_version}}/graphiql.min.js"
+          integrity="{{graphiql_sri}}"
           crossorigin="anonymous"></script>
   <script src="https://cdn.jsdelivr.net/npm/subscriptions-transport-ws@{{subscriptions_transport_ws_version}}/browser/client.js"
+          integrity="{{subscriptions_transport_ws_sri}}"
           crossorigin="anonymous"></script>
 </head>
 <body>
diff --git a/graphene_django/views.py b/graphene_django/views.py
index 22b4864..59084e8 100644
--- a/graphene_django/views.py
+++ b/graphene_django/views.py
@@ -52,10 +52,27 @@ def instantiate_middleware(middlewares):
 
 
 class GraphQLView(View):
-    graphiql_version = "1.0.3"
     graphiql_template = "graphene/graphiql.html"
+
+    # Polyfill for window.fetch.
+    whatwg_fetch_version = "3.2.0"
+    whatwg_fetch_sri = "sha256-l6HCB9TT2v89oWbDdo2Z3j+PSVypKNLA/nqfzSbM8mo="
+
+    # React and ReactDOM.
     react_version = "16.13.1"
-    subscriptions_transport_ws_version = "0.9.16"
+    react_sri = "sha256-yUhvEmYVhZ/GGshIQKArLvySDSh6cdmdcIx0spR3UP4="
+    react_dom_sri = "sha256-vFt3l+illeNlwThbDUdoPTqF81M8WNSZZZt3HEjsbSU="
+
+    # The GraphiQL React app.
+    graphiql_version = "1.0.3"
+    graphiql_sri = "sha256-VR4buIDY9ZXSyCNFHFNik6uSe0MhigCzgN4u7moCOTk="
+    graphiql_css_sri = "sha256-LwqxjyZgqXDYbpxQJ5zLQeNcf7WVNSJ+r8yp2rnWE/E="
+
+    # The websocket transport library for subscriptions.
+    subscriptions_transport_ws_version = "0.9.17"
+    subscriptions_transport_ws_sri = (
+        "sha256-kCDzver8iRaIQ/SVlfrIwxaBQ/avXf9GQFJRLlErBnk="
+    )
 
     schema = None
     graphiql = False
@@ -101,7 +118,7 @@ class GraphQLView(View):
         self.batch = self.batch or batch
         self.backend = backend
         if subscription_path is None:
-            subscription_path = graphene_settings.SUBSCRIPTION_PATH
+            self.subscription_path = graphene_settings.SUBSCRIPTION_PATH
 
         assert isinstance(
             self.schema, GraphQLSchema
@@ -137,9 +154,18 @@ class GraphQLView(View):
             if show_graphiql:
                 return self.render_graphiql(
                     request,
-                    graphiql_version=self.graphiql_version,
+                    # Dependency parameters.
+                    whatwg_fetch_version=self.whatwg_fetch_version,
+                    whatwg_fetch_sri=self.whatwg_fetch_sri,
                     react_version=self.react_version,
+                    react_sri=self.react_sri,
+                    react_dom_sri=self.react_dom_sri,
+                    graphiql_version=self.graphiql_version,
+                    graphiql_sri=self.graphiql_sri,
+                    graphiql_css_sri=self.graphiql_css_sri,
                     subscriptions_transport_ws_version=self.subscriptions_transport_ws_version,
+                    subscriptions_transport_ws_sri=self.subscriptions_transport_ws_sri,
+                    # The SUBSCRIPTION_PATH setting.
                     subscription_path=self.subscription_path,
                 )
 

From e439bf3727d44b0d49d6cd5f5f6758fe2dd47bec Mon Sep 17 00:00:00 2001
From: Mel van Londen <melvanlonden@gmail.com>
Date: Sun, 12 Jul 2020 13:17:03 -0700
Subject: [PATCH 107/116] bump version to 2.12.0

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index 8e83945..49f480d 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,7 +1,7 @@
 from .fields import DjangoConnectionField, DjangoListField
 from .types import DjangoObjectType
 
-__version__ = "2.11.1"
+__version__ = "2.12.0"
 
 __all__ = [
     "__version__",

From 63cfbbf59aaf9a20015194999e95b3fa5f82b6e7 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Mon, 13 Jul 2020 22:09:52 +0100
Subject: [PATCH 108/116] Remove operation name from the regex and default to
 query (#1004)

---
 graphene_django/static/graphene_django/graphiql.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/graphene_django/static/graphene_django/graphiql.js b/graphene_django/static/graphene_django/graphiql.js
index 17836ef..45f8ad7 100644
--- a/graphene_django/static/graphene_django/graphiql.js
+++ b/graphene_django/static/graphene_django/graphiql.js
@@ -135,15 +135,18 @@
     // Run a regex against the query to determine the operation type (query, mutation, subscription).
     var operationRegex = new RegExp(
       // Look for lines that start with an operation keyword, ignoring whitespace.
-      "^\\s*(query|mutation|subscription)\\s+" +
-        // The operation keyword should be followed by the operationName in the GraphQL parameters.
-        graphQLParams.operationName +
+      "^\\s*(query|mutation|subscription)\\s*" +
+        // The operation keyword should be followed by whitespace and the operationName in the GraphQL parameters (if available).
+        (graphQLParams.operationName ? ("\\s+" + graphQLParams.operationName) : "") +
         // The line should eventually encounter an opening curly brace.
         "[^\\{]*\\{",
       // Enable multiline matching.
       "m",
     );
     var match = operationRegex.exec(graphQLParams.query);
+    if (!match) {
+      return "query";
+    }
 
     return match[1];
   }

From b552dcac24364d3ef824f865ba419c74605942b2 Mon Sep 17 00:00:00 2001
From: Mel van Londen <melvanlonden@gmail.com>
Date: Mon, 13 Jul 2020 14:12:42 -0700
Subject: [PATCH 109/116] bump version number

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index 49f480d..f94b5be 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,7 +1,7 @@
 from .fields import DjangoConnectionField, DjangoListField
 from .types import DjangoObjectType
 
-__version__ = "2.12.0"
+__version__ = "2.12.1"
 
 __all__ = [
     "__version__",

From 97de26bf2e5c38f998cc5e2fb3086345be8f0161 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Wed, 5 Aug 2020 20:17:53 +0100
Subject: [PATCH 110/116] Update tutorial docs (#994)

---
 docs/installation.rst   |   8 +-
 docs/queries.rst        | 151 +++++++++++++++++---------
 docs/tutorial-plain.rst | 230 +++++++++++++---------------------------
 docs/tutorial-relay.rst |   2 +
 4 files changed, 177 insertions(+), 214 deletions(-)

diff --git a/docs/installation.rst b/docs/installation.rst
index 048a994..35272b0 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -25,8 +25,8 @@ Add ``graphene_django`` to the ``INSTALLED_APPS`` in the ``settings.py`` file of
 
     INSTALLED_APPS = [
         ...
-        'django.contrib.staticfiles', # Required for GraphiQL
-        'graphene_django'
+        "django.contrib.staticfiles", # Required for GraphiQL
+        "graphene_django"
     ]
 
 
@@ -63,7 +63,7 @@ Finally, define the schema location for Graphene in the ``settings.py`` file of
 .. code:: python
 
     GRAPHENE = {
-        'SCHEMA': 'django_root.schema.schema'
+        "SCHEMA": "django_root.schema.schema"
     }
 
 Where ``path.schema.schema`` is the location of the ``Schema`` object in your Django project.
@@ -75,7 +75,7 @@ The most basic ``schema.py`` looks like this:
     import graphene
 
     class Query(graphene.ObjectType):
-        pass
+        hello = graphene.String(default_value="Hi!")
 
     schema = graphene.Schema(query=Query)
 
diff --git a/docs/queries.rst b/docs/queries.rst
index 4b3f718..02a2bf2 100644
--- a/docs/queries.rst
+++ b/docs/queries.rst
@@ -20,27 +20,26 @@ Full example
     # my_app/schema.py
 
     import graphene
+    from graphene_django import DjangoObjectType
 
-    from graphene_django.types import DjangoObjectType
     from .models import Question
 
-
     class QuestionType(DjangoObjectType):
         class Meta:
             model = Question
+            fields = ("id", "question_text")
 
-
-    class Query:
+    class Query(graphene.ObjectType):
         questions = graphene.List(QuestionType)
-        question = graphene.Field(QuestionType, question_id=graphene.String())
+        question_by_id = graphene.Field(QuestionType, id=graphene.String())
 
-        def resolve_questions(self, info, **kwargs):
+        def resolve_questions(root, info, **kwargs):
             # Querying a list
             return Question.objects.all()
 
-        def resolve_question(self, info, question_id):
+        def resolve_question_by_id(root, info, id):
             # Querying a single question
-            return Question.objects.get(pk=question_id)
+            return Question.objects.get(pk=id)
 
 
 Specifying which fields to include
@@ -60,21 +59,27 @@ Show **only** these fields on the model:
 
 .. code:: python
 
+    from graphene_django import DjangoObjectType
+    from .models import Question
+
     class QuestionType(DjangoObjectType):
         class Meta:
             model = Question
-            fields = ('id', 'question_text')
+            fields = ("id", "question_text")
 
-You can also set the ``fields`` attribute to the special value ``'__all__'`` to indicate that all fields in the model should be used.
+You can also set the ``fields`` attribute to the special value ``"__all__"`` to indicate that all fields in the model should be used.
 
 For example:
 
 .. code:: python
 
+    from graphene_django import DjangoObjectType
+    from .models import Question
+
     class QuestionType(DjangoObjectType):
         class Meta:
             model = Question
-            fields = '__all__'
+            fields = "__all__"
 
 
 ``exclude``
@@ -84,10 +89,13 @@ Show all fields **except** those in ``exclude``:
 
 .. code:: python
 
+    from graphene_django import DjangoObjectType
+    from .models import Question
+
     class QuestionType(DjangoObjectType):
         class Meta:
             model = Question
-            exclude = ('question_text',)
+            exclude = ("question_text",)
 
 
 Customising fields
@@ -97,16 +105,19 @@ You can completely overwrite a field, or add new fields, to a ``DjangoObjectType
 
 .. code:: python
 
+    from graphene_django import DjangoObjectType
+    from .models import Question
+
     class QuestionType(DjangoObjectType):
 
         class Meta:
             model = Question
-            fields = ('id', 'question_text')
+            fields = ("id", "question_text")
 
         extra_field = graphene.String()
 
         def resolve_extra_field(self, info):
-            return 'hello!'
+            return "hello!"
 
 
 Choices to Enum conversion
@@ -121,12 +132,19 @@ For example the following ``Model`` and ``DjangoObjectType``:
 
 .. code:: python
 
-   class PetModel(models.Model):
-      kind = models.CharField(max_length=100, choices=(('cat', 'Cat'), ('dog', 'Dog')))
+    from django.db import models
+    from graphene_django import DjangoObjectType
 
-   class Pet(DjangoObjectType):
-      class Meta:
-         model = PetModel
+    class PetModel(models.Model):
+        kind = models.CharField(
+            max_length=100,
+            choices=(("cat", "Cat"), ("dog", "Dog"))
+        )
+
+    class Pet(DjangoObjectType):
+        class Meta:
+            model = PetModel
+            fields = ("id", "kind",)
 
 Results in the following GraphQL schema definition:
 
@@ -148,27 +166,35 @@ You can disable this automatic conversion by setting
 
 .. code:: python
 
-   class Pet(DjangoObjectType):
-      class Meta:
-         model = PetModel
-         convert_choices_to_enum = False
+    from graphene_django import DjangoObjectType
+    from .models import PetModel
+
+    class Pet(DjangoObjectType):
+        class Meta:
+            model = PetModel
+            fields = ("id", "kind",)
+            convert_choices_to_enum = False
 
 .. code::
 
-   type Pet {
-     id: ID!
-     kind: String!
-   }
+  type Pet {
+    id: ID!
+    kind: String!
+  }
 
 You can also set ``convert_choices_to_enum`` to a list of fields that should be
 automatically converted into enums:
 
 .. code:: python
 
-   class Pet(DjangoObjectType):
-      class Meta:
-         model = PetModel
-         convert_choices_to_enum = ['kind']
+    from graphene_django import DjangoObjectType
+    from .models import PetModel
+
+    class Pet(DjangoObjectType):
+        class Meta:
+            model = PetModel
+            fields = ("id", "kind",)
+            convert_choices_to_enum = ["kind"]
 
 **Note:** Setting ``convert_choices_to_enum = []`` is the same as setting it to
 ``False``.
@@ -181,6 +207,8 @@ Say you have the following models:
 
 .. code:: python
 
+    from django.db import models
+
     class Category(models.Model):
         foo = models.CharField(max_length=256)
 
@@ -192,10 +220,13 @@ When ``Question`` is published as a ``DjangoObjectType`` and you want to add ``C
 
 .. code:: python
 
+    from graphene_django import DjangoObjectType
+    from .models import Question
+
     class QuestionType(DjangoObjectType):
         class Meta:
             model = Question
-            fields = ('category',)
+            fields = ("category",)
 
 Then all query-able related models must be defined as DjangoObjectType subclass,
 or they will fail to show if you are trying to query those relation fields. You only
@@ -203,9 +234,13 @@ need to create the most basic class for this to work:
 
 .. code:: python
 
+    from graphene_django import DjangoObjectType
+    from .models import Category
+
     class CategoryType(DjangoObjectType):
         class Meta:
             model = Category
+            fields = ("foo",)
 
 .. _django-objecttype-get-queryset:
 
@@ -220,7 +255,6 @@ Use this to control filtering on the ObjectType level instead of the Query objec
     from graphene_django.types import DjangoObjectType
     from .models import Question
 
-
     class QuestionType(DjangoObjectType):
         class Meta:
             model = Question
@@ -240,18 +274,22 @@ This resolve method should follow this format:
 
 .. code:: python
 
-    def resolve_foo(self, info, **kwargs):
+    def resolve_foo(parent, info, **kwargs):
 
 Where "foo" is the name of the field declared in the ``Query`` object.
 
 .. code:: python
 
-    class Query:
+    import graphene
+    from .models import Question
+    from .types import QuestionType
+
+    class Query(graphene.ObjectType):
         foo = graphene.List(QuestionType)
 
-        def resolve_foo(self, info, **kwargs):
-            id = kwargs.get('id')
-            return QuestionModel.objects.get(id)
+        def resolve_foo(root, info):
+            id = kwargs.get("id")
+            return Question.objects.get(id)
 
 Arguments
 ~~~~~~~~~
@@ -260,10 +298,18 @@ Additionally, Resolvers will receive **any arguments declared in the field defin
 
 .. code:: python
 
-    class Query:
-        question = graphene.Field(Question, foo=graphene.String(), bar=graphene.Int())
+    import graphene
+    from .models import Question
+    from .types import QuestionType
 
-        def resolve_question(self, info, foo, bar):
+    class Query(graphene.ObjectType):
+        question = graphene.Field(
+            QuestionType,
+            foo=graphene.String(),
+            bar=graphene.Int()
+        )
+
+        def resolve_question(root, info, foo, bar):
             # If `foo` or `bar` are declared in the GraphQL query they will be here, else None.
             return Question.objects.filter(foo=foo, bar=bar).first()
 
@@ -278,7 +324,15 @@ of Django's ``HTTPRequest`` in your resolve methods, such as checking for authen
 
 .. code:: python
 
-    def resolve_questions(self, info, **kwargs):
+    import graphene
+
+    from .models import Question
+    from .types import QuestionType
+
+    class Query(graphene.ObjectType):
+        questions = graphene.List(QuestionType)
+
+    def resolve_questions(root, info):
         # See if a user is authenticated
         if info.context.user.is_authenticated():
             return Question.objects.all()
@@ -305,15 +359,13 @@ Django models and your external API.
     import graphene
     from .models import Question
 
-
     class MyQuestion(graphene.ObjectType):
         text = graphene.String()
 
-
-    class Query:
+    class Query(graphene.ObjectType):
         question = graphene.Field(MyQuestion, question_id=graphene.String())
 
-        def resolve_question(self, info, question_id):
+        def resolve_question(root, info, question_id):
             question = Question.objects.get(pk=question_id)
             return MyQuestion(
                 text=question.question_text
@@ -343,25 +395,22 @@ the core graphene pages for more information on customizing the Relay experience
     from graphene_django import DjangoObjectType
     from .models import Question
 
-
     class QuestionType(DjangoObjectType):
         class Meta:
             model = Question
-            interfaces = (relay.Node,)
-
+            interfaces = (relay.Node,)  # make sure you add this
+            fields = "__all__"
 
     class QuestionConnection(relay.Connection):
         class Meta:
             node = QuestionType
 
-
     class Query:
         questions = relay.ConnectionField(QuestionConnection)
 
         def resolve_questions(root, info, **kwargs):
             return Question.objects.all()
 
-
 You can now execute queries like:
 
 
diff --git a/docs/tutorial-plain.rst b/docs/tutorial-plain.rst
index e80f9ab..45927a5 100644
--- a/docs/tutorial-plain.rst
+++ b/docs/tutorial-plain.rst
@@ -3,15 +3,11 @@ Basic Tutorial
 
 Graphene Django has a number of additional features that are designed to make
 working with Django easy. Our primary focus in this tutorial is to give a good
-understanding of how to connect models from Django ORM to graphene object types.
+understanding of how to connect models from Django ORM to Graphene object types.
 
 Set up the Django project
 -------------------------
 
-You can find the entire project in ``examples/cookbook-plain``.
-
-----
-
 We will set up the project, create the following:
 
 -  A Django project called ``cookbook``
@@ -28,13 +24,12 @@ We will set up the project, create the following:
     source env/bin/activate  # On Windows use `env\Scripts\activate`
 
     # Install Django and Graphene with Django support
-    pip install django
-    pip install graphene_django
+    pip install django graphene_django
 
     # Set up a new project with a single application
-    django-admin.py startproject cookbook .  # Note the trailing '.' character
+    django-admin startproject cookbook .  # Note the trailing '.' character
     cd cookbook
-    django-admin.py startapp ingredients
+    django-admin startapp ingredients
 
 Now sync your database for the first time:
 
@@ -54,19 +49,18 @@ Let's get started with these models:
     # cookbook/ingredients/models.py
     from django.db import models
 
-
     class Category(models.Model):
         name = models.CharField(max_length=100)
 
         def __str__(self):
             return self.name
 
-
     class Ingredient(models.Model):
         name = models.CharField(max_length=100)
         notes = models.TextField()
         category = models.ForeignKey(
-            Category, related_name='ingredients', on_delete=models.CASCADE)
+            Category, related_name="ingredients", on_delete=models.CASCADE
+        )
 
         def __str__(self):
             return self.name
@@ -75,10 +69,12 @@ Add ingredients as INSTALLED_APPS:
 
 .. code:: python
 
+    # cookbook/settings.py
+
     INSTALLED_APPS = [
         ...
         # Install the ingredients app
-        'cookbook.ingredients',
+        "cookbook.ingredients",
     ]
 
 
@@ -102,13 +98,13 @@ following:
 
 .. code:: bash
 
-    $ python ./manage.py loaddata ingredients
+    python manage.py loaddata ingredients
 
     Installed 6 object(s) from 1 fixture(s)
 
 Alternatively you can use the Django admin interface to create some data
 yourself. You'll need to run the development server (see below), and
-create a login for yourself too (``./manage.py createsuperuser``).
+create a login for yourself too (``python manage.py createsuperuser``).
 
 Register models with admin panel:
 
@@ -138,66 +134,48 @@ order to create this representation, Graphene needs to know about each
 This graph also has a *root type* through which all access begins. This
 is the ``Query`` class below.
 
-This means, for each of our models, we are going to create a type, subclassing ``DjangoObjectType``
+To create GraphQL types for each of our Django models, we are going to subclass the ``DjangoObjectType`` class which will automatically define GraphQL fields that correspond to the fields on the Django models.
 
 After we've done that, we will list those types as fields in the ``Query`` class.
 
-Create ``cookbook/ingredients/schema.py`` and type the following:
+Create ``cookbook/schema.py`` and type the following:
 
 .. code:: python
 
-    # cookbook/ingredients/schema.py
+    # cookbook/schema.py
     import graphene
-
-    from graphene_django.types import DjangoObjectType
+    from graphene_django import DjangoObjectType
 
     from cookbook.ingredients.models import Category, Ingredient
 
-
     class CategoryType(DjangoObjectType):
         class Meta:
             model = Category
-
+            fields = ("id", "name", "ingredients")
 
     class IngredientType(DjangoObjectType):
         class Meta:
             model = Ingredient
+            fields = ("id", "name", "notes", "category")
 
-
-    class Query(object):
-        all_categories = graphene.List(CategoryType)
+    class Query(graphene.ObjectType):
         all_ingredients = graphene.List(IngredientType)
+        category_by_name = graphene.Field(CategoryType, name=graphene.String(required=True))
 
-        def resolve_all_categories(self, info, **kwargs):
-            return Category.objects.all()
-
-        def resolve_all_ingredients(self, info, **kwargs):
+        def resolve_all_ingredients(root, info):
             # We can easily optimize query count in the resolve method
-            return Ingredient.objects.select_related('category').all()
+            return Ingredient.objects.select_related("category").all()
 
-
-Note that the above ``Query`` class is a mixin, inheriting from
-``object``. This is because we will now create a project-level query
-class which will combine all our app-level mixins.
-
-Create the parent project-level ``cookbook/schema.py``:
-
-.. code:: python
-
-    import graphene
-
-    import cookbook.ingredients.schema
-
-
-    class Query(cookbook.ingredients.schema.Query, graphene.ObjectType):
-        # This class will inherit from multiple Queries
-        # as we begin to add more apps to our project
-        pass
+        def resolve_category_by_name(root, info, name):
+            try:
+                return Category.objects.get(name=name)
+            except Category.DoesNotExist:
+                return None
 
     schema = graphene.Schema(query=Query)
 
 You can think of this as being something like your top-level ``urls.py``
-file (although it currently lacks any namespacing).
+file.
 
 Testing everything so far
 -------------------------
@@ -216,18 +194,21 @@ Add ``graphene_django`` to ``INSTALLED_APPS`` in ``cookbook/settings.py``:
 
 .. code:: python
 
+    # cookbook/settings.py
+
     INSTALLED_APPS = [
         ...
-        # This will also make the `graphql_schema` management command available
-        'graphene_django',
+        "graphene_django",
     ]
 
 And then add the ``SCHEMA`` to the ``GRAPHENE`` config in ``cookbook/settings.py``:
 
 .. code:: python
 
+    # cookbook/settings.py
+
     GRAPHENE = {
-        'SCHEMA': 'cookbook.schema.schema'
+        "SCHEMA": "cookbook.schema.schema"
     }
 
 Alternatively, we can specify the schema to be used in the urls definition,
@@ -245,14 +226,17 @@ aforementioned GraphiQL we specify that on the parameters with ``graphiql=True``
 
 .. code:: python
 
-    from django.conf.urls import url, include
+    # cookbook/urls.py
+
     from django.contrib import admin
+    from django.urls import path
+    from django.views.decorators.csrf import csrf_exempt
 
     from graphene_django.views import GraphQLView
 
     urlpatterns = [
-        url(r'^admin/', admin.site.urls),
-        url(r'^graphql$', GraphQLView.as_view(graphiql=True)),
+        path("admin/", admin.site.urls),
+        path("graphql", csrf_exempt(GraphQLView.as_view(graphiql=True))),
     ]
 
 
@@ -261,16 +245,19 @@ as explained above, we can do so here using:
 
 .. code:: python
 
-    from django.conf.urls import url, include
+    # cookbook/urls.py
+
     from django.contrib import admin
+    from django.urls import path
+    from django.views.decorators.csrf import csrf_exempt
 
     from graphene_django.views import GraphQLView
 
     from cookbook.schema import schema
 
     urlpatterns = [
-        url(r'^admin/', admin.site.urls),
-        url(r'^graphql$', GraphQLView.as_view(graphiql=True, schema=schema)),
+        path("admin/", admin.site.urls),
+        path("graphql", csrf_exempt(GraphQLView.as_view(graphiql=True, schema=schema))),
     ]
 
 
@@ -283,10 +270,10 @@ from the command line.
 
 .. code:: bash
 
-    $ python ./manage.py runserver
+    python manage.py runserver
 
     Performing system checks...
-    Django version 1.11, using settings 'cookbook.settings'
+    Django version 3.0.7, using settings 'cookbook.settings'
     Starting development server at http://127.0.0.1:8000/
     Quit the server with CONTROL-C.
 
@@ -329,24 +316,25 @@ If you are using the provided fixtures, you will see the following response:
       }
     }
 
-You can experiment with ``allCategories`` too.
 
-Something to have in mind is the `auto camelcasing <http://docs.graphene-python.org/en/latest/types/schema/#auto-camelcase-field-names>`__ that is happening.
+Congratulations, you have created a working GraphQL server 🥳!
+
+Note: Graphene `automatically camelcases <http://docs.graphene-python.org/en/latest/types/schema/#auto-camelcase-field-names>`__ all field names for better compatibility with JavaScript clients.
 
 
 Getting relations
 -----------------
 
-Right now, with this simple setup in place, we can query for relations too. This is where graphql becomes really powerful!
+Using the current schema we can query for relations too. This is where GraphQL becomes really powerful!
 
-For example, we may want to list all categories and in each category, all ingredients that are in that category.
+For example, we may want to get a specific categories and list all ingredients that are in that category.
 
 We can do that with the following query:
 
 .. code::
 
     query {
-      allCategories {
+      categoryByName(name: "Dairy") {
         id
         name
         ingredients {
@@ -356,43 +344,26 @@ We can do that with the following query:
       }
     }
 
-
 This will give you (in case you are using the fixtures) the following result:
 
 .. code::
 
     {
       "data": {
-        "allCategories": [
-          {
-            "id": "1",
-            "name": "Dairy",
-            "ingredients": [
-              {
-                "id": "1",
-                "name": "Eggs"
-              },
-              {
-                "id": "2",
-                "name": "Milk"
-              }
-            ]
-          },
-          {
-            "id": "2",
-            "name": "Meat",
-            "ingredients": [
-              {
-                "id": "3",
-                "name": "Beef"
-              },
-              {
-                "id": "4",
-                "name": "Chicken"
-              }
-            ]
-          }
-        ]
+        "categoryByName": {
+          "id": "1",
+          "name": "Dairy",
+          "ingredients": [
+            {
+              "id": "1",
+              "name": "Eggs"
+            },
+            {
+              "id": "2",
+              "name": "Milk"
+            }
+          ]
+        }
       }
     }
 
@@ -411,71 +382,12 @@ We can also list all ingredients and get information for the category they are i
       }
     }
 
-Getting single objects
-----------------------
-
-So far, we have been able to fetch list of objects and follow relation. But what about single objects?
-
-We can update our schema to support that, by adding new query for ``ingredient`` and ``category`` and adding arguments, so we can query for specific objects.
-Add the **Highlighted** lines to ``cookbook/ingredients/schema.py``
-
-.. literalinclude:: schema.py
-  :emphasize-lines: 19-21,25-27,36-58
-
-Now, with the code in place, we can query for single objects.
-
-For example, lets query ``category``:
-
-
-.. code::
-
-    query {
-      category(id: 1) {
-        name
-      }
-      anotherCategory: category(name: "Dairy") {
-        ingredients {
-          id
-          name
-        }
-      }
-    }
-
-This will give us the following results:
-
-.. code::
-
-    {
-      "data": {
-        "category": {
-          "name": "Dairy"
-        },
-        "anotherCategory": {
-          "ingredients": [
-            {
-              "id": "1",
-              "name": "Eggs"
-            },
-            {
-              "id": "2",
-              "name": "Milk"
-            }
-          ]
-        }
-      }
-    }
-
-As an exercise, you can try making some queries to ``ingredient``.
-
-Something to keep in mind - since we are using one field several times in our query, we need `aliases <http://graphql.org/learn/queries/#aliases>`__
-
-
 Summary
 -------
 
-As you can see, GraphQL is very powerful but there are a lot of repetitions in our example. We can do a lot of improvements by adding layers of abstraction on top of ``graphene-django``.
+As you can see, GraphQL is very powerful and integrating Django models allows you to get started with a working server quickly.
 
-If you want to put things like ``django-filter`` and automatic pagination in action, you should continue with the **relay tutorial.**
+If you want to put things like ``django-filter`` and automatic pagination in action, you should continue with the :ref:`Relay tutorial`.
 
-A good idea is to check the `graphene <http://docs.graphene-python.org/en/latest/>`__
-documentation but it is not essential to understand and use Graphene-Django in your project.
\ No newline at end of file
+A good idea is to check the `Graphene <http://docs.graphene-python.org/en/latest/>`__
+documentation so that you are familiar with it as well.
diff --git a/docs/tutorial-relay.rst b/docs/tutorial-relay.rst
index e900ea1..94f1aa7 100644
--- a/docs/tutorial-relay.rst
+++ b/docs/tutorial-relay.rst
@@ -1,3 +1,5 @@
+.. _Relay tutorial:
+
 Relay tutorial
 ========================================
 

From 2308965658f34a059f59b8c0c4fa786a6adeea7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikolai=20R=C3=B8ed=20Kristiansen?= <nikolaik@gmail.com>
Date: Wed, 5 Aug 2020 21:24:16 +0200
Subject: [PATCH 111/116] Extract query function from GraphQLTestCase making it
 possible to use in a pytest fixture (#1015)

---
 docs/testing.rst                    | 42 +++++++++++--
 graphene_django/tests/test_utils.py | 27 ++++++++
 graphene_django/utils/testing.py    | 97 ++++++++++++++++++++---------
 3 files changed, 132 insertions(+), 34 deletions(-)

diff --git a/docs/testing.rst b/docs/testing.rst
index 473a9ba..23acef2 100644
--- a/docs/testing.rst
+++ b/docs/testing.rst
@@ -1,6 +1,9 @@
 Testing API calls with django
 =============================
 
+Using unittest
+--------------
+
 If you want to unittest your API calls derive your test case from the class `GraphQLTestCase`.
 
 Your endpoint is set through the `GRAPHQL_URL` attribute on `GraphQLTestCase`. The default endpoint is `GRAPHQL_URL = "/graphql/"`.
@@ -12,12 +15,8 @@ Usage:
     import json
 
     from graphene_django.utils.testing import GraphQLTestCase
-    from my_project.config.schema import schema
 
     class MyFancyTestCase(GraphQLTestCase):
-        # Here you need to inject your test case's schema
-        GRAPHQL_SCHEMA = schema
-
         def test_some_query(self):
             response = self.query(
                 '''
@@ -82,3 +81,38 @@ Usage:
 
             # Add some more asserts if you like
             ...
+
+Using pytest
+------------
+
+To use pytest define a simple fixture using the query helper below
+
+.. code:: python
+
+        # Create a fixture using the graphql_query helper and `client` fixture from `pytest-django`.
+        import pytest
+        from graphene_django.utils.testing import graphql_query
+
+        @pytest.fixture
+        def client_query(client)
+            def func(*args, **kwargs):
+                return graphql_query(*args, **kwargs, client=client)
+
+            return func
+
+        # Test you query using the client_query fixture
+        def test_some_query(client_query):
+            response = graphql_query(
+                '''
+                query {
+                    myModel {
+                        id
+                        name
+                    }
+                }
+                ''',
+                op_name='myModel'
+            )
+
+            content = json.loads(response.content)
+            assert 'errors' not in content
\ No newline at end of file
diff --git a/graphene_django/tests/test_utils.py b/graphene_django/tests/test_utils.py
index c0d376b..f5a8b05 100644
--- a/graphene_django/tests/test_utils.py
+++ b/graphene_django/tests/test_utils.py
@@ -6,6 +6,7 @@ from mock import patch
 
 from ..utils import camelize, get_model_fields, GraphQLTestCase
 from .models import Film, Reporter
+from ..utils.testing import graphql_query
 
 
 def test_get_model_fields_no_duplication():
@@ -58,3 +59,29 @@ def test_graphql_test_case_op_name(post_mock):
         "operationName",
         "QueryName",
     ) in body.items(), "Field 'operationName' is not present in the final request."
+
+
+@pytest.mark.django_db
+@patch("graphene_django.utils.testing.Client.post")
+def test_graphql_query_case_op_name(post_mock):
+    graphql_query("query { }", op_name="QueryName")
+    body = json.loads(post_mock.call_args.args[1])
+    # `operationName` field from https://graphql.org/learn/serving-over-http/#post-request
+    assert (
+        "operationName",
+        "QueryName",
+    ) in body.items(), "Field 'operationName' is not present in the final request."
+
+
+@pytest.fixture
+def client_query(client):
+    def func(*args, **kwargs):
+        return graphql_query(*args, client=client, **kwargs)
+
+    return func
+
+
+def test_pytest_fixture_usage(client_query):
+    response = graphql_query("query { test }")
+    content = json.loads(response.content)
+    assert content == {"data": {"test": "Hello World"}}
diff --git a/graphene_django/utils/testing.py b/graphene_django/utils/testing.py
index 0f68a51..6b2d3e8 100644
--- a/graphene_django/utils/testing.py
+++ b/graphene_django/utils/testing.py
@@ -2,6 +2,63 @@ import json
 
 from django.test import TestCase, Client
 
+DEFAULT_GRAPHQL_URL = "/graphql/"
+
+
+def graphql_query(
+    query,
+    op_name=None,
+    input_data=None,
+    variables=None,
+    headers=None,
+    client=None,
+    graphql_url=None,
+):
+    """
+    Args:
+        query (string)              - GraphQL query to run
+        op_name (string)            - If the query is a mutation or named query, you must
+                                      supply the op_name.  For annon queries ("{ ... }"),
+                                      should be None (default).
+        input_data (dict)           - If provided, the $input variable in GraphQL will be set
+                                      to this value. If both ``input_data`` and ``variables``,
+                                      are provided, the ``input`` field in the ``variables``
+                                      dict will be overwritten with this value.
+        variables (dict)            - If provided, the "variables" field in GraphQL will be
+                                      set to this value.
+        headers (dict)              - If provided, the headers in POST request to GRAPHQL_URL
+                                      will be set to this value.
+        client (django.test.Client) - Test client. Defaults to django.test.Client.
+        graphql_url (string)        - URL to graphql endpoint. Defaults to "/graphql".
+
+    Returns:
+        Response object from client
+    """
+    if client is None:
+        client = Client()
+    if not graphql_url:
+        graphql_url = DEFAULT_GRAPHQL_URL
+
+    body = {"query": query}
+    if op_name:
+        body["operationName"] = op_name
+    if variables:
+        body["variables"] = variables
+    if input_data:
+        if variables in body:
+            body["variables"]["input"] = input_data
+        else:
+            body["variables"] = {"input": input_data}
+    if headers:
+        resp = client.post(
+            graphql_url, json.dumps(body), content_type="application/json", **headers
+        )
+    else:
+        resp = client.post(
+            graphql_url, json.dumps(body), content_type="application/json"
+        )
+    return resp
+
 
 class GraphQLTestCase(TestCase):
     """
@@ -9,19 +66,12 @@ class GraphQLTestCase(TestCase):
     """
 
     # URL to graphql endpoint
-    GRAPHQL_URL = "/graphql/"
-    # Here you need to set your graphql schema for the tests
-    GRAPHQL_SCHEMA = None
+    GRAPHQL_URL = DEFAULT_GRAPHQL_URL
 
     @classmethod
     def setUpClass(cls):
         super(GraphQLTestCase, cls).setUpClass()
 
-        if not cls.GRAPHQL_SCHEMA:
-            raise AttributeError(
-                "Variable GRAPHQL_SCHEMA not defined in GraphQLTestCase."
-            )
-
         cls._client = Client()
 
     def query(self, query, op_name=None, input_data=None, variables=None, headers=None):
@@ -43,28 +93,15 @@ class GraphQLTestCase(TestCase):
         Returns:
             Response object from client
         """
-        body = {"query": query}
-        if op_name:
-            body["operationName"] = op_name
-        if variables:
-            body["variables"] = variables
-        if input_data:
-            if variables in body:
-                body["variables"]["input"] = input_data
-            else:
-                body["variables"] = {"input": input_data}
-        if headers:
-            resp = self._client.post(
-                self.GRAPHQL_URL,
-                json.dumps(body),
-                content_type="application/json",
-                **headers
-            )
-        else:
-            resp = self._client.post(
-                self.GRAPHQL_URL, json.dumps(body), content_type="application/json"
-            )
-        return resp
+        return graphql_query(
+            query,
+            op_name=op_name,
+            input_data=input_data,
+            variables=variables,
+            headers=headers,
+            client=self._client,
+            graphql_url=self.GRAPHQL_URL,
+        )
 
     def assertResponseNoErrors(self, resp):
         """

From 55769e814f3fc3da6c6d39696d6d1460fd8c9c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Kowalski?= <radek.kwlsk@gmail.com>
Date: Fri, 7 Aug 2020 11:13:26 +0200
Subject: [PATCH 112/116] Add headers support to GraphiQL (#1016)

Co-authored-by: Jonathan Kim <jkimbo@gmail.com>
---
 docs/settings.rst                             | 21 +++++++++++++++++++
 graphene_django/settings.py                   |  4 ++++
 .../static/graphene_django/graphiql.js        | 19 ++++++++++-------
 .../templates/graphene/graphiql.html          |  1 +
 graphene_django/views.py                      |  2 ++
 5 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index c2f8600..1e82e70 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -186,3 +186,24 @@ Default: ``None``
    GRAPHENE = {
       'SUBSCRIPTION_PATH': "/ws/graphql"
    }
+
+
+``GRAPHIQL_HEADER_EDITOR_ENABLED``
+---------------------
+
+GraphiQL starting from version 1.0.0 allows setting custom headers in similar fashion to query variables.
+
+Set to ``False`` if you want to disable GraphiQL headers editor tab for some reason.
+
+This setting is passed to ``headerEditorEnabled`` GraphiQL options, for details refer to GraphiQLDocs_.
+
+.. _GraphiQLDocs: https://github.com/graphql/graphiql/tree/main/packages/graphiql#options
+
+
+Default: ``True``
+
+.. code:: python
+
+   GRAPHENE = {
+      'GRAPHIQL_HEADER_EDITOR_ENABLED': True,
+   }
diff --git a/graphene_django/settings.py b/graphene_django/settings.py
index 52cca89..71b791c 100644
--- a/graphene_django/settings.py
+++ b/graphene_django/settings.py
@@ -41,6 +41,10 @@ DEFAULTS = {
     "DJANGO_CHOICE_FIELD_ENUM_CUSTOM_NAME": None,
     # Use a separate path for handling subscriptions.
     "SUBSCRIPTION_PATH": None,
+    # By default GraphiQL headers editor tab is enabled, set to False to hide it
+    # This sets headerEditorEnabled GraphiQL option, for details go to
+    # https://github.com/graphql/graphiql/tree/main/packages/graphiql#options
+    "GRAPHIQL_HEADER_EDITOR_ENABLED": True,
 }
 
 if settings.DEBUG:
diff --git a/graphene_django/static/graphene_django/graphiql.js b/graphene_django/static/graphene_django/graphiql.js
index 45f8ad7..8c3b5ce 100644
--- a/graphene_django/static/graphene_django/graphiql.js
+++ b/graphene_django/static/graphene_django/graphiql.js
@@ -61,13 +61,15 @@
   var fetchURL = locationQuery(otherParams);
 
   // Defines a GraphQL fetcher using the fetch API.
-  function httpClient(graphQLParams) {
-    var headers = {
-      Accept: "application/json",
-      "Content-Type": "application/json",
-    };
+  function httpClient(graphQLParams, opts) {
+    if (typeof opts === 'undefined') {
+      opts = {};
+    }
+    var headers = opts.headers || {};
+    headers['Accept'] = headers['Accept'] || 'application/json';
+    headers['Content-Type'] = headers['Content-Type'] || 'application/json';
     if (csrftoken) {
-      headers["X-CSRFToken"] = csrftoken;
+      headers['X-CSRFToken'] = csrftoken
     }
     return fetch(fetchURL, {
       method: "post",
@@ -108,7 +110,7 @@
   var activeSubscription = null;
 
   // Define a GraphQL fetcher that can intelligently route queries based on the operation type.
-  function graphQLFetcher(graphQLParams) {
+  function graphQLFetcher(graphQLParams, opts) {
     var operationType = getOperationType(graphQLParams);
 
     // If we're about to execute a new operation, and we have an active subscription,
@@ -126,7 +128,7 @@
         },
       };
     } else {
-      return httpClient(graphQLParams);
+      return httpClient(graphQLParams, opts);
     }
   }
 
@@ -173,6 +175,7 @@
     onEditQuery: onEditQuery,
     onEditVariables: onEditVariables,
     onEditOperationName: onEditOperationName,
+    headerEditorEnabled: GRAPHENE_SETTINGS.graphiqlHeaderEditorEnabled,
     query: parameters.query,
   };
   if (parameters.variables) {
diff --git a/graphene_django/templates/graphene/graphiql.html b/graphene_django/templates/graphene/graphiql.html
index abc4b52..cec4893 100644
--- a/graphene_django/templates/graphene/graphiql.html
+++ b/graphene_django/templates/graphene/graphiql.html
@@ -45,6 +45,7 @@ add "&raw" to the end of the URL within a browser.
     {% if subscription_path %}
       subscriptionPath: "{{subscription_path}}",
     {% endif %}
+      graphiqlHeaderEditorEnabled: {{ graphiql_header_editor_enabled|yesno:"true,false" }},
     };
   </script>
   <script src="{% static 'graphene_django/graphiql.js' %}"></script>
diff --git a/graphene_django/views.py b/graphene_django/views.py
index 59084e8..5ee0297 100644
--- a/graphene_django/views.py
+++ b/graphene_django/views.py
@@ -167,6 +167,8 @@ class GraphQLView(View):
                     subscriptions_transport_ws_sri=self.subscriptions_transport_ws_sri,
                     # The SUBSCRIPTION_PATH setting.
                     subscription_path=self.subscription_path,
+                    # GraphiQL headers tab,
+                    graphiql_header_editor_enabled=graphene_settings.GRAPHIQL_HEADER_EDITOR_ENABLED,
                 )
 
             if self.batch:

From 11dbde3beaa9882277082ec108b993c36be62f4e Mon Sep 17 00:00:00 2001
From: Thomas Leonard <64223923+tcleonard@users.noreply.github.com>
Date: Fri, 7 Aug 2020 10:15:35 +0100
Subject: [PATCH 113/116] Fix Connection/Edge naming and add unit test (#1012)

Co-authored-by: Thomas Leonard <thomas@loftorbital.com>
---
 graphene_django/tests/test_types.py | 26 ++++++++++++++++++++++++++
 graphene_django/types.py            |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/graphene_django/tests/test_types.py b/graphene_django/tests/test_types.py
index 4d14749..fb95820 100644
--- a/graphene_django/tests/test_types.py
+++ b/graphene_django/tests/test_types.py
@@ -9,6 +9,7 @@ from graphene import Connection, Field, Interface, ObjectType, Schema, String
 from graphene.relay import Node
 
 from .. import registry
+from ..filter import DjangoFilterConnectionField
 from ..types import DjangoObjectType, DjangoObjectTypeOptions
 from .models import Article as ArticleModel
 from .models import Reporter as ReporterModel
@@ -580,3 +581,28 @@ class TestDjangoObjectType:
         }
         """
         )
+
+
+@with_local_registry
+def test_django_objecttype_name_connection_propagation():
+    class Reporter(DjangoObjectType):
+        class Meta:
+            model = ReporterModel
+            name = "CustomReporterName"
+            filter_fields = ["email"]
+            interfaces = (Node,)
+
+    class Query(ObjectType):
+        reporter = Node.Field(Reporter)
+        reporters = DjangoFilterConnectionField(Reporter)
+
+    assert Reporter._meta.name == "CustomReporterName"
+    schema = str(Schema(query=Query))
+
+    assert "type CustomReporterName implements Node {" in schema
+    assert "type CustomReporterNameConnection {" in schema
+    assert "type CustomReporterNameEdge {" in schema
+
+    assert "type Reporter implements Node {" not in schema
+    assert "type ReporterConnection {" not in schema
+    assert "type ReporterEdge {" not in schema
diff --git a/graphene_django/types.py b/graphene_django/types.py
index b31fd0f..e38ae1f 100644
--- a/graphene_django/types.py
+++ b/graphene_django/types.py
@@ -239,7 +239,7 @@ class DjangoObjectType(ObjectType):
                 connection_class = Connection
 
             connection = connection_class.create_type(
-                "{}Connection".format(cls.__name__), node=cls
+                "{}Connection".format(options.get("name") or cls.__name__), node=cls
             )
 
         if connection is not None:

From 67a0492c124587a98435621565c00b3f9e9053f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikolai=20R=C3=B8ed=20Kristiansen?= <nikolaik@gmail.com>
Date: Fri, 7 Aug 2020 11:22:15 +0200
Subject: [PATCH 114/116] Add converter for django 3.1 JSONField (#1017)

---
 .github/workflows/tests.yml             |  2 +-
 graphene_django/compat.py               | 10 ++++++++--
 graphene_django/converter.py            |  5 +++--
 graphene_django/tests/test_converter.py | 16 ++++++++++++++--
 tox.ini                                 |  4 +++-
 5 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 37453f0..b9e57b5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        django: ["1.11", "2.2", "3.0"]
+        django: ["1.11", "2.2", "3.0", "3.1"]
         python-version: ["3.6", "3.7", "3.8"]
         include:
           - django: "1.11"
diff --git a/graphene_django/compat.py b/graphene_django/compat.py
index 59fab30..6e5e769 100644
--- a/graphene_django/compat.py
+++ b/graphene_django/compat.py
@@ -8,8 +8,14 @@ try:
     from django.contrib.postgres.fields import (
         ArrayField,
         HStoreField,
-        JSONField,
+        JSONField as PGJSONField,
         RangeField,
     )
 except ImportError:
-    ArrayField, HStoreField, JSONField, RangeField = (MissingType,) * 4
+    ArrayField, HStoreField, PGJSONField, RangeField = (MissingType,) * 4
+
+try:
+    # JSONField is only available from Django 3.1
+    from django.contrib.fields import JSONField
+except ImportError:
+    JSONField = MissingType
diff --git a/graphene_django/converter.py b/graphene_django/converter.py
index ca524ff..0de6964 100644
--- a/graphene_django/converter.py
+++ b/graphene_django/converter.py
@@ -24,7 +24,7 @@ from graphene.utils.str_converters import to_camel_case
 from graphql import assert_valid_name
 
 from .settings import graphene_settings
-from .compat import ArrayField, HStoreField, JSONField, RangeField
+from .compat import ArrayField, HStoreField, JSONField, PGJSONField, RangeField
 from .fields import DjangoListField, DjangoConnectionField
 from .utils import import_single_dispatch
 from .utils.str_converters import to_const
@@ -267,8 +267,9 @@ def convert_postgres_array_to_list(field, registry=None):
 
 
 @convert_django_field.register(HStoreField)
+@convert_django_field.register(PGJSONField)
 @convert_django_field.register(JSONField)
-def convert_postgres_field_to_string(field, registry=None):
+def convert_pg_and_json_field_to_string(field, registry=None):
     return JSONString(description=field.help_text, required=not field.null)
 
 
diff --git a/graphene_django/tests/test_converter.py b/graphene_django/tests/test_converter.py
index f6e3606..7d8e669 100644
--- a/graphene_django/tests/test_converter.py
+++ b/graphene_django/tests/test_converter.py
@@ -11,7 +11,14 @@ from graphene.relay import ConnectionField, Node
 from graphene.types.datetime import Date, DateTime, Time
 from graphene.types.json import JSONString
 
-from ..compat import ArrayField, HStoreField, JSONField, MissingType, RangeField
+from ..compat import (
+    ArrayField,
+    HStoreField,
+    JSONField,
+    PGJSONField,
+    MissingType,
+    RangeField,
+)
 from ..converter import (
     convert_django_field,
     convert_django_field_with_choices,
@@ -348,8 +355,13 @@ def test_should_postgres_hstore_convert_string():
     assert_conversion(HStoreField, JSONString)
 
 
-@pytest.mark.skipif(JSONField is MissingType, reason="JSONField should exist")
+@pytest.mark.skipif(PGJSONField is MissingType, reason="PGJSONField should exist")
 def test_should_postgres_json_convert_string():
+    assert_conversion(PGJSONField, JSONString)
+
+
+@pytest.mark.skipif(JSONField is MissingType, reason="JSONField should exist")
+def test_should_json_convert_string():
     assert_conversion(JSONField, JSONString)
 
 
diff --git a/tox.ini b/tox.ini
index 6744c5b..9086a55 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     py{27,35,36,37,38}-django{111,20,21,22,master},
-    py{36,37,38}-django30,
+    py{36,37,38}-django{30,31},
     black,flake8
 
 [gh-actions]
@@ -18,6 +18,7 @@ DJANGO =
     2.1: django21
     2.2: django22
     3.0: django30
+    3.1: django31
     master: djangomaster
 
 [testenv]
@@ -33,6 +34,7 @@ deps =
     django21: Django>=2.1,<2.2
     django22: Django>=2.2,<3.0
     django30: Django>=3.0a1,<3.1
+    django31: Django>=3.1,<3.2
     djangomaster: https://github.com/django/django/archive/master.zip
 commands = {posargs:py.test --cov=graphene_django graphene_django examples}
 

From bd553be10e6200c6558cc7dd91d7bc3743325d6e Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Wed, 12 Aug 2020 07:03:23 +0100
Subject: [PATCH 115/116] Fix JSONField import (#1021)

---
 graphene_django/compat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/compat.py b/graphene_django/compat.py
index 6e5e769..8a2b933 100644
--- a/graphene_django/compat.py
+++ b/graphene_django/compat.py
@@ -16,6 +16,6 @@ except ImportError:
 
 try:
     # JSONField is only available from Django 3.1
-    from django.contrib.fields import JSONField
+    from django.db.models import JSONField
 except ImportError:
     JSONField = MissingType

From 5b1451132d80869ac46eb42faac2836bda6c658a Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkimbo@gmail.com>
Date: Wed, 12 Aug 2020 07:10:01 +0100
Subject: [PATCH 116/116] v2.13.0

---
 graphene_django/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphene_django/__init__.py b/graphene_django/__init__.py
index f94b5be..03ccbeb 100644
--- a/graphene_django/__init__.py
+++ b/graphene_django/__init__.py
@@ -1,7 +1,7 @@
 from .fields import DjangoConnectionField, DjangoListField
 from .types import DjangoObjectType
 
-__version__ = "2.12.1"
+__version__ = "2.13.0"
 
 __all__ = [
     "__version__",