.github/workflows/deploy.yml

@@ -6,18 +6,13 @@ on:
       - 'v*'
 
 jobs:
-  lint:
+  build:
-    uses: ./.github/workflows/lint.yml
-  tests:
-    uses: ./.github/workflows/tests.yml
-  release:
     runs-on: ubuntu-latest
-    needs: [lint, tests]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up Python 3.11
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: '3.11'
     - name: Build wheel and source tarball

.github/workflows/lint.yml

@@ -1,19 +1,15 @@
 name: Lint
 
-on:
+on: [push, pull_request]
-  push:
-    branches: ["main"]
-  pull_request:
-  workflow_call:
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up Python 3.11
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: '3.11'
     - name: Install dependencies

.github/workflows/tests.yml

@@ -1,10 +1,6 @@
 name: Tests
 
-on:
+on: [push, pull_request]
-  push:
-    branches: ["main"]
-  pull_request:
-  workflow_call:
 
 jobs:
   build:
@@ -12,29 +8,19 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        django: ["3.2", "4.2", "5.0", "5.1", "5.2"]
+        django: ["3.2", "4.1", "4.2"]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10"]
-        exclude:
+        include:
           - django: "3.2"
+            python-version: "3.7"
+          - django: "4.1"
+            python-version: "3.11"
+          - django: "4.2"
             python-version: "3.11"
-          - django: "3.2"
-            python-version: "3.12"
-          - django: "5.0"
-            python-version: "3.8"
-          - django: "5.0"
-            python-version: "3.9"
-          - django: "5.1"
-            python-version: "3.8"
-          - django: "5.1"
-            python-version: "3.9"
-          - django: "5.2"
-            python-version: "3.8"
-          - django: "5.2"
-            python-version: "3.9"
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -45,3 +31,4 @@ jobs:
       run: tox
       env:
         DJANGO: ${{ matrix.django }}
+        TOXENV: ${{ matrix.toxenv }}

.gitignore

@@ -11,7 +11,6 @@ __pycache__/
 # Distribution / packaging
 .Python
 env/
-.env/
 venv/
 .venv/
 build/

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ default_language_version:
   python: python3.11
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.4.0
     hooks:
     -   id: check-merge-conflict
     -   id: check-json
@@ -15,9 +15,16 @@ repos:
         - --autofix
     -   id: trailing-whitespace
         exclude: README.md
--   repo: https://github.com/astral-sh/ruff-pre-commit
+-   repo: https://github.com/asottile/pyupgrade
-    rev: v0.1.2
+    rev: v3.3.2
     hooks:
-    -   id: ruff
+    -   id: pyupgrade
-        args: [--fix, --exit-non-zero-on-fix, --show-fixes]
+        args: [--py37-plus]
-    -   id: ruff-format
+-   repo: https://github.com/psf/black
+    rev: 23.3.0
+    hooks:
+    -   id: black
+-   repo: https://github.com/PyCQA/flake8
+    rev: 6.0.0
+    hooks:
+    -   id: flake8

.readthedocs.yaml

@@ -1,18 +0,0 @@
-# .readthedocs.yaml
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-version: 2
-build:
-  os: ubuntu-22.04
-  tools:
-    python: "3.12"
-
-# Build documentation in the "docs/" directory with Sphinx
-sphinx:
-  configuration: docs/conf.py
-
-# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
-python:
-   install:
-      - requirements: docs/requirements.txt

.ruff.toml

@@ -1,32 +0,0 @@
-select = [
-    "E",    # pycodestyle
-    "W",    # pycodestyle
-    "F",    # pyflake
-    "I",    # isort
-    "B",    # flake8-bugbear
-    "C4",   # flake8-comprehensions
-    "UP",   # pyupgrade
-]
-
-ignore = [
-    "E501",  # line-too-long
-    "B017",  # pytest.raises(Exception) should be considered evil
-    "B028",  # warnings.warn called without an explicit stacklevel keyword argument
-    "B904",  # check for raise statements in exception handlers that lack a from clause
-    "W191",  # https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
-]
-
-exclude = [
-    "**/docs",
-]
-
-target-version = "py38"
-
-[per-file-ignores]
-# Ignore unused imports (F401) in these files
-"__init__.py" = ["F401"]
-
-[isort]
-known-first-party = ["graphene", "graphene-django"]
-known-local-folder = ["cookbook"]
-combine-as-imports = true

CONTRIBUTING.md

@@ -33,7 +33,7 @@ make tests
 
 ## Opening Pull Requests
 
-Please fork the project and open a pull request against the `main` branch.
+Please fork the project and open a pull request against the master branch.
 
 This will trigger a series of test and lint checks.
 

Makefile

@@ -10,15 +10,15 @@ dev-setup:
 
 .PHONY: tests ## Run unit tests
 tests:
-	PYTHONPATH=. pytest graphene_django --cov=graphene_django -vv
+	py.test graphene_django --cov=graphene_django -vv
 
 .PHONY: format ## Format code
 format:
-	ruff format graphene_django examples setup.py
+	black graphene_django examples setup.py
 
 .PHONY: lint ## Lint code
 lint:
-	ruff graphene_django examples
+	flake8 graphene_django examples
 
 .PHONY: docs ## Generate docs
 docs: dev-setup

README.md

@@ -30,7 +30,7 @@ Graphene-Django is an open-source library that provides seamless integration bet
 
 To install Graphene-Django, run the following command:
 
-```sh
+```
 pip install graphene-django
 ```
 
@@ -114,11 +114,11 @@ class MyModelAPITestCase(GraphQLTestCase):
 
 ## Contributing
 
-Contributions to Graphene-Django are always welcome! To get started, check the repository's [issue tracker](https://github.com/graphql-python/graphene-django/issues) and [contribution guidelines](https://github.com/graphql-python/graphene-django/blob/main/CONTRIBUTING.md).
+Contributions to Graphene-Django are always welcome! To get started, check the repository's [issue tracker](https://github.com/graphql-python/graphene-django/issues) and [contribution guidelines](https://github.com/graphql-python/graphene-django/blob/master/CONTRIBUTING.md).
 
 ## License
 
-Graphene-Django is released under the [MIT License](https://github.com/graphql-python/graphene-django/blob/main/LICENSE).
+Graphene-Django is released under the [MIT License](https://github.com/graphql-python/graphene-django/blob/master/LICENSE).
 
 ## Resources
 

docs/authorization.rst

@@ -144,21 +144,6 @@ If you are using ``DjangoObjectType`` you can define a custom `get_queryset`.
                 return queryset.filter(published=True)
             return queryset
 
-.. warning::
-
-    Defining a custom ``get_queryset`` gives the guaranteed it will be called
-    when resolving the ``DjangoObjectType``, even through related objects.
-    Note that because of this, benefits from using ``select_related``
-    in objects that define a relation to this ``DjangoObjectType`` will be canceled out.
-    In the case of ``prefetch_related``, the benefits of the optimization will be lost only
-    if the custom ``get_queryset`` modifies the queryset. For more information about this, refers
-    to Django documentation about ``prefetch_related``: https://docs.djangoproject.com/en/4.2/ref/models/querysets/#prefetch-related.
-
-
-    If you want to explicitly disable the execution of the custom ``get_queryset`` when resolving,
-    you can decorate the resolver with `@graphene_django.bypass_get_queryset`. Note that this
-    can lead to authorization leaks if you are performing authorization checks in the custom
-    ``get_queryset``.
 
 Filtering ID-based Node Access
 ------------------------------
@@ -212,8 +197,8 @@ For Django 2.2 and above:
 .. code:: python
 
     urlpatterns = [
-        # some other urls
+      # some other urls
-        path('graphql/', PrivateGraphQLView.as_view(graphiql=True, schema=schema)),
+      path('graphql/', PrivateGraphQLView.as_view(graphiql=True, schema=schema)),
     ]
 
 .. _LoginRequiredMixin: https://docs.djangoproject.com/en/dev/topics/auth/default/#the-loginrequired-mixin

docs/index.rst

@@ -33,6 +33,5 @@ For more advanced use, check out the Relay tutorial.
    authorization
    debug
    introspection
-   validation
    testing
    settings

docs/introspection.rst

@@ -57,9 +57,9 @@ specify the parameters in your settings.py:
 .. code:: python
 
     GRAPHENE = {
-        'SCHEMA': 'tutorial.quickstart.schema',
+    	'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)
+    	'SCHEMA_INDENT': 2,  # Defaults to None (displays all data on a single line)
     }
 
 

docs/settings.rst

@@ -6,7 +6,7 @@ Graphene-Django can be customised using settings. This page explains each settin
 Usage
 -----
 
-Add settings to your Django project by creating a Dictionary with name ``GRAPHENE`` in the project's ``settings.py``:
+Add settings to your Django project by creating a Dictonary with name ``GRAPHENE`` in the project's ``settings.py``:
 
 .. code:: python
 
@@ -142,15 +142,6 @@ Default: ``False``
    # ]
 
 
-``DJANGO_CHOICE_FIELD_ENUM_CONVERT``
---------------------------------------
-
-When set to ``True`` Django choice fields are automatically converted into Enum types.
-
-Can be disabled globally by setting it to ``False``.
-
-Default: ``True``
-
 ``DJANGO_CHOICE_FIELD_ENUM_V2_NAMING``
 --------------------------------------
 
@@ -206,6 +197,9 @@ Set to ``False`` if you want to disable GraphiQL headers editor tab for some rea
 
 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
@@ -236,6 +230,8 @@ Set to ``True`` if you want to persist GraphiQL headers after refreshing the pag
 
 This setting is passed to ``shouldPersistHeaders`` GraphiQL options, for details refer to GraphiQLDocs_.
 
+.. _GraphiQLDocs: https://github.com/graphql/graphiql/tree/main/packages/graphiql#options
+
 
 Default: ``False``
 
@@ -244,48 +240,3 @@ Default: ``False``
    GRAPHENE = {
       'GRAPHIQL_SHOULD_PERSIST_HEADERS': False,
    }
-
-
-``GRAPHIQL_INPUT_VALUE_DEPRECATION``
-------------------------------------
-
-Set to ``True`` if you want GraphiQL to show any deprecated fields on input object types' docs.
-
-For example, having this schema:
-
-.. code:: python
-
-    class MyMutationInputType(graphene.InputObjectType):
-        old_field = graphene.String(deprecation_reason="You should now use 'newField' instead.")
-        new_field = graphene.String()
-
-    class MyMutation(graphene.Mutation):
-        class Arguments:
-            input = types.MyMutationInputType()
-
-GraphiQL will add a ``Show Deprecated Fields`` button to toggle information display on ``oldField`` and its deprecation
-reason. Otherwise, you would get neither a button nor any information at all on ``oldField``.
-
-This setting is passed to ``inputValueDeprecation`` GraphiQL options, for details refer to GraphiQLDocs_.
-
-Default: ``False``
-
-.. code:: python
-
-   GRAPHENE = {
-      'GRAPHIQL_INPUT_VALUE_DEPRECATION': False,
-   }
-
-
-.. _GraphiQLDocs: https://graphiql-test.netlify.app/typedoc/modules/graphiql_react#graphiqlprovider-2
-
-
-``MAX_VALIDATION_ERRORS``
-------------------------------------
-
-In case ``validation_rules`` are provided to ``GraphQLView``, if this is set to a non-negative ``int`` value,
-``graphql.validation.validate`` will stop validation after this number of errors has been reached.
-If not set or set to ``None``, the maximum number of errors will follow ``graphql.validation.validate`` default
-*i.e.* 100.
-
-Default: ``None``

docs/tutorial-plain.rst

@@ -104,7 +104,7 @@ Load some test data
 
 Now is a good time to load up some test data. The easiest option will be
 to `download the
-ingredients.json <https://raw.githubusercontent.com/graphql-python/graphene-django/main/examples/cookbook/cookbook/ingredients/fixtures/ingredients.json>`__
+ingredients.json <https://raw.githubusercontent.com/graphql-python/graphene-django/master/examples/cookbook/cookbook/ingredients/fixtures/ingredients.json>`__
 fixture and place it in
 ``cookbook/ingredients/fixtures/ingredients.json``. You can then run the
 following:

docs/tutorial-relay.rst

@@ -7,12 +7,12 @@ Graphene has a number of additional features that are designed to make
 working with Django *really simple*.
 
 Note: The code in this quickstart is pulled from the `cookbook example
-app <https://github.com/graphql-python/graphene-django/tree/main/examples/cookbook>`__.
+app <https://github.com/graphql-python/graphene-django/tree/master/examples/cookbook>`__.
 
 A good idea is to check the following things first:
 
 * `Graphene Relay documentation <http://docs.graphene-python.org/en/latest/relay/>`__
-* `GraphQL Relay Specification <https://relay.dev/docs/guides/graphql-server-specification/>`__
+* `GraphQL Relay Specification <https://facebook.github.io/relay/docs/en/graphql-server-specification.html>`__
 
 Setup the Django project
 ------------------------
@@ -87,7 +87,7 @@ Load some test data
 
 Now is a good time to load up some test data. The easiest option will be
 to `download the
-ingredients.json <https://raw.githubusercontent.com/graphql-python/graphene-django/main/examples/cookbook/cookbook/ingredients/fixtures/ingredients.json>`__
+ingredients.json <https://raw.githubusercontent.com/graphql-python/graphene-django/master/examples/cookbook/cookbook/ingredients/fixtures/ingredients.json>`__
 fixture and place it in
 ``cookbook/ingredients/fixtures/ingredients.json``. You can then run the
 following:

docs/validation.rst

@@ -1,29 +0,0 @@
-Query Validation
-================
-
-Graphene-Django supports query validation by allowing passing a list of validation rules (subclasses of `ValidationRule <https://github.com/graphql-python/graphql-core/blob/v3.2.3/src/graphql/validation/rules/__init__.py>`_ from graphql-core) to the ``validation_rules`` option in ``GraphQLView``.
-
-.. code:: python
-
-    from django.urls import path
-    from graphene.validation import DisableIntrospection
-    from graphene_django.views import GraphQLView
-
-    urlpatterns = [
-        path("graphql", GraphQLView.as_view(validation_rules=(DisableIntrospection,))),
-    ]
-
-or
-
-.. code:: python
-
-    from django.urls import path
-    from graphene.validation import DisableIntrospection
-    from graphene_django.views import GraphQLView
-
-    class View(GraphQLView):
-        validation_rules = (DisableIntrospection,)
-
-    urlpatterns = [
-        path("graphql", View.as_view()),
-    ]

examples/cookbook-plain/cookbook/schema.py

@@ -1,8 +1,8 @@
-import graphene
-from graphene_django.debug import DjangoDebug
-
 import cookbook.ingredients.schema
 import cookbook.recipes.schema
+import graphene
+
+from graphene_django.debug import DjangoDebug
 
 
 class Query(

examples/cookbook-plain/cookbook/urls.py

@@ -1,8 +1,9 @@
-from django.contrib import admin
 from django.urls import path
+from django.contrib import admin
 
 from graphene_django.views import GraphQLView
 
+
 urlpatterns = [
     path("admin/", admin.site.urls),
     path("graphql/", GraphQLView.as_view(graphiql=True)),

examples/cookbook/cookbook/ingredients/schema.py

@@ -1,9 +1,8 @@
+from cookbook.ingredients.models import Category, Ingredient
 from graphene import Node
 from graphene_django.filter import DjangoFilterConnectionField
 from graphene_django.types import DjangoObjectType
 
-from cookbook.ingredients.models import Category, Ingredient
-
 
 # Graphene will automatically map the Category model's fields onto the CategoryNode.
 # This is configured in the CategoryNode's Meta class (as you can see below)

examples/cookbook/cookbook/recipes/models.py

@@ -6,9 +6,7 @@ from cookbook.ingredients.models import Ingredient
 class Recipe(models.Model):
     title = models.CharField(max_length=100)
     instructions = models.TextField()
-
+    __unicode__ = lambda self: self.title
-    def __unicode__(self):
-        return self.title
 
 
 class RecipeIngredient(models.Model):

examples/cookbook/cookbook/recipes/schema.py

@@ -1,9 +1,8 @@
+from cookbook.recipes.models import Recipe, RecipeIngredient
 from graphene import Node
 from graphene_django.filter import DjangoFilterConnectionField
 from graphene_django.types import DjangoObjectType
 
-from cookbook.recipes.models import Recipe, RecipeIngredient
-
 
 class RecipeNode(DjangoObjectType):
     class Meta:

examples/cookbook/cookbook/schema.py

@@ -1,8 +1,8 @@
-import graphene
-from graphene_django.debug import DjangoDebug
-
 import cookbook.ingredients.schema
 import cookbook.recipes.schema
+import graphene
+
+from graphene_django.debug import DjangoDebug
 
 
 class Query(

examples/cookbook/cookbook/urls.py

@@ -3,6 +3,7 @@ from django.contrib import admin
 
 from graphene_django.views import GraphQLView
 
+
 urlpatterns = [
     url(r"^admin/", admin.site.urls),
     url(r"^graphql$", GraphQLView.as_view(graphiql=True)),

examples/cookbook/dummy_data.json

@@ -231,7 +231,7 @@
     "fields": {
       "category": 3,
       "name": "Newt",
-      "notes": "Braised and Confused"
+      "notes": "Braised and Confuesd"
     },
     "model": "ingredients.ingredient",
     "pk": 5

examples/cookbook/requirements.txt

@@ -1,5 +1,5 @@
 graphene>=2.1,<3
 graphene-django>=2.1,<3
 graphql-core>=2.1,<3
-django==4.2.18
+django==3.1.14
 django-filter>=2

examples/django_test_settings.py

@@ -1,5 +1,5 @@
-import os
 import sys
+import os
 
 ROOT_PATH = os.path.dirname(os.path.abspath(__file__))
 sys.path.insert(0, ROOT_PATH + "/examples/")
@@ -28,5 +28,3 @@ TEMPLATES = [
 GRAPHENE = {"SCHEMA": "graphene_django.tests.schema_view.schema"}
 
 ROOT_URLCONF = "graphene_django.tests.urls"
-
-USE_TZ = True

examples/starwars/data.py

@@ -28,7 +28,7 @@ def initialize():
 
     # Yeah, technically it's Corellian. But it flew in the service of the rebels,
     # so for the purposes of this demo it's a rebel ship.
-    falcon = Ship(id="4", name="Millennium Falcon", faction=rebels)
+    falcon = Ship(id="4", name="Millenium Falcon", faction=rebels)
     falcon.save()
 
     homeOne = Ship(id="5", name="Home One", faction=rebels)

examples/starwars/schema.py

@@ -1,13 +1,11 @@
 import graphene
-from graphene import Schema, relay
+from graphene import Schema, relay, resolve_only_args
 from graphene_django import DjangoConnectionField, DjangoObjectType
 
 from .data import create_ship, get_empire, get_faction, get_rebels, get_ship, get_ships
-from .models import (
+from .models import Character as CharacterModel
-    Character as CharacterModel,
+from .models import Faction as FactionModel
-    Faction as FactionModel,
+from .models import Ship as ShipModel
-    Ship as ShipModel,
-)
 
 
 class Ship(DjangoObjectType):
@@ -62,13 +60,16 @@ class Query(graphene.ObjectType):
     node = relay.Node.Field()
     ships = DjangoConnectionField(Ship, description="All the ships.")
 
-    def resolve_ships(self, info):
+    @resolve_only_args
+    def resolve_ships(self):
         return get_ships()
 
-    def resolve_rebels(self, info):
+    @resolve_only_args
+    def resolve_rebels(self):
         return get_rebels()
 
-    def resolve_empire(self, info):
+    @resolve_only_args
+    def resolve_empire(self):
         return get_empire()
 
 

examples/starwars/tests/test_mutation.py

@@ -40,7 +40,7 @@ def test_mutations():
                         {"node": {"id": "U2hpcDox", "name": "X-Wing"}},
                         {"node": {"id": "U2hpcDoy", "name": "Y-Wing"}},
                         {"node": {"id": "U2hpcDoz", "name": "A-Wing"}},
-                        {"node": {"id": "U2hpcDo0", "name": "Millennium Falcon"}},
+                        {"node": {"id": "U2hpcDo0", "name": "Millenium Falcon"}},
                         {"node": {"id": "U2hpcDo1", "name": "Home One"}},
                         {"node": {"id": "U2hpcDo5", "name": "Peter"}},
                     ]

graphene_django/__init__.py

@@ -1,13 +1,11 @@
 from .fields import DjangoConnectionField, DjangoListField
 from .types import DjangoObjectType
-from .utils import bypass_get_queryset
 
-__version__ = "3.2.3"
+__version__ = "3.1.2"
 
 __all__ = [
     "__version__",
     "DjangoObjectType",
     "DjangoListField",
     "DjangoConnectionField",
-    "bypass_get_queryset",
 ]

graphene_django/compat.py

@@ -1,13 +1,3 @@
-import sys
-from collections.abc import Callable
-from pathlib import PurePath
-
-# For backwards compatibility, we import JSONField to have it available for import via
-# this compat module (https://github.com/graphql-python/graphene-django/issues/1428).
-# Django's JSONField is available in Django 3.2+ (the minimum version we support)
-from django.db.models import Choices, JSONField
-
-
 class MissingType:
     def __init__(self, *args, **kwargs):
         pass
@@ -17,49 +7,10 @@ try:
     # Postgres fields are only available in Django with psycopg2 installed
     # and we cannot have psycopg2 on PyPy
     from django.contrib.postgres.fields import (
+        IntegerRangeField,
         ArrayField,
         HStoreField,
-        IntegerRangeField,
         RangeField,
     )
 except ImportError:
-    IntegerRangeField, HStoreField, RangeField = (MissingType,) * 3
+    IntegerRangeField, ArrayField, HStoreField, RangeField = (MissingType,) * 4
-
-    # For unit tests we fake ArrayField using JSONFields
-    if any(
-        PurePath(sys.argv[0]).match(p)
-        for p in [
-            "**/pytest",
-            "**/py.test",
-            "**/pytest/__main__.py",
-        ]
-    ):
-
-        class ArrayField(JSONField):
-            def __init__(self, *args, **kwargs):
-                if len(args) > 0:
-                    self.base_field = args[0]
-                super().__init__(**kwargs)
-
-    else:
-        ArrayField = MissingType
-
-
-try:
-    from django.utils.choices import normalize_choices
-except ImportError:
-
-    def normalize_choices(choices):
-        if isinstance(choices, type) and issubclass(choices, Choices):
-            choices = choices.choices
-
-        if isinstance(choices, Callable):
-            choices = choices()
-
-        # In restframework==3.15.0, choices are not passed
-        # as OrderedDict anymore, so it's safer to check
-        # for a dict
-        if isinstance(choices, dict):
-            choices = choices.items()
-
-        return choices

graphene_django/converter.py

@@ -1,11 +1,10 @@
-import inspect
+from collections import OrderedDict
-from functools import partial, singledispatch, wraps
+from functools import singledispatch, wraps
 
 from django.db import models
 from django.utils.encoding import force_str
 from django.utils.functional import Promise
 from django.utils.module_loading import import_string
-from graphql import GraphQLError
 
 from graphene import (
     ID,
@@ -13,7 +12,6 @@ from graphene import (
     Boolean,
     Date,
     DateTime,
-    Decimal,
     Dynamic,
     Enum,
     Field,
@@ -23,11 +21,12 @@ from graphene import (
     NonNull,
     String,
     Time,
+    Decimal,
 )
 from graphene.types.json import JSONString
-from graphene.types.resolver import get_default_resolver
 from graphene.types.scalars import BigInt
 from graphene.utils.str_converters import to_camel_case
+from graphql import GraphQLError
 
 try:
     from graphql import assert_name
@@ -36,8 +35,8 @@ except ImportError:
     from graphql import assert_valid_name as assert_name
 from graphql.pyutils import register_description
 
-from .compat import ArrayField, HStoreField, RangeField, normalize_choices
+from .compat import ArrayField, HStoreField, RangeField
-from .fields import DjangoConnectionField, DjangoListField
+from .fields import DjangoListField, DjangoConnectionField
 from .settings import graphene_settings
 from .utils.str_converters import to_const
 
@@ -60,24 +59,6 @@ class BlankValueField(Field):
         return blank_field_wrapper(resolver)
 
 
-class EnumValueField(BlankValueField):
-    def wrap_resolve(self, parent_resolver):
-        resolver = super().wrap_resolve(parent_resolver)
-
-        # create custom resolver
-        def enum_field_wrapper(func):
-            @wraps(func)
-            def wrapped_resolver(*args, **kwargs):
-                return_value = func(*args, **kwargs)
-                if isinstance(return_value, models.Choices):
-                    return_value = return_value.value
-                return return_value
-
-            return wrapped_resolver
-
-        return enum_field_wrapper(resolver)
-
-
 def convert_choice_name(name):
     name = to_const(force_str(name))
     try:
@@ -89,7 +70,8 @@ def convert_choice_name(name):
 
 def get_choices(choices):
     converted_names = []
-    choices = normalize_choices(choices)
+    if isinstance(choices, OrderedDict):
+        choices = choices.items()
     for value, help_text in choices:
         if isinstance(help_text, (tuple, list)):
             yield from get_choices(help_text)
@@ -149,24 +131,20 @@ def convert_choice_field_to_enum(field, name=None):
 
 
 def convert_django_field_with_choices(
-    field, registry=None, convert_choices_to_enum=None
+    field, registry=None, convert_choices_to_enum=True
 ):
     if registry is not None:
         converted = registry.get_converted_field(field)
         if converted:
             return converted
     choices = getattr(field, "choices", None)
-    if convert_choices_to_enum is None:
-        convert_choices_to_enum = bool(
-            graphene_settings.DJANGO_CHOICE_FIELD_ENUM_CONVERT
-        )
     if choices and convert_choices_to_enum:
         EnumCls = convert_choice_field_to_enum(field)
         required = not (field.blank or field.null)
 
         converted = EnumCls(
             description=get_django_field_description(field), required=required
-        ).mount_as(EnumValueField)
+        ).mount_as(BlankValueField)
     else:
         converted = convert_django_field(field, registry)
     if registry is not None:
@@ -181,7 +159,9 @@ def get_django_field_description(field):
 @singledispatch
 def convert_django_field(field, registry=None):
     raise Exception(
-        f"Don't know how to convert the Django field {field} ({field.__class__})"
+        "Don't know how to convert the Django field {} ({})".format(
+            field, field.__class__
+        )
     )
 
 
@@ -199,13 +179,19 @@ def convert_field_to_string(field, registry=None):
     )
 
 
-@convert_django_field.register(models.AutoField)
 @convert_django_field.register(models.BigAutoField)
-@convert_django_field.register(models.SmallAutoField)
+@convert_django_field.register(models.AutoField)
 def convert_field_to_id(field, registry=None):
     return ID(description=get_django_field_description(field), required=not field.null)
 
 
+if hasattr(models, "SmallAutoField"):
+
+    @convert_django_field.register(models.SmallAutoField)
+    def convert_field_small_to_id(field, registry=None):
+        return convert_field_to_id(field, registry)
+
+
 @convert_django_field.register(models.UUIDField)
 def convert_field_to_uuid(field, registry=None):
     return UUID(
@@ -272,10 +258,6 @@ def convert_time_to_string(field, registry=None):
 
 @convert_django_field.register(models.OneToOneRel)
 def convert_onetoone_field_to_djangomodel(field, registry=None):
-    from graphene.utils.str_converters import to_snake_case
-
-    from .types import DjangoObjectType
-
     model = field.related_model
 
     def dynamic_type():
@@ -283,55 +265,7 @@ def convert_onetoone_field_to_djangomodel(field, registry=None):
         if not _type:
             return
 
-        class CustomField(Field):
+        return Field(_type, required=not field.null)
-            def wrap_resolve(self, parent_resolver):
-                """
-                Implements a custom resolver which goes through the `get_node` method to ensure that
-                it goes through the `get_queryset` method of the DjangoObjectType.
-                """
-                resolver = super().wrap_resolve(parent_resolver)
-
-                # If `get_queryset` was not overridden in the DjangoObjectType
-                # or if we explicitly bypass the `get_queryset` method,
-                # we can just return the default resolver.
-                if (
-                    _type.get_queryset.__func__
-                    is DjangoObjectType.get_queryset.__func__
-                    or getattr(resolver, "_bypass_get_queryset", False)
-                ):
-                    return resolver
-
-                def custom_resolver(root, info, **args):
-                    # Note: this function is used to resolve 1:1 relation fields
-
-                    is_resolver_awaitable = inspect.iscoroutinefunction(resolver)
-
-                    if is_resolver_awaitable:
-                        fk_obj = resolver(root, info, **args)
-                        # In case the resolver is a custom awaitable resolver that overwrites
-                        # the default Django resolver
-                        return fk_obj
-
-                    field_name = to_snake_case(info.field_name)
-                    reversed_field_name = root.__class__._meta.get_field(
-                        field_name
-                    ).remote_field.name
-                    try:
-                        return _type.get_queryset(
-                            _type._meta.model.objects.filter(
-                                **{reversed_field_name: root.pk}
-                            ),
-                            info,
-                        ).get()
-                    except _type._meta.model.DoesNotExist:
-                        return None
-
-                return custom_resolver
-
-        return CustomField(
-            _type,
-            required=not field.null,
-        )
 
     return Dynamic(dynamic_type)
 
@@ -379,10 +313,6 @@ def convert_field_to_list_or_connection(field, registry=None):
 @convert_django_field.register(models.OneToOneField)
 @convert_django_field.register(models.ForeignKey)
 def convert_field_to_djangomodel(field, registry=None):
-    from graphene.utils.str_converters import to_snake_case
-
-    from .types import DjangoObjectType
-
     model = field.related_model
 
     def dynamic_type():
@@ -390,79 +320,7 @@ def convert_field_to_djangomodel(field, registry=None):
         if not _type:
             return
 
-        class CustomField(Field):
+        return Field(
-            def wrap_resolve(self, parent_resolver):
-                """
-                Implements a custom resolver which goes through the `get_node` method to ensure that
-                it goes through the `get_queryset` method of the DjangoObjectType.
-                """
-                resolver = super().wrap_resolve(parent_resolver)
-
-                # If `get_queryset` was not overridden in the DjangoObjectType
-                # or if we explicitly bypass the `get_queryset` method,
-                # we can just return the default resolver.
-                if (
-                    _type.get_queryset.__func__
-                    is DjangoObjectType.get_queryset.__func__
-                    or getattr(resolver, "_bypass_get_queryset", False)
-                ):
-                    return resolver
-
-                def custom_resolver(root, info, **args):
-                    # Note: this function is used to resolve FK or 1:1 fields
-                    #   it does not differentiate between custom-resolved fields
-                    #   and default resolved fields.
-
-                    # because this is a django foreign key or one-to-one field, the primary-key for
-                    # this node can be accessed from the root node.
-                    # ex: article.reporter_id
-
-                    # get the name of the id field from the root's model
-                    field_name = to_snake_case(info.field_name)
-                    db_field_key = root.__class__._meta.get_field(field_name).attname
-                    if hasattr(root, db_field_key):
-                        # get the object's primary-key from root
-                        object_pk = getattr(root, db_field_key)
-                    else:
-                        return None
-
-                    is_resolver_awaitable = inspect.iscoroutinefunction(resolver)
-
-                    if is_resolver_awaitable:
-                        fk_obj = resolver(root, info, **args)
-                        # In case the resolver is a custom awaitable resolver that overwrites
-                        # the default Django resolver
-                        return fk_obj
-
-                    instance_from_get_node = _type.get_node(info, object_pk)
-
-                    if instance_from_get_node is None:
-                        # no instance to return
-                        return
-                    elif (
-                        isinstance(resolver, partial)
-                        and resolver.func is get_default_resolver()
-                    ):
-                        return instance_from_get_node
-                    elif resolver is not get_default_resolver():
-                        # Default resolver is overridden
-                        # For optimization, add the instance to the resolver
-                        setattr(root, field_name, instance_from_get_node)
-                        # Explanation:
-                        #   previously, _type.get_node` is called which results in at least one hit to the database.
-                        #   But, if we did not pass the instance to the root, calling the resolver will result in
-                        #   another call to get the instance which results in at least two database queries in total
-                        #   to resolve this node only.
-                        #   That's why the value of the object is set in the root so when the object is accessed
-                        #   in the resolver (root.field_name) it does not access the database unless queried explicitly.
-                        fk_obj = resolver(root, info, **args)
-                        return fk_obj
-                    else:
-                        return instance_from_get_node
-
-                return custom_resolver
-
-        return CustomField(
             _type,
             description=get_django_field_description(field),
             required=not field.null,

graphene_django/debug/middleware.py

@@ -1,7 +1,9 @@
 from django.db import connections
 
-from .exception.formating import wrap_exception
+from promise import Promise
+
 from .sql.tracking import unwrap_cursor, wrap_cursor
+from .exception.formating import wrap_exception
 from .types import DjangoDebug
 
 

graphene_django/debug/tests/test_query.py

@@ -1,6 +1,5 @@
-import pytest
-
 import graphene
+import pytest
 from graphene.relay import Node
 from graphene_django import DjangoConnectionField, DjangoObjectType
 

graphene_django/debug/types.py

@@ -1,7 +1,7 @@
 from graphene import List, ObjectType
 
-from .exception.types import DjangoDebugException
 from .sql.types import DjangoDebugSQL
+from .exception.types import DjangoDebugException
 
 
 class DjangoDebug(ObjectType):

graphene_django/fields.py

@@ -1,12 +1,14 @@
 from functools import partial
 
 from django.db.models.query import QuerySet
+
 from graphql_relay import (
     connection_from_array_slice,
     cursor_to_offset,
     get_offset_with_default,
     offset_to_cursor,
 )
+
 from promise import Promise
 
 from graphene import Int, NonNull
@@ -20,20 +22,17 @@ 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
 
         # Django would never return a Set of None  vvvvvvv
         super().__init__(List(NonNull(_type)), *args, **kwargs)
 
-    @property
-    def type(self):
-        from .types import DjangoObjectType
-
         assert issubclass(
             self._underlying_type, DjangoObjectType
-        ), "DjangoListField only accepts DjangoObjectType types as underlying type"
+        ), "DjangoListField only accepts DjangoObjectType types"
-        return super().type
 
     @property
     def _underlying_type(self):
@@ -197,7 +196,7 @@ class DjangoConnectionField(ConnectionField):
         enforce_first_or_last,
         root,
         info,
-        **args,
+        **args
     ):
         first = args.get("first")
         last = args.get("last")
@@ -247,7 +246,7 @@ class DjangoConnectionField(ConnectionField):
     def wrap_resolve(self, parent_resolver):
         return partial(
             self.connection_resolver,
-            self.resolver or parent_resolver,
+            parent_resolver,
             self.connection_type,
             self.get_manager(),
             self.get_queryset_resolver(),

graphene_django/filter/__init__.py

@@ -1,5 +1,4 @@
 import warnings
-
 from ..utils import DJANGO_FILTER_INSTALLED
 
 if not DJANGO_FILTER_INSTALLED:

graphene_django/filter/fields.py

@@ -3,8 +3,8 @@ from functools import partial
 
 from django.core.exceptions import ValidationError
 
-from graphene.types.argument import to_arguments
 from graphene.types.enum import EnumType
+from graphene.types.argument import to_arguments
 from graphene.utils.str_converters import to_snake_case
 
 from ..fields import DjangoConnectionField
@@ -36,7 +36,7 @@ class DjangoFilterConnectionField(DjangoConnectionField):
         extra_filter_meta=None,
         filterset_class=None,
         *args,
-        **kwargs,
+        **kwargs
     ):
         self._fields = fields
         self._provided_filterset_class = filterset_class
@@ -58,7 +58,7 @@ class DjangoFilterConnectionField(DjangoConnectionField):
     def filterset_class(self):
         if not self._filterset_class:
             fields = self._fields or self.node_type._meta.filter_fields
-            meta = {"model": self.model, "fields": fields}
+            meta = dict(model=self.model, fields=fields)
             if self._extra_filter_meta:
                 meta.update(self._extra_filter_meta)
 

graphene_django/filter/filters/__init__.py

@@ -1,5 +1,4 @@
 import warnings
-
 from ...utils import DJANGO_FILTER_INSTALLED
 
 if not DJANGO_FILTER_INSTALLED:

graphene_django/filter/filters/array_filter.py

@@ -1,36 +1,13 @@
 from django_filters.constants import EMPTY_VALUES
-from django_filters.filters import FilterMethod
 
 from .typed_filter import TypedFilter
 
 
-class ArrayFilterMethod(FilterMethod):
-    def __call__(self, qs, value):
-        if value is None:
-            return qs
-        return self.method(qs, self.f.field_name, value)
-
-
 class ArrayFilter(TypedFilter):
     """
     Filter made for PostgreSQL ArrayField.
     """
 
-    @TypedFilter.method.setter
-    def method(self, value):
-        """
-        Override method setter so that in case a custom `method` is provided
-        (see documentation https://django-filter.readthedocs.io/en/stable/ref/filters.html#method),
-        it doesn't fall back to checking if the value is in `EMPTY_VALUES` (from the `__call__` method
-        of the `FilterMethod` class) and instead use our ArrayFilterMethod that consider empty lists as values.
-
-        Indeed when providing a `method` the `filter` method below is overridden and replaced by `FilterMethod(self)`
-        which means that the validation of the empty value is made by the `FilterMethod.__call__` method instead.
-        """
-        TypedFilter.method.fset(self, value)
-        if value is not None:
-            self.filter = ArrayFilterMethod(self)
-
     def filter(self, qs, value):
         """
         Override the default filter class to check first whether the list is

graphene_django/filter/filters/global_id_filter.py

@@ -1,4 +1,5 @@
 from django_filters import Filter, MultipleChoiceFilter
+
 from graphql_relay.node.node import from_global_id
 
 from ...forms import GlobalIDFormField, GlobalIDMultipleChoiceField

graphene_django/filter/filters/list_filter.py

@@ -1,36 +1,12 @@
-from django_filters.filters import FilterMethod
-
 from .typed_filter import TypedFilter
 
 
-class ListFilterMethod(FilterMethod):
-    def __call__(self, qs, value):
-        if value is None:
-            return qs
-        return self.method(qs, self.f.field_name, value)
-
-
 class ListFilter(TypedFilter):
     """
     Filter that takes a list of value as input.
     It is for example used for `__in` filters.
     """
 
-    @TypedFilter.method.setter
-    def method(self, value):
-        """
-        Override method setter so that in case a custom `method` is provided
-        (see documentation https://django-filter.readthedocs.io/en/stable/ref/filters.html#method),
-        it doesn't fall back to checking if the value is in `EMPTY_VALUES` (from the `__call__` method
-        of the `FilterMethod` class) and instead use our ListFilterMethod that consider empty lists as values.
-
-        Indeed when providing a `method` the `filter` method below is overridden and replaced by `FilterMethod(self)`
-        which means that the validation of the empty value is made by the `FilterMethod.__call__` method instead.
-        """
-        TypedFilter.method.fset(self, value)
-        if value is not None:
-            self.filter = ListFilterMethod(self)
-
     def filter(self, qs, value):
         """
         Override the default filter class to check first whether the list is

graphene_django/filter/filterset.py

@@ -1,14 +1,12 @@
 import itertools
 
 from django.db import models
-from django_filters.filterset import (
+from django_filters.filterset import BaseFilterSet, FilterSet
-    FILTER_FOR_DBFIELD_DEFAULTS,
+from django_filters.filterset import FILTER_FOR_DBFIELD_DEFAULTS
-    BaseFilterSet,
-    FilterSet,
-)
 
 from .filters import GlobalIDFilter, GlobalIDMultipleChoiceFilter
 
+
 GRAPHENE_FILTER_SET_OVERRIDES = {
     models.AutoField: {"filter_class": GlobalIDFilter},
     models.OneToOneField: {"filter_class": GlobalIDFilter},

graphene_django/filter/tests/conftest.py

@@ -1,15 +1,15 @@
-from functools import reduce
+from unittest.mock import MagicMock
-
 import pytest
+
 from django.db import models
 from django.db.models.query import QuerySet
+from django_filters import filters
 from django_filters import FilterSet
-
 import graphene
 from graphene.relay import Node
 from graphene_django import DjangoObjectType
-from graphene_django.filter import ArrayFilter
 from graphene_django.utils import DJANGO_FILTER_INSTALLED
+from graphene_django.filter import ArrayFilter, ListFilter
 
 from ...compat import ArrayField
 
@@ -25,15 +25,15 @@ else:
     )
 
 
+STORE = {"events": []}
+
+
 class Event(models.Model):
     name = models.CharField(max_length=50)
     tags = ArrayField(models.CharField(max_length=50))
     tag_ids = ArrayField(models.IntegerField())
     random_field = ArrayField(models.BooleanField())
 
-    def __repr__(self):
-        return f"Event [{self.name}]"
-
 
 @pytest.fixture
 def EventFilterSet():
@@ -44,18 +44,10 @@ def EventFilterSet():
                 "name": ["exact", "contains"],
             }
 
-        # Those are actually usable with our Query fixture below
+        # Those are actually usable with our Query fixture bellow
         tags__contains = ArrayFilter(field_name="tags", lookup_expr="contains")
         tags__overlap = ArrayFilter(field_name="tags", lookup_expr="overlap")
         tags = ArrayFilter(field_name="tags", lookup_expr="exact")
-        tags__len = ArrayFilter(
-            field_name="tags", lookup_expr="len", input_type=graphene.Int
-        )
-        tags__len__in = ArrayFilter(
-            field_name="tags",
-            method="tags__len__in_filter",
-            input_type=graphene.List(graphene.Int),
-        )
 
         # Those are actually not usable and only to check type declarations
         tags_ids__contains = ArrayFilter(field_name="tag_ids", lookup_expr="contains")
@@ -69,14 +61,6 @@ def EventFilterSet():
         )
         random_field = ArrayFilter(field_name="random_field", lookup_expr="exact")
 
-        def tags__len__in_filter(self, queryset, _name, value):
-            if not value:
-                return queryset.none()
-            return reduce(
-                lambda q1, q2: q1.union(q2),
-                [queryset.filter(tags__len=v) for v in value],
-            ).distinct()
-
     return EventFilterSet
 
 
@@ -99,94 +83,68 @@ def Query(EventType):
     we are running unit tests in sqlite which does not have ArrayFields.
     """
 
-    events = [
-        Event(name="Live Show", tags=["concert", "music", "rock"]),
-        Event(name="Musical", tags=["movie", "music"]),
-        Event(name="Ballet", tags=["concert", "dance"]),
-        Event(name="Speech", tags=[]),
-    ]
-
     class Query(graphene.ObjectType):
         events = DjangoFilterConnectionField(EventType)
 
         def resolve_events(self, info, **kwargs):
-            class FakeQuerySet(QuerySet):
+            events = [
-                def __init__(self, model=None):
+                Event(name="Live Show", tags=["concert", "music", "rock"]),
-                    self.model = Event
+                Event(name="Musical", tags=["movie", "music"]),
-                    self.__store = list(events)
+                Event(name="Ballet", tags=["concert", "dance"]),
+                Event(name="Speech", tags=[]),
+            ]
 
-                def all(self):
+            STORE["events"] = events
-                    return self
 
-                def filter(self, **kwargs):
+            m_queryset = MagicMock(spec=QuerySet)
-                    queryset = FakeQuerySet()
+            m_queryset.model = Event
-                    queryset.__store = list(self.__store)
+
-                    if "tags__contains" in kwargs:
+            def filter_events(**kwargs):
-                        queryset.__store = list(
+                if "tags__contains" in kwargs:
-                            filter(
+                    STORE["events"] = list(
-                                lambda e: set(kwargs["tags__contains"]).issubset(
+                        filter(
-                                    set(e.tags)
+                            lambda e: set(kwargs["tags__contains"]).issubset(
-                                ),
+                                set(e.tags)
-                                queryset.__store,
+                            ),
-                            )
+                            STORE["events"],
                         )
-                    if "tags__overlap" in kwargs:
+                    )
-                        queryset.__store = list(
+                if "tags__overlap" in kwargs:
-                            filter(
+                    STORE["events"] = list(
-                                lambda e: not set(kwargs["tags__overlap"]).isdisjoint(
+                        filter(
-                                    set(e.tags)
+                            lambda e: not set(kwargs["tags__overlap"]).isdisjoint(
-                                ),
+                                set(e.tags)
-                                queryset.__store,
+                            ),
-                            )
+                            STORE["events"],
                         )
-                    if "tags__exact" in kwargs:
+                    )
-                        queryset.__store = list(
+                if "tags__exact" in kwargs:
-                            filter(
+                    STORE["events"] = list(
-                                lambda e: set(kwargs["tags__exact"]) == set(e.tags),
+                        filter(
-                                queryset.__store,
+                            lambda e: set(kwargs["tags__exact"]) == set(e.tags),
-                            )
+                            STORE["events"],
                         )
-                    if "tags__len" in kwargs:
+                    )
-                        queryset.__store = list(
-                            filter(
-                                lambda e: len(e.tags) == kwargs["tags__len"],
-                                queryset.__store,
-                            )
-                        )
-                    return queryset
 
-                def union(self, *args):
+            def mock_queryset_filter(*args, **kwargs):
-                    queryset = FakeQuerySet()
+                filter_events(**kwargs)
-                    queryset.__store = self.__store
+                return m_queryset
-                    for arg in args:
-                        queryset.__store += arg.__store
-                    return queryset
 
-                def none(self):
+            def mock_queryset_none(*args, **kwargs):
-                    queryset = FakeQuerySet()
+                STORE["events"] = []
-                    queryset.__store = []
+                return m_queryset
-                    return queryset
 
-                def count(self):
+            def mock_queryset_count(*args, **kwargs):
-                    return len(self.__store)
+                return len(STORE["events"])
 
-                def distinct(self):
+            m_queryset.all.return_value = m_queryset
-                    queryset = FakeQuerySet()
+            m_queryset.filter.side_effect = mock_queryset_filter
-                    queryset.__store = []
+            m_queryset.none.side_effect = mock_queryset_none
-                    for event in self.__store:
+            m_queryset.count.side_effect = mock_queryset_count
-                        if event not in queryset.__store:
+            m_queryset.__getitem__.side_effect = lambda index: STORE[
-                            queryset.__store.append(event)
+                "events"
-                    queryset.__store = sorted(queryset.__store, key=lambda e: e.name)
+            ].__getitem__(index)
-                    return queryset
 
-                def __getitem__(self, index):
+            return m_queryset
-                    return self.__store[index]
-
-            return FakeQuerySet()
 
     return Query
-
-
-@pytest.fixture
-def schema(Query):
-    return graphene.Schema(query=Query)

graphene_django/filter/tests/test_array_field_contains_filter.py

@@ -1,14 +1,18 @@
 import pytest
 
+from graphene import Schema
+
 from ...compat import ArrayField, MissingType
 
 
 @pytest.mark.skipif(ArrayField is MissingType, reason="ArrayField should exist")
-def test_array_field_contains_multiple(schema):
+def test_array_field_contains_multiple(Query):
     """
     Test contains filter on a array field of string.
     """
 
+    schema = Schema(query=Query)
+
     query = """
     query {
         events (tags_Contains: ["concert", "music"]) {
@@ -28,11 +32,13 @@ def test_array_field_contains_multiple(schema):
 
 
 @pytest.mark.skipif(ArrayField is MissingType, reason="ArrayField should exist")
-def test_array_field_contains_one(schema):
+def test_array_field_contains_one(Query):
     """
     Test contains filter on a array field of string.
     """
 
+    schema = Schema(query=Query)
+
     query = """
     query {
         events (tags_Contains: ["music"]) {
@@ -53,11 +59,13 @@ def test_array_field_contains_one(schema):
 
 
 @pytest.mark.skipif(ArrayField is MissingType, reason="ArrayField should exist")
-def test_array_field_contains_empty_list(schema):
+def test_array_field_contains_empty_list(Query):
     """
     Test contains filter on a array field of string.
     """
 
+    schema = Schema(query=Query)
+
     query = """
     query {
         events (tags_Contains: []) {

graphene_django/filter/tests/test_array_field_custom_filter.py

@@ -1,186 +0,0 @@
-import pytest
-
-from ...compat import ArrayField, MissingType
-
-
-@pytest.mark.skipif(ArrayField is MissingType, reason="ArrayField should exist")
-def test_array_field_len_filter(schema):
-    query = """
-    query {
-        events (tags_Len: 2) {
-            edges {
-                node {
-                    name
-                }
-            }
-        }
-    }
-    """
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["events"]["edges"] == [
-        {"node": {"name": "Musical"}},
-        {"node": {"name": "Ballet"}},
-    ]
-
-    query = """
-    query {
-        events (tags_Len: 0) {
-            edges {
-                node {
-                    name
-                }
-            }
-        }
-    }
-    """
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["events"]["edges"] == [
-        {"node": {"name": "Speech"}},
-    ]
-
-    query = """
-    query {
-        events (tags_Len: 10) {
-            edges {
-                node {
-                    name
-                }
-            }
-        }
-    }
-    """
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["events"]["edges"] == []
-
-    query = """
-    query {
-        events (tags_Len: "2") {
-            edges {
-                node {
-                    name
-                }
-            }
-        }
-    }
-    """
-    result = schema.execute(query)
-    assert len(result.errors) == 1
-    assert result.errors[0].message == 'Int cannot represent non-integer value: "2"'
-
-    query = """
-    query {
-        events (tags_Len: True) {
-            edges {
-                node {
-                    name
-                }
-            }
-        }
-    }
-    """
-    result = schema.execute(query)
-    assert len(result.errors) == 1
-    assert result.errors[0].message == "Int cannot represent non-integer value: True"
-
-
-@pytest.mark.skipif(ArrayField is MissingType, reason="ArrayField should exist")
-def test_array_field_custom_filter(schema):
-    query = """
-    query {
-        events (tags_Len_In: 2) {
-            edges {
-                node {
-                    name
-                }
-            }
-        }
-    }
-    """
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["events"]["edges"] == [
-        {"node": {"name": "Ballet"}},
-        {"node": {"name": "Musical"}},
-    ]
-
-    query = """
-    query {
-        events (tags_Len_In: [0, 2]) {
-            edges {
-                node {
-                    name
-                }
-            }
-        }
-    }
-    """
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["events"]["edges"] == [
-        {"node": {"name": "Ballet"}},
-        {"node": {"name": "Musical"}},
-        {"node": {"name": "Speech"}},
-    ]
-
-    query = """
-    query {
-        events (tags_Len_In: [10]) {
-            edges {
-                node {
-                    name
-                }
-            }
-        }
-    }
-    """
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["events"]["edges"] == []
-
-    query = """
-    query {
-        events (tags_Len_In: []) {
-            edges {
-                node {
-                    name
-                }
-            }
-        }
-    }
-    """
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["events"]["edges"] == []
-
-    query = """
-    query {
-        events (tags_Len_In: "12") {
-            edges {
-                node {
-                    name
-                }
-            }
-        }
-    }
-    """
-    result = schema.execute(query)
-    assert len(result.errors) == 1
-    assert result.errors[0].message == 'Int cannot represent non-integer value: "12"'
-
-    query = """
-    query {
-        events (tags_Len_In: True) {
-            edges {
-                node {
-                    name
-                }
-            }
-        }
-    }
-    """
-    result = schema.execute(query)
-    assert len(result.errors) == 1
-    assert result.errors[0].message == "Int cannot represent non-integer value: True"

graphene_django/filter/tests/test_array_field_exact_filter.py

@@ -1,14 +1,18 @@
 import pytest
 
+from graphene import Schema
+
 from ...compat import ArrayField, MissingType
 
 
 @pytest.mark.skipif(ArrayField is MissingType, reason="ArrayField should exist")
-def test_array_field_exact_no_match(schema):
+def test_array_field_exact_no_match(Query):
     """
     Test exact filter on a array field of string.
     """
 
+    schema = Schema(query=Query)
+
     query = """
     query {
         events (tags: ["concert", "music"]) {
@@ -26,11 +30,13 @@ def test_array_field_exact_no_match(schema):
 
 
 @pytest.mark.skipif(ArrayField is MissingType, reason="ArrayField should exist")
-def test_array_field_exact_match(schema):
+def test_array_field_exact_match(Query):
     """
     Test exact filter on a array field of string.
     """
 
+    schema = Schema(query=Query)
+
     query = """
     query {
         events (tags: ["movie", "music"]) {
@@ -50,11 +56,13 @@ def test_array_field_exact_match(schema):
 
 
 @pytest.mark.skipif(ArrayField is MissingType, reason="ArrayField should exist")
-def test_array_field_exact_empty_list(schema):
+def test_array_field_exact_empty_list(Query):
     """
     Test exact filter on a array field of string.
     """
 
+    schema = Schema(query=Query)
+
     query = """
     query {
         events (tags: []) {
@@ -74,10 +82,11 @@ def test_array_field_exact_empty_list(schema):
 
 
 @pytest.mark.skipif(ArrayField is MissingType, reason="ArrayField should exist")
-def test_array_field_filter_schema_type(schema):
+def test_array_field_filter_schema_type(Query):
     """
     Check that the type in the filter is an array field like on the object type.
     """
+    schema = Schema(query=Query)
     schema_str = str(schema)
 
     assert (
@@ -103,8 +112,6 @@ def test_array_field_filter_schema_type(schema):
         "tags_Contains": "[String!]",
         "tags_Overlap": "[String!]",
         "tags": "[String!]",
-        "tags_Len": "Int",
-        "tags_Len_In": "[Int]",
         "tagsIds_Contains": "[Int!]",
         "tagsIds_Overlap": "[Int!]",
         "tagsIds": "[Int!]",

graphene_django/filter/tests/test_array_field_overlap_filter.py

@@ -1,14 +1,18 @@
 import pytest
 
+from graphene import Schema
+
 from ...compat import ArrayField, MissingType
 
 
 @pytest.mark.skipif(ArrayField is MissingType, reason="ArrayField should exist")
-def test_array_field_overlap_multiple(schema):
+def test_array_field_overlap_multiple(Query):
     """
     Test overlap filter on a array field of string.
     """
 
+    schema = Schema(query=Query)
+
     query = """
     query {
         events (tags_Overlap: ["concert", "music"]) {
@@ -30,11 +34,13 @@ def test_array_field_overlap_multiple(schema):
 
 
 @pytest.mark.skipif(ArrayField is MissingType, reason="ArrayField should exist")
-def test_array_field_overlap_one(schema):
+def test_array_field_overlap_one(Query):
     """
     Test overlap filter on a array field of string.
     """
 
+    schema = Schema(query=Query)
+
     query = """
     query {
         events (tags_Overlap: ["music"]) {
@@ -55,11 +61,13 @@ def test_array_field_overlap_one(schema):
 
 
 @pytest.mark.skipif(ArrayField is MissingType, reason="ArrayField should exist")
-def test_array_field_overlap_empty_list(schema):
+def test_array_field_overlap_empty_list(Query):
     """
     Test overlap filter on a array field of string.
     """
 
+    schema = Schema(query=Query)
+
     query = """
     query {
         events (tags_Overlap: []) {

graphene_django/filter/tests/test_enum_filtering.py

@@ -2,7 +2,8 @@ import pytest
 
 import graphene
 from graphene.relay import Node
-from graphene_django import DjangoConnectionField, DjangoObjectType
+
+from graphene_django import DjangoObjectType, DjangoConnectionField
 from graphene_django.tests.models import Article, Reporter
 from graphene_django.utils import DJANGO_FILTER_INSTALLED
 

graphene_django/filter/tests/test_fields.py

@@ -19,8 +19,8 @@ if DJANGO_FILTER_INSTALLED:
     from django_filters import FilterSet, NumberFilter, OrderingFilter
 
     from graphene_django.filter import (
-        DjangoFilterConnectionField,
         GlobalIDFilter,
+        DjangoFilterConnectionField,
         GlobalIDMultipleChoiceFilter,
     )
     from graphene_django.filter.tests.filters import (
@@ -222,7 +222,7 @@ def test_filter_filterset_information_on_meta_related():
         reporter = Field(ReporterFilterNode)
         article = Field(ArticleFilterNode)
 
-    Schema(query=Query)
+    schema = Schema(query=Query)
     articles_field = ReporterFilterNode._meta.fields["articles"].get_type()
     assert_arguments(articles_field, "headline", "reporter")
     assert_not_orderable(articles_field)
@@ -294,7 +294,7 @@ def test_filter_filterset_class_information_on_meta_related():
         reporter = Field(ReporterFilterNode)
         article = Field(ArticleFilterNode)
 
-    Schema(query=Query)
+    schema = Schema(query=Query)
     articles_field = ReporterFilterNode._meta.fields["articles"].get_type()
     assert_arguments(articles_field, "headline", "reporter")
     assert_not_orderable(articles_field)
@@ -789,7 +789,7 @@ def test_order_by():
 
     query = """
         query NodeFilteringQuery {
-            allReporters(orderBy: "-firstname") {
+            allReporters(orderBy: "-firtsnaMe") {
                 edges {
                     node {
                         firstName
@@ -802,7 +802,7 @@ def test_order_by():
     assert result.errors
 
 
-def test_order_by_is_preserved():
+def test_order_by_is_perserved():
     class ReporterType(DjangoObjectType):
         class Meta:
             model = Reporter
@@ -1186,7 +1186,7 @@ def test_filter_filterset_based_on_mixin():
         first_name="Adam", last_name="Doe", email="adam@doe.com"
     )
 
-    Article.objects.create(
+    article_2 = Article.objects.create(
         headline="Good Bye",
         reporter=reporter_2,
         editor=reporter_2,

graphene_django/filter/tests/test_in_filter.py

@@ -1,16 +1,14 @@
 from datetime import datetime
 
 import pytest
-from django_filters import (
-    FilterSet,
-    rest_framework as filters,
-)
 
+from django_filters import FilterSet
+from django_filters import rest_framework as filters
 from graphene import ObjectType, Schema
 from graphene.relay import Node
 from graphene_django import DjangoObjectType
+from graphene_django.tests.models import Pet, Person, Reporter, Article, Film
 from graphene_django.filter.tests.filters import ArticleFilter
-from graphene_django.tests.models import Article, Film, Person, Pet, Reporter
 from graphene_django.utils import DJANGO_FILTER_INSTALLED
 
 pytestmark = []
@@ -350,9 +348,9 @@ def test_fk_id_in_filter(query):
 
     schema = Schema(query=query)
 
-    query = f"""
+    query = """
     query {{
-        articles (reporter_In: [{john_doe.id}, {jean_bon.id}]) {{
+        articles (reporter_In: [{}, {}]) {{
             edges {{
                 node {{
                     headline
@@ -363,7 +361,10 @@ def test_fk_id_in_filter(query):
             }}
         }}
     }}
-    """
+    """.format(
+        john_doe.id,
+        jean_bon.id,
+    )
     result = schema.execute(query)
     assert not result.errors
     assert result.data["articles"]["edges"] == [

graphene_django/filter/tests/test_range_filter.py

@@ -1,7 +1,8 @@
 import json
-
 import pytest
 
+from django_filters import FilterSet
+from django_filters import rest_framework as filters
 from graphene import ObjectType, Schema
 from graphene.relay import Node
 from graphene_django import DjangoObjectType

graphene_django/filter/tests/test_typed_filter.py

@@ -1,12 +1,10 @@
-import operator
-from functools import reduce
-
 import pytest
-from django.db.models import Q
+
 from django_filters import FilterSet
 
 import graphene
 from graphene.relay import Node
+
 from graphene_django import DjangoObjectType
 from graphene_django.tests.models import Article, Reporter
 from graphene_django.utils import DJANGO_FILTER_INSTALLED
@@ -16,8 +14,8 @@ pytestmark = []
 if DJANGO_FILTER_INSTALLED:
     from graphene_django.filter import (
         DjangoFilterConnectionField,
-        ListFilter,
         TypedFilter,
+        ListFilter,
     )
 else:
     pytestmark.append(
@@ -48,10 +46,6 @@ def schema():
         only_first = TypedFilter(
             input_type=graphene.Boolean, method="only_first_filter"
         )
-        headline_search = ListFilter(
-            method="headline_search_filter",
-            input_type=graphene.List(graphene.String),
-        )
 
         def first_n_filter(self, queryset, _name, value):
             return queryset[:value]
@@ -62,13 +56,6 @@ def schema():
             else:
                 return queryset
 
-        def headline_search_filter(self, queryset, _name, value):
-            if not value:
-                return queryset.none()
-            return queryset.filter(
-                reduce(operator.or_, [Q(headline__icontains=v) for v in value])
-            )
-
     class ArticleType(DjangoObjectType):
         class Meta:
             model = Article
@@ -102,7 +89,6 @@ def test_typed_filter_schema(schema):
         "lang_InStr": "[String]",
         "firstN": "Int",
         "onlyFirst": "Boolean",
-        "headlineSearch": "[String]",
     }
 
     all_articles_filters = (
@@ -120,7 +106,24 @@ def test_typed_filters_work(schema):
     Article.objects.create(headline="A", reporter=reporter, editor=reporter, lang="es")
     Article.objects.create(headline="B", reporter=reporter, editor=reporter, lang="es")
     Article.objects.create(headline="C", reporter=reporter, editor=reporter, lang="en")
-    Article.objects.create(headline="AB", reporter=reporter, editor=reporter, lang="es")
+
+    query = "query { articles (lang_In: [ES]) { edges { node { headline } } } }"
+
+    result = schema.execute(query)
+    assert not result.errors
+    assert result.data["articles"]["edges"] == [
+        {"node": {"headline": "A"}},
+        {"node": {"headline": "B"}},
+    ]
+
+    query = 'query { articles (lang_InStr: ["es"]) { edges { node { headline } } } }'
+
+    result = schema.execute(query)
+    assert not result.errors
+    assert result.data["articles"]["edges"] == [
+        {"node": {"headline": "A"}},
+        {"node": {"headline": "B"}},
+    ]
 
     query = 'query { articles (lang_Contains: "n") { edges { node { headline } } } }'
 
@@ -136,7 +139,7 @@ def test_typed_filters_work(schema):
     assert not result.errors
     assert result.data["articles"]["edges"] == [
         {"node": {"headline": "A"}},
-        {"node": {"headline": "AB"}},
+        {"node": {"headline": "B"}},
     ]
 
     query = "query { articles (onlyFirst: true) { edges { node { headline } } } }"
@@ -146,86 +149,3 @@ def test_typed_filters_work(schema):
     assert result.data["articles"]["edges"] == [
         {"node": {"headline": "A"}},
     ]
-
-
-def test_list_filters_work(schema):
-    reporter = Reporter.objects.create(first_name="John", last_name="Doe", email="")
-    Article.objects.create(headline="A", reporter=reporter, editor=reporter, lang="es")
-    Article.objects.create(headline="B", reporter=reporter, editor=reporter, lang="es")
-    Article.objects.create(headline="C", reporter=reporter, editor=reporter, lang="en")
-    Article.objects.create(headline="AB", reporter=reporter, editor=reporter, lang="es")
-
-    query = "query { articles (lang_In: [ES]) { edges { node { headline } } } }"
-
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["articles"]["edges"] == [
-        {"node": {"headline": "A"}},
-        {"node": {"headline": "AB"}},
-        {"node": {"headline": "B"}},
-    ]
-
-    query = 'query { articles (lang_InStr: ["es"]) { edges { node { headline } } } }'
-
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["articles"]["edges"] == [
-        {"node": {"headline": "A"}},
-        {"node": {"headline": "AB"}},
-        {"node": {"headline": "B"}},
-    ]
-
-    query = "query { articles (lang_InStr: []) { edges { node { headline } } } }"
-
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["articles"]["edges"] == []
-
-    query = "query { articles (lang_InStr: null) { edges { node { headline } } } }"
-
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["articles"]["edges"] == [
-        {"node": {"headline": "A"}},
-        {"node": {"headline": "AB"}},
-        {"node": {"headline": "B"}},
-        {"node": {"headline": "C"}},
-    ]
-
-    query = 'query { articles (headlineSearch: ["a", "B"]) { edges { node { headline } } } }'
-
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["articles"]["edges"] == [
-        {"node": {"headline": "A"}},
-        {"node": {"headline": "AB"}},
-        {"node": {"headline": "B"}},
-    ]
-
-    query = "query { articles (headlineSearch: []) { edges { node { headline } } } }"
-
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["articles"]["edges"] == []
-
-    query = "query { articles (headlineSearch: null) { edges { node { headline } } } }"
-
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["articles"]["edges"] == [
-        {"node": {"headline": "A"}},
-        {"node": {"headline": "AB"}},
-        {"node": {"headline": "B"}},
-        {"node": {"headline": "C"}},
-    ]
-
-    query = 'query { articles (headlineSearch: [""]) { edges { node { headline } } } }'
-
-    result = schema.execute(query)
-    assert not result.errors
-    assert result.data["articles"]["edges"] == [
-        {"node": {"headline": "A"}},
-        {"node": {"headline": "AB"}},
-        {"node": {"headline": "B"}},
-        {"node": {"headline": "C"}},
-    ]

graphene_django/filter/utils.py

@@ -1,11 +1,10 @@
-from django import forms
-from django_filters.utils import get_model_field
-
 import graphene
-
+from django import forms
-from ..forms import GlobalIDFormField, GlobalIDMultipleChoiceField
+from django_filters.utils import get_model_field, get_field_parts
-from .filters import ListFilter, RangeFilter, TypedFilter
+from django_filters.filters import Filter, BaseCSVFilter
+from .filters import ArrayFilter, ListFilter, RangeFilter, TypedFilter
 from .filterset import custom_filterset_factory, setup_filterset
+from ..forms import GlobalIDFormField, GlobalIDMultipleChoiceField
 
 
 def get_field_type(registry, model, field_name):
@@ -43,7 +42,7 @@ def get_filtering_args_from_filterset(filterset_class, type):
             isinstance(filter_field, TypedFilter)
             and filter_field.input_type is not None
         ):
-            # First check if the filter input type has been explicitly given
+            # First check if the filter input type has been explicitely given
             field_type = filter_field.input_type
         else:
             if name not in filterset_class.declared_filters or isinstance(
@@ -51,7 +50,7 @@ def get_filtering_args_from_filterset(filterset_class, type):
             ):
                 # Get the filter field for filters that are no explicitly declared.
                 if filter_type == "isnull":
-                    field_type = graphene.Boolean
+                    field = graphene.Boolean(required=required)
                 else:
                     model_field = get_model_field(model, filter_field.field_name)
 
@@ -145,7 +144,7 @@ def replace_csv_filters(filterset_class):
                 label=filter_field.label,
                 method=filter_field.method,
                 exclude=filter_field.exclude,
-                **filter_field.extra,
+                **filter_field.extra
             )
         elif filter_type == "range":
             filterset_class.base_filters[name] = RangeFilter(
@@ -154,5 +153,5 @@ def replace_csv_filters(filterset_class):
                 label=filter_field.label,
                 method=filter_field.method,
                 exclude=filter_field.exclude,
-                **filter_field.extra,
+                **filter_field.extra
             )

graphene_django/forms/converter.py

@@ -5,15 +5,15 @@ from django.core.exceptions import ImproperlyConfigured
 
 from graphene import (
     ID,
-    UUID,
     Boolean,
-    Date,
-    DateTime,
     Decimal,
     Float,
     Int,
     List,
     String,
+    UUID,
+    Date,
+    DateTime,
     Time,
 )
 
@@ -27,8 +27,8 @@ def get_form_field_description(field):
 @singledispatch
 def convert_form_field(field):
     raise ImproperlyConfigured(
-        f"Don't know how to convert the Django form field {field} ({field.__class__}) "
+        "Don't know how to convert the Django form field %s (%s) "
-        "to Graphene type"
+        "to Graphene type" % (field, field.__class__)
     )
 
 

graphene_django/forms/forms.py

@@ -3,6 +3,7 @@ import binascii
 from django.core.exceptions import ValidationError
 from django.forms import CharField, Field, MultipleChoiceField
 from django.utils.translation import gettext_lazy as _
+
 from graphql_relay import from_global_id
 
 

graphene_django/forms/mutation.py

@@ -23,7 +23,8 @@ def fields_for_form(form, only_fields, exclude_fields):
     for name, field in form.fields.items():
         is_not_in_only = only_fields and name not in only_fields
         is_excluded = (
-            name in exclude_fields  # or
+            name
+            in exclude_fields  # or
             # name in already_created_fields
         )
 

graphene_django/forms/tests/test_converter.py

@@ -1,34 +1,31 @@
-from django import VERSION as DJANGO_VERSION, forms
+from django import forms
 from pytest import raises
 
+import graphene
 from graphene import (
-    ID,
+    String,
-    UUID,
+    Int,
     Boolean,
-    Date,
-    DateTime,
     Decimal,
     Float,
-    Int,
+    ID,
+    UUID,
     List,
     NonNull,
-    String,
+    DateTime,
+    Date,
     Time,
 )
 
 from ..converter import convert_form_field
 
 
-def assert_conversion(django_field, graphene_field, *args, **kwargs):
+def assert_conversion(django_field, graphene_field, *args):
-    # Arrange
+    field = django_field(*args, help_text="Custom Help Text")
-    help_text = kwargs.setdefault("help_text", "Custom Help Text")
-    field = django_field(*args, **kwargs)
-    # Act
     graphene_type = convert_form_field(field)
-    # Assert
     assert isinstance(graphene_type, graphene_field)
     field = graphene_type.Field()
-    assert field.description == help_text
+    assert field.description == "Custom Help Text"
     return field
 
 
@@ -63,12 +60,7 @@ def test_should_slug_convert_string():
 
 
 def test_should_url_convert_string():
-    kwargs = {}
+    assert_conversion(forms.URLField, String)
-    if DJANGO_VERSION >= (5, 0):
-        # silence RemovedInDjango60Warning
-        kwargs["assume_scheme"] = "https"
-
-    assert_conversion(forms.URLField, String, **kwargs)
 
 
 def test_should_choice_convert_string():
@@ -84,7 +76,8 @@ def test_should_regex_convert_string():
 
 
 def test_should_uuid_convert_string():
-    assert_conversion(forms.UUIDField, UUID)
+    if hasattr(forms, "UUIDField"):
+        assert_conversion(forms.UUIDField, UUID)
 
 
 def test_should_integer_convert_int():

graphene_django/forms/tests/test_djangoinputobject.py

@@ -1,11 +1,11 @@
+import graphene
+
 from django import forms
 from pytest import raises
 
-import graphene
 from graphene_django import DjangoObjectType
-
-from ...tests.models import CHOICES, Film, Reporter
 from ..types import DjangoFormInputObjectType
+from ...tests.models import Reporter, Film, CHOICES
 
 # Reporter a_choice CHOICES = ((1, "this"), (2, _("that")))
 THIS = CHOICES[0][0]
@@ -31,7 +31,7 @@ class ReporterType(DjangoObjectType):
 class ReporterForm(forms.ModelForm):
     class Meta:
         model = Reporter
-        exclude = ("pets", "email", "fans")
+        exclude = ("pets", "email")
 
 
 class MyForm(forms.Form):

graphene_django/forms/tests/test_mutation.py

@@ -1,3 +1,4 @@
+import pytest
 from django import forms
 from django.core.exceptions import ValidationError
 from pytest import raises
@@ -279,7 +280,7 @@ def test_model_form_mutation_mutate_invalid_form():
     result = PetMutation.mutate_and_get_payload(None, None)
 
     # A pet was not created
-    assert Pet.objects.count() == 0
+    Pet.objects.count() == 0
 
     fields_w_error = [e.field for e in result.errors]
     assert len(result.errors) == 2

graphene_django/forms/types.py

@@ -1,11 +1,12 @@
 import graphene
+
 from graphene import ID
 from graphene.types.inputobjecttype import InputObjectType
 from graphene.utils.str_converters import to_camel_case
 
-from ..converter import EnumValueField
-from ..types import ErrorType  # noqa Import ErrorType for backwards compatibility
 from .mutation import fields_for_form
+from ..types import ErrorType  # noqa Import ErrorType for backwards compatability
+from ..converter import BlankValueField
 
 
 class DjangoFormInputObjectType(InputObjectType):
@@ -57,10 +58,11 @@ class DjangoFormInputObjectType(InputObjectType):
             if (
                 object_type
                 and name in object_type._meta.fields
-                and isinstance(object_type._meta.fields[name], EnumValueField)
+                and isinstance(object_type._meta.fields[name], BlankValueField)
             ):
-                # Field type EnumValueField here means that field
+                # Field type BlankValueField here means that field
-                # with choices have been converted to enum
+                # with choises have been converted to enum
+                # (BlankValueField is using only for that task ?)
                 setattr(cls, name, cls.get_enum_cnv_cls_instance(name, object_type))
             elif (
                 object_type

graphene_django/management/commands/graphql_schema.py

@@ -1,12 +1,12 @@
-import functools
+import os
 import importlib
 import json
-import os
+import functools
 
 from django.core.management.base import BaseCommand, CommandError
 from django.utils import autoreload
-from graphql import print_schema
 
+from graphql import print_schema
 from graphene_django.settings import graphene_settings
 
 
@@ -83,7 +83,7 @@ class Command(CommandArguments):
     def handle(self, *args, **options):
         options_schema = options.get("schema")
 
-        if options_schema and isinstance(options_schema, str):
+        if options_schema and type(options_schema) is str:
             module_str, schema_name = options_schema.rsplit(".", 1)
             mod = importlib.import_module(module_str)
             schema = getattr(mod, schema_name)

graphene_django/registry.py

@@ -8,7 +8,9 @@ class Registry:
 
         assert issubclass(
             cls, DjangoObjectType
-        ), f'Only DjangoObjectTypes can be registered, received "{cls.__name__}"'
+        ), 'Only DjangoObjectTypes can be registered, received "{}"'.format(
+            cls.__name__
+        )
         assert cls._meta.registry == self, "Registry for a Model have to match."
         # assert self.get_type_for_model(cls._meta.model) == cls, (
         #     'Multiple DjangoObjectTypes registered for "{}"'.format(cls._meta.model)

graphene_django/rest_framework/models.py

@@ -14,14 +14,3 @@ class MyFakeModelWithPassword(models.Model):
 class MyFakeModelWithDate(models.Model):
     cool_name = models.CharField(max_length=50)
     last_edited = models.DateField()
-
-
-class MyFakeModelWithChoiceField(models.Model):
-    class ChoiceType(models.Choices):
-        ASDF = "asdf"
-        HI = "hi"
-
-    choice_type = models.CharField(
-        max_length=4,
-        default=ChoiceType.HI.name,
-    )

graphene_django/rest_framework/mutation.py

@@ -1,5 +1,4 @@
 from collections import OrderedDict
-from enum import Enum
 
 from django.shortcuts import get_object_or_404
 from rest_framework import serializers
@@ -19,7 +18,6 @@ class SerializerMutationOptions(MutationOptions):
     model_class = None
     model_operations = ["create", "update"]
     serializer_class = None
-    optional_fields = ()
 
 
 def fields_for_serializer(
@@ -29,7 +27,6 @@ def fields_for_serializer(
     is_input=False,
     convert_choices_to_enum=True,
     lookup_field=None,
-    optional_fields=(),
 ):
     fields = OrderedDict()
     for name, field in serializer.fields.items():
@@ -50,13 +47,9 @@ def fields_for_serializer(
 
         if is_not_in_only or is_excluded:
             continue
-        is_optional = name in optional_fields or "__all__" in optional_fields
 
         fields[name] = convert_serializer_field(
-            field,
+            field, is_input=is_input, convert_choices_to_enum=convert_choices_to_enum
-            is_input=is_input,
-            convert_choices_to_enum=convert_choices_to_enum,
-            force_optional=is_optional,
         )
     return fields
 
@@ -80,8 +73,7 @@ class SerializerMutation(ClientIDMutation):
         exclude_fields=(),
         convert_choices_to_enum=True,
         _meta=None,
-        optional_fields=(),
+        **options
-        **options,
     ):
         if not serializer_class:
             raise Exception("serializer_class is required for the SerializerMutation")
@@ -105,7 +97,6 @@ class SerializerMutation(ClientIDMutation):
             is_input=True,
             convert_choices_to_enum=convert_choices_to_enum,
             lookup_field=lookup_field,
-            optional_fields=optional_fields,
         )
         output_fields = fields_for_serializer(
             serializer,
@@ -133,10 +124,8 @@ class SerializerMutation(ClientIDMutation):
     def get_serializer_kwargs(cls, root, info, **input):
         lookup_field = cls._meta.lookup_field
         model_class = cls._meta.model_class
+
         if model_class:
-            for input_dict_key, maybe_enum in input.items():
-                if isinstance(maybe_enum, Enum):
-                    input[input_dict_key] = maybe_enum.value
             if "update" in cls._meta.model_operations and lookup_field in input:
                 instance = get_object_or_404(
                     model_class, **{lookup_field: input[lookup_field]}

graphene_django/rest_framework/serializer_converter.py

@@ -5,22 +5,20 @@ from rest_framework import serializers
 
 import graphene
 
-from ..converter import convert_choices_to_named_enum_with_descriptions
 from ..registry import get_global_registry
+from ..converter import convert_choices_to_named_enum_with_descriptions
 from .types import DictType
 
 
 @singledispatch
 def get_graphene_type_from_serializer_field(field):
     raise ImproperlyConfigured(
-        f"Don't know how to convert the serializer field {field} ({field.__class__}) "
+        "Don't know how to convert the serializer field %s (%s) "
-        "to Graphene type"
+        "to Graphene type" % (field, field.__class__)
     )
 
 
-def convert_serializer_field(
+def convert_serializer_field(field, is_input=True, convert_choices_to_enum=True):
-    field, is_input=True, convert_choices_to_enum=True, force_optional=False
-):
     """
     Converts a django rest frameworks field to a graphql field
     and marks the field as required if we are creating an input type
@@ -33,10 +31,7 @@ def convert_serializer_field(
         graphql_type = get_graphene_type_from_serializer_field(field)
 
     args = []
-    kwargs = {
+    kwargs = {"description": field.help_text, "required": is_input and field.required}
-        "description": field.help_text,
-        "required": is_input and field.required and not force_optional,
-    }
 
     # if it is a tuple or a list it means that we are returning
     # the graphql type and the child type

graphene_django/rest_framework/tests/test_field_converter.py

@@ -1,11 +1,11 @@
 import copy
 
+import graphene
 from django.db import models
+from graphene import InputObjectType
 from pytest import raises
 from rest_framework import serializers
 
-import graphene
-
 from ..serializer_converter import convert_serializer_field
 from ..types import DictType
 
@@ -96,7 +96,8 @@ def test_should_regex_convert_string():
 
 
 def test_should_uuid_convert_string():
-    assert_conversion(serializers.UUIDField, graphene.String)
+    if hasattr(serializers, "UUIDField"):
+        assert_conversion(serializers.UUIDField, graphene.String)
 
 
 def test_should_model_convert_field():

graphene_django/rest_framework/tests/test_mutation.py

@@ -3,16 +3,11 @@ import datetime
 from pytest import raises
 from rest_framework import serializers
 
-from graphene import Field, ResolveInfo, String
+from graphene import Field, ResolveInfo
 from graphene.types.inputobjecttype import InputObjectType
 
 from ...types import DjangoObjectType
-from ..models import (
+from ..models import MyFakeModel, MyFakeModelWithDate, MyFakeModelWithPassword
-    MyFakeModel,
-    MyFakeModelWithChoiceField,
-    MyFakeModelWithDate,
-    MyFakeModelWithPassword,
-)
 from ..mutation import SerializerMutation
 
 
@@ -105,16 +100,6 @@ def test_exclude_fields():
     assert "created" not in MyMutation.Input._meta.fields
 
 
-def test_model_serializer_optional_fields():
-    class MyMutation(SerializerMutation):
-        class Meta:
-            serializer_class = MyModelSerializer
-            optional_fields = ("cool_name",)
-
-    assert "cool_name" in MyMutation.Input._meta.fields
-    assert MyMutation.Input._meta.fields["cool_name"].type == String
-
-
 def test_write_only_field():
     class WriteOnlyFieldModelSerializer(serializers.ModelSerializer):
         password = serializers.CharField(write_only=True)
@@ -260,7 +245,7 @@ def test_model_invalid_update_mutate_and_get_payload_success():
             model_operations = ["update"]
 
     with raises(Exception) as exc:
-        InvalidModelMutation.mutate_and_get_payload(
+        result = InvalidModelMutation.mutate_and_get_payload(
             None, mock_info(), **{"cool_name": "Narf"}
         )
 
@@ -275,7 +260,7 @@ def test_perform_mutate_success():
     result = MyMethodMutation.mutate_and_get_payload(
         None,
         mock_info(),
-        **{"cool_name": "Narf", "last_edited": datetime.date(2020, 1, 4)},
+        **{"cool_name": "Narf", "last_edited": datetime.date(2020, 1, 4)}
     )
 
     assert result.errors is None
@@ -283,39 +268,6 @@ def test_perform_mutate_success():
     assert result.days_since_last_edit == 4
 
 
-def test_perform_mutate_success_with_enum_choice_field():
-    class ListViewChoiceFieldSerializer(serializers.ModelSerializer):
-        choice_type = serializers.ChoiceField(
-            choices=[(x.name, x.value) for x in MyFakeModelWithChoiceField.ChoiceType],
-            required=False,
-        )
-
-        class Meta:
-            model = MyFakeModelWithChoiceField
-            fields = "__all__"
-
-    class SomeCreateSerializerMutation(SerializerMutation):
-        class Meta:
-            serializer_class = ListViewChoiceFieldSerializer
-
-    choice_type = {
-        "choice_type": SomeCreateSerializerMutation.Input.choice_type.type.get("ASDF")
-    }
-    name = MyFakeModelWithChoiceField.ChoiceType.ASDF.name
-    result = SomeCreateSerializerMutation.mutate_and_get_payload(
-        None, mock_info(), **choice_type
-    )
-    assert result.errors is None
-    assert result.choice_type == name
-    kwargs = SomeCreateSerializerMutation.get_serializer_kwargs(
-        None, mock_info(), **choice_type
-    )
-    assert kwargs["data"]["choice_type"] == name
-    assert 1 == MyFakeModelWithChoiceField.objects.count()
-    item = MyFakeModelWithChoiceField.objects.first()
-    assert item.choice_type == name
-
-
 def test_mutate_and_get_payload_error():
     class MyMutation(SerializerMutation):
         class Meta:

graphene_django/settings.py

@@ -12,11 +12,12 @@ Graphene settings, checking for user settings first, then falling
 back to the defaults.
 """
 
-import importlib  # Available in Python 3.1+
-
 from django.conf import settings
 from django.test.signals import setting_changed
 
+import importlib  # Available in Python 3.1+
+
+
 # Copied shamelessly from Django REST Framework
 
 DEFAULTS = {
@@ -30,8 +31,6 @@ DEFAULTS = {
     # Max items returned in ConnectionFields / FilterConnectionFields
     "RELAY_CONNECTION_MAX_LIMIT": 100,
     "CAMELCASE_ERRORS": True,
-    # Automatically convert Choice fields of Django into Enum fields
-    "DJANGO_CHOICE_FIELD_ENUM_CONVERT": True,
     # Set to True to enable v2 naming convention for choice field Enum's
     "DJANGO_CHOICE_FIELD_ENUM_V2_NAMING": False,
     "DJANGO_CHOICE_FIELD_ENUM_CUSTOM_NAME": None,
@@ -42,10 +41,8 @@ DEFAULTS = {
     # https://github.com/graphql/graphiql/tree/main/packages/graphiql#options
     "GRAPHIQL_HEADER_EDITOR_ENABLED": True,
     "GRAPHIQL_SHOULD_PERSIST_HEADERS": False,
-    "GRAPHIQL_INPUT_VALUE_DEPRECATION": False,
     "ATOMIC_MUTATIONS": False,
     "TESTING_ENDPOINT": "/graphql",
-    "MAX_VALIDATION_ERRORS": None,
 }
 
 if settings.DEBUG:

graphene_django/static/graphene_django/graphiql.js

@@ -122,7 +122,6 @@
       onEditOperationName: onEditOperationName,
       isHeadersEditorEnabled: GRAPHENE_SETTINGS.graphiqlHeaderEditorEnabled,
       shouldPersistHeaders: GRAPHENE_SETTINGS.graphiqlShouldPersistHeaders,
-      inputValueDeprecation: GRAPHENE_SETTINGS.graphiqlInputValueDeprecation,
       query: query,
     };
     if (parameters.variables) {

graphene_django/templates/graphene/graphiql.html

@@ -54,7 +54,6 @@ add "&raw" to the end of the URL within a browser.
     {% endif %}
       graphiqlHeaderEditorEnabled: {{ graphiql_header_editor_enabled|yesno:"true,false" }},
       graphiqlShouldPersistHeaders: {{ graphiql_should_persist_headers|yesno:"true,false" }},
-      graphiqlInputValueDeprecation: {{ graphiql_input_value_deprecation|yesno:"true,false" }},
     };
   </script>
   <script src="{% static 'graphene_django/graphiql.js' %}"></script>

graphene_django/tests/issues/test_520.py

@@ -1,14 +1,21 @@
 # https://github.com/graphql-python/graphene-django/issues/520
 
+import datetime
 
 from django import forms
-from rest_framework import serializers
 
 import graphene
 
-from ...forms.mutation import DjangoFormMutation
+from graphene import Field, ResolveInfo
+from graphene.types.inputobjecttype import InputObjectType
+from pytest import raises
+from pytest import mark
+from rest_framework import serializers
+
+from ...types import DjangoObjectType
 from ...rest_framework.models import MyFakeModel
 from ...rest_framework.mutation import SerializerMutation
+from ...forms.mutation import DjangoFormMutation
 
 
 class MyModelSerializer(serializers.ModelSerializer):

graphene_django/tests/models.py

@@ -1,43 +1,11 @@
-import django
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
 CHOICES = ((1, "this"), (2, _("that")))
 
 
-def get_choices_as_class(choices_class):
-    if django.VERSION >= (5, 0):
-        return choices_class
-    else:
-        return choices_class.choices
-
-
-def get_choices_as_callable(choices_class):
-    if django.VERSION >= (5, 0):
-
-        def choices():
-            return choices_class.choices
-
-        return choices
-    else:
-        return choices_class.choices
-
-
-class TypedIntChoice(models.IntegerChoices):
-    CHOICE_THIS = 1
-    CHOICE_THAT = 2
-
-
-class TypedStrChoice(models.TextChoices):
-    CHOICE_THIS = "this"
-    CHOICE_THAT = "that"
-
-
 class Person(models.Model):
     name = models.CharField(max_length=30)
-    parent = models.ForeignKey(
-        "self", on_delete=models.CASCADE, null=True, blank=True, related_name="children"
-    )
 
 
 class Pet(models.Model):
@@ -51,11 +19,7 @@ class Pet(models.Model):
 class FilmDetails(models.Model):
     location = models.CharField(max_length=30)
     film = models.OneToOneField(
-        "Film",
+        "Film", on_delete=models.CASCADE, related_name="details"
-        on_delete=models.CASCADE,
-        related_name="details",
-        null=True,
-        blank=True,
     )
 
 
@@ -80,24 +44,8 @@ class Reporter(models.Model):
     email = models.EmailField()
     pets = models.ManyToManyField("self")
     a_choice = models.IntegerField(choices=CHOICES, null=True, blank=True)
-    typed_choice = models.IntegerField(
-        choices=TypedIntChoice.choices,
-        null=True,
-        blank=True,
-    )
-    class_choice = models.IntegerField(
-        choices=get_choices_as_class(TypedIntChoice),
-        null=True,
-        blank=True,
-    )
-    callable_choice = models.IntegerField(
-        choices=get_choices_as_callable(TypedStrChoice),
-        null=True,
-        blank=True,
-    )
     objects = models.Manager()
     doe_objects = DoeReporterManager()
-    fans = models.ManyToManyField(Person)
 
     reporter_type = models.IntegerField(
         "Reporter Type",
@@ -142,16 +90,6 @@ class CNNReporter(Reporter):
     objects = CNNReporterManager()
 
 
-class APNewsReporter(Reporter):
-    """
-    This class only inherits from Reporter for testing multi table inheritance
-    similar to what you'd see in django-polymorphic
-    """
-
-    alias = models.CharField(max_length=30)
-    objects = models.Manager()
-
-
 class Article(models.Model):
     headline = models.CharField(max_length=100)
     pub_date = models.DateField(auto_now_add=True)

graphene_django/tests/mutations.py

@@ -1,4 +1,5 @@
 from graphene import Field
+
 from graphene_django.forms.mutation import DjangoFormMutation, DjangoModelFormMutation
 
 from .forms import PetForm

graphene_django/tests/test_command.py

@@ -1,8 +1,8 @@
-from io import StringIO
 from textwrap import dedent
-from unittest.mock import mock_open, patch
 
 from django.core import management
+from io import StringIO
+from unittest.mock import mock_open, patch
 
 from graphene import ObjectType, Schema, String
 

graphene_django/tests/test_converter.py

@@ -25,16 +25,16 @@ from ..converter import (
 )
 from ..registry import Registry
 from ..types import DjangoObjectType
-from .models import Article, Film, FilmDetails, Reporter, TypedIntChoice, TypedStrChoice
+from .models import Article, Film, FilmDetails, Reporter
 
 # from graphene.core.types.custom_scalars import DateTime, Time, JSONString
 
 
 def assert_conversion(django_field, graphene_field, *args, **kwargs):
-    _kwargs = {**kwargs, "help_text": "Custom Help Text"}
+    _kwargs = kwargs.copy()
     if "null" not in kwargs:
         _kwargs["null"] = True
-    field = django_field(*args, **_kwargs)
+    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()
@@ -53,8 +53,9 @@ def assert_conversion(django_field, graphene_field, *args, **kwargs):
 
 
 def test_should_unknown_django_field_raise_exception():
-    with raises(Exception, match="Don't know how to convert the Django field"):
+    with raises(Exception) as excinfo:
         convert_django_field(None)
+    assert "Don't know how to convert the Django field" in str(excinfo.value)
 
 
 def test_should_date_time_convert_string():
@@ -114,7 +115,8 @@ def test_should_big_auto_convert_id():
 
 
 def test_should_small_auto_convert_id():
-    assert_conversion(models.SmallAutoField, graphene.ID, primary_key=True)
+    if hasattr(models, "SmallAutoField"):
+        assert_conversion(models.SmallAutoField, graphene.ID, primary_key=True)
 
 
 def test_should_uuid_convert_id():
@@ -164,34 +166,14 @@ def test_field_with_choices_convert_enum():
         help_text="Language", choices=(("es", "Spanish"), ("en", "English"))
     )
 
-    class ChoicesModel(models.Model):
+    class TranslatedModel(models.Model):
         language = field
 
         class Meta:
             app_label = "test"
 
     graphene_type = convert_django_field_with_choices(field).type.of_type
-    assert graphene_type._meta.name == "TestChoicesModelLanguageChoices"
+    assert graphene_type._meta.name == "TestTranslatedModelLanguageChoices"
-    assert graphene_type._meta.enum.__members__["ES"].value == "es"
-    assert graphene_type._meta.enum.__members__["ES"].description == "Spanish"
-    assert graphene_type._meta.enum.__members__["EN"].value == "en"
-    assert graphene_type._meta.enum.__members__["EN"].description == "English"
-
-
-def test_field_with_callable_choices_convert_enum():
-    def get_choices():
-        return ("es", "Spanish"), ("en", "English")
-
-    field = models.CharField(help_text="Language", choices=get_choices)
-
-    class CallableChoicesModel(models.Model):
-        language = field
-
-        class Meta:
-            app_label = "test"
-
-    graphene_type = convert_django_field_with_choices(field).type.of_type
-    assert graphene_type._meta.name == "TestCallableChoicesModelLanguageChoices"
     assert graphene_type._meta.enum.__members__["ES"].value == "es"
     assert graphene_type._meta.enum.__members__["ES"].description == "Spanish"
     assert graphene_type._meta.enum.__members__["EN"].value == "en"
@@ -441,102 +423,35 @@ def test_choice_enum_blank_value():
     class ReporterType(DjangoObjectType):
         class Meta:
             model = Reporter
-            fields = ("callable_choice",)
+            fields = (
+                "first_name",
+                "a_choice",
+            )
 
     class Query(graphene.ObjectType):
         reporter = graphene.Field(ReporterType)
 
         def resolve_reporter(root, info):
-            # return a model instance with blank choice field value
+            return Reporter.objects.first()
-            return Reporter(callable_choice="")
 
     schema = graphene.Schema(query=Query)
 
+    # Create model with empty choice option
+    Reporter.objects.create(
+        first_name="Bridget", last_name="Jones", email="bridget@example.com"
+    )
+
     result = schema.execute(
         """
         query {
             reporter {
-                callableChoice
+                firstName
+                aChoice
             }
         }
     """
     )
     assert not result.errors
     assert result.data == {
-        "reporter": {"callableChoice": None},
+        "reporter": {"firstName": "Bridget", "aChoice": None},
     }
-
-
-def test_typed_choice_value():
-    """Test that typed choices fields are resolved correctly to the enum values"""
-
-    class ReporterType(DjangoObjectType):
-        class Meta:
-            model = Reporter
-            fields = ("typed_choice", "class_choice", "callable_choice")
-
-    class Query(graphene.ObjectType):
-        reporter = graphene.Field(ReporterType)
-
-        def resolve_reporter(root, info):
-            # assign choice values to the fields instead of their str or int values
-            return Reporter(
-                typed_choice=TypedIntChoice.CHOICE_THIS,
-                class_choice=TypedIntChoice.CHOICE_THAT,
-                callable_choice=TypedStrChoice.CHOICE_THIS,
-            )
-
-    class CreateReporter(graphene.Mutation):
-        reporter = graphene.Field(ReporterType)
-
-        def mutate(root, info, **kwargs):
-            return CreateReporter(
-                reporter=Reporter(
-                    typed_choice=TypedIntChoice.CHOICE_THIS,
-                    class_choice=TypedIntChoice.CHOICE_THAT,
-                    callable_choice=TypedStrChoice.CHOICE_THIS,
-                ),
-            )
-
-    class Mutation(graphene.ObjectType):
-        create_reporter = CreateReporter.Field()
-
-    schema = graphene.Schema(query=Query, mutation=Mutation)
-
-    reporter_fragment = """
-        fragment reporter on ReporterType {
-            typedChoice
-            classChoice
-            callableChoice
-        }
-    """
-
-    expected_reporter = {
-        "typedChoice": "A_1",
-        "classChoice": "A_2",
-        "callableChoice": "THIS",
-    }
-
-    result = schema.execute(
-        reporter_fragment
-        + """
-        query {
-            reporter { ...reporter }
-        }
-        """
-    )
-    assert not result.errors
-    assert result.data["reporter"] == expected_reporter
-
-    result = schema.execute(
-        reporter_fragment
-        + """
-        mutation {
-            createReporter {
-                reporter { ...reporter }
-            }
-        }
-        """
-    )
-    assert not result.errors
-    assert result.data["createReporter"]["reporter"] == expected_reporter

graphene_django/tests/test_fields.py

@@ -1,8 +1,8 @@
 import datetime
 import re
+from django.db.models import Count, Prefetch
 
 import pytest
-from django.db.models import Count, Prefetch
 
 from graphene import List, NonNull, ObjectType, Schema, String
 
@@ -12,23 +12,17 @@ from .models import (
     Article as ArticleModel,
     Film as FilmModel,
     FilmDetails as FilmDetailsModel,
-    Person as PersonModel,
     Reporter as ReporterModel,
 )
 
 
 class TestDjangoListField:
     def test_only_django_object_types(self):
-        class Query(ObjectType):
+        class TestType(ObjectType):
-            something = DjangoListField(String)
+            foo = String()
 
-        with pytest.raises(TypeError) as excinfo:
+        with pytest.raises(AssertionError):
-            Schema(query=Query)
+            list_field = DjangoListField(TestType)
-
-        assert (
-            "Query fields cannot be resolved. DjangoListField only accepts DjangoObjectType types as underlying type"
-            in str(excinfo.value)
-        )
 
     def test_only_import_paths(self):
         list_field = DjangoListField("graphene_django.tests.schema.Human")
@@ -268,69 +262,6 @@ class TestDjangoListField:
             ]
         }
 
-    def test_same_type_nested_list_field(self):
-        class Person(DjangoObjectType):
-            class Meta:
-                model = PersonModel
-                fields = ("name", "parent")
-
-            children = DjangoListField(lambda: Person)
-
-        class Query(ObjectType):
-            persons = DjangoListField(Person)
-
-        schema = Schema(query=Query)
-
-        query = """
-            query {
-                persons {
-                    name
-                    children {
-                        name
-                    }
-                }
-            }
-        """
-
-        p1 = PersonModel.objects.create(name="Tara")
-        PersonModel.objects.create(name="Debra")
-
-        PersonModel.objects.create(
-            name="Toto",
-            parent=p1,
-        )
-        PersonModel.objects.create(
-            name="Tata",
-            parent=p1,
-        )
-
-        result = schema.execute(query)
-
-        assert not result.errors
-        assert result.data == {
-            "persons": [
-                {
-                    "name": "Tara",
-                    "children": [
-                        {"name": "Toto"},
-                        {"name": "Tata"},
-                    ],
-                },
-                {
-                    "name": "Debra",
-                    "children": [],
-                },
-                {
-                    "name": "Toto",
-                    "children": [],
-                },
-                {
-                    "name": "Tata",
-                    "children": [],
-                },
-            ]
-        }
-
     def test_get_queryset_filter(self):
         class Reporter(DjangoObjectType):
             class Meta:

graphene_django/tests/test_forms.py

@@ -3,6 +3,7 @@ from pytest import raises
 
 from ..forms import GlobalIDFormField, GlobalIDMultipleChoiceField
 
+
 # 'TXlUeXBlOmFiYw==' -> 'MyType', 'abc'
 
 

graphene_django/tests/test_get_queryset.py

@@ -1,11 +1,14 @@
 import pytest
-from graphql_relay import to_global_id
 
 import graphene
 from graphene.relay import Node
 
+from graphql_relay import to_global_id
+
+from ..fields import DjangoConnectionField
 from ..types import DjangoObjectType
-from .models import Article, Film, FilmDetails, Reporter
+
+from .models import Article, Reporter
 
 
 class TestShouldCallGetQuerySetOnForeignKey:
@@ -26,7 +29,6 @@ class TestShouldCallGetQuerySetOnForeignKey:
         class ReporterType(DjangoObjectType):
             class Meta:
                 model = Reporter
-                fields = "__all__"
 
             @classmethod
             def get_queryset(cls, queryset, info):
@@ -37,7 +39,6 @@ class TestShouldCallGetQuerySetOnForeignKey:
         class ArticleType(DjangoObjectType):
             class Meta:
                 model = Article
-                fields = "__all__"
 
             @classmethod
             def get_queryset(cls, queryset, info):
@@ -126,69 +127,6 @@ class TestShouldCallGetQuerySetOnForeignKey:
         assert not result.errors
         assert result.data == {"reporter": {"firstName": "Jane"}}
 
-    def test_get_queryset_called_on_foreignkey(self):
-        # If a user tries to access a reporter through an article they should get our authorization error
-        query = """
-            query getArticle($id: ID!) {
-                article(id: $id) {
-                    headline
-                    reporter {
-                        firstName
-                    }
-                }
-            }
-        """
-
-        result = self.schema.execute(query, variables={"id": self.articles[0].id})
-        assert len(result.errors) == 1
-        assert result.errors[0].message == "Not authorized to access reporters."
-
-        # An admin user should be able to get reporters through an article
-        query = """
-            query getArticle($id: ID!) {
-                article(id: $id) {
-                    headline
-                    reporter {
-                        firstName
-                    }
-                }
-            }
-        """
-
-        result = self.schema.execute(
-            query,
-            variables={"id": self.articles[0].id},
-            context_value={"admin": True},
-        )
-        assert not result.errors
-        assert result.data["article"] == {
-            "headline": "A fantastic article",
-            "reporter": {"firstName": "Jane"},
-        }
-
-        # An admin user should not be able to access draft article through a reporter
-        query = """
-            query getReporter($id: ID!) {
-                reporter(id: $id) {
-                    firstName
-                    articles {
-                        headline
-                    }
-                }
-            }
-        """
-
-        result = self.schema.execute(
-            query,
-            variables={"id": self.reporter.id},
-            context_value={"admin": True},
-        )
-        assert not result.errors
-        assert result.data["reporter"] == {
-            "firstName": "Jane",
-            "articles": [{"headline": "A fantastic article"}],
-        }
-
 
 class TestShouldCallGetQuerySetOnForeignKeyNode:
     """
@@ -202,7 +140,6 @@ class TestShouldCallGetQuerySetOnForeignKeyNode:
         class ReporterType(DjangoObjectType):
             class Meta:
                 model = Reporter
-                fields = "__all__"
                 interfaces = (Node,)
 
             @classmethod
@@ -214,7 +151,6 @@ class TestShouldCallGetQuerySetOnForeignKeyNode:
         class ArticleType(DjangoObjectType):
             class Meta:
                 model = Article
-                fields = "__all__"
                 interfaces = (Node,)
 
             @classmethod
@@ -297,274 +233,3 @@ class TestShouldCallGetQuerySetOnForeignKeyNode:
         )
         assert not result.errors
         assert result.data == {"reporter": {"firstName": "Jane"}}
-
-    def test_get_queryset_called_on_foreignkey(self):
-        # If a user tries to access a reporter through an article they should get our authorization error
-        query = """
-            query getArticle($id: ID!) {
-                article(id: $id) {
-                    headline
-                    reporter {
-                        firstName
-                    }
-                }
-            }
-        """
-
-        result = self.schema.execute(
-            query, variables={"id": to_global_id("ArticleType", self.articles[0].id)}
-        )
-        assert len(result.errors) == 1
-        assert result.errors[0].message == "Not authorized to access reporters."
-
-        # An admin user should be able to get reporters through an article
-        query = """
-            query getArticle($id: ID!) {
-                article(id: $id) {
-                    headline
-                    reporter {
-                        firstName
-                    }
-                }
-            }
-        """
-
-        result = self.schema.execute(
-            query,
-            variables={"id": to_global_id("ArticleType", self.articles[0].id)},
-            context_value={"admin": True},
-        )
-        assert not result.errors
-        assert result.data["article"] == {
-            "headline": "A fantastic article",
-            "reporter": {"firstName": "Jane"},
-        }
-
-        # An admin user should not be able to access draft article through a reporter
-        query = """
-            query getReporter($id: ID!) {
-                reporter(id: $id) {
-                    firstName
-                    articles {
-                        edges {
-                            node {
-                                headline
-                            }
-                        }
-                    }
-                }
-            }
-        """
-
-        result = self.schema.execute(
-            query,
-            variables={"id": to_global_id("ReporterType", self.reporter.id)},
-            context_value={"admin": True},
-        )
-        assert not result.errors
-        assert result.data["reporter"] == {
-            "firstName": "Jane",
-            "articles": {"edges": [{"node": {"headline": "A fantastic article"}}]},
-        }
-
-
-class TestShouldCallGetQuerySetOnOneToOne:
-    @pytest.fixture(autouse=True)
-    def setup_schema(self):
-        class FilmDetailsType(DjangoObjectType):
-            class Meta:
-                model = FilmDetails
-                fields = "__all__"
-
-            @classmethod
-            def get_queryset(cls, queryset, info):
-                if info.context and info.context.get("permission_get_film_details"):
-                    return queryset
-                raise Exception("Not authorized to access film details.")
-
-        class FilmType(DjangoObjectType):
-            class Meta:
-                model = Film
-                fields = "__all__"
-
-            @classmethod
-            def get_queryset(cls, queryset, info):
-                if info.context and info.context.get("permission_get_film"):
-                    return queryset
-                raise Exception("Not authorized to access film.")
-
-        class Query(graphene.ObjectType):
-            film_details = graphene.Field(
-                FilmDetailsType, id=graphene.ID(required=True)
-            )
-            film = graphene.Field(FilmType, id=graphene.ID(required=True))
-
-            def resolve_film_details(self, info, id):
-                return (
-                    FilmDetailsType.get_queryset(FilmDetails.objects, info)
-                    .filter(id=id)
-                    .last()
-                )
-
-            def resolve_film(self, info, id):
-                return FilmType.get_queryset(Film.objects, info).filter(id=id).last()
-
-        self.schema = graphene.Schema(query=Query)
-
-        self.films = [
-            Film.objects.create(
-                genre="do",
-            ),
-            Film.objects.create(
-                genre="ac",
-            ),
-        ]
-
-        self.film_details = [
-            FilmDetails.objects.create(
-                film=self.films[0],
-            ),
-            FilmDetails.objects.create(
-                film=self.films[1],
-            ),
-        ]
-
-    def test_get_queryset_called_on_field(self):
-        # A user tries to access a film
-        query = """
-            query getFilm($id: ID!) {
-                film(id: $id) {
-                    genre
-                }
-            }
-        """
-
-        # With `permission_get_film`
-        result = self.schema.execute(
-            query,
-            variables={"id": self.films[0].id},
-            context_value={"permission_get_film": True},
-        )
-        assert not result.errors
-        assert result.data["film"] == {
-            "genre": "DO",
-        }
-
-        # Without `permission_get_film`
-        result = self.schema.execute(
-            query,
-            variables={"id": self.films[1].id},
-            context_value={"permission_get_film": False},
-        )
-        assert len(result.errors) == 1
-        assert result.errors[0].message == "Not authorized to access film."
-
-        # A user tries to access a film details
-        query = """
-            query getFilmDetails($id: ID!) {
-                filmDetails(id: $id) {
-                    location
-                }
-            }
-        """
-
-        # With `permission_get_film`
-        result = self.schema.execute(
-            query,
-            variables={"id": self.film_details[0].id},
-            context_value={"permission_get_film_details": True},
-        )
-        assert not result.errors
-        assert result.data == {"filmDetails": {"location": ""}}
-
-        # Without `permission_get_film`
-        result = self.schema.execute(
-            query,
-            variables={"id": self.film_details[0].id},
-            context_value={"permission_get_film_details": False},
-        )
-        assert len(result.errors) == 1
-        assert result.errors[0].message == "Not authorized to access film details."
-
-    def test_get_queryset_called_on_foreignkey(self, django_assert_num_queries):
-        # A user tries to access a film details through a film
-        query = """
-            query getFilm($id: ID!) {
-                film(id: $id) {
-                    genre
-                    details {
-                        location
-                    }
-                }
-            }
-        """
-
-        # With `permission_get_film_details`
-        with django_assert_num_queries(2):
-            result = self.schema.execute(
-                query,
-                variables={"id": self.films[0].id},
-                context_value={
-                    "permission_get_film": True,
-                    "permission_get_film_details": True,
-                },
-            )
-        assert not result.errors
-        assert result.data["film"] == {
-            "genre": "DO",
-            "details": {"location": ""},
-        }
-
-        # Without `permission_get_film_details`
-        with django_assert_num_queries(1):
-            result = self.schema.execute(
-                query,
-                variables={"id": self.films[0].id},
-                context_value={
-                    "permission_get_film": True,
-                    "permission_get_film_details": False,
-                },
-            )
-        assert len(result.errors) == 1
-        assert result.errors[0].message == "Not authorized to access film details."
-
-        # A user tries to access a film through a film details
-        query = """
-            query getFilmDetails($id: ID!) {
-                filmDetails(id: $id) {
-                    location
-                    film {
-                        genre
-                    }
-                }
-            }
-        """
-
-        # With `permission_get_film`
-        with django_assert_num_queries(2):
-            result = self.schema.execute(
-                query,
-                variables={"id": self.film_details[0].id},
-                context_value={
-                    "permission_get_film": True,
-                    "permission_get_film_details": True,
-                },
-            )
-        assert not result.errors
-        assert result.data["filmDetails"] == {
-            "location": "",
-            "film": {"genre": "DO"},
-        }
-
-        # Without `permission_get_film`
-        with django_assert_num_queries(1):
-            result = self.schema.execute(
-                query,
-                variables={"id": self.film_details[1].id},
-                context_value={
-                    "permission_get_film": False,
-                    "permission_get_film_details": True,
-                },
-            )
-        assert len(result.errors) == 1
-        assert result.errors[0].message == "Not authorized to access film."

graphene_django/tests/test_query.py

@@ -1,6 +1,5 @@
-import base64
 import datetime
-from unittest.mock import ANY, Mock
+import base64
 
 import pytest
 from django.db import models
@@ -16,16 +15,7 @@ from ..compat import IntegerRangeField, MissingType
 from ..fields import DjangoConnectionField
 from ..types import DjangoObjectType
 from ..utils import DJANGO_FILTER_INSTALLED
-from .models import (
+from .models import Article, CNNReporter, Film, FilmDetails, Person, Pet, Reporter
-    APNewsReporter,
-    Article,
-    CNNReporter,
-    Film,
-    FilmDetails,
-    Person,
-    Pet,
-    Reporter,
-)
 
 
 def test_should_query_only_fields():
@@ -127,9 +117,9 @@ def test_should_query_well():
 @pytest.mark.skipif(IntegerRangeField is MissingType, reason="RangeField should exist")
 def test_should_query_postgres_fields():
     from django.contrib.postgres.fields import (
+        IntegerRangeField,
         ArrayField,
         HStoreField,
-        IntegerRangeField,
     )
 
     class Event(models.Model):
@@ -356,7 +346,7 @@ def test_should_query_connectionfields():
 
 
 def test_should_keep_annotations():
-    from django.db.models import Avg, Count
+    from django.db.models import Count, Avg
 
     class ReporterType(DjangoObjectType):
         class Meta:
@@ -518,7 +508,7 @@ def test_should_query_node_filtering_with_distinct_queryset():
             ).distinct()
 
     f = Film.objects.create()
-    FilmDetails.objects.create(location="Berlin", film=f)
+    fd = FilmDetails.objects.create(location="Berlin", film=f)
 
     schema = graphene.Schema(query=Query)
     query = """
@@ -641,7 +631,7 @@ def test_should_enforce_first_or_last(graphene_settings):
     class Query(graphene.ObjectType):
         all_reporters = DjangoConnectionField(ReporterType)
 
-    Reporter.objects.create(
+    r = Reporter.objects.create(
         first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
     )
 
@@ -683,7 +673,7 @@ def test_should_error_if_first_is_greater_than_max(graphene_settings):
 
     assert Query.all_reporters.max_limit == 100
 
-    Reporter.objects.create(
+    r = Reporter.objects.create(
         first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
     )
 
@@ -725,7 +715,7 @@ def test_should_error_if_last_is_greater_than_max(graphene_settings):
 
     assert Query.all_reporters.max_limit == 100
 
-    Reporter.objects.create(
+    r = Reporter.objects.create(
         first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
     )
 
@@ -789,7 +779,7 @@ def test_should_query_promise_connectionfields():
 
 
 def test_should_query_connectionfields_with_last():
-    Reporter.objects.create(
+    r = Reporter.objects.create(
         first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
     )
 
@@ -826,11 +816,11 @@ def test_should_query_connectionfields_with_last():
 
 
 def test_should_query_connectionfields_with_manager():
-    Reporter.objects.create(
+    r = Reporter.objects.create(
         first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
     )
 
-    Reporter.objects.create(
+    r = Reporter.objects.create(
         first_name="John", last_name="NotDoe", email="johndoe@example.com", a_choice=1
     )
 
@@ -1074,306 +1064,11 @@ def test_proxy_model_support():
     assert result.data == expected
 
 
-def test_model_inheritance_support_reverse_relationships():
-    """
-    This test asserts that we can query reverse relationships for all Reporters and proxied Reporters and multi table Reporters.
-    """
-
-    class FilmType(DjangoObjectType):
-        class Meta:
-            model = Film
-            fields = "__all__"
-
-    class ReporterType(DjangoObjectType):
-        class Meta:
-            model = Reporter
-            interfaces = (Node,)
-            use_connection = True
-            fields = "__all__"
-
-    class CNNReporterType(DjangoObjectType):
-        class Meta:
-            model = CNNReporter
-            interfaces = (Node,)
-            use_connection = True
-            fields = "__all__"
-
-    class APNewsReporterType(DjangoObjectType):
-        class Meta:
-            model = APNewsReporter
-            interfaces = (Node,)
-            use_connection = True
-            fields = "__all__"
-
-    film = Film.objects.create(genre="do")
-
-    reporter = Reporter.objects.create(
-        first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
-    )
-
-    cnn_reporter = CNNReporter.objects.create(
-        first_name="Some",
-        last_name="Guy",
-        email="someguy@cnn.com",
-        a_choice=1,
-        reporter_type=2,  # set this guy to be CNN
-    )
-
-    ap_news_reporter = APNewsReporter.objects.create(
-        first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
-    )
-
-    film.reporters.add(cnn_reporter, ap_news_reporter)
-    film.save()
-
-    class Query(graphene.ObjectType):
-        all_reporters = DjangoConnectionField(ReporterType)
-        cnn_reporters = DjangoConnectionField(CNNReporterType)
-        ap_news_reporters = DjangoConnectionField(APNewsReporterType)
-
-    schema = graphene.Schema(query=Query)
-    query = """
-        query ProxyModelQuery {
-            allReporters {
-                edges {
-                    node {
-                        id
-                        films {
-                            id
-                        }
-                    }
-                }
-            }
-            cnnReporters {
-                edges {
-                    node {
-                        id
-                        films {
-                            id
-                        }
-                    }
-                }
-            }
-            apNewsReporters {
-                edges {
-                    node {
-                        id
-                        films {
-                            id
-                        }
-                    }
-                }
-            }
-        }
-    """
-
-    expected = {
-        "allReporters": {
-            "edges": [
-                {
-                    "node": {
-                        "id": to_global_id("ReporterType", reporter.id),
-                        "films": [],
-                    },
-                },
-                {
-                    "node": {
-                        "id": to_global_id("ReporterType", cnn_reporter.id),
-                        "films": [{"id": f"{film.id}"}],
-                    },
-                },
-                {
-                    "node": {
-                        "id": to_global_id("ReporterType", ap_news_reporter.id),
-                        "films": [{"id": f"{film.id}"}],
-                    },
-                },
-            ]
-        },
-        "cnnReporters": {
-            "edges": [
-                {
-                    "node": {
-                        "id": to_global_id("CNNReporterType", cnn_reporter.id),
-                        "films": [{"id": f"{film.id}"}],
-                    }
-                }
-            ]
-        },
-        "apNewsReporters": {
-            "edges": [
-                {
-                    "node": {
-                        "id": to_global_id("APNewsReporterType", ap_news_reporter.id),
-                        "films": [{"id": f"{film.id}"}],
-                    }
-                }
-            ]
-        },
-    }
-
-    result = schema.execute(query)
-    assert result.data == expected
-
-
-def test_model_inheritance_support_local_relationships():
-    """
-    This test asserts that we can query local relationships for all Reporters and proxied Reporters and multi table Reporters.
-    """
-
-    class PersonType(DjangoObjectType):
-        class Meta:
-            model = Person
-            fields = "__all__"
-
-    class ReporterType(DjangoObjectType):
-        class Meta:
-            model = Reporter
-            interfaces = (Node,)
-            use_connection = True
-            fields = "__all__"
-
-    class CNNReporterType(DjangoObjectType):
-        class Meta:
-            model = CNNReporter
-            interfaces = (Node,)
-            use_connection = True
-            fields = "__all__"
-
-    class APNewsReporterType(DjangoObjectType):
-        class Meta:
-            model = APNewsReporter
-            interfaces = (Node,)
-            use_connection = True
-            fields = "__all__"
-
-    film = Film.objects.create(genre="do")
-
-    reporter = Reporter.objects.create(
-        first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
-    )
-
-    reporter_fan = Person.objects.create(name="Reporter Fan")
-
-    reporter.fans.add(reporter_fan)
-    reporter.save()
-
-    cnn_reporter = CNNReporter.objects.create(
-        first_name="Some",
-        last_name="Guy",
-        email="someguy@cnn.com",
-        a_choice=1,
-        reporter_type=2,  # set this guy to be CNN
-    )
-    cnn_fan = Person.objects.create(name="CNN Fan")
-    cnn_reporter.fans.add(cnn_fan)
-    cnn_reporter.save()
-
-    ap_news_reporter = APNewsReporter.objects.create(
-        first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
-    )
-    ap_news_fan = Person.objects.create(name="AP News Fan")
-    ap_news_reporter.fans.add(ap_news_fan)
-    ap_news_reporter.save()
-
-    film.reporters.add(cnn_reporter, ap_news_reporter)
-    film.save()
-
-    class Query(graphene.ObjectType):
-        all_reporters = DjangoConnectionField(ReporterType)
-        cnn_reporters = DjangoConnectionField(CNNReporterType)
-        ap_news_reporters = DjangoConnectionField(APNewsReporterType)
-
-    schema = graphene.Schema(query=Query)
-    query = """
-        query ProxyModelQuery {
-            allReporters {
-                edges {
-                    node {
-                        id
-                        fans {
-                            name
-                        }
-                    }
-                }
-            }
-            cnnReporters {
-                edges {
-                    node {
-                        id
-                        fans {
-                            name
-                        }
-                    }
-                }
-            }
-            apNewsReporters {
-                edges {
-                    node {
-                        id
-                        fans {
-                            name
-                        }
-                    }
-                }
-            }
-        }
-    """
-
-    expected = {
-        "allReporters": {
-            "edges": [
-                {
-                    "node": {
-                        "id": to_global_id("ReporterType", reporter.id),
-                        "fans": [{"name": f"{reporter_fan.name}"}],
-                    },
-                },
-                {
-                    "node": {
-                        "id": to_global_id("ReporterType", cnn_reporter.id),
-                        "fans": [{"name": f"{cnn_fan.name}"}],
-                    },
-                },
-                {
-                    "node": {
-                        "id": to_global_id("ReporterType", ap_news_reporter.id),
-                        "fans": [{"name": f"{ap_news_fan.name}"}],
-                    },
-                },
-            ]
-        },
-        "cnnReporters": {
-            "edges": [
-                {
-                    "node": {
-                        "id": to_global_id("CNNReporterType", cnn_reporter.id),
-                        "fans": [{"name": f"{cnn_fan.name}"}],
-                    }
-                }
-            ]
-        },
-        "apNewsReporters": {
-            "edges": [
-                {
-                    "node": {
-                        "id": to_global_id("APNewsReporterType", ap_news_reporter.id),
-                        "fans": [{"name": f"{ap_news_fan.name}"}],
-                    }
-                }
-            ]
-        },
-    }
-
-    result = schema.execute(query)
-    assert result.data == expected
-
-
 def test_should_resolve_get_queryset_connectionfields():
-    Reporter.objects.create(
+    reporter_1 = Reporter.objects.create(
         first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
     )
-    CNNReporter.objects.create(
+    reporter_2 = CNNReporter.objects.create(
         first_name="Some",
         last_name="Guy",
         email="someguy@cnn.com",
@@ -1415,10 +1110,10 @@ def test_should_resolve_get_queryset_connectionfields():
 
 
 def test_connection_should_limit_after_to_list_length():
-    Reporter.objects.create(
+    reporter_1 = Reporter.objects.create(
         first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
     )
-    Reporter.objects.create(
+    reporter_2 = Reporter.objects.create(
         first_name="Some", last_name="Guy", email="someguy@cnn.com", a_choice=1
     )
 
@@ -1445,19 +1140,19 @@ def test_connection_should_limit_after_to_list_length():
     """
 
     after = base64.b64encode(b"arrayconnection:10").decode()
-    result = schema.execute(query, variable_values={"after": after})
+    result = schema.execute(query, variable_values=dict(after=after))
     expected = {"allReporters": {"edges": []}}
     assert not result.errors
     assert result.data == expected
 
 
 REPORTERS = [
-    {
+    dict(
-        "first_name": f"First {i}",
+        first_name=f"First {i}",
-        "last_name": f"Last {i}",
+        last_name=f"Last {i}",
-        "email": f"johndoe+{i}@example.com",
+        email=f"johndoe+{i}@example.com",
-        "a_choice": 1,
+        a_choice=1,
-    }
+    )
     for i in range(6)
 ]
 
@@ -1532,7 +1227,7 @@ def test_should_have_next_page(graphene_settings):
     assert result.data["allReporters"]["pageInfo"]["hasNextPage"]
 
     last_result = result.data["allReporters"]["pageInfo"]["endCursor"]
-    result2 = schema.execute(query, variable_values={"first": 4, "after": last_result})
+    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"]
@@ -1623,7 +1318,7 @@ class TestBackwardPagination:
         after = base64.b64encode(b"arrayconnection:0").decode()
         result = schema.execute(
             query_first_last_and_after,
-            variable_values={"after": after},
+            variable_values=dict(after=after),
         )
         assert not result.errors
         assert len(result.data["allReporters"]["edges"]) == 3
@@ -1655,7 +1350,7 @@ class TestBackwardPagination:
         before = base64.b64encode(b"arrayconnection:5").decode()
         result = schema.execute(
             query_first_last_and_after,
-            variable_values={"before": before},
+            variable_values=dict(before=before),
         )
         assert not result.errors
         assert len(result.data["allReporters"]["edges"]) == 1
@@ -1711,7 +1406,7 @@ def test_should_preserve_prefetch_related(django_assert_num_queries):
     """
     schema = graphene.Schema(query=Query)
 
-    with django_assert_num_queries(3):
+    with django_assert_num_queries(3) as captured:
         result = schema.execute(query)
         assert not result.errors
 
@@ -1878,7 +1573,7 @@ def test_connection_should_forbid_offset_filtering_with_before():
         }
     """
     before = base64.b64encode(b"arrayconnection:2").decode()
-    result = schema.execute(query, variable_values={"before": before})
+    result = schema.execute(query, variable_values=dict(before=before))
     expected_error = "You can't provide a `before` value at the same time as an `offset` value to properly paginate the `allReporters` connection."
     assert len(result.errors) == 1
     assert result.errors[0].message == expected_error
@@ -1914,7 +1609,7 @@ def test_connection_should_allow_offset_filtering_with_after():
     """
 
     after = base64.b64encode(b"arrayconnection:0").decode()
-    result = schema.execute(query, variable_values={"after": after})
+    result = schema.execute(query, variable_values=dict(after=after))
     assert not result.errors
     expected = {
         "allReporters": {
@@ -1950,7 +1645,7 @@ def test_connection_should_succeed_if_last_higher_than_number_of_objects():
         }
     """
 
-    result = schema.execute(query, variable_values={"last": 2})
+    result = schema.execute(query, variable_values=dict(last=2))
     assert not result.errors
     expected = {"allReporters": {"edges": []}}
     assert result.data == expected
@@ -1960,7 +1655,7 @@ def test_connection_should_succeed_if_last_higher_than_number_of_objects():
     Reporter.objects.create(first_name="Jane", last_name="Roe")
     Reporter.objects.create(first_name="Some", last_name="Lady")
 
-    result = schema.execute(query, variable_values={"last": 2})
+    result = schema.execute(query, variable_values=dict(last=2))
     assert not result.errors
     expected = {
         "allReporters": {
@@ -1972,7 +1667,7 @@ def test_connection_should_succeed_if_last_higher_than_number_of_objects():
     }
     assert result.data == expected
 
-    result = schema.execute(query, variable_values={"last": 4})
+    result = schema.execute(query, variable_values=dict(last=4))
     assert not result.errors
     expected = {
         "allReporters": {
@@ -1986,7 +1681,7 @@ def test_connection_should_succeed_if_last_higher_than_number_of_objects():
     }
     assert result.data == expected
 
-    result = schema.execute(query, variable_values={"last": 20})
+    result = schema.execute(query, variable_values=dict(last=20))
     assert not result.errors
     expected = {
         "allReporters": {
@@ -2001,62 +1696,14 @@ def test_connection_should_succeed_if_last_higher_than_number_of_objects():
     assert result.data == expected
 
 
-def test_connection_should_call_resolver_function():
-    resolver_mock = Mock(
-        name="resolver",
-        return_value=[
-            Reporter(first_name="Some", last_name="One"),
-            Reporter(first_name="John", last_name="Doe"),
-        ],
-    )
-
-    class ReporterType(DjangoObjectType):
-        class Meta:
-            model = Reporter
-            fields = "__all__"
-            interfaces = [Node]
-
-    class Query(graphene.ObjectType):
-        reporters = DjangoConnectionField(ReporterType, resolver=resolver_mock)
-
-    schema = graphene.Schema(query=Query)
-    result = schema.execute(
-        """
-        query {
-            reporters {
-                edges {
-                    node {
-                        firstName
-                        lastName
-                    }
-                }
-            }
-        }
-        """
-    )
-
-    resolver_mock.assert_called_once_with(None, ANY)
-    assert not result.errors
-    assert result.data == {
-        "reporters": {
-            "edges": [
-                {"node": {"firstName": "Some", "lastName": "One"}},
-                {"node": {"firstName": "John", "lastName": "Doe"}},
-            ],
-        },
-    }
-
-
 def test_should_query_nullable_foreign_key():
     class PetType(DjangoObjectType):
         class Meta:
             model = Pet
-            fields = "__all__"
 
     class PersonType(DjangoObjectType):
         class Meta:
             model = Person
-            fields = "__all__"
 
     class Query(graphene.ObjectType):
         pet = graphene.Field(PetType, name=graphene.String(required=True))
@@ -2071,8 +1718,10 @@ def test_should_query_nullable_foreign_key():
     schema = graphene.Schema(query=Query)
 
     person = Person.objects.create(name="Jane")
-    Pet.objects.create(name="Stray dog", age=1)
+    pets = [
-    Pet.objects.create(name="Jane's dog", owner=person, age=1)
+        Pet.objects.create(name="Stray dog", age=1),
+        Pet.objects.create(name="Jane's dog", owner=person, age=1),
+    ]
 
     query_pet = """
         query getPet($name: String!) {
@@ -2109,76 +1758,3 @@ def test_should_query_nullable_foreign_key():
     assert result.data["person"] == {
         "pets": [{"name": "Jane's dog"}],
     }
-
-
-def test_should_query_nullable_one_to_one_relation_with_custom_resolver():
-    class FilmType(DjangoObjectType):
-        class Meta:
-            model = Film
-            fields = "__all__"
-
-        @classmethod
-        def get_queryset(cls, queryset, info):
-            return queryset
-
-    class FilmDetailsType(DjangoObjectType):
-        class Meta:
-            model = FilmDetails
-            fields = "__all__"
-
-        @classmethod
-        def get_queryset(cls, queryset, info):
-            return queryset
-
-    class Query(graphene.ObjectType):
-        film = graphene.Field(FilmType, genre=graphene.String(required=True))
-        film_details = graphene.Field(
-            FilmDetailsType, location=graphene.String(required=True)
-        )
-
-        def resolve_film(self, info, genre):
-            return Film.objects.filter(genre=genre).first()
-
-        def resolve_film_details(self, info, location):
-            return FilmDetails.objects.filter(location=location).first()
-
-    schema = graphene.Schema(query=Query)
-
-    Film.objects.create(genre="do")
-    FilmDetails.objects.create(location="London")
-
-    query_film = """
-        query getFilm($genre: String!) {
-            film(genre: $genre) {
-                genre
-                details {
-                    location
-                }
-            }
-        }
-    """
-
-    query_film_details = """
-        query getFilmDetails($location: String!) {
-            filmDetails(location: $location) {
-                location
-                film {
-                    genre
-                }
-            }
-        }
-    """
-
-    result = schema.execute(query_film, variables={"genre": "do"})
-    assert not result.errors
-    assert result.data["film"] == {
-        "genre": "DO",
-        "details": None,
-    }
-
-    result = schema.execute(query_film_details, variables={"location": "London"})
-    assert not result.errors
-    assert result.data["filmDetails"] == {
-        "location": "London",
-        "film": None,
-    }

graphene_django/tests/test_schema.py

@@ -33,21 +33,17 @@ def test_should_map_fields_correctly():
             fields = "__all__"
 
     fields = list(ReporterType2._meta.fields.keys())
-    assert fields[:-3] == [
+    assert fields[:-2] == [
         "id",
         "first_name",
         "last_name",
         "email",
         "pets",
         "a_choice",
-        "typed_choice",
-        "class_choice",
-        "callable_choice",
-        "fans",
         "reporter_type",
     ]
 
-    assert sorted(fields[-3:]) == ["apnewsreporter", "articles", "films"]
+    assert sorted(fields[-2:]) == ["articles", "films"]
 
 
 def test_should_map_only_few_fields():

graphene_django/tests/test_types.py

@@ -1,10 +1,9 @@
-import warnings
 from collections import OrderedDict, defaultdict
 from textwrap import dedent
-from unittest.mock import patch
 
 import pytest
 from django.db import models
+from unittest.mock import patch
 
 from graphene import Connection, Field, Interface, ObjectType, Schema, String
 from graphene.relay import Node
@@ -12,10 +11,8 @@ from graphene.relay import Node
 from .. import registry
 from ..filter import DjangoFilterConnectionField
 from ..types import DjangoObjectType, DjangoObjectTypeOptions
-from .models import (
+from .models import Article as ArticleModel
-    Article as ArticleModel,
+from .models import Reporter as ReporterModel
-    Reporter as ReporterModel,
-)
 
 
 class Reporter(DjangoObjectType):
@@ -70,20 +67,16 @@ def test_django_get_node(get):
 def test_django_objecttype_map_correct_fields():
     fields = Reporter._meta.fields
     fields = list(fields.keys())
-    assert fields[:-3] == [
+    assert fields[:-2] == [
         "id",
         "first_name",
         "last_name",
         "email",
         "pets",
         "a_choice",
-        "typed_choice",
-        "class_choice",
-        "callable_choice",
-        "fans",
         "reporter_type",
     ]
-    assert sorted(fields[-3:]) == ["apnewsreporter", "articles", "films"]
+    assert sorted(fields[-2:]) == ["articles", "films"]
 
 
 def test_django_objecttype_with_node_have_correct_fields():
@@ -189,9 +182,6 @@ def test_schema_representation():
           email: String!
           pets: [Reporter!]!
           aChoice: TestsReporterAChoiceChoices
-          typedChoice: TestsReporterTypedChoiceChoices
-          classChoice: TestsReporterClassChoiceChoices
-          callableChoice: TestsReporterCallableChoiceChoices
           reporterType: TestsReporterReporterTypeChoices
           articles(offset: Int, before: String, after: String, first: Int, last: Int): ArticleConnection!
         }
@@ -205,33 +195,6 @@ def test_schema_representation():
           A_2
         }
 
-        \"""An enumeration.\"""
-        enum TestsReporterTypedChoiceChoices {
-          \"""Choice This\"""
-          A_1
-
-          \"""Choice That\"""
-          A_2
-        }
-
-        \"""An enumeration.\"""
-        enum TestsReporterClassChoiceChoices {
-          \"""Choice This\"""
-          A_1
-
-          \"""Choice That\"""
-          A_2
-        }
-
-        \"""An enumeration.\"""
-        enum TestsReporterCallableChoiceChoices {
-          \"""Choice This\"""
-          THIS
-
-          \"""Choice That\"""
-          THAT
-        }
-
         \"""An enumeration.\"""
         enum TestsReporterReporterTypeChoices {
           \"""Regular\"""
@@ -433,7 +396,7 @@ def test_django_objecttype_fields_exist_on_model():
     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:
@@ -441,8 +404,7 @@ def test_django_objecttype_fields_exist_on_model():
                 fields = ["first_name", "some_method", "email"]
 
     # Don't warn if selecting a custom field
-    with warnings.catch_warnings():
+    with pytest.warns(None) as record:
-        warnings.simplefilter("error")
 
         class Reporter3(DjangoObjectType):
             custom_field = String()
@@ -451,6 +413,8 @@ def test_django_objecttype_fields_exist_on_model():
                 model = ReporterModel
                 fields = ["first_name", "custom_field", "email"]
 
+    assert len(record) == 0
+
 
 @with_local_registry
 def test_django_objecttype_exclude_fields_exist_on_model():
@@ -478,14 +442,15 @@ def test_django_objecttype_exclude_fields_exist_on_model():
                 exclude = ["custom_field"]
 
     # Don't warn on exclude fields
-    with warnings.catch_warnings():
+    with pytest.warns(None) as record:
-        warnings.simplefilter("error")
 
         class Reporter4(DjangoObjectType):
             class Meta:
                 model = ReporterModel
                 exclude = ["email", "first_name"]
 
+    assert len(record) == 0
+
 
 @with_local_registry
 def test_django_objecttype_neither_fields_nor_exclude():
@@ -499,22 +464,24 @@ def test_django_objecttype_neither_fields_nor_exclude():
             class Meta:
                 model = ReporterModel
 
-    with warnings.catch_warnings():
+    with pytest.warns(None) as record:
-        warnings.simplefilter("error")
 
         class Reporter2(DjangoObjectType):
             class Meta:
                 model = ReporterModel
                 fields = ["email"]
 
-    with warnings.catch_warnings():
+    assert len(record) == 0
-        warnings.simplefilter("error")
+
+    with pytest.warns(None) as record:
 
         class Reporter3(DjangoObjectType):
             class Meta:
                 model = ReporterModel
                 exclude = ["email"]
 
+    assert len(record) == 0
+
 
 def custom_enum_name(field):
     return f"CustomEnum{field.name.title()}"
@@ -691,122 +658,6 @@ class TestDjangoObjectType:
             }"""
         )
 
-    def test_django_objecttype_convert_choices_global_false(
-        self, graphene_settings, PetModel
-    ):
-        graphene_settings.DJANGO_CHOICE_FIELD_ENUM_CONVERT = False
-
-        class Pet(DjangoObjectType):
-            class Meta:
-                model = PetModel
-                fields = "__all__"
-
-        class Query(ObjectType):
-            pet = Field(Pet)
-
-        schema = Schema(query=Query)
-
-        assert str(schema) == dedent(
-            """\
-            type Query {
-              pet: Pet
-            }
-
-            type Pet {
-              id: ID!
-              kind: String!
-              cuteness: Int!
-            }"""
-        )
-
-    def test_django_objecttype_convert_choices_true_global_false(
-        self, graphene_settings, PetModel
-    ):
-        graphene_settings.DJANGO_CHOICE_FIELD_ENUM_CONVERT = False
-
-        class Pet(DjangoObjectType):
-            class Meta:
-                model = PetModel
-                fields = "__all__"
-                convert_choices_to_enum = True
-
-        class Query(ObjectType):
-            pet = Field(Pet)
-
-        schema = Schema(query=Query)
-
-        assert str(schema) == dedent(
-            """\
-            type Query {
-              pet: Pet
-            }
-
-            type Pet {
-              id: ID!
-              kind: TestsPetModelKindChoices!
-              cuteness: TestsPetModelCutenessChoices!
-            }
-
-            \"""An enumeration.\"""
-            enum TestsPetModelKindChoices {
-              \"""Cat\"""
-              CAT
-
-              \"""Dog\"""
-              DOG
-            }
-
-            \"""An enumeration.\"""
-            enum TestsPetModelCutenessChoices {
-              \"""Kind of cute\"""
-              A_1
-
-              \"""Pretty cute\"""
-              A_2
-
-              \"""OMG SO CUTE!!!\"""
-              A_3
-            }"""
-        )
-
-    def test_django_objecttype_convert_choices_enum_list_global_false(
-        self, graphene_settings, PetModel
-    ):
-        graphene_settings.DJANGO_CHOICE_FIELD_ENUM_CONVERT = False
-
-        class Pet(DjangoObjectType):
-            class Meta:
-                model = PetModel
-                convert_choices_to_enum = ["kind"]
-                fields = "__all__"
-
-        class Query(ObjectType):
-            pet = Field(Pet)
-
-        schema = Schema(query=Query)
-
-        assert str(schema) == dedent(
-            """\
-            type Query {
-              pet: Pet
-            }
-
-            type Pet {
-              id: ID!
-              kind: TestsPetModelKindChoices!
-              cuteness: Int!
-            }
-
-            \"""An enumeration.\"""
-            enum TestsPetModelKindChoices {
-              \"""Cat\"""
-              CAT
-
-              \"""Dog\"""
-              DOG
-            }"""
-        )
-
 
 @with_local_registry
 def test_django_objecttype_name_connection_propagation():

graphene_django/tests/test_utils.py

@@ -1,12 +1,12 @@
 import json
-from unittest.mock import patch
 
 import pytest
 from django.utils.translation import gettext_lazy
+from unittest.mock import patch
 
-from ..utils import GraphQLTestCase, camelize, get_model_fields, get_reverse_fields
+from ..utils import camelize, get_model_fields, GraphQLTestCase
+from .models import Film, Reporter
 from ..utils.testing import graphql_query
-from .models import APNewsReporter, CNNReporter, Film, Reporter
 
 
 def test_get_model_fields_no_duplication():
@@ -19,18 +19,6 @@ def test_get_model_fields_no_duplication():
     assert len(film_fields) == len(film_name_set)
 
 
-def test_get_reverse_fields_includes_proxied_models():
-    reporter_fields = get_reverse_fields(Reporter, [])
-    cnn_reporter_fields = get_reverse_fields(CNNReporter, [])
-    ap_news_reporter_fields = get_reverse_fields(APNewsReporter, [])
-
-    assert (
-        len(list(reporter_fields))
-        == len(list(cnn_reporter_fields))
-        == len(list(ap_news_reporter_fields))
-    )
-
-
 def test_camelize():
     assert camelize({}) == {}
     assert camelize("value_a") == "value_a"

graphene_django/tests/test_views.py

@@ -1,10 +1,13 @@
 import json
-from http import HTTPStatus
-from unittest.mock import patch
 
 import pytest
+
+from unittest.mock import patch
+
 from django.db import connection
 
+from graphene_django.settings import graphene_settings
+
 from .models import Pet
 
 try:
@@ -28,17 +31,13 @@ def response_json(response):
     return json.loads(response.content.decode())
 
 
-def j(**kwargs):
+j = lambda **kwargs: json.dumps(kwargs)
-    return json.dumps(kwargs)
+jl = lambda **kwargs: json.dumps([kwargs])
-
-
-def jl(**kwargs):
-    return json.dumps([kwargs])
 
 
 def test_graphiql_is_enabled(client):
     response = client.get(url_string(), HTTP_ACCEPT="text/html")
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response["Content-Type"].split(";")[0] == "text/html"
 
 
@@ -47,7 +46,7 @@ def test_qfactor_graphiql(client):
         url_string(query="{test}"),
         HTTP_ACCEPT="application/json;q=0.8, text/html;q=0.9",
     )
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response["Content-Type"].split(";")[0] == "text/html"
 
 
@@ -56,7 +55,7 @@ def test_qfactor_json(client):
         url_string(query="{test}"),
         HTTP_ACCEPT="text/html;q=0.8, application/json;q=0.9",
     )
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response["Content-Type"].split(";")[0] == "application/json"
     assert response_json(response) == {"data": {"test": "Hello World"}}
 
@@ -64,7 +63,7 @@ def test_qfactor_json(client):
 def test_allows_get_with_query_param(client):
     response = client.get(url_string(query="{test}"))
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {"data": {"test": "Hello World"}}
 
 
@@ -76,7 +75,7 @@ def test_allows_get_with_variable_values(client):
         )
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {"data": {"test": "Hello Dolly"}}
 
 
@@ -95,7 +94,7 @@ def test_allows_get_with_operation_name(client):
         )
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {
         "data": {"test": "Hello World", "shared": "Hello Everyone"}
     }
@@ -104,7 +103,7 @@ def test_allows_get_with_operation_name(client):
 def test_reports_validation_errors(client):
     response = client.get(url_string(query="{ test, unknownOne, unknownTwo }"))
 
-    assert response.status_code == HTTPStatus.BAD_REQUEST
+    assert response.status_code == 400
     assert response_json(response) == {
         "errors": [
             {
@@ -129,7 +128,7 @@ def test_errors_when_missing_operation_name(client):
         )
     )
 
-    assert response.status_code == HTTPStatus.BAD_REQUEST
+    assert response.status_code == 400
     assert response_json(response) == {
         "errors": [
             {
@@ -147,7 +146,7 @@ def test_errors_when_sending_a_mutation_via_get(client):
         """
         )
     )
-    assert response.status_code == HTTPStatus.METHOD_NOT_ALLOWED
+    assert response.status_code == 405
     assert response_json(response) == {
         "errors": [
             {"message": "Can only perform a mutation operation from a POST request."}
@@ -166,7 +165,7 @@ def test_errors_when_selecting_a_mutation_within_a_get(client):
         )
     )
 
-    assert response.status_code == HTTPStatus.METHOD_NOT_ALLOWED
+    assert response.status_code == 405
     assert response_json(response) == {
         "errors": [
             {"message": "Can only perform a mutation operation from a POST request."}
@@ -185,14 +184,14 @@ def test_allows_mutation_to_exist_within_a_get(client):
         )
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {"data": {"test": "Hello World"}}
 
 
 def test_allows_post_with_json_encoding(client):
     response = client.post(url_string(), j(query="{test}"), "application/json")
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {"data": {"test": "Hello World"}}
 
 
@@ -201,7 +200,7 @@ def test_batch_allows_post_with_json_encoding(client):
         batch_url_string(), jl(id=1, query="{test}"), "application/json"
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == [
         {"id": 1, "data": {"test": "Hello World"}, "status": 200}
     ]
@@ -210,7 +209,7 @@ def test_batch_allows_post_with_json_encoding(client):
 def test_batch_fails_if_is_empty(client):
     response = client.post(batch_url_string(), "[]", "application/json")
 
-    assert response.status_code == HTTPStatus.BAD_REQUEST
+    assert response.status_code == 400
     assert response_json(response) == {
         "errors": [{"message": "Received an empty list in the batch request."}]
     }
@@ -223,18 +222,18 @@ def test_allows_sending_a_mutation_via_post(client):
         "application/json",
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {"data": {"writeTest": {"test": "Hello World"}}}
 
 
 def test_allows_post_with_url_encoding(client):
     response = client.post(
         url_string(),
-        urlencode({"query": "{test}"}),
+        urlencode(dict(query="{test}")),
         "application/x-www-form-urlencoded",
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {"data": {"test": "Hello World"}}
 
 
@@ -248,7 +247,7 @@ def test_supports_post_json_query_with_string_variables(client):
         "application/json",
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {"data": {"test": "Hello Dolly"}}
 
 
@@ -263,7 +262,7 @@ def test_batch_supports_post_json_query_with_string_variables(client):
         "application/json",
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == [
         {"id": 1, "data": {"test": "Hello Dolly"}, "status": 200}
     ]
@@ -279,7 +278,7 @@ def test_supports_post_json_query_with_json_variables(client):
         "application/json",
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {"data": {"test": "Hello Dolly"}}
 
 
@@ -294,7 +293,7 @@ def test_batch_supports_post_json_query_with_json_variables(client):
         "application/json",
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == [
         {"id": 1, "data": {"test": "Hello Dolly"}, "status": 200}
     ]
@@ -304,15 +303,15 @@ def test_supports_post_url_encoded_query_with_string_variables(client):
     response = client.post(
         url_string(),
         urlencode(
-            {
+            dict(
-                "query": "query helloWho($who: String){ test(who: $who) }",
+                query="query helloWho($who: String){ test(who: $who) }",
-                "variables": json.dumps({"who": "Dolly"}),
+                variables=json.dumps({"who": "Dolly"}),
-            }
+            )
         ),
         "application/x-www-form-urlencoded",
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {"data": {"test": "Hello Dolly"}}
 
 
@@ -323,18 +322,18 @@ def test_supports_post_json_quey_with_get_variable_values(client):
         "application/json",
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {"data": {"test": "Hello Dolly"}}
 
 
 def test_post_url_encoded_query_with_get_variable_values(client):
     response = client.post(
         url_string(variables=json.dumps({"who": "Dolly"})),
-        urlencode({"query": "query helloWho($who: String){ test(who: $who) }"}),
+        urlencode(dict(query="query helloWho($who: String){ test(who: $who) }")),
         "application/x-www-form-urlencoded",
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {"data": {"test": "Hello Dolly"}}
 
 
@@ -345,7 +344,7 @@ def test_supports_post_raw_text_query_with_get_variable_values(client):
         "application/graphql",
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {"data": {"test": "Hello Dolly"}}
 
 
@@ -366,7 +365,7 @@ def test_allows_post_with_operation_name(client):
         "application/json",
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {
         "data": {"test": "Hello World", "shared": "Hello Everyone"}
     }
@@ -390,7 +389,7 @@ def test_batch_allows_post_with_operation_name(client):
         "application/json",
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == [
         {
             "id": 1,
@@ -414,7 +413,7 @@ def test_allows_post_with_get_operation_name(client):
         "application/graphql",
     )
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {
         "data": {"test": "Hello World", "shared": "Hello Everyone"}
     }
@@ -431,7 +430,7 @@ def test_inherited_class_with_attributes_works(client):
 
     # Check graphiql works
     response = client.get(url_string(inherited_url), HTTP_ACCEPT="text/html")
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
 
 
 @pytest.mark.urls("graphene_django.tests.urls_pretty")
@@ -453,7 +452,7 @@ def test_supports_pretty_printing_by_request(client):
 
 def test_handles_field_errors_caught_by_graphql(client):
     response = client.get(url_string(query="{thrower}"))
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {
         "data": None,
         "errors": [
@@ -468,7 +467,7 @@ def test_handles_field_errors_caught_by_graphql(client):
 
 def test_handles_syntax_errors_caught_by_graphql(client):
     response = client.get(url_string(query="syntaxerror"))
-    assert response.status_code == HTTPStatus.BAD_REQUEST
+    assert response.status_code == 400
     assert response_json(response) == {
         "errors": [
             {
@@ -482,7 +481,7 @@ def test_handles_syntax_errors_caught_by_graphql(client):
 def test_handles_errors_caused_by_a_lack_of_query(client):
     response = client.get(url_string())
 
-    assert response.status_code == HTTPStatus.BAD_REQUEST
+    assert response.status_code == 400
     assert response_json(response) == {
         "errors": [{"message": "Must provide query string."}]
     }
@@ -491,7 +490,7 @@ def test_handles_errors_caused_by_a_lack_of_query(client):
 def test_handles_not_expected_json_bodies(client):
     response = client.post(url_string(), "[]", "application/json")
 
-    assert response.status_code == HTTPStatus.BAD_REQUEST
+    assert response.status_code == 400
     assert response_json(response) == {
         "errors": [{"message": "The received data is not a valid JSON query."}]
     }
@@ -500,7 +499,7 @@ def test_handles_not_expected_json_bodies(client):
 def test_handles_invalid_json_bodies(client):
     response = client.post(url_string(), "[oh}", "application/json")
 
-    assert response.status_code == HTTPStatus.BAD_REQUEST
+    assert response.status_code == 400
     assert response_json(response) == {
         "errors": [{"message": "POST body sent invalid JSON."}]
     }
@@ -512,17 +511,17 @@ def test_handles_django_request_error(client, monkeypatch):
 
     monkeypatch.setattr("django.http.request.HttpRequest.read", mocked_read)
 
-    valid_json = json.dumps({"foo": "bar"})
+    valid_json = json.dumps(dict(foo="bar"))
     response = client.post(url_string(), valid_json, "application/json")
 
-    assert response.status_code == HTTPStatus.BAD_REQUEST
+    assert response.status_code == 400
     assert response_json(response) == {"errors": [{"message": "foo-bar"}]}
 
 
 def test_handles_incomplete_json_bodies(client):
     response = client.post(url_string(), '{"query":', "application/json")
 
-    assert response.status_code == HTTPStatus.BAD_REQUEST
+    assert response.status_code == 400
     assert response_json(response) == {
         "errors": [{"message": "POST body sent invalid JSON."}]
     }
@@ -534,7 +533,7 @@ def test_handles_plain_post_text(client):
         "query helloWho($who: String){ test(who: $who) }",
         "text/plain",
     )
-    assert response.status_code == HTTPStatus.BAD_REQUEST
+    assert response.status_code == 400
     assert response_json(response) == {
         "errors": [{"message": "Must provide query string."}]
     }
@@ -546,7 +545,7 @@ def test_handles_poorly_formed_variables(client):
             query="query helloWho($who: String){ test(who: $who) }", variables="who:You"
         )
     )
-    assert response.status_code == HTTPStatus.BAD_REQUEST
+    assert response.status_code == 400
     assert response_json(response) == {
         "errors": [{"message": "Variables are invalid JSON."}]
     }
@@ -554,7 +553,7 @@ def test_handles_poorly_formed_variables(client):
 
 def test_handles_unsupported_http_methods(client):
     response = client.put(url_string(query="{test}"))
-    assert response.status_code == HTTPStatus.METHOD_NOT_ALLOWED
+    assert response.status_code == 405
     assert response["Allow"] == "GET, POST"
     assert response_json(response) == {
         "errors": [{"message": "GraphQL only supports GET and POST requests."}]
@@ -564,7 +563,7 @@ def test_handles_unsupported_http_methods(client):
 def test_passes_request_into_context_request(client):
     response = client.get(url_string(query="{request}", q="testing"))
 
-    assert response.status_code == HTTPStatus.OK
+    assert response.status_code == 200
     assert response_json(response) == {"data": {"request": "testing"}}
 
 
@@ -828,97 +827,3 @@ def test_query_errors_atomic_request(set_rollback_mock, client):
 def test_query_errors_non_atomic(set_rollback_mock, client):
     client.get(url_string(query="force error"))
     set_rollback_mock.assert_not_called()
-
-
-VALIDATION_URLS = [
-    "/graphql/validation/",
-    "/graphql/validation/alternative/",
-    "/graphql/validation/inherited/",
-]
-
-QUERY_WITH_TWO_INTROSPECTIONS = """
-query Instrospection {
-    queryType: __schema {
-        queryType {name}
-    }
-    mutationType: __schema {
-        mutationType {name}
-    }
-}
-"""
-
-N_INTROSPECTIONS = 2
-
-INTROSPECTION_DISALLOWED_ERROR_MESSAGE = "introspection is disabled"
-MAX_VALIDATION_ERRORS_EXCEEDED_MESSAGE = "too many validation errors"
-
-
-@pytest.mark.urls("graphene_django.tests.urls_validation")
-def test_allow_introspection(client):
-    response = client.post(
-        url_string("/graphql/", query="{__schema {queryType {name}}}")
-    )
-    assert response.status_code == HTTPStatus.OK
-
-    assert response_json(response) == {
-        "data": {"__schema": {"queryType": {"name": "QueryRoot"}}}
-    }
-
-
-@pytest.mark.parametrize("url", VALIDATION_URLS)
-@pytest.mark.urls("graphene_django.tests.urls_validation")
-def test_validation_disallow_introspection(client, url):
-    response = client.post(url_string(url, query="{__schema {queryType {name}}}"))
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST
-
-    json_response = response_json(response)
-    assert "data" not in json_response
-    assert "errors" in json_response
-    assert len(json_response["errors"]) == 1
-
-    error_message = json_response["errors"][0]["message"]
-    assert INTROSPECTION_DISALLOWED_ERROR_MESSAGE in error_message
-
-
-@pytest.mark.parametrize("url", VALIDATION_URLS)
-@pytest.mark.urls("graphene_django.tests.urls_validation")
-@patch(
-    "graphene_django.settings.graphene_settings.MAX_VALIDATION_ERRORS", N_INTROSPECTIONS
-)
-def test_within_max_validation_errors(client, url):
-    response = client.post(url_string(url, query=QUERY_WITH_TWO_INTROSPECTIONS))
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST
-
-    json_response = response_json(response)
-    assert "data" not in json_response
-    assert "errors" in json_response
-    assert len(json_response["errors"]) == N_INTROSPECTIONS
-
-    error_messages = [error["message"].lower() for error in json_response["errors"]]
-
-    n_introspection_error_messages = sum(
-        INTROSPECTION_DISALLOWED_ERROR_MESSAGE in msg for msg in error_messages
-    )
-    assert n_introspection_error_messages == N_INTROSPECTIONS
-
-    assert all(
-        MAX_VALIDATION_ERRORS_EXCEEDED_MESSAGE not in msg for msg in error_messages
-    )
-
-
-@pytest.mark.parametrize("url", VALIDATION_URLS)
-@pytest.mark.urls("graphene_django.tests.urls_validation")
-@patch("graphene_django.settings.graphene_settings.MAX_VALIDATION_ERRORS", 1)
-def test_exceeds_max_validation_errors(client, url):
-    response = client.post(url_string(url, query=QUERY_WITH_TWO_INTROSPECTIONS))
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST
-
-    json_response = response_json(response)
-    assert "data" not in json_response
-    assert "errors" in json_response
-
-    error_messages = (error["message"].lower() for error in json_response["errors"])
-    assert any(MAX_VALIDATION_ERRORS_EXCEEDED_MESSAGE in msg for msg in error_messages)

graphene_django/tests/urls_validation.py

@@ -1,26 +0,0 @@
-from django.urls import path
-
-from graphene.validation import DisableIntrospection
-
-from ..views import GraphQLView
-from .schema_view import schema
-
-
-class View(GraphQLView):
-    schema = schema
-
-
-class NoIntrospectionView(View):
-    validation_rules = (DisableIntrospection,)
-
-
-class NoIntrospectionViewInherited(NoIntrospectionView):
-    pass
-
-
-urlpatterns = [
-    path("graphql/", View.as_view()),
-    path("graphql/validation/", View.as_view(validation_rules=(DisableIntrospection,))),
-    path("graphql/validation/alternative/", NoIntrospectionView.as_view()),
-    path("graphql/validation/inherited/", NoIntrospectionViewInherited.as_view()),
-]

graphene_django/types.py

@@ -1,10 +1,9 @@
 import warnings
 from collections import OrderedDict
-from typing import Type  # noqa: F401
+from typing import Type
-
-from django.db.models import Model  # noqa: F401
 
 import graphene
+from django.db.models import Model
 from graphene.relay import Connection, Node
 from graphene.types.objecttype import ObjectType, ObjectTypeOptions
 from graphene.types.utils import yank_fields_from_attrs
@@ -23,7 +22,7 @@ ALL_FIELDS = "__all__"
 
 
 def construct_fields(
-    model, registry, only_fields, exclude_fields, convert_choices_to_enum=None
+    model, registry, only_fields, exclude_fields, convert_choices_to_enum
 ):
     _model_fields = get_model_fields(model)
 
@@ -47,7 +46,7 @@ def construct_fields(
             continue
 
         _convert_choices_to_enum = convert_choices_to_enum
-        if isinstance(_convert_choices_to_enum, list):
+        if not isinstance(_convert_choices_to_enum, bool):
             # then `convert_choices_to_enum` is a list of field names to convert
             if name in _convert_choices_to_enum:
                 _convert_choices_to_enum = True
@@ -102,8 +101,10 @@ def validate_fields(type_, model, fields, only_fields, exclude_fields):
         if name in all_field_names:
             # Field is a custom field
             warnings.warn(
-                f'Excluding the custom field "{name}" on DjangoObjectType "{type_}" has no effect. '
+                (
-                'Either remove the custom field or remove the field from the "exclude" list.'
+                    '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, type_=type_)
             )
         else:
             if not hasattr(model, name):
@@ -146,9 +147,9 @@ class DjangoObjectType(ObjectType):
         connection_class=None,
         use_connection=None,
         interfaces=(),
-        convert_choices_to_enum=None,
+        convert_choices_to_enum=True,
         _meta=None,
-        **options,
+        **options
     ):
         assert is_valid_django_model(model), (
             'You need to pass a valid Django Model in {}.Meta, received "{}".'
@@ -158,9 +159,9 @@ class DjangoObjectType(ObjectType):
             registry = get_global_registry()
 
         assert isinstance(registry, Registry), (
-            f"The attribute registry in {cls.__name__} needs to be an instance of "
+            "The attribute registry in {} needs to be an instance of "
-            f'Registry, received "{registry}".'
+            'Registry, received "{}".'
-        )
+        ).format(cls.__name__, registry)
 
         if filter_fields and filterset_class:
             raise Exception("Can't set both filter_fields and filterset_class")
@@ -173,7 +174,7 @@ class DjangoObjectType(ObjectType):
 
         assert not (fields and exclude), (
             "Cannot set both 'fields' and 'exclude' options on "
-            f"DjangoObjectType {cls.__name__}."
+            "DjangoObjectType {class_name}.".format(class_name=cls.__name__)
         )
 
         # Alias only_fields -> fields
@@ -212,8 +213,8 @@ class DjangoObjectType(ObjectType):
             warnings.warn(
                 "Creating a DjangoObjectType without either the `fields` "
                 "or the `exclude` option is deprecated. Add an explicit `fields "
-                f"= '__all__'` option on DjangoObjectType {cls.__name__} to use all "
+                "= '__all__'` option on DjangoObjectType {class_name} to use all "
-                "fields",
+                "fields".format(class_name=cls.__name__),
                 DeprecationWarning,
                 stacklevel=2,
             )
@@ -238,9 +239,9 @@ class DjangoObjectType(ObjectType):
             )
 
         if connection is not None:
-            assert issubclass(
+            assert issubclass(connection, Connection), (
-                connection, Connection
+                "The connection must be a Connection. Received {}"
-            ), f"The connection must be a Connection. Received {connection.__name__}"
+            ).format(connection.__name__)
 
         if not _meta:
             _meta = DjangoObjectTypeOptions(cls)
@@ -271,7 +272,7 @@ class DjangoObjectType(ObjectType):
         if isinstance(root, cls):
             return True
         if not is_valid_django_model(root.__class__):
-            raise Exception(f'Received incompatible instance "{root}".')
+            raise Exception(('Received incompatible instance "{}".').format(root))
 
         if cls._meta.model._meta.proxy:
             model = root._meta.model

graphene_django/utils/__init__.py

@@ -1,7 +1,6 @@
 from .testing import GraphQLTestCase
 from .utils import (
     DJANGO_FILTER_INSTALLED,
-    bypass_get_queryset,
     camelize,
     get_model_fields,
     get_reverse_fields,
@@ -17,5 +16,4 @@ __all__ = [
     "camelize",
     "is_valid_django_model",
     "GraphQLTestCase",
-    "bypass_get_queryset",
 ]

graphene_django/utils/str_converters.py

@@ -1,5 +1,4 @@
 import re
-
 from text_unidecode import unidecode
 
 

graphene_django/utils/testing.py

@@ -4,7 +4,6 @@ import warnings
 from django.test import Client, TestCase, TransactionTestCase
 
 from graphene_django.settings import graphene_settings
-from graphene_django.utils.utils import _DJANGO_VERSION_AT_LEAST_4_2
 
 DEFAULT_GRAPHQL_URL = "/graphql"
 
@@ -56,14 +55,8 @@ def graphql_query(
         else:
             body["variables"] = {"input": input_data}
     if headers:
-        header_params = (
-            {"headers": headers} if _DJANGO_VERSION_AT_LEAST_4_2 else headers
-        )
         resp = client.post(
-            graphql_url,
+            graphql_url, json.dumps(body), content_type="application/json", **headers
-            json.dumps(body),
-            content_type="application/json",
-            **header_params,
         )
     else:
         resp = client.post(

graphene_django/utils/tests/test_testing.py

@@ -1,9 +1,9 @@
 import pytest
-from django.test import Client
 
-from ...settings import graphene_settings
-from ...tests.test_types import with_local_registry
 from .. import GraphQLTestCase
+from ...tests.test_types import with_local_registry
+from ...settings import graphene_settings
+from django.test import Client
 
 
 @with_local_registry
@@ -23,7 +23,7 @@ def test_graphql_test_case_deprecated_client_getter():
     tc.setUpClass()
 
     with pytest.warns(PendingDeprecationWarning):
-        tc._client  # noqa: B018
+        tc._client
 
 
 @with_local_registry

graphene_django/utils/utils.py

@@ -1,6 +1,5 @@
 import inspect
 
-import django
 from django.db import connection, models, transaction
 from django.db.models.manager import Manager
 from django.utils.encoding import force_str
@@ -38,52 +37,18 @@ def camelize(data):
     return data
 
 
-def _get_model_ancestry(model):
-    model_ancestry = [model]
-
-    for base in model.__bases__:
-        if is_valid_django_model(base) and getattr(base, "_meta", False):
-            model_ancestry.append(base)
-    return model_ancestry
-
-
 def get_reverse_fields(model, local_field_names):
-    """
+    for name, attr in model.__dict__.items():
-    Searches through the model's ancestry and gets reverse relationships the models
+        # Don't duplicate any local fields
-    Yields a tuple of (field.name, field)
+        if name in local_field_names:
-    """
+            continue
-    model_ancestry = _get_model_ancestry(model)
 
-    for _model in model_ancestry:
+        # "rel" for FK and M2M relations and "related" for O2O Relations
-        for name, attr in _model.__dict__.items():
+        related = getattr(attr, "rel", None) or getattr(attr, "related", None)
-            # Don't duplicate any local fields
+        if isinstance(related, models.ManyToOneRel):
-            if name in local_field_names:
+            yield (name, related)
-                continue
+        elif isinstance(related, models.ManyToManyRel) and not related.symmetrical:
-
+            yield (name, related)
-            # "rel" for FK and M2M relations and "related" for O2O Relations
-            related = getattr(attr, "rel", None) or getattr(attr, "related", None)
-            if isinstance(related, models.ManyToOneRel):
-                yield (name, related)
-            elif isinstance(related, models.ManyToManyRel) and not related.symmetrical:
-                yield (name, related)
-
-
-def get_local_fields(model):
-    """
-    Searches through the model's ancestry and gets the fields on the models
-    Returns a dict of {field.name: field}
-    """
-    model_ancestry = _get_model_ancestry(model)
-
-    local_fields_dict = {}
-    for _model in model_ancestry:
-        for field in sorted(
-            list(_model._meta.fields) + list(_model._meta.local_many_to_many)
-        ):
-            if field.name not in local_fields_dict:
-                local_fields_dict[field.name] = field
-
-    return list(local_fields_dict.items())
 
 
 def maybe_queryset(value):
@@ -93,14 +58,17 @@ def maybe_queryset(value):
 
 
 def get_model_fields(model):
-    """
+    local_fields = [
-    Gets all the fields and relationships on the Django model and its ancestry.
+        (field.name, field)
-    Prioritizes local fields and relationships over the reverse relationships of the same name
+        for field in sorted(
-    Returns a tuple of (field.name, field)
+            list(model._meta.fields) + list(model._meta.local_many_to_many)
-    """
+        )
-    local_fields = get_local_fields(model)
+    ]
-    local_field_names = {field[0] for field in local_fields}
+
+    # Make sure we don't duplicate local fields with "reverse" version
+    local_field_names = [field[0] for field in local_fields]
     reverse_fields = get_reverse_fields(model, local_field_names)
+
     all_fields = local_fields + list(reverse_fields)
 
     return all_fields
@@ -111,7 +79,24 @@ def is_valid_django_model(model):
 
 
 def import_single_dispatch():
-    from functools import singledispatch
+    try:
+        from functools import singledispatch
+    except ImportError:
+        singledispatch = None
+
+    if not singledispatch:
+        try:
+            from singledispatch import singledispatch
+        except ImportError:
+            pass
+
+    if not singledispatch:
+        raise Exception(
+            "It seems your python version does not include "
+            "functools.singledispatch. Please install the 'singledispatch' "
+            "package. More information here: "
+            "https://pypi.python.org/pypi/singledispatch"
+        )
 
     return singledispatch
 
@@ -120,17 +105,3 @@ def set_rollback():
     atomic_requests = connection.settings_dict.get("ATOMIC_REQUESTS", False)
     if atomic_requests and connection.in_atomic_block:
         transaction.set_rollback(True)
-
-
-def bypass_get_queryset(resolver):
-    """
-    Adds a bypass_get_queryset attribute to the resolver, which is used to
-    bypass any custom get_queryset method of the DjangoObjectType.
-    """
-    resolver._bypass_get_queryset = True
-    return resolver
-
-
-_DJANGO_VERSION_AT_LEAST_4_2 = django.VERSION[0] > 4 or (
-    django.VERSION[0] >= 4 and django.VERSION[1] >= 2
-)

graphene_django/views.py

@@ -9,19 +9,13 @@ from django.shortcuts import render
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.views.generic import View
-from graphql import (
+from graphql import OperationType, get_operation_ast, parse
-    ExecutionResult,
-    OperationType,
-    execute,
-    get_operation_ast,
-    parse,
-    validate_schema,
-)
 from graphql.error import GraphQLError
-from graphql.execution.middleware import MiddlewareManager
+from graphql.execution import ExecutionResult
-from graphql.validation import validate
 
 from graphene import Schema
+from graphql.execution.middleware import MiddlewareManager
+
 from graphene_django.constants import MUTATION_ERRORS_FLAG
 from graphene_django.utils.utils import set_rollback
 
@@ -46,9 +40,9 @@ def get_accepted_content_types(request):
 
     raw_content_types = request.META.get("HTTP_ACCEPT", "*/*").split(",")
     qualified_content_types = map(qualify, raw_content_types)
-    return [
+    return list(
         x[0] for x in sorted(qualified_content_types, key=lambda x: x[1], reverse=True)
-    ]
+    )
 
 
 def instantiate_middleware(middlewares):
@@ -96,7 +90,6 @@ class GraphQLView(View):
     batch = False
     subscription_path = None
     execution_context_class = None
-    validation_rules = None
 
     def __init__(
         self,
@@ -108,7 +101,6 @@ class GraphQLView(View):
         batch=False,
         subscription_path=None,
         execution_context_class=None,
-        validation_rules=None,
     ):
         if not schema:
             schema = graphene_settings.SCHEMA
@@ -137,8 +129,6 @@ class GraphQLView(View):
         ), "A Schema is required to be provided to GraphQLView."
         assert not all((graphiql, batch)), "Use either graphiql or batch processing"
 
-        self.validation_rules = validation_rules or self.validation_rules
-
     # noinspection PyUnusedLocal
     def get_root_value(self, request):
         return self.root_value
@@ -178,13 +168,11 @@ class GraphQLView(View):
                     subscriptions_transport_ws_sri=self.subscriptions_transport_ws_sri,
                     graphiql_plugin_explorer_version=self.graphiql_plugin_explorer_version,
                     graphiql_plugin_explorer_sri=self.graphiql_plugin_explorer_sri,
-                    graphiql_plugin_explorer_css_sri=self.graphiql_plugin_explorer_css_sri,
                     # The SUBSCRIPTION_PATH setting.
                     subscription_path=self.subscription_path,
                     # GraphiQL headers tab,
                     graphiql_header_editor_enabled=graphene_settings.GRAPHIQL_HEADER_EDITOR_ENABLED,
                     graphiql_should_persist_headers=graphene_settings.GRAPHIQL_SHOULD_PERSIST_HEADERS,
-                    graphiql_input_value_deprecation=graphene_settings.GRAPHIQL_INPUT_VALUE_DEPRECATION,
                 )
 
             if self.batch:
@@ -306,61 +294,43 @@ class GraphQLView(View):
                 return None
             raise HttpError(HttpResponseBadRequest("Must provide query string."))
 
-        schema = self.schema.graphql_schema
-
-        schema_validation_errors = validate_schema(schema)
-        if schema_validation_errors:
-            return ExecutionResult(data=None, errors=schema_validation_errors)
-
         try:
             document = parse(query)
         except Exception as e:
             return ExecutionResult(errors=[e])
 
-        operation_ast = get_operation_ast(document, operation_name)
+        if request.method.lower() == "get":
+            operation_ast = get_operation_ast(document, operation_name)
+            if operation_ast and operation_ast.operation != OperationType.QUERY:
+                if show_graphiql:
+                    return None
 
-        if (
+                raise HttpError(
-            request.method.lower() == "get"
+                    HttpResponseNotAllowed(
-            and operation_ast is not None
+                        ["POST"],
-            and operation_ast.operation != OperationType.QUERY
+                        "Can only perform a {} operation from a POST request.".format(
-        ):
+                            operation_ast.operation.value
-            if show_graphiql:
+                        ),
-                return None
+                    )
-
-            raise HttpError(
-                HttpResponseNotAllowed(
-                    ["POST"],
-                    "Can only perform a {} operation from a POST request.".format(
-                        operation_ast.operation.value
-                    ),
                 )
-            )
-
-        validation_errors = validate(
-            schema,
-            document,
-            self.validation_rules,
-            graphene_settings.MAX_VALIDATION_ERRORS,
-        )
-
-        if validation_errors:
-            return ExecutionResult(data=None, errors=validation_errors)
-
         try:
-            execute_options = {
+            extra_options = {}
+            if self.execution_context_class:
+                extra_options["execution_context_class"] = self.execution_context_class
+
+            options = {
+                "source": query,
                 "root_value": self.get_root_value(request),
-                "context_value": self.get_context(request),
                 "variable_values": variables,
                 "operation_name": operation_name,
+                "context_value": self.get_context(request),
                 "middleware": self.get_middleware(request),
             }
-            if self.execution_context_class:
+            options.update(extra_options)
-                execute_options[
-                    "execution_context_class"
-                ] = self.execution_context_class
 
+            operation_ast = get_operation_ast(document, operation_name)
             if (
-                operation_ast is not None
+                operation_ast
                 and operation_ast.operation == OperationType.MUTATION
                 and (
                     graphene_settings.ATOMIC_MUTATIONS is True
@@ -368,12 +338,12 @@ class GraphQLView(View):
                 )
             ):
                 with transaction.atomic():
-                    result = execute(schema, document, **execute_options)
+                    result = self.schema.execute(**options)
                     if getattr(request, MUTATION_ERRORS_FLAG, False) is True:
                         transaction.set_rollback(True)
                 return result
 
-            return execute(schema, document, **execute_options)
+            return self.schema.execute(**options)
         except Exception as e:
             return ExecutionResult(errors=[e])
 

setup.cfg

@@ -4,13 +4,46 @@ test=pytest
 [bdist_wheel]
 universal=1
 
+[flake8]
+exclude = docs,graphene_django/debug/sql/*
+max-line-length = 120
+select =
+	# Dictionary key repeated
+	F601,
+	# Ensure use of ==/!= to compare with str, bytes and int literals
+	F632,
+	# Redefinition of unused name
+	F811,
+	# Using an undefined variable
+	F821,
+	# Defining an undefined variable in __all__
+	F822,
+	# Using a variable before it is assigned
+	F823,
+	# Duplicate argument in function declaration
+	F831,
+	# Black would format this line
+	BLK,
+	# Do not use bare except
+	B001,
+	# Don't allow ++n. You probably meant n += 1
+	B002,
+	# Do not use mutable structures for argument defaults
+	B006,
+	# Do not perform calls in argument defaults
+	B008
+
 [coverage:run]
 omit = */tests/*
 
+[isort]
+known_first_party=graphene,graphene_django
+multi_line_output=3
+include_trailing_comma=True
+force_grid_wrap=0
+use_parentheses=True
+line_length=88
+
 [tool:pytest]
 DJANGO_SETTINGS_MODULE = examples.django_test_settings
 addopts = --random-order
-filterwarnings =
-    error
-    # we can't do anything about the DeprecationWarning about typing.ByteString in graphql
-    default:'typing\.ByteString' is deprecated:DeprecationWarning:graphql\.pyutils\.is_iterable

setup.py

@@ -26,7 +26,10 @@ tests_require = [
 
 
 dev_requires = [
-    "ruff==0.1.2",
+    "black==23.3.0",
+    "flake8==6.0.0",
+    "flake8-black==0.3.6",
+    "flake8-bugbear==23.3.23",
     "pre-commit",
 ] + tests_require
 
@@ -45,18 +48,16 @@ setup(
         "Intended Audience :: Developers",
         "Topic :: Software Development :: Libraries",
         "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Framework :: Django",
         "Framework :: Django :: 3.2",
         "Framework :: Django :: 4.1",
         "Framework :: Django :: 4.2",
-        "Framework :: Django :: 5.1",
-        "Framework :: Django :: 5.2",
     ],
     keywords="api graphql protocol rest relay graphene",
     packages=find_packages(exclude=["tests", "examples", "examples.*"]),

tox.ini

@@ -1,25 +1,23 @@
 [tox]
 envlist =
-    py{38,39,310}-django32
+    py{37,38,39,310}-django32,
-    py{38,39}-django42
+    py{38,39,310}-django{41,42,main},
-    py{310,311,312}-django{42,50,51,main}
+    py311-django{41,42,main}
     pre-commit
 
 [gh-actions]
 python =
+    3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310
     3.11: py311
-    3.12: py312
 
 [gh-actions:env]
 DJANGO =
     3.2: django32
+    4.1: django41
     4.2: django42
-    5.0: django50
-    5.1: django51
-    5.2: django52
     main: djangomain
 
 [testenv]
@@ -32,15 +30,13 @@ deps =
     -e.[test]
     psycopg2-binary
     django32: Django>=3.2,<4.0
+    django41: Django>=4.1,<4.2
     django42: Django>=4.2,<4.3
-    django50: Django>=5.0,<5.1
-    django51: Django>=5.1,<5.2
-    django52: Django>=5.2,<6.0
     djangomain: https://github.com/django/django/archive/main.zip
-commands = {posargs:pytest --cov=graphene_django graphene_django examples}
+commands = {posargs:py.test --cov=graphene_django graphene_django examples}
 
 [testenv:pre-commit]
 skip_install = true
 deps = pre-commit
 commands =
-    pre-commit run {posargs:--all-files --show-diff-on-failure}
+    pre-commit run --all-files --show-diff-on-failure