.github/workflows/build.yaml

@@ -1,21 +0,0 @@
-name: 📦 Build
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.10"
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install build twine
-    - name: Building package
-      run: python3 -m build
-    - name: Check package with Twine
-      run: twine check dist/*

.github/workflows/coveralls.yml

@@ -0,0 +1,25 @@
+name: 📊 Check Coverage
+on:
+  push:
+    branches:
+      - master
+      - '*.x'
+    paths-ignore:
+      - 'docs/**'
+      - '*.md'
+      - '*.rst'
+  pull_request:
+    branches:
+      - master
+      - '*.x'
+    paths-ignore:
+      - 'docs/**'
+      - '*.md'
+      - '*.rst'
+jobs:
+  coveralls_finish:
+    # check coverage increase/decrease
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls Finished
+        uses: AndreMiras/coveralls-python-action@develop

.github/workflows/deploy.yml

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

.github/workflows/lint.yml

@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v5
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v2
       with:
-        python-version: "3.10"
+        python-version: 3.9
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/tests.yml

@@ -25,40 +25,32 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {name: '3.13', python: '3.13', os: ubuntu-latest, tox: py313}
-          - {name: '3.12', python: '3.12', os: ubuntu-latest, tox: py312}
-          - {name: '3.11', python: '3.11', os: ubuntu-latest, tox: py311}
           - {name: '3.10', python: '3.10', os: ubuntu-latest, tox: py310}
           - {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39}
           - {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38}
+          - {name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37}
+          - {name: '3.6', python: '3.6', os: ubuntu-latest, tox: py36}
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
 
       - name: update pip
         run: |
-          python -m pip install --upgrade pip
-          pip install --upgrade setuptools wheel
+          pip install -U wheel
+          pip install -U setuptools
+          python -m pip install -U pip
 
       - name: get pip cache dir
         id: pip-cache
-        run: echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=dir::$(pip cache dir)"
+
       - name: cache pip dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: pip|${{ runner.os }}|${{ matrix.python }}|${{ hashFiles('setup.py') }}
+
       - run: pip install tox
       - run: tox -e ${{ matrix.tox }}
-      - name: Upload coverage.xml
-        if: ${{ matrix.python == '3.10' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: graphene-coverage
-          path: coverage.xml
-          if-no-files-found: error
-      - name: Upload coverage.xml to codecov
-        if: ${{ matrix.python == '3.10' }}
-        uses: codecov/codecov-action@v4

.gitignore

@@ -90,4 +90,3 @@ venv/
 *.sqlite3
 .vscode
 .mypy_cache
-.ruff_cache

.isort.cfg

@@ -0,0 +1,2 @@
+[settings]
+known_third_party = aniso8601,graphql,graphql_relay,promise,pytest,pytz,pyutils,setuptools,snapshottest,sphinx_graphene_theme

.pre-commit-config.yaml

@@ -1,9 +1,9 @@
 default_language_version:
-  python: python3.10
+  python: python3.9
 
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.2.0
     hooks:
     -   id: check-merge-conflict
     -   id: check-json
@@ -17,13 +17,14 @@ repos:
     -   id: trailing-whitespace
         exclude: README.md
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.3
+    rev: v2.32.1
     hooks:
     -   id: pyupgrade
--   repo: https://github.com/astral-sh/ruff-pre-commit
-    # Ruff version.
-    rev: v0.5.0
+-   repo: https://github.com/ambv/black
+    rev: 22.3.0
     hooks:
-        - id: ruff
-        - id: ruff-format
-          args: [ --check ]
+    -   id: black
+-   repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
+    hooks:
+    -   id: flake8

Makefile

@@ -7,7 +7,6 @@ help:
 install-dev:
 	pip install -e ".[dev]"
 
-.PHONY: test ## Run tests
 test:
 	py.test graphene examples
 

README.md

@@ -1,8 +1,8 @@
-# ![Graphene Logo](http://graphene-python.org/favicon.png) [Graphene](http://graphene-python.org)  [![PyPI version](https://badge.fury.io/py/graphene.svg)](https://badge.fury.io/py/graphene) [![Coverage Status](https://coveralls.io/repos/graphql-python/graphene/badge.svg?branch=master&service=github)](https://coveralls.io/github/graphql-python/graphene?branch=master) [![](https://dcbadge.vercel.app/api/server/T6Gp6NFYHe?style=flat)](https://discord.gg/T6Gp6NFYHe)
+# ![Graphene Logo](http://graphene-python.org/favicon.png) [Graphene](http://graphene-python.org) [![Build Status](https://travis-ci.org/graphql-python/graphene.svg?branch=master)](https://travis-ci.org/graphql-python/graphene) [![PyPI version](https://badge.fury.io/py/graphene.svg)](https://badge.fury.io/py/graphene) [![Coverage Status](https://coveralls.io/repos/graphql-python/graphene/badge.svg?branch=master&service=github)](https://coveralls.io/github/graphql-python/graphene?branch=master)
 
-[💬 Join the community on Discord](https://discord.gg/T6Gp6NFYHe)
+[💬 Join the community on Slack](https://join.slack.com/t/graphenetools/shared_invite/enQtOTE2MDQ1NTg4MDM1LTA4Nzk0MGU0NGEwNzUxZGNjNDQ4ZjAwNDJjMjY0OGE1ZDgxZTg4YjM2ZTc4MjE2ZTAzZjE2ZThhZTQzZTkyMmM)
 
-**We are looking for contributors**! Please check the current issues to see how you can help ❤️
+**We are looking for contributors**! Please check the [ROADMAP](https://github.com/graphql-python/graphene/blob/master/ROADMAP.md) to see how you can help ❤️
 
 ## Introduction
 
@@ -10,7 +10,7 @@
 
 - **Easy to use:** Graphene helps you use GraphQL in Python without effort.
 - **Relay:** Graphene has builtin support for Relay.
-- **Data agnostic:** Graphene supports any kind of data source: SQL (Django, SQLAlchemy), Mongo, custom Python objects, etc.
+- **Data agnostic:** Graphene supports any kind of data source: SQL (Django, SQLAlchemy), NoSQL, custom Python objects, etc.
   We believe that by providing a complete API you could plug Graphene anywhere your data lives and make your data available
   through GraphQL.
 
@@ -20,19 +20,18 @@ Graphene has multiple integrations with different frameworks:
 
 | integration       | Package                                                                                 |
 | ----------------- | --------------------------------------------------------------------------------------- |
-| SQLAlchemy        | [graphene-sqlalchemy](https://github.com/graphql-python/graphene-sqlalchemy/)           |
-| Mongo             | [graphene-mongo](https://github.com/graphql-python/graphene-mongo/)                     |
-| Apollo Federation | [graphene-federation](https://github.com/graphql-python/graphene-federation/)           |
 | Django            | [graphene-django](https://github.com/graphql-python/graphene-django/)                   |
+| SQLAlchemy        | [graphene-sqlalchemy](https://github.com/graphql-python/graphene-sqlalchemy/)           |
+| Google App Engine | [graphene-gae](https://github.com/graphql-python/graphene-gae/)                         |
 
 Also, Graphene is fully compatible with the GraphQL spec, working seamlessly with all GraphQL clients, such as [Relay](https://github.com/facebook/relay), [Apollo](https://github.com/apollographql/apollo-client) and [gql](https://github.com/graphql-python/gql).
 
 ## Installation
 
-To install `graphene`, just run this command in your shell
+For instaling graphene, just run this command in your shell
 
 ```bash
-pip install "graphene>=3.1"
+pip install "graphene>=3.0"
 ```
 
 ## Examples
@@ -85,24 +84,18 @@ pip install -e ".[test]"
 Well-written tests and maintaining good test coverage is important to this project. While developing, run new and existing tests with:
 
 ```sh
-pytest graphene/relay/tests/test_node.py # Single file
-pytest graphene/relay # All tests in directory
+py.test graphene/relay/tests/test_node.py # Single file
+py.test graphene/relay # All tests in directory
 ```
 
 Add the `-s` flag if you have introduced breakpoints into the code for debugging.
 Add the `-v` ("verbose") flag to get more detailed test output. For even more detailed output, use `-vv`.
 Check out the [pytest documentation](https://docs.pytest.org/en/latest/) for more options and test running controls.
 
-Regularly ensure your `pre-commit` hooks are up to date and enabled:
-
-```sh
-pre-commit install
-```
-
 You can also run the benchmarks with:
 
 ```sh
-pytest graphene --benchmark-only
+py.test graphene --benchmark-only
 ```
 
 Graphene supports several versions of Python. To make sure that changes do not break compatibility with any of those versions, we use `tox` to create virtualenvs for each Python version and run tests with that version. To run against all Python versions defined in the `tox.ini` config file, just run:
@@ -114,10 +107,10 @@ tox
 If you wish to run against a specific version defined in the `tox.ini` file:
 
 ```sh
-tox -e py39
+tox -e py36
 ```
 
-Tox can only use whatever versions of Python are installed on your system. When you create a pull request, GitHub Actions pipelines will also be running the same tests and report the results, so there is no need for potential contributors to try to install every single version of Python on their own system ahead of time. We appreciate opening issues and pull requests to make graphene even more stable & useful!
+Tox can only use whatever versions of Python are installed on your system. When you create a pull request, Travis will also be running the same tests and report the results, so there is no need for potential contributors to try to install every single version of Python on their own system ahead of time. We appreciate opening issues and pull requests to make graphene even more stable & useful!
 
 ### Building Documentation
 

README.rst

@@ -0,0 +1,174 @@
+|Graphene Logo| `Graphene <http://graphene-python.org>`__ |Build Status| |PyPI version| |Coverage Status|
+=========================================================================================================
+
+`💬 Join the community on
+Slack <https://join.slack.com/t/graphenetools/shared_invite/enQtOTE2MDQ1NTg4MDM1LTA4Nzk0MGU0NGEwNzUxZGNjNDQ4ZjAwNDJjMjY0OGE1ZDgxZTg4YjM2ZTc4MjE2ZTAzZjE2ZThhZTQzZTkyMmM>`__
+
+**We are looking for contributors**! Please check the
+`ROADMAP <https://github.com/graphql-python/graphene/blob/master/ROADMAP.md>`__
+to see how you can help ❤️
+
+Introduction
+------------
+
+`Graphene <http://graphene-python.org>`__ is an opinionated Python
+library for building GraphQL schemas/types fast and easily.
+
+-  **Easy to use:** Graphene helps you use GraphQL in Python without
+   effort.
+-  **Relay:** Graphene has builtin support for Relay.
+-  **Data agnostic:** Graphene supports any kind of data source: SQL
+   (Django, SQLAlchemy), NoSQL, custom Python objects, etc. We believe
+   that by providing a complete API you could plug Graphene anywhere
+   your data lives and make your data available through GraphQL.
+
+Integrations
+------------
+
+Graphene has multiple integrations with different frameworks:
+
++-------------------+-------------------------------------------------+
+| integration       | Package                                         |
++===================+=================================================+
+| Django            | `graphene-django <https:/                       |
+|                   | /github.com/graphql-python/graphene-django/>`__ |
++-------------------+-------------------------------------------------+
+| SQLAlchemy        | `graphene-sqlalchemy <https://git               |
+|                   | hub.com/graphql-python/graphene-sqlalchemy/>`__ |
++-------------------+-------------------------------------------------+
+| Google App Engine | `graphene-gae <http                             |
+|                   | s://github.com/graphql-python/graphene-gae/>`__ |
++-------------------+-------------------------------------------------+
+
+Also, Graphene is fully compatible with the GraphQL spec, working
+seamlessly with all GraphQL clients, such as
+`Relay <https://github.com/facebook/relay>`__,
+`Apollo <https://github.com/apollographql/apollo-client>`__ and
+`gql <https://github.com/graphql-python/gql>`__.
+
+Installation
+------------
+
+For instaling graphene, just run this command in your shell
+
+.. code:: bash
+
+   pip install "graphene>=3.0"
+
+Examples
+--------
+
+Here is one example for you to get started:
+
+.. code:: python
+
+   import graphene
+
+   class Query(graphene.ObjectType):
+       hello = graphene.String(description='A typical hello world')
+
+       def resolve_hello(self, info):
+           return 'World'
+
+   schema = graphene.Schema(query=Query)
+
+Then Querying ``graphene.Schema`` is as simple as:
+
+.. code:: python
+
+   query = '''
+       query SayHello {
+         hello
+       }
+   '''
+   result = schema.execute(query)
+
+If you want to learn even more, you can also check the following
+`examples <examples/>`__:
+
+-  **Basic Schema**: `Starwars example <examples/starwars>`__
+-  **Relay Schema**: `Starwars Relay
+   example <examples/starwars_relay>`__
+
+Documentation
+-------------
+
+Documentation and links to additional resources are available at
+https://docs.graphene-python.org/en/latest/
+
+Contributing
+------------
+
+After cloning this repo, create a
+`virtualenv <https://virtualenv.pypa.io/en/stable/>`__ and ensure
+dependencies are installed by running:
+
+.. code:: sh
+
+   virtualenv venv
+   source venv/bin/activate
+   pip install -e ".[test]"
+
+Well-written tests and maintaining good test coverage is important to
+this project. While developing, run new and existing tests with:
+
+.. code:: sh
+
+   py.test graphene/relay/tests/test_node.py # Single file
+   py.test graphene/relay # All tests in directory
+
+Add the ``-s`` flag if you have introduced breakpoints into the code for
+debugging. Add the ``-v`` (“verbose”) flag to get more detailed test
+output. For even more detailed output, use ``-vv``. Check out the
+`pytest documentation <https://docs.pytest.org/en/latest/>`__ for more
+options and test running controls.
+
+You can also run the benchmarks with:
+
+.. code:: sh
+
+   py.test graphene --benchmark-only
+
+Graphene supports several versions of Python. To make sure that changes
+do not break compatibility with any of those versions, we use ``tox`` to
+create virtualenvs for each Python version and run tests with that
+version. To run against all Python versions defined in the ``tox.ini``
+config file, just run:
+
+.. code:: sh
+
+   tox
+
+If you wish to run against a specific version defined in the ``tox.ini``
+file:
+
+.. code:: sh
+
+   tox -e py36
+
+Tox can only use whatever versions of Python are installed on your
+system. When you create a pull request, Travis will also be running the
+same tests and report the results, so there is no need for potential
+contributors to try to install every single version of Python on their
+own system ahead of time. We appreciate opening issues and pull requests
+to make graphene even more stable & useful!
+
+Building Documentation
+~~~~~~~~~~~~~~~~~~~~~~
+
+The documentation is generated using the excellent
+`Sphinx <http://www.sphinx-doc.org/>`__ and a custom theme.
+
+An HTML version of the documentation is produced by running:
+
+.. code:: sh
+
+   make docs
+
+.. |Graphene Logo| image:: http://graphene-python.org/favicon.png
+.. |Build Status| image:: https://travis-ci.org/graphql-python/graphene.svg?branch=master
+   :target: https://travis-ci.org/graphql-python/graphene
+.. |PyPI version| image:: https://badge.fury.io/py/graphene.svg
+   :target: https://badge.fury.io/py/graphene
+.. |Coverage Status| image:: https://coveralls.io/repos/graphql-python/graphene/badge.svg?branch=master&service=github
+   :target: https://coveralls.io/github/graphql-python/graphene?branch=master

ROADMAP.md

@@ -0,0 +1,54 @@
+# GraphQL Python Roadmap
+
+In order to move Graphene and the GraphQL Python ecosystem forward it's essential to be clear with the community on next steps, so we can move uniformly.
+
+_👋 If you have more ideas on how to move the Graphene ecosystem forward, don't hesistate to [open a PR](https://github.com/graphql-python/graphene/edit/master/ROADMAP.md)_
+
+
+## Now
+- [ ] Continue to support v2.x with security releases
+- [ ] Last major/feature release is cut and graphene-* libraries should pin to that version number
+
+## Next
+New features will only be developed on version 3 of ecosystem libraries.
+
+### [Core-Next](https://github.com/graphql-python/graphql-core-next)
+Targeted as v3 of [graphql-core](https://pypi.org/project/graphql-core/), Python 3 only
+
+### Graphene
+- [ ] Integrate with the core-next API and resolve all breaking changes
+- [ ] GraphQL types from type annotations - [See issue](https://github.com/graphql-python/graphene/issues/729)
+- [ ] Add support for coroutines in Connection, Mutation (abstracting out Promise requirement) - [See PR](https://github.com/graphql-python/graphene/pull/824)
+
+### Graphene-*
+- [ ] Integrate with the graphene core-next API and resolve all breaking changes
+
+### *-graphql
+- [ ] Integrate with the graphql core-next API and resolve all breaking changes
+
+## Ongoing Initiatives
+- [ ] Improve documentation, especially for new users to the library
+- [ ] Recipes for “quick start” that people can ideally use/run
+
+
+## Dependent Libraries
+| Repo                                                                         | Release Manager | CODEOWNERS | Pinned     | next/master created | Labels Standardized |
+| ---------------------------------------------------------------------------- | --------------- | ---------- | ---------- | ------------------- | ------------------- |
+| [graphene](https://github.com/graphql-python/graphene)                       | ekampf          | ✅          |            | ✅                   |                     |
+| [graphql-core](https://github.com/graphql-python/graphql-core)               | Cito            | ✅          | N/A        | N/A                 |                     |
+| [graphql-core-next](https://github.com/graphql-python/graphql-core-next)     | Cito            | ✅          | N/A        | N/A                 |                     |
+| [graphql-server-core](https://github.com/graphql-python/graphql-server-core) | Cito            |            | ✅          | ✅                   |                     |
+| [gql](https://github.com/graphql-python/gql)                                 | ekampf          |            |            |                     |                     |
+| [gql-next](https://github.com/graphql-python/gql-next)                       | ekampf          |            | N/A        | N/A                 |                     |
+| ...[aiohttp](https://github.com/graphql-python/aiohttp-graphql)              |                 |            |            |                     |                     |
+| ...[django](https://github.com/graphql-python/graphene-django)               | mvanlonden      |            | ✅          | ✅                   |                     |
+| ...[sanic](https://github.com/graphql-python/sanic-graphql)                  | ekampf          |            |            |                     |                     |
+| ...[flask](https://github.com/graphql-python/flask-graphql)                  |                 |            |            |                     |                     |
+| ...[webob](https://github.com/graphql-python/webob-graphql)                  |                 |            |            |                     |                     |
+| ...[tornado](https://github.com/graphql-python/graphene-tornado)             | ewhauser        |            | PR created | ✅                   |                     |
+| ...[ws](https://github.com/graphql-python/graphql-ws)                        | Cito/dfee       |            | ✅          | ✅                   |                     |
+| ...[gae](https://github.com/graphql-python/graphene-gae)                     | ekampf          |            | PR created | ✅                   |                     |
+| ...[sqlalchemy](https://github.com/graphql-python/graphene-sqlalchemy)       | jnak/Nabell     | ✅          | ✅          | ✅                   |                     |
+| ...[mongo](https://github.com/graphql-python/graphene-mongo)                 |                 |            | ✅          | ✅                   |                     |
+| ...[relay-py](https://github.com/graphql-python/graphql-relay-py)            | Cito            |            |            |                     |                     |
+| ...[wsgi](https://github.com/moritzmhmk/wsgi-graphql)                        |                 |            |            |                     |                     |

SECURITY.md

@@ -1,15 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Support for security issues is currently provided for Graphene 3.0 and above. Support on earlier versions cannot be guaranteed by the maintainers of this library, but community PRs may be accepted in critical cases.
-The preferred mitigation strategy is via an upgrade to Graphene 3.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 3.x     | :white_check_mark: |
-| <3.x    | :x:                |
-
-## Reporting a Vulnerability
-
-Please use responsible disclosure by contacting a core maintainer via Discord or E-Mail.

UPGRADE-v1.0.md

@@ -153,7 +153,7 @@ class Query(ObjectType):
 ```
 
 Also, if you wanted to create an `ObjectType` that implements `Node`, you have to do it
-explicitly.
+explicity.
 
 ## Django
 

UPGRADE-v2.0.md

@@ -123,7 +123,7 @@ def resolve_my_field(root, info, my_arg):
     return ...
 ```
 
-**PS.: Take care with receiving args like `my_arg` as above. This doesn't work for optional (non-required) arguments as standard `Connection`'s arguments (first, last, after, before).**
+**PS.: Take care with receiving args like `my_arg` as above. This doesn't work for optional (non-required) arguments as stantard `Connection`'s arguments (first, last, after, before).**
 You may need something like this:
 
 ```python

bin/autolinter

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Install the required scripts with
+# pip install autoflake autopep8 isort
+autoflake ./examples/ ./graphene/ -r --remove-unused-variables --remove-all-unused-imports --in-place
+autopep8 ./examples/ ./graphene/ -r --in-place --experimental --aggressive --max-line-length 120
+isort -rc ./examples/ ./graphene/

docs/api/index.rst

@@ -92,7 +92,7 @@ Execution Metadata
 
 .. autoclass:: graphene.Context
 
-.. autoclass:: graphql.ExecutionResult
+.. autoclass:: graphql.execution.base.ExecutionResult
 
 .. Relay
 .. -----

docs/conf.py

@@ -1,5 +1,4 @@
 import os
-import sys
 
 import sphinx_graphene_theme
 
@@ -23,6 +22,8 @@ on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
+import os
+import sys
 
 sys.path.insert(0, os.path.abspath(".."))
 
@@ -81,7 +82,7 @@ release = "1.0"
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-# language = None
+language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -455,4 +456,5 @@ intersphinx_mapping = {
         "http://docs.graphene-python.org/projects/sqlalchemy/en/latest/",
         None,
     ),
+    "graphene_gae": ("http://docs.graphene-python.org/projects/gae/en/latest/", None),
 }

docs/execution/dataloader.rst

@@ -4,7 +4,7 @@ Dataloader
 DataLoader is a generic utility to be used as part of your application's
 data fetching layer to provide a simplified and consistent API over
 various remote data sources such as databases or web services via batching
-and caching. It is provided by a separate package `aiodataloader <https://pypi.org/project/aiodataloader/>`.
+and caching.
 
 
 Batching
@@ -15,19 +15,21 @@ Create loaders by providing a batch loading function.
 
 .. code:: python
 
-    from aiodataloader import DataLoader
+    from promise import Promise
+    from promise.dataloader import DataLoader
 
     class UserLoader(DataLoader):
-        async def batch_load_fn(self, keys):
-            # Here we call a function to return a user for each key in keys
-            return [get_user(id=key) for key in keys]
+        def batch_load_fn(self, keys):
+            # Here we return a promise that will result on the
+            # corresponding user for each key in keys
+            return Promise.resolve([get_user(id=key) for key in keys])
 
 
-A batch loading async function accepts a list of keys, and returns a list of ``values``.
-
+A batch loading function accepts a list of keys, and returns a ``Promise``
+which resolves to a list of ``values``.
 
 ``DataLoader`` will coalesce all individual loads which occur within a
-single frame of execution (executed once the wrapping event loop is resolved)
+single frame of execution (executed once the wrapping promise is resolved)
 and then call your batch function with all requested keys.
 
 
@@ -35,11 +37,9 @@ and then call your batch function with all requested keys.
 
     user_loader = UserLoader()
 
-    user1 = await user_loader.load(1)
-    user1_best_friend = await user_loader.load(user1.best_friend_id)
+    user_loader.load(1).then(lambda user: user_loader.load(user.best_friend_id))
 
-    user2 = await user_loader.load(2)
-    user2_best_friend = await user_loader.load(user2.best_friend_id)
+    user_loader.load(2).then(lambda user: user_loader.load(user.best_friend_id))
 
 
 A naive application may have issued *four* round-trips to a backend for the
@@ -53,9 +53,9 @@ make sure that you then order the query result for the results to match the keys
 .. code:: python
 
    class UserLoader(DataLoader):
-       async def batch_load_fn(self, keys):
+       def batch_load_fn(self, keys):
            users = {user.id: user for user in User.objects.filter(id__in=keys)}
-           return [users.get(user_id) for user_id in keys]
+           return Promise.resolve([users.get(user_id) for user_id in keys])
 
 
 ``DataLoader`` allows you to decouple unrelated parts of your application without
@@ -110,8 +110,8 @@ leaner code and at most 4 database requests, and possibly fewer if there are cac
         best_friend = graphene.Field(lambda: User)
         friends = graphene.List(lambda: User)
 
-        async def resolve_best_friend(root, info):
-            return await user_loader.load(root.best_friend_id)
+        def resolve_best_friend(root, info):
+            return user_loader.load(root.best_friend_id)
 
-        async def resolve_friends(root, info):
-            return await user_loader.load_many(root.friend_ids)
+        def resolve_friends(root, info):
+            return user_loader.load_many(root.friend_ids)

docs/execution/fileuploading.rst

@@ -4,5 +4,5 @@ File uploading
 File uploading is not part of the official GraphQL spec yet and is not natively
 implemented in Graphene.
 
-If your server needs to support file uploading then you can use the library: `graphene-file-upload <https://github.com/lmcgartland/graphene-file-upload>`_ which enhances Graphene to add file
+If your server needs to support file uploading then you can use the libary: `graphene-file-upload <https://github.com/lmcgartland/graphene-file-upload>`_ which enhances Graphene to add file
 uploads and conforms to the unoffical GraphQL `multipart request spec <https://github.com/jaydenseric/graphql-multipart-request-spec>`_.

docs/execution/middleware.rst

@@ -41,8 +41,6 @@ And then execute it with:
 
     result = schema.execute('THE QUERY', middleware=[AuthorizationMiddleware()])
 
-If the ``middleware`` argument includes multiple middlewares,
-these middlewares will be executed bottom-up, i.e. from last to first.
 
 Functional example
 ------------------

docs/execution/queryvalidation.rst

@@ -1,5 +1,5 @@
 Query Validation
-================
+==========
 GraphQL uses query validators to check if Query AST is valid and can be executed. Every GraphQL server implements
 standard query validators. For example, there is an validator that tests if queried field exists on queried type, that
 makes query fail with "Cannot query field on type" error if it doesn't.
@@ -8,7 +8,7 @@ To help with common use cases, graphene provides a few validation rules out of t
 
 
 Depth limit Validator
----------------------
+-----------------
 The depth limit validator helps to prevent execution of malicious
 queries. It takes in the following arguments.
 
@@ -17,7 +17,7 @@ queries. It takes in the following arguments.
 - ``callback`` Called each time validation runs. Receives an Object which is a map of the depths for each operation.
 
 Usage
------
+-------
 
 Here is how you would implement depth-limiting on your schema.
 
@@ -54,7 +54,7 @@ the disable introspection validation rule ensures that your schema cannot be int
 This is a useful security measure in production environments.
 
 Usage
------
+-------
 
 Here is how you would disable introspection for your schema.
 

docs/index.rst

@@ -1,6 +1,12 @@
 Graphene
 ========
 
+------------
+
+The documentation below is for the ``dev`` (prerelease) version of Graphene. To view the documentation for the latest stable Graphene version go to the `v2 docs <https://docs.graphene-python.org/en/stable/>`_.
+
+------------
+
 Contents:
 
 .. toctree::
@@ -21,6 +27,7 @@ Integrations
 * `Graphene-Django <http://docs.graphene-python.org/projects/django/en/latest/>`_ (`source <https://github.com/graphql-python/graphene-django/>`_)
 * Flask-Graphql (`source <https://github.com/graphql-python/flask-graphql>`_)
 * `Graphene-SQLAlchemy <http://docs.graphene-python.org/projects/sqlalchemy/en/latest/>`_ (`source <https://github.com/graphql-python/graphene-sqlalchemy/>`_)
+* `Graphene-GAE <http://docs.graphene-python.org/projects/gae/en/latest/>`_ (`source <https://github.com/graphql-python/graphene-gae/>`_)
 * `Graphene-Mongo <http://graphene-mongo.readthedocs.io/en/latest/>`_ (`source <https://github.com/graphql-python/graphene-mongo>`_)
 * `Starlette <https://www.starlette.io/graphql/>`_ (`source <https://github.com/encode/starlette>`_)
 * `FastAPI <https://fastapi.tiangolo.com/advanced/graphql/>`_ (`source <https://github.com/tiangolo/fastapi>`_)

docs/quickstart.rst

@@ -28,7 +28,7 @@ Compare Graphene's *code-first* approach to building a GraphQL API with *schema-
 
 .. _Apollo Server: https://www.apollographql.com/docs/apollo-server/
 
-.. _Ariadne: https://ariadnegraphql.org/
+.. _Ariadne: https://ariadne.readthedocs.io
 
 Graphene is fully featured with integrations for the most popular web frameworks and ORMs. Graphene produces schemas that are fully compliant with the GraphQL spec and provides tools and patterns for building a Relay-Compliant API as well.
 
@@ -37,12 +37,12 @@ An example in Graphene
 
 Let’s build a basic GraphQL schema to say "hello" and "goodbye" in Graphene.
 
-When we send a **Query** requesting only one **Field**, ``hello``, and specify a value for the ``firstName`` **Argument**...
+When we send a **Query** requesting only one **Field**, ``hello``, and specify a value for the ``name`` **Argument**...
 
 .. code::
 
     {
-      hello(firstName: "friend")
+      hello(name: "friend")
     }
 
 ...we would expect the following Response containing only the data requested (the ``goodbye`` field is not resolved).
@@ -59,7 +59,7 @@ When we send a **Query** requesting only one **Field**, ``hello``, and specify a
 Requirements
 ~~~~~~~~~~~~
 
--  Python (3.8, 3.9, 3.10, 3.11, 3.12, pypy)
+-  Python (2.7, 3.4, 3.5, 3.6, pypy)
 -  Graphene (3.0)
 
 Project setup
@@ -79,15 +79,14 @@ In Graphene, we can define a simple schema using the following code:
     from graphene import ObjectType, String, Schema
 
     class Query(ObjectType):
-        # this defines a Field `hello` in our Schema with a single Argument `first_name`
-        # By default, the argument name will automatically be camel-based into firstName in the generated schema
-        hello = String(first_name=String(default_value="stranger"))
+        # this defines a Field `hello` in our Schema with a single Argument `name`
+        hello = String(name=String(default_value="stranger"))
         goodbye = String()
 
         # our Resolver method takes the GraphQL context (root, info) as well as
-        # Argument (first_name) for the Field and returns data for the query Response
-        def resolve_hello(root, info, first_name):
-            return f'Hello {first_name}!'
+        # Argument (name) for the Field and returns data for the query Response
+        def resolve_hello(root, info, name):
+            return f'Hello {name}!'
 
         def resolve_goodbye(root, info):
             return 'See ya!'
@@ -111,7 +110,7 @@ In the `GraphQL Schema Definition Language`_, we could describe the fields defin
 .. code::
 
     type Query {
-      hello(firstName: String = "stranger"): String
+      hello(name: String = "stranger"): String
       goodbye: String
     }
 
@@ -131,7 +130,7 @@ Then we can start querying our **Schema** by passing a GraphQL query string to `
     # "Hello stranger!"
 
     # or passing the argument in the query
-    query_with_argument = '{ hello(firstName: "GraphQL") }'
+    query_with_argument = '{ hello(name: "GraphQL") }'
     result = schema.execute(query_with_argument)
     print(result.data['hello'])
     # "Hello GraphQL!"

docs/requirements.txt

@@ -1,5 +1,5 @@
 # Required library
-Sphinx==6.1.3
-sphinx-autobuild==2021.3.14
+Sphinx==1.5.3
+sphinx-autobuild==0.7.1
 # Docs template
 http://graphene-python.org/sphinx_graphene_theme.zip

docs/testing/index.rst

@@ -69,3 +69,43 @@ You can also add extra keyword arguments to the ``execute`` method, such as
                 'hey': 'hello Peter!'
             }
         }
+
+
+Snapshot testing
+~~~~~~~~~~~~~~~~
+
+As our APIs evolve, we need to know when our changes introduce any breaking changes that might break
+some of the clients of our GraphQL app.
+
+However, writing tests and replicating the same response we expect from our GraphQL application can be a
+tedious and repetitive task, and sometimes it's easier to skip this process.
+
+Because of that, we recommend the usage of `SnapshotTest <https://github.com/syrusakbary/snapshottest/>`_.
+
+SnapshotTest lets us write all these tests in a breeze, as it automatically creates the ``snapshots`` for us
+the first time the test are executed.
+
+
+Here is a simple example on how our tests will look if we use ``pytest``:
+
+.. code:: python
+
+    def test_hey(snapshot):
+        client = Client(my_schema)
+        # This will create a snapshot dir and a snapshot file
+        # the first time the test is executed, with the response
+        # of the execution.
+        snapshot.assert_match(client.execute('''{ hey }'''))
+
+
+If we are using ``unittest``:
+
+.. code:: python
+
+    from snapshottest import TestCase
+
+    class APITestCase(TestCase):
+        def test_api_me(self):
+            """Testing the API for /me"""
+            client = Client(my_schema)
+            self.assertMatchSnapshot(client.execute('''{ hey }'''))

docs/types/enums.rst

@@ -86,7 +86,7 @@ In the Python ``Enum`` implementation you can access a member by initing the Enu
     assert Color(1) == Color.RED
 
 
-However, in Graphene ``Enum`` you need to call `.get` to have the same effect:
+However, in Graphene ``Enum`` you need to call get to have the same effect:
 
 .. code:: python
 

docs/types/objecttypes.rst

@@ -80,10 +80,6 @@ If we have a schema with Person type and one field on the root query.
 
     from graphene import ObjectType, String, Field
 
-    def get_human(name):
-        first_name, last_name = name.split()
-        return Person(first_name, last_name)
-
     class Person(ObjectType):
         full_name = String()
 

docs/types/scalars.rst

@@ -270,8 +270,8 @@ The following is an example for creating a DateTime scalar:
             return dt.isoformat()
 
         @staticmethod
-        def parse_literal(node, _variables=None):
-            if isinstance(node, ast.StringValueNode):
+        def parse_literal(node):
+            if isinstance(node, ast.StringValue):
                 return datetime.datetime.strptime(
                     node.value, "%Y-%m-%dT%H:%M:%S.%f")
 

examples/simple_example.py

@@ -8,6 +8,7 @@ class Patron(graphene.ObjectType):
 
 
 class Query(graphene.ObjectType):
+
     patron = graphene.Field(Patron)
 
     def resolve_patron(root, info):

examples/starwars/tests/snapshots/snap_test_query.py

@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+# snapshottest: v1 - https://goo.gl/zC4yUc
+from __future__ import unicode_literals
+
+from snapshottest import Snapshot
+
+snapshots = Snapshot()
+
+snapshots["test_hero_name_query 1"] = {"data": {"hero": {"name": "R2-D2"}}}
+
+snapshots["test_hero_name_and_friends_query 1"] = {
+    "data": {
+        "hero": {
+            "id": "2001",
+            "name": "R2-D2",
+            "friends": [
+                {"name": "Luke Skywalker"},
+                {"name": "Han Solo"},
+                {"name": "Leia Organa"},
+            ],
+        }
+    }
+}
+
+snapshots["test_nested_query 1"] = {
+    "data": {
+        "hero": {
+            "name": "R2-D2",
+            "friends": [
+                {
+                    "name": "Luke Skywalker",
+                    "appearsIn": ["NEWHOPE", "EMPIRE", "JEDI"],
+                    "friends": [
+                        {"name": "Han Solo"},
+                        {"name": "Leia Organa"},
+                        {"name": "C-3PO"},
+                        {"name": "R2-D2"},
+                    ],
+                },
+                {
+                    "name": "Han Solo",
+                    "appearsIn": ["NEWHOPE", "EMPIRE", "JEDI"],
+                    "friends": [
+                        {"name": "Luke Skywalker"},
+                        {"name": "Leia Organa"},
+                        {"name": "R2-D2"},
+                    ],
+                },
+                {
+                    "name": "Leia Organa",
+                    "appearsIn": ["NEWHOPE", "EMPIRE", "JEDI"],
+                    "friends": [
+                        {"name": "Luke Skywalker"},
+                        {"name": "Han Solo"},
+                        {"name": "C-3PO"},
+                        {"name": "R2-D2"},
+                    ],
+                },
+            ],
+        }
+    }
+}
+
+snapshots["test_fetch_luke_query 1"] = {"data": {"human": {"name": "Luke Skywalker"}}}
+
+snapshots["test_fetch_some_id_query 1"] = {
+    "data": {"human": {"name": "Luke Skywalker"}}
+}
+
+snapshots["test_fetch_some_id_query2 1"] = {"data": {"human": {"name": "Han Solo"}}}
+
+snapshots["test_invalid_id_query 1"] = {"data": {"human": None}}
+
+snapshots["test_fetch_luke_aliased 1"] = {"data": {"luke": {"name": "Luke Skywalker"}}}
+
+snapshots["test_fetch_luke_and_leia_aliased 1"] = {
+    "data": {"luke": {"name": "Luke Skywalker"}, "leia": {"name": "Leia Organa"}}
+}
+
+snapshots["test_duplicate_fields 1"] = {
+    "data": {
+        "luke": {"name": "Luke Skywalker", "homePlanet": "Tatooine"},
+        "leia": {"name": "Leia Organa", "homePlanet": "Alderaan"},
+    }
+}
+
+snapshots["test_use_fragment 1"] = {
+    "data": {
+        "luke": {"name": "Luke Skywalker", "homePlanet": "Tatooine"},
+        "leia": {"name": "Leia Organa", "homePlanet": "Alderaan"},
+    }
+}
+
+snapshots["test_check_type_of_r2 1"] = {
+    "data": {"hero": {"__typename": "Droid", "name": "R2-D2"}}
+}
+
+snapshots["test_check_type_of_luke 1"] = {
+    "data": {"hero": {"__typename": "Human", "name": "Luke Skywalker"}}
+}

examples/starwars/tests/test_query.py

@@ -8,19 +8,19 @@ setup()
 client = Client(schema)
 
 
-def test_hero_name_query():
-    result = client.execute("""
+def test_hero_name_query(snapshot):
+    query = """
         query HeroNameQuery {
           hero {
             name
           }
         }
-    """)
-    assert result == {"data": {"hero": {"name": "R2-D2"}}}
+    """
+    snapshot.assert_match(client.execute(query))
 
 
-def test_hero_name_and_friends_query():
-    result = client.execute("""
+def test_hero_name_and_friends_query(snapshot):
+    query = """
         query HeroNameAndFriendsQuery {
           hero {
             id
@@ -30,24 +30,12 @@ def test_hero_name_and_friends_query():
             }
           }
         }
-    """)
-    assert result == {
-        "data": {
-            "hero": {
-                "id": "2001",
-                "name": "R2-D2",
-                "friends": [
-                    {"name": "Luke Skywalker"},
-                    {"name": "Han Solo"},
-                    {"name": "Leia Organa"},
-                ],
-            }
-        }
-    }
+    """
+    snapshot.assert_match(client.execute(query))
 
 
-def test_nested_query():
-    result = client.execute("""
+def test_nested_query(snapshot):
+    query = """
         query NestedQuery {
           hero {
             name
@@ -60,113 +48,70 @@ def test_nested_query():
             }
           }
         }
-    """)
-    assert result == {
-        "data": {
-            "hero": {
-                "name": "R2-D2",
-                "friends": [
-                    {
-                        "name": "Luke Skywalker",
-                        "appearsIn": ["NEWHOPE", "EMPIRE", "JEDI"],
-                        "friends": [
-                            {"name": "Han Solo"},
-                            {"name": "Leia Organa"},
-                            {"name": "C-3PO"},
-                            {"name": "R2-D2"},
-                        ],
-                    },
-                    {
-                        "name": "Han Solo",
-                        "appearsIn": ["NEWHOPE", "EMPIRE", "JEDI"],
-                        "friends": [
-                            {"name": "Luke Skywalker"},
-                            {"name": "Leia Organa"},
-                            {"name": "R2-D2"},
-                        ],
-                    },
-                    {
-                        "name": "Leia Organa",
-                        "appearsIn": ["NEWHOPE", "EMPIRE", "JEDI"],
-                        "friends": [
-                            {"name": "Luke Skywalker"},
-                            {"name": "Han Solo"},
-                            {"name": "C-3PO"},
-                            {"name": "R2-D2"},
-                        ],
-                    },
-                ],
-            }
-        }
-    }
+    """
+    snapshot.assert_match(client.execute(query))
 
 
-def test_fetch_luke_query():
-    result = client.execute("""
+def test_fetch_luke_query(snapshot):
+    query = """
         query FetchLukeQuery {
           human(id: "1000") {
             name
           }
         }
-    """)
-    assert result == {"data": {"human": {"name": "Luke Skywalker"}}}
+    """
+    snapshot.assert_match(client.execute(query))
 
 
-def test_fetch_some_id_query():
-    result = client.execute(
-        """
+def test_fetch_some_id_query(snapshot):
+    query = """
         query FetchSomeIDQuery($someId: String!) {
           human(id: $someId) {
             name
           }
         }
-    """,
-        variables={"someId": "1000"},
-    )
-    assert result == {"data": {"human": {"name": "Luke Skywalker"}}}
+    """
+    params = {"someId": "1000"}
+    snapshot.assert_match(client.execute(query, variables=params))
 
 
-def test_fetch_some_id_query2():
-    result = client.execute(
-        """
+def test_fetch_some_id_query2(snapshot):
+    query = """
         query FetchSomeIDQuery($someId: String!) {
           human(id: $someId) {
             name
           }
         }
-    """,
-        variables={"someId": "1002"},
-    )
-    assert result == {"data": {"human": {"name": "Han Solo"}}}
+    """
+    params = {"someId": "1002"}
+    snapshot.assert_match(client.execute(query, variables=params))
 
 
-def test_invalid_id_query():
-    result = client.execute(
-        """
+def test_invalid_id_query(snapshot):
+    query = """
         query humanQuery($id: String!) {
           human(id: $id) {
             name
           }
         }
-    """,
-        variables={"id": "not a valid id"},
-    )
-    assert result == {"data": {"human": None}}
+    """
+    params = {"id": "not a valid id"}
+    snapshot.assert_match(client.execute(query, variables=params))
 
 
-def test_fetch_luke_aliased():
-    result = client.execute("""
+def test_fetch_luke_aliased(snapshot):
+    query = """
         query FetchLukeAliased {
           luke: human(id: "1000") {
             name
           }
         }
-    """)
-    assert result == {"data": {"luke": {"name": "Luke Skywalker"}}}
+    """
+    snapshot.assert_match(client.execute(query))
 
 
-def test_fetch_luke_and_leia_aliased():
-    result = client.execute("""
+def test_fetch_luke_and_leia_aliased(snapshot):
+    query = """
         query FetchLukeAndLeiaAliased {
           luke: human(id: "1000") {
             name
@@ -175,14 +120,12 @@ def test_fetch_luke_and_leia_aliased():
             name
           }
         }
-    """)
-    assert result == {
-        "data": {"luke": {"name": "Luke Skywalker"}, "leia": {"name": "Leia Organa"}}
-    }
+    """
+    snapshot.assert_match(client.execute(query))
 
 
-def test_duplicate_fields():
-    result = client.execute("""
+def test_duplicate_fields(snapshot):
+    query = """
         query DuplicateFields {
           luke: human(id: "1000") {
             name
@@ -193,17 +136,12 @@ def test_duplicate_fields():
             homePlanet
           }
         }
-    """)
-    assert result == {
-        "data": {
-            "luke": {"name": "Luke Skywalker", "homePlanet": "Tatooine"},
-            "leia": {"name": "Leia Organa", "homePlanet": "Alderaan"},
-        }
-    }
+    """
+    snapshot.assert_match(client.execute(query))
 
 
-def test_use_fragment():
-    result = client.execute("""
+def test_use_fragment(snapshot):
+    query = """
         query UseFragment {
           luke: human(id: "1000") {
             ...HumanFragment
@@ -216,36 +154,29 @@ def test_use_fragment():
           name
           homePlanet
         }
-    """)
-    assert result == {
-        "data": {
-            "luke": {"name": "Luke Skywalker", "homePlanet": "Tatooine"},
-            "leia": {"name": "Leia Organa", "homePlanet": "Alderaan"},
-        }
-    }
+    """
+    snapshot.assert_match(client.execute(query))
 
 
-def test_check_type_of_r2():
-    result = client.execute("""
+def test_check_type_of_r2(snapshot):
+    query = """
         query CheckTypeOfR2 {
           hero {
             __typename
             name
           }
         }
-    """)
-    assert result == {"data": {"hero": {"__typename": "Droid", "name": "R2-D2"}}}
+    """
+    snapshot.assert_match(client.execute(query))
 
 
-def test_check_type_of_luke():
-    result = client.execute("""
+def test_check_type_of_luke(snapshot):
+    query = """
         query CheckTypeOfLuke {
           hero(episode: EMPIRE) {
             __typename
             name
           }
         }
-    """)
-    assert result == {
-        "data": {"hero": {"__typename": "Human", "name": "Luke Skywalker"}}
-    }
+    """
+    snapshot.assert_match(client.execute(query))

examples/starwars_relay/tests/snapshots/snap_test_connections.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# snapshottest: v1 - https://goo.gl/zC4yUc
+from __future__ import unicode_literals
+
+from snapshottest import Snapshot
+
+snapshots = Snapshot()
+
+snapshots["test_correct_fetch_first_ship_rebels 1"] = {
+    "data": {
+        "rebels": {
+            "name": "Alliance to Restore the Republic",
+            "ships": {
+                "pageInfo": {
+                    "startCursor": "YXJyYXljb25uZWN0aW9uOjA=",
+                    "endCursor": "YXJyYXljb25uZWN0aW9uOjA=",
+                    "hasNextPage": True,
+                    "hasPreviousPage": False,
+                },
+                "edges": [
+                    {"cursor": "YXJyYXljb25uZWN0aW9uOjA=", "node": {"name": "X-Wing"}}
+                ],
+            },
+        }
+    }
+}

examples/starwars_relay/tests/snapshots/snap_test_mutation.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# snapshottest: v1 - https://goo.gl/zC4yUc
+from __future__ import unicode_literals
+
+from snapshottest import Snapshot
+
+snapshots = Snapshot()
+
+snapshots["test_mutations 1"] = {
+    "data": {
+        "introduceShip": {
+            "ship": {"id": "U2hpcDo5", "name": "Peter"},
+            "faction": {
+                "name": "Alliance to Restore the Republic",
+                "ships": {
+                    "edges": [
+                        {"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": "U2hpcDo1", "name": "Home One"}},
+                        {"node": {"id": "U2hpcDo5", "name": "Peter"}},
+                    ]
+                },
+            },
+        }
+    }
+}

examples/starwars_relay/tests/snapshots/snap_test_objectidentification.py

@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*-
+# snapshottest: v1 - https://goo.gl/zC4yUc
+from __future__ import unicode_literals
+
+from snapshottest import Snapshot
+
+
+snapshots = Snapshot()
+
+snapshots["test_correctly_fetches_id_name_rebels 1"] = {
+    "data": {
+        "rebels": {"id": "RmFjdGlvbjox", "name": "Alliance to Restore the Republic"}
+    }
+}
+
+snapshots["test_correctly_refetches_rebels 1"] = {
+    "data": {"node": {"id": "RmFjdGlvbjox", "name": "Alliance to Restore the Republic"}}
+}
+
+snapshots["test_correctly_fetches_id_name_empire 1"] = {
+    "data": {"empire": {"id": "RmFjdGlvbjoy", "name": "Galactic Empire"}}
+}
+
+snapshots["test_correctly_refetches_empire 1"] = {
+    "data": {"node": {"id": "RmFjdGlvbjoy", "name": "Galactic Empire"}}
+}
+
+snapshots["test_correctly_refetches_xwing 1"] = {
+    "data": {"node": {"id": "U2hpcDox", "name": "X-Wing"}}
+}
+
+snapshots[
+    "test_str_schema 1"
+] = '''type Query {
+  rebels: Faction
+  empire: Faction
+  node(
+    """The ID of the object"""
+    id: ID!
+  ): Node
+}
+
+"""A faction in the Star Wars saga"""
+type Faction implements Node {
+  """The ID of the object"""
+  id: ID!
+
+  """The name of the faction."""
+  name: String
+
+  """The ships used by the faction."""
+  ships(before: String, after: String, first: Int, last: Int): ShipConnection
+}
+
+"""An object with an ID"""
+interface Node {
+  """The ID of the object"""
+  id: ID!
+}
+
+type ShipConnection {
+  """Pagination data for this connection."""
+  pageInfo: PageInfo!
+
+  """Contains the nodes in this connection."""
+  edges: [ShipEdge]!
+}
+
+"""
+The Relay compliant `PageInfo` type, containing data necessary to paginate this connection.
+"""
+type PageInfo {
+  """When paginating forwards, are there more items?"""
+  hasNextPage: Boolean!
+
+  """When paginating backwards, are there more items?"""
+  hasPreviousPage: Boolean!
+
+  """When paginating backwards, the cursor to continue."""
+  startCursor: String
+
+  """When paginating forwards, the cursor to continue."""
+  endCursor: String
+}
+
+"""A Relay edge containing a `Ship` and its cursor."""
+type ShipEdge {
+  """The item at the end of the edge"""
+  node: Ship
+
+  """A cursor for use in pagination"""
+  cursor: String!
+}
+
+"""A ship in the Star Wars saga"""
+type Ship implements Node {
+  """The ID of the object"""
+  id: ID!
+
+  """The name of the ship."""
+  name: String
+}
+
+type Mutation {
+  introduceShip(input: IntroduceShipInput!): IntroduceShipPayload
+}
+
+type IntroduceShipPayload {
+  ship: Ship
+  faction: Faction
+  clientMutationId: String
+}
+
+input IntroduceShipInput {
+  shipName: String!
+  factionId: String!
+  clientMutationId: String
+}'''

examples/starwars_relay/tests/test_connections.py

@@ -8,46 +8,26 @@ setup()
 client = Client(schema)
 
 
-def test_correct_fetch_first_ship_rebels():
-    result = client.execute("""
-        query RebelsShipsQuery {
-          rebels {
-            name,
-            ships(first: 1) {
-              pageInfo {
-                startCursor
-                endCursor
-                hasNextPage
-                hasPreviousPage
-              }
-              edges {
-                cursor
-                node {
-                  name
-                }
-              }
+def test_correct_fetch_first_ship_rebels(snapshot):
+    query = """
+    query RebelsShipsQuery {
+      rebels {
+        name,
+        ships(first: 1) {
+          pageInfo {
+            startCursor
+            endCursor
+            hasNextPage
+            hasPreviousPage
+          }
+          edges {
+            cursor
+            node {
+              name
             }
           }
         }
-    """)
-    assert result == {
-        "data": {
-            "rebels": {
-                "name": "Alliance to Restore the Republic",
-                "ships": {
-                    "pageInfo": {
-                        "startCursor": "YXJyYXljb25uZWN0aW9uOjA=",
-                        "endCursor": "YXJyYXljb25uZWN0aW9uOjA=",
-                        "hasNextPage": True,
-                        "hasPreviousPage": False,
-                    },
-                    "edges": [
-                        {
-                            "cursor": "YXJyYXljb25uZWN0aW9uOjA=",
-                            "node": {"name": "X-Wing"},
-                        }
-                    ],
-                },
-            }
-        }
+      }
     }
+    """
+    snapshot.assert_match(client.execute(query))

examples/starwars_relay/tests/test_mutation.py

@@ -8,45 +8,26 @@ setup()
 client = Client(schema)
 
 
-def test_mutations():
-    result = client.execute("""
-        mutation MyMutation {
-          introduceShip(input:{clientMutationId:"abc", shipName: "Peter", factionId: "1"}) {
-            ship {
-              id
-              name
-            }
-            faction {
-              name
-              ships {
-                edges {
-                  node {
-                    id
-                    name
-                  }
-                }
+def test_mutations(snapshot):
+    query = """
+    mutation MyMutation {
+      introduceShip(input:{clientMutationId:"abc", shipName: "Peter", factionId: "1"}) {
+        ship {
+          id
+          name
+        }
+        faction {
+          name
+          ships {
+            edges {
+              node {
+                id
+                name
               }
             }
           }
         }
-    """)
-    assert result == {
-        "data": {
-            "introduceShip": {
-                "ship": {"id": "U2hpcDo5", "name": "Peter"},
-                "faction": {
-                    "name": "Alliance to Restore the Republic",
-                    "ships": {
-                        "edges": [
-                            {"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": "U2hpcDo1", "name": "Home One"}},
-                            {"node": {"id": "U2hpcDo5", "name": "Peter"}},
-                        ]
-                    },
-                },
-            }
-        }
+      }
     }
+    """
+    snapshot.assert_match(client.execute(query))

examples/starwars_relay/tests/test_objectidentification.py

@@ -1,5 +1,3 @@
-import textwrap
-
 from graphene.test import Client
 
 from ..data import setup
@@ -10,115 +8,24 @@ setup()
 client = Client(schema)
 
 
-def test_str_schema():
-    assert str(schema).strip() == textwrap.dedent(
-        '''\
-        type Query {
-          rebels: Faction
-          empire: Faction
-          node(
-            """The ID of the object"""
-            id: ID!
-          ): Node
-        }
-
-        """A faction in the Star Wars saga"""
-        type Faction implements Node {
-          """The ID of the object"""
-          id: ID!
-
-          """The name of the faction."""
-          name: String
-
-          """The ships used by the faction."""
-          ships(before: String, after: String, first: Int, last: Int): ShipConnection
-        }
-
-        """An object with an ID"""
-        interface Node {
-          """The ID of the object"""
-          id: ID!
-        }
-
-        type ShipConnection {
-          """Pagination data for this connection."""
-          pageInfo: PageInfo!
-
-          """Contains the nodes in this connection."""
-          edges: [ShipEdge]!
-        }
-
-        """
-        The Relay compliant `PageInfo` type, containing data necessary to paginate this connection.
-        """
-        type PageInfo {
-          """When paginating forwards, are there more items?"""
-          hasNextPage: Boolean!
-
-          """When paginating backwards, are there more items?"""
-          hasPreviousPage: Boolean!
-
-          """When paginating backwards, the cursor to continue."""
-          startCursor: String
-
-          """When paginating forwards, the cursor to continue."""
-          endCursor: String
-        }
-
-        """A Relay edge containing a `Ship` and its cursor."""
-        type ShipEdge {
-          """The item at the end of the edge"""
-          node: Ship
-
-          """A cursor for use in pagination"""
-          cursor: String!
-        }
-
-        """A ship in the Star Wars saga"""
-        type Ship implements Node {
-          """The ID of the object"""
-          id: ID!
-
-          """The name of the ship."""
-          name: String
-        }
-
-        type Mutation {
-          introduceShip(input: IntroduceShipInput!): IntroduceShipPayload
-        }
-
-        type IntroduceShipPayload {
-          ship: Ship
-          faction: Faction
-          clientMutationId: String
-        }
-
-        input IntroduceShipInput {
-          shipName: String!
-          factionId: String!
-          clientMutationId: String
-        }'''
-    )
+def test_str_schema(snapshot):
+    snapshot.assert_match(str(schema).strip())
 
 
-def test_correctly_fetches_id_name_rebels():
-    result = client.execute("""
+def test_correctly_fetches_id_name_rebels(snapshot):
+    query = """
       query RebelsQuery {
         rebels {
           id
           name
         }
       }
-    """)
-    assert result == {
-        "data": {
-            "rebels": {"id": "RmFjdGlvbjox", "name": "Alliance to Restore the Republic"}
-        }
-    }
+    """
+    snapshot.assert_match(client.execute(query))
 
 
-def test_correctly_refetches_rebels():
-    result = client.execute("""
+def test_correctly_refetches_rebels(snapshot):
+    query = """
       query RebelsRefetchQuery {
         node(id: "RmFjdGlvbjox") {
           id
@@ -127,30 +34,24 @@ def test_correctly_refetches_rebels():
           }
         }
       }
-    """)
-    assert result == {
-        "data": {
-            "node": {"id": "RmFjdGlvbjox", "name": "Alliance to Restore the Republic"}
-        }
-    }
+    """
+    snapshot.assert_match(client.execute(query))
 
 
-def test_correctly_fetches_id_name_empire():
-    result = client.execute("""
+def test_correctly_fetches_id_name_empire(snapshot):
+    query = """
       query EmpireQuery {
         empire {
           id
           name
         }
       }
-    """)
-    assert result == {
-        "data": {"empire": {"id": "RmFjdGlvbjoy", "name": "Galactic Empire"}}
-    }
+    """
+    snapshot.assert_match(client.execute(query))
 
 
-def test_correctly_refetches_empire():
-    result = client.execute("""
+def test_correctly_refetches_empire(snapshot):
+    query = """
       query EmpireRefetchQuery {
         node(id: "RmFjdGlvbjoy") {
           id
@@ -159,14 +60,12 @@ def test_correctly_refetches_empire():
           }
         }
       }
-    """)
-    assert result == {
-        "data": {"node": {"id": "RmFjdGlvbjoy", "name": "Galactic Empire"}}
-    }
+    """
+    snapshot.assert_match(client.execute(query))
 
 
-def test_correctly_refetches_xwing():
-    result = client.execute("""
+def test_correctly_refetches_xwing(snapshot):
+    query = """
       query XWingRefetchQuery {
         node(id: "U2hpcDox") {
           id
@@ -175,5 +74,5 @@ def test_correctly_refetches_xwing():
           }
         }
       }
-    """)
-    assert result == {"data": {"node": {"id": "U2hpcDox", "name": "X-Wing"}}}
+    """
+    snapshot.assert_match(client.execute(query))

graphene/__init__.py

@@ -1,15 +1,11 @@
 from .pyutils.version import get_version
 from .relay import (
-    BaseGlobalIDType,
     ClientIDMutation,
     Connection,
     ConnectionField,
-    DefaultGlobalIDType,
     GlobalID,
     Node,
     PageInfo,
-    SimpleGlobalIDType,
-    UUIDGlobalIDType,
     is_node,
 )
 from .types import (
@@ -17,7 +13,6 @@ from .types import (
     UUID,
     Argument,
     Base64,
-    BigInt,
     Boolean,
     Context,
     Date,
@@ -46,7 +41,7 @@ from .types import (
 from .utils.module_loading import lazy_import
 from .utils.resolve_only_args import resolve_only_args
 
-VERSION = (3, 4, 3, "final", 0)
+VERSION = (3, 1, 0, "final", 0)
 
 
 __version__ = get_version(VERSION)
@@ -55,8 +50,6 @@ __all__ = [
     "__version__",
     "Argument",
     "Base64",
-    "BigInt",
-    "BaseGlobalIDType",
     "Boolean",
     "ClientIDMutation",
     "Connection",
@@ -65,7 +58,6 @@ __all__ = [
     "Date",
     "DateTime",
     "Decimal",
-    "DefaultGlobalIDType",
     "Dynamic",
     "Enum",
     "Field",
@@ -86,12 +78,10 @@ __all__ = [
     "ResolveInfo",
     "Scalar",
     "Schema",
-    "SimpleGlobalIDType",
     "String",
     "Time",
-    "Union",
     "UUID",
-    "UUIDGlobalIDType",
+    "Union",
     "is_node",
     "lazy_import",
     "resolve_only_args",

graphene/pyutils/version.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import datetime
 import os
 import subprocess
@@ -71,6 +73,6 @@ def get_git_changeset():
         )
         timestamp = git_log.communicate()[0]
         timestamp = datetime.datetime.utcfromtimestamp(int(timestamp))
-    except Exception:
+    except:
         return None
     return timestamp.strftime("%Y%m%d%H%M%S")

graphene/relay/__init__.py

@@ -1,23 +1,13 @@
 from .node import Node, is_node, GlobalID
 from .mutation import ClientIDMutation
 from .connection import Connection, ConnectionField, PageInfo
-from .id_type import (
-    BaseGlobalIDType,
-    DefaultGlobalIDType,
-    SimpleGlobalIDType,
-    UUIDGlobalIDType,
-)
 
 __all__ = [
-    "BaseGlobalIDType",
+    "Node",
+    "is_node",
+    "GlobalID",
     "ClientIDMutation",
     "Connection",
     "ConnectionField",
-    "DefaultGlobalIDType",
-    "GlobalID",
-    "Node",
     "PageInfo",
-    "SimpleGlobalIDType",
-    "UUIDGlobalIDType",
-    "is_node",
 ]

graphene/relay/connection.py

@@ -1,7 +1,6 @@
 import re
 from collections.abc import Iterable
 from functools import partial
-from typing import Type
 
 from graphql_relay import connection_from_array
 
@@ -9,34 +8,7 @@ from ..types import Boolean, Enum, Int, Interface, List, NonNull, Scalar, String
 from ..types.field import Field
 from ..types.objecttype import ObjectType, ObjectTypeOptions
 from ..utils.thenables import maybe_thenable
-from .node import is_node, AbstractNode
-
-
-def get_edge_class(
-    connection_class: Type["Connection"],
-    _node: Type[AbstractNode],
-    base_name: str,
-    strict_types: bool = False,
-):
-    edge_class = getattr(connection_class, "Edge", None)
-
-    class EdgeBase:
-        node = Field(
-            NonNull(_node) if strict_types else _node,
-            description="The item at the end of the edge",
-        )
-        cursor = String(required=True, description="A cursor for use in pagination")
-
-    class EdgeMeta:
-        description = f"A Relay edge containing a `{base_name}` and its cursor."
-
-    edge_name = f"{base_name}Edge"
-
-    edge_bases = [edge_class, EdgeBase] if edge_class else [EdgeBase]
-    if not isinstance(edge_class, ObjectType):
-        edge_bases = [*edge_bases, ObjectType]
-
-    return type(edge_name, tuple(edge_bases), {"Meta": EdgeMeta})
+from .node import is_node
 
 
 class PageInfo(ObjectType):
@@ -89,11 +61,8 @@ class Connection(ObjectType):
         abstract = True
 
     @classmethod
-    def __init_subclass_with_meta__(
-        cls, node=None, name=None, strict_types=False, _meta=None, **options
-    ):
-        if not _meta:
-            _meta = ConnectionOptions(cls)
+    def __init_subclass_with_meta__(cls, node=None, name=None, **options):
+        _meta = ConnectionOptions(cls)
         assert node, f"You have to provide a node in {cls.__name__}.Meta"
         assert isinstance(node, NonNull) or issubclass(
             node, (Scalar, Enum, ObjectType, Interface, Union, NonNull)
@@ -103,29 +72,39 @@ class Connection(ObjectType):
         if not name:
             name = f"{base_name}Connection"
 
+        edge_class = getattr(cls, "Edge", None)
+        _node = node
+
+        class EdgeBase:
+            node = Field(_node, description="The item at the end of the edge")
+            cursor = String(required=True, description="A cursor for use in pagination")
+
+        class EdgeMeta:
+            description = f"A Relay edge containing a `{base_name}` and its cursor."
+
+        edge_name = f"{base_name}Edge"
+        if edge_class:
+            edge_bases = (edge_class, EdgeBase, ObjectType)
+        else:
+            edge_bases = (EdgeBase, ObjectType)
+
+        edge = type(edge_name, edge_bases, {"Meta": EdgeMeta})
+        cls.Edge = edge
+
         options["name"] = name
-
         _meta.node = node
-
-        if not _meta.fields:
-            _meta.fields = {}
-
-        if "page_info" not in _meta.fields:
-            _meta.fields["page_info"] = Field(
+        _meta.fields = {
+            "page_info": Field(
                 PageInfo,
                 name="pageInfo",
                 required=True,
                 description="Pagination data for this connection.",
-            )
-
-        if "edges" not in _meta.fields:
-            edge_class = get_edge_class(cls, node, base_name, strict_types)  # type: ignore
-            cls.Edge = edge_class
-            _meta.fields["edges"] = Field(
-                NonNull(List(NonNull(edge_class) if strict_types else edge_class)),
+            ),
+            "edges": Field(
+                NonNull(List(edge)),
                 description="Contains the nodes in this connection.",
-            )
-
+            ),
+        }
         return super(Connection, cls).__init_subclass_with_meta__(
             _meta=_meta, **options
         )

graphene/relay/id_type.py

@@ -1,87 +0,0 @@
-from graphql_relay import from_global_id, to_global_id
-
-from ..types import ID, UUID
-from ..types.base import BaseType
-
-from typing import Type
-
-
-class BaseGlobalIDType:
-    """
-    Base class that define the required attributes/method for a type.
-    """
-
-    graphene_type: Type[BaseType] = ID
-
-    @classmethod
-    def resolve_global_id(cls, info, global_id):
-        # return _type, _id
-        raise NotImplementedError
-
-    @classmethod
-    def to_global_id(cls, _type, _id):
-        # return _id
-        raise NotImplementedError
-
-
-class DefaultGlobalIDType(BaseGlobalIDType):
-    """
-    Default global ID type: base64 encoded version of "<node type name>: <node id>".
-    """
-
-    graphene_type = ID
-
-    @classmethod
-    def resolve_global_id(cls, info, global_id):
-        try:
-            _type, _id = from_global_id(global_id)
-            if not _type:
-                raise ValueError("Invalid Global ID")
-            return _type, _id
-        except Exception as e:
-            raise Exception(
-                f'Unable to parse global ID "{global_id}". '
-                'Make sure it is a base64 encoded string in the format: "TypeName:id". '
-                f"Exception message: {e}"
-            )
-
-    @classmethod
-    def to_global_id(cls, _type, _id):
-        return to_global_id(_type, _id)
-
-
-class SimpleGlobalIDType(BaseGlobalIDType):
-    """
-    Simple global ID type: simply the id of the object.
-    To be used carefully as the user is responsible for ensuring that the IDs are indeed global
-    (otherwise it could cause request caching issues).
-    """
-
-    graphene_type = ID
-
-    @classmethod
-    def resolve_global_id(cls, info, global_id):
-        _type = info.return_type.graphene_type._meta.name
-        return _type, global_id
-
-    @classmethod
-    def to_global_id(cls, _type, _id):
-        return _id
-
-
-class UUIDGlobalIDType(BaseGlobalIDType):
-    """
-    UUID global ID type.
-    By definition UUID are global so they are used as they are.
-    """
-
-    graphene_type = UUID
-
-    @classmethod
-    def resolve_global_id(cls, info, global_id):
-        _type = info.return_type.graphene_type._meta.name
-        return _type, global_id
-
-    @classmethod
-    def to_global_id(cls, _type, _id):
-        return _id

graphene/relay/node.py

@@ -1,10 +1,11 @@
 from functools import partial
 from inspect import isclass
 
-from ..types import Field, Interface, ObjectType
+from graphql_relay import from_global_id, to_global_id
+
+from ..types import ID, Field, Interface, ObjectType
 from ..types.interface import InterfaceOptions
 from ..types.utils import get_type
-from .id_type import BaseGlobalIDType, DefaultGlobalIDType
 
 
 def is_node(objecttype):
@@ -21,18 +22,8 @@ def is_node(objecttype):
 
 
 class GlobalID(Field):
-    def __init__(
-        self,
-        node=None,
-        parent_type=None,
-        required=True,
-        global_id_type=DefaultGlobalIDType,
-        *args,
-        **kwargs,
-    ):
-        super(GlobalID, self).__init__(
-            global_id_type.graphene_type, required=required, *args, **kwargs
-        )
+    def __init__(self, node=None, parent_type=None, required=True, *args, **kwargs):
+        super(GlobalID, self).__init__(ID, required=required, *args, **kwargs)
         self.node = node or Node
         self.parent_type_name = parent_type._meta.name if parent_type else None
 
@@ -56,14 +47,12 @@ class NodeField(Field):
         assert issubclass(node, Node), "NodeField can only operate in Nodes"
         self.node_type = node
         self.field_type = type_
-        global_id_type = node._meta.global_id_type
 
         super(NodeField, self).__init__(
-            # If we don't specify a type, the field type will be the node interface
+            # If we don's specify a type, the field type will be the node
+            # interface
             type_ or node,
-            id=global_id_type.graphene_type(
-                required=True, description="The ID of the object"
-            ),
+            id=ID(required=True, description="The ID of the object"),
             **kwargs,
         )
 
@@ -76,23 +65,11 @@ class AbstractNode(Interface):
         abstract = True
 
     @classmethod
-    def __init_subclass_with_meta__(cls, global_id_type=DefaultGlobalIDType, **options):
-        assert issubclass(
-            global_id_type, BaseGlobalIDType
-        ), "Custom ID type need to be implemented as a subclass of BaseGlobalIDType."
+    def __init_subclass_with_meta__(cls, **options):
         _meta = InterfaceOptions(cls)
-        _meta.global_id_type = global_id_type
-        _meta.fields = {
-            "id": GlobalID(
-                cls, global_id_type=global_id_type, description="The ID of the object"
-            )
-        }
+        _meta.fields = {"id": GlobalID(cls, description="The ID of the object")}
         super(AbstractNode, cls).__init_subclass_with_meta__(_meta=_meta, **options)
 
-    @classmethod
-    def resolve_global_id(cls, info, global_id):
-        return cls._meta.global_id_type.resolve_global_id(info, global_id)
-
 
 class Node(AbstractNode):
     """An object with an ID"""
@@ -107,7 +84,16 @@ class Node(AbstractNode):
 
     @classmethod
     def get_node_from_global_id(cls, info, global_id, only_type=None):
-        _type, _id = cls.resolve_global_id(info, global_id)
+        try:
+            _type, _id = cls.from_global_id(global_id)
+            if not _type:
+                raise ValueError("Invalid Global ID")
+        except Exception as e:
+            raise Exception(
+                f'Unable to parse global ID "{global_id}". '
+                'Make sure it is a base64 encoded string in the format: "TypeName:id". '
+                f"Exception message: {e}"
+            )
 
         graphene_type = info.schema.get_type(_type)
         if graphene_type is None:
@@ -130,6 +116,10 @@ class Node(AbstractNode):
         if get_node:
             return get_node(info, _id)
 
+    @classmethod
+    def from_global_id(cls, global_id):
+        return from_global_id(global_id)
+
     @classmethod
     def to_global_id(cls, type_, id):
-        return cls._meta.global_id_type.to_global_id(type_, id)
+        return to_global_id(type_, id)

graphene/relay/tests/test_connection.py

@@ -1,15 +1,7 @@
-import re
-
 from pytest import raises
 
 from ...types import Argument, Field, Int, List, NonNull, ObjectType, Schema, String
-from ..connection import (
-    Connection,
-    ConnectionField,
-    PageInfo,
-    ConnectionOptions,
-    get_edge_class,
-)
+from ..connection import Connection, ConnectionField, PageInfo
 from ..node import Node
 
 
@@ -59,111 +51,6 @@ def test_connection_inherit_abstracttype():
     assert list(fields) == ["page_info", "edges", "extra"]
 
 
-def test_connection_extra_abstract_fields():
-    class ConnectionWithNodes(Connection):
-        class Meta:
-            abstract = True
-
-        @classmethod
-        def __init_subclass_with_meta__(cls, node=None, name=None, **options):
-            _meta = ConnectionOptions(cls)
-
-            _meta.fields = {
-                "nodes": Field(
-                    NonNull(List(node)),
-                    description="Contains all the nodes in this connection.",
-                ),
-            }
-
-            return super(ConnectionWithNodes, cls).__init_subclass_with_meta__(
-                node=node, name=name, _meta=_meta, **options
-            )
-
-    class MyObjectConnection(ConnectionWithNodes):
-        class Meta:
-            node = MyObject
-
-        class Edge:
-            other = String()
-
-    assert MyObjectConnection._meta.name == "MyObjectConnection"
-    fields = MyObjectConnection._meta.fields
-    assert list(fields) == ["nodes", "page_info", "edges"]
-    edge_field = fields["edges"]
-    pageinfo_field = fields["page_info"]
-    nodes_field = fields["nodes"]
-
-    assert isinstance(edge_field, Field)
-    assert isinstance(edge_field.type, NonNull)
-    assert isinstance(edge_field.type.of_type, List)
-    assert edge_field.type.of_type.of_type == MyObjectConnection.Edge
-
-    assert isinstance(pageinfo_field, Field)
-    assert isinstance(pageinfo_field.type, NonNull)
-    assert pageinfo_field.type.of_type == PageInfo
-
-    assert isinstance(nodes_field, Field)
-    assert isinstance(nodes_field.type, NonNull)
-    assert isinstance(nodes_field.type.of_type, List)
-    assert nodes_field.type.of_type.of_type == MyObject
-
-
-def test_connection_override_fields():
-    class ConnectionWithNodes(Connection):
-        class Meta:
-            abstract = True
-
-        @classmethod
-        def __init_subclass_with_meta__(cls, node=None, name=None, **options):
-            _meta = ConnectionOptions(cls)
-            base_name = (
-                re.sub("Connection$", "", name or cls.__name__) or node._meta.name
-            )
-
-            edge_class = get_edge_class(cls, node, base_name)
-
-            _meta.fields = {
-                "page_info": Field(
-                    NonNull(
-                        PageInfo,
-                        name="pageInfo",
-                        required=True,
-                        description="Pagination data for this connection.",
-                    )
-                ),
-                "edges": Field(
-                    NonNull(List(NonNull(edge_class))),
-                    description="Contains the nodes in this connection.",
-                ),
-            }
-
-            return super(ConnectionWithNodes, cls).__init_subclass_with_meta__(
-                node=node, name=name, _meta=_meta, **options
-            )
-
-    class MyObjectConnection(ConnectionWithNodes):
-        class Meta:
-            node = MyObject
-
-    assert MyObjectConnection._meta.name == "MyObjectConnection"
-    fields = MyObjectConnection._meta.fields
-    assert list(fields) == ["page_info", "edges"]
-    edge_field = fields["edges"]
-    pageinfo_field = fields["page_info"]
-
-    assert isinstance(edge_field, Field)
-    assert isinstance(edge_field.type, NonNull)
-    assert isinstance(edge_field.type.of_type, List)
-    assert isinstance(edge_field.type.of_type.of_type, NonNull)
-
-    assert edge_field.type.of_type.of_type.of_type.__name__ == "MyObjectEdge"
-
-    # This page info is NonNull
-    assert isinstance(pageinfo_field, Field)
-    assert isinstance(edge_field.type, NonNull)
-    assert pageinfo_field.type.of_type == PageInfo
-
-
 def test_connection_name():
     custom_name = "MyObjectCustomNameConnection"
 
@@ -299,20 +186,3 @@ def test_connectionfield_required():
     executed = schema.execute("{ testConnection { edges { cursor } } }")
     assert not executed.errors
     assert executed.data == {"testConnection": {"edges": []}}
-
-
-def test_connectionfield_strict_types():
-    class MyObjectConnection(Connection):
-        class Meta:
-            node = MyObject
-            strict_types = True
-
-    connection_field = ConnectionField(MyObjectConnection)
-    edges_field_type = connection_field.type._meta.fields["edges"].type
-    assert isinstance(edges_field_type, NonNull)
-
-    edges_list_element_type = edges_field_type.of_type.of_type
-    assert isinstance(edges_list_element_type, NonNull)
-
-    node_field = edges_list_element_type.of_type._meta.fields["node"]
-    assert isinstance(node_field.type, NonNull)

graphene/relay/tests/test_custom_global_id.py

@@ -1,325 +0,0 @@
-import re
-from uuid import uuid4
-
-from graphql import graphql_sync
-
-from ..id_type import BaseGlobalIDType, SimpleGlobalIDType, UUIDGlobalIDType
-from ..node import Node
-from ...types import Int, ObjectType, Schema, String
-
-
-class TestUUIDGlobalID:
-    def setup_method(self):
-        self.user_list = [
-            {"id": uuid4(), "name": "First"},
-            {"id": uuid4(), "name": "Second"},
-            {"id": uuid4(), "name": "Third"},
-            {"id": uuid4(), "name": "Fourth"},
-        ]
-        self.users = {user["id"]: user for user in self.user_list}
-
-        class CustomNode(Node):
-            class Meta:
-                global_id_type = UUIDGlobalIDType
-
-        class User(ObjectType):
-            class Meta:
-                interfaces = [CustomNode]
-
-            name = String()
-
-            @classmethod
-            def get_node(cls, _type, _id):
-                return self.users[_id]
-
-        class RootQuery(ObjectType):
-            user = CustomNode.Field(User)
-
-        self.schema = Schema(query=RootQuery, types=[User])
-        self.graphql_schema = self.schema.graphql_schema
-
-    def test_str_schema_correct(self):
-        """
-        Check that the schema has the expected and custom node interface and user type and that they both use UUIDs
-        """
-        parsed = re.findall(r"(.+) \{\n\s*([\w\W]*?)\n\}", str(self.schema))
-        types = [t for t, f in parsed]
-        fields = [f for t, f in parsed]
-        custom_node_interface = "interface CustomNode"
-        assert custom_node_interface in types
-        assert (
-            '"""The ID of the object"""\n  id: UUID!'
-            == fields[types.index(custom_node_interface)]
-        )
-        user_type = "type User implements CustomNode"
-        assert user_type in types
-        assert (
-            '"""The ID of the object"""\n  id: UUID!\n  name: String'
-            == fields[types.index(user_type)]
-        )
-
-    def test_get_by_id(self):
-        query = """query userById($id: UUID!) {
-            user(id: $id) {
-                id
-                name
-            }
-        }"""
-        # UUID need to be converted to string for serialization
-        result = graphql_sync(
-            self.graphql_schema,
-            query,
-            variable_values={"id": str(self.user_list[0]["id"])},
-        )
-        assert not result.errors
-        assert result.data["user"]["id"] == str(self.user_list[0]["id"])
-        assert result.data["user"]["name"] == self.user_list[0]["name"]
-
-
-class TestSimpleGlobalID:
-    def setup_method(self):
-        self.user_list = [
-            {"id": "my global primary key in clear 1", "name": "First"},
-            {"id": "my global primary key in clear 2", "name": "Second"},
-            {"id": "my global primary key in clear 3", "name": "Third"},
-            {"id": "my global primary key in clear 4", "name": "Fourth"},
-        ]
-        self.users = {user["id"]: user for user in self.user_list}
-
-        class CustomNode(Node):
-            class Meta:
-                global_id_type = SimpleGlobalIDType
-
-        class User(ObjectType):
-            class Meta:
-                interfaces = [CustomNode]
-
-            name = String()
-
-            @classmethod
-            def get_node(cls, _type, _id):
-                return self.users[_id]
-
-        class RootQuery(ObjectType):
-            user = CustomNode.Field(User)
-
-        self.schema = Schema(query=RootQuery, types=[User])
-        self.graphql_schema = self.schema.graphql_schema
-
-    def test_str_schema_correct(self):
-        """
-        Check that the schema has the expected and custom node interface and user type and that they both use UUIDs
-        """
-        parsed = re.findall(r"(.+) \{\n\s*([\w\W]*?)\n\}", str(self.schema))
-        types = [t for t, f in parsed]
-        fields = [f for t, f in parsed]
-        custom_node_interface = "interface CustomNode"
-        assert custom_node_interface in types
-        assert (
-            '"""The ID of the object"""\n  id: ID!'
-            == fields[types.index(custom_node_interface)]
-        )
-        user_type = "type User implements CustomNode"
-        assert user_type in types
-        assert (
-            '"""The ID of the object"""\n  id: ID!\n  name: String'
-            == fields[types.index(user_type)]
-        )
-
-    def test_get_by_id(self):
-        query = """query {
-            user(id: "my global primary key in clear 3") {
-                id
-                name
-            }
-        }"""
-        result = graphql_sync(self.graphql_schema, query)
-        assert not result.errors
-        assert result.data["user"]["id"] == self.user_list[2]["id"]
-        assert result.data["user"]["name"] == self.user_list[2]["name"]
-
-
-class TestCustomGlobalID:
-    def setup_method(self):
-        self.user_list = [
-            {"id": 1, "name": "First"},
-            {"id": 2, "name": "Second"},
-            {"id": 3, "name": "Third"},
-            {"id": 4, "name": "Fourth"},
-        ]
-        self.users = {user["id"]: user for user in self.user_list}
-
-        class CustomGlobalIDType(BaseGlobalIDType):
-            """
-            Global id that is simply and integer in clear.
-            """
-
-            graphene_type = Int
-
-            @classmethod
-            def resolve_global_id(cls, info, global_id):
-                _type = info.return_type.graphene_type._meta.name
-                return _type, global_id
-
-            @classmethod
-            def to_global_id(cls, _type, _id):
-                return _id
-
-        class CustomNode(Node):
-            class Meta:
-                global_id_type = CustomGlobalIDType
-
-        class User(ObjectType):
-            class Meta:
-                interfaces = [CustomNode]
-
-            name = String()
-
-            @classmethod
-            def get_node(cls, _type, _id):
-                return self.users[_id]
-
-        class RootQuery(ObjectType):
-            user = CustomNode.Field(User)
-
-        self.schema = Schema(query=RootQuery, types=[User])
-        self.graphql_schema = self.schema.graphql_schema
-
-    def test_str_schema_correct(self):
-        """
-        Check that the schema has the expected and custom node interface and user type and that they both use UUIDs
-        """
-        parsed = re.findall(r"(.+) \{\n\s*([\w\W]*?)\n\}", str(self.schema))
-        types = [t for t, f in parsed]
-        fields = [f for t, f in parsed]
-        custom_node_interface = "interface CustomNode"
-        assert custom_node_interface in types
-        assert (
-            '"""The ID of the object"""\n  id: Int!'
-            == fields[types.index(custom_node_interface)]
-        )
-        user_type = "type User implements CustomNode"
-        assert user_type in types
-        assert (
-            '"""The ID of the object"""\n  id: Int!\n  name: String'
-            == fields[types.index(user_type)]
-        )
-
-    def test_get_by_id(self):
-        query = """query {
-            user(id: 2) {
-                id
-                name
-            }
-        }"""
-        result = graphql_sync(self.graphql_schema, query)
-        assert not result.errors
-        assert result.data["user"]["id"] == self.user_list[1]["id"]
-        assert result.data["user"]["name"] == self.user_list[1]["name"]
-
-
-class TestIncompleteCustomGlobalID:
-    def setup_method(self):
-        self.user_list = [
-            {"id": 1, "name": "First"},
-            {"id": 2, "name": "Second"},
-            {"id": 3, "name": "Third"},
-            {"id": 4, "name": "Fourth"},
-        ]
-        self.users = {user["id"]: user for user in self.user_list}
-
-    def test_must_define_to_global_id(self):
-        """
-        Test that if the `to_global_id` method is not defined, we can query the object, but we can't request its ID.
-        """
-
-        class CustomGlobalIDType(BaseGlobalIDType):
-            graphene_type = Int
-
-            @classmethod
-            def resolve_global_id(cls, info, global_id):
-                _type = info.return_type.graphene_type._meta.name
-                return _type, global_id
-
-        class CustomNode(Node):
-            class Meta:
-                global_id_type = CustomGlobalIDType
-
-        class User(ObjectType):
-            class Meta:
-                interfaces = [CustomNode]
-
-            name = String()
-
-            @classmethod
-            def get_node(cls, _type, _id):
-                return self.users[_id]
-
-        class RootQuery(ObjectType):
-            user = CustomNode.Field(User)
-
-        self.schema = Schema(query=RootQuery, types=[User])
-        self.graphql_schema = self.schema.graphql_schema
-
-        query = """query {
-            user(id: 2) {
-                name
-            }
-        }"""
-        result = graphql_sync(self.graphql_schema, query)
-        assert not result.errors
-        assert result.data["user"]["name"] == self.user_list[1]["name"]
-
-        query = """query {
-            user(id: 2) {
-                id
-                name
-            }
-        }"""
-        result = graphql_sync(self.graphql_schema, query)
-        assert result.errors is not None
-        assert len(result.errors) == 1
-        assert result.errors[0].path == ["user", "id"]
-
-    def test_must_define_resolve_global_id(self):
-        """
-        Test that if the `resolve_global_id` method is not defined, we can't query the object by ID.
-        """
-
-        class CustomGlobalIDType(BaseGlobalIDType):
-            graphene_type = Int
-
-            @classmethod
-            def to_global_id(cls, _type, _id):
-                return _id
-
-        class CustomNode(Node):
-            class Meta:
-                global_id_type = CustomGlobalIDType
-
-        class User(ObjectType):
-            class Meta:
-                interfaces = [CustomNode]
-
-            name = String()
-
-            @classmethod
-            def get_node(cls, _type, _id):
-                return self.users[_id]
-
-        class RootQuery(ObjectType):
-            user = CustomNode.Field(User)
-
-        self.schema = Schema(query=RootQuery, types=[User])
-        self.graphql_schema = self.schema.graphql_schema
-
-        query = """query {
-            user(id: 2) {
-                id
-                name
-            }
-        }"""
-        result = graphql_sync(self.graphql_schema, query)
-        assert result.errors is not None
-        assert len(result.errors) == 1
-        assert result.errors[0].path == ["user"]

graphene/relay/tests/test_mutation_async.py

@@ -3,7 +3,6 @@ from pytest import mark
 from graphene.types import ID, Field, ObjectType, Schema
 from graphene.types.scalars import String
 from graphene.relay.mutation import ClientIDMutation
-from graphene.test import Client
 
 
 class SharedFields(object):
@@ -62,27 +61,24 @@ class Mutation(ObjectType):
 
 
 schema = Schema(query=RootQuery, mutation=Mutation)
-client = Client(schema)
 
 
 @mark.asyncio
 async def test_node_query_promise():
-    executed = await client.execute_async(
+    executed = await schema.execute_async(
         'mutation a { sayPromise(input: {what:"hello", clientMutationId:"1"}) { phrase } }'
     )
-    assert isinstance(executed, dict)
-    assert "errors" not in executed
-    assert executed["data"] == {"sayPromise": {"phrase": "hello"}}
+    assert not executed.errors
+    assert executed.data == {"sayPromise": {"phrase": "hello"}}
 
 
 @mark.asyncio
 async def test_edge_query():
-    executed = await client.execute_async(
+    executed = await schema.execute_async(
         'mutation a { other(input: {clientMutationId:"1"}) { clientMutationId, myNodeEdge { cursor node { name }} } }'
     )
-    assert isinstance(executed, dict)
-    assert "errors" not in executed
-    assert executed["data"] == {
+    assert not executed.errors
+    assert dict(executed.data) == {
         "other": {
             "clientMutationId": "1",
             "myNodeEdge": {"cursor": "1", "node": {"name": "name"}},

graphene/relay/tests/test_node.py

@@ -8,6 +8,7 @@ from ..node import Node, is_node
 
 
 class SharedNodeFields:
+
     shared = String()
     something_else = String()
 
@@ -54,7 +55,6 @@ def test_node_good():
     assert "id" in MyNode._meta.fields
     assert is_node(MyNode)
     assert not is_node(object)
-    assert not is_node("node")
 
 
 def test_node_query():

graphene/test/__init__.py

@@ -1,3 +1,4 @@
+from promise import Promise, is_thenable
 from graphql.error import GraphQLError
 
 from graphene.types.schema import Schema
@@ -30,10 +31,7 @@ class Client:
 
     def execute(self, *args, **kwargs):
         executed = self.schema.execute(*args, **dict(self.execute_options, **kwargs))
-        return self.format_result(executed)
+        if is_thenable(executed):
+            return Promise.resolve(executed).then(self.format_result)
 
-    async def execute_async(self, *args, **kwargs):
-        executed = await self.schema.execute_async(
-            *args, **dict(self.execute_options, **kwargs)
-        )
         return self.format_result(executed)

graphene/tests/issues/test_1293.py

@@ -1,41 +0,0 @@
-# https://github.com/graphql-python/graphene/issues/1293
-
-from datetime import datetime, timezone
-
-import graphene
-from graphql.utilities import print_schema
-
-
-class Filters(graphene.InputObjectType):
-    datetime_after = graphene.DateTime(
-        required=False,
-        default_value=datetime.fromtimestamp(1434549820.776, timezone.utc),
-    )
-    datetime_before = graphene.DateTime(
-        required=False,
-        default_value=datetime.fromtimestamp(1444549820.776, timezone.utc),
-    )
-
-
-class SetDatetime(graphene.Mutation):
-    class Arguments:
-        filters = Filters(required=True)
-
-    ok = graphene.Boolean()
-
-    def mutate(root, info, filters):
-        return SetDatetime(ok=True)
-
-
-class Query(graphene.ObjectType):
-    goodbye = graphene.String()
-
-
-class Mutations(graphene.ObjectType):
-    set_datetime = SetDatetime.Field()
-
-
-def test_schema_printable_with_default_datetime_value():
-    schema = graphene.Schema(query=Query, mutation=Mutations)
-    schema_str = print_schema(schema.graphql_schema)
-    assert schema_str, "empty schema printed"

graphene/tests/issues/test_1419.py

@@ -24,8 +24,8 @@ from ...types.uuid import UUID
         (ID, "1"),
         (DateTime, '"2022-02-02T11:11:11"'),
         (UUID, '"cbebbc62-758e-4f75-a890-bc73b5017d81"'),
-        (Decimal, '"1.1"'),
-        (JSONString, '"{\\"key\\":\\"foo\\",\\"value\\":\\"bar\\"}"'),
+        (Decimal, "1.1"),
+        (JSONString, '{key:"foo",value:"bar"}'),
         (Base64, '"Q2hlbG8gd29ycmxkCg=="'),
     ],
 )

graphene/tests/issues/test_881.py

@@ -1,27 +0,0 @@
-import pickle
-
-from ...types.enum import Enum
-
-
-class PickleEnum(Enum):
-    # is defined outside of test because pickle unable to dump class inside ot pytest function
-    A = "a"
-    B = 1
-
-
-def test_enums_pickling():
-    a = PickleEnum.A
-    pickled = pickle.dumps(a)
-    restored = pickle.loads(pickled)
-    assert type(a) is type(restored)
-    assert a == restored
-    assert a.value == restored.value
-    assert a.name == restored.name
-
-    b = PickleEnum.B
-    pickled = pickle.dumps(b)
-    restored = pickle.loads(pickled)
-    assert type(a) is type(restored)
-    assert b == restored
-    assert b.value == restored.value
-    assert b.name == restored.name

graphene/types/__init__.py

@@ -1,3 +1,4 @@
+# flake8: noqa
 from graphql import GraphQLResolveInfo as ResolveInfo
 
 from .argument import Argument
@@ -14,7 +15,7 @@ from .interface import Interface
 from .json import JSONString
 from .mutation import Mutation
 from .objecttype import ObjectType
-from .scalars import ID, BigInt, Boolean, Float, Int, Scalar, String
+from .scalars import ID, Boolean, Float, Int, Scalar, String
 from .schema import Schema
 from .structures import List, NonNull
 from .union import Union
@@ -23,7 +24,6 @@ from .uuid import UUID
 __all__ = [
     "Argument",
     "Base64",
-    "BigInt",
     "Boolean",
     "Context",
     "Date",

graphene/types/argument.py

@@ -31,22 +31,18 @@ class Argument(MountedType):
         type (class for a graphene.UnmountedType): must be a class (not an instance) of an
             unmounted graphene type (ex. scalar or object) which is used for the type of this
             argument in the GraphQL schema.
-        required (optional, bool): indicates this argument as not null in the graphql schema. Same behavior
+        required (bool): indicates this argument as not null in the graphql schema. Same behavior
             as graphene.NonNull. Default False.
-        name (optional, str): the name of the GraphQL argument. Defaults to parameter name.
-        description (optional, str): the description of the GraphQL argument in the schema.
-        default_value (optional, Any): The value to be provided if the user does not set this argument in
+        name (str): the name of the GraphQL argument. Defaults to parameter name.
+        description (str): the description of the GraphQL argument in the schema.
+        default_value (Any): The value to be provided if the user does not set this argument in
             the operation.
-        deprecation_reason (optional, str): Setting this value indicates that the argument is
-            depreciated and may provide instruction or reason on how for clients to proceed. Cannot be
-            set if the argument is required (see spec).
     """
 
     def __init__(
         self,
         type_,
         default_value=Undefined,
-        deprecation_reason=None,
         description=None,
         name=None,
         required=False,
@@ -55,16 +51,12 @@ class Argument(MountedType):
         super(Argument, self).__init__(_creation_counter=_creation_counter)
 
         if required:
-            assert (
-                deprecation_reason is None
-            ), f"Argument {name} is required, cannot deprecate it."
             type_ = NonNull(type_)
 
         self.name = name
         self._type = type_
         self.default_value = default_value
         self.description = description
-        self.deprecation_reason = deprecation_reason
 
     @property
     def type(self):
@@ -76,7 +68,6 @@ class Argument(MountedType):
             and self.type == other.type
             and self.default_value == other.default_value
             and self.description == other.description
-            and self.deprecation_reason == other.deprecation_reason
         )
 
 

graphene/types/base.py

@@ -1,17 +1,17 @@
-from typing import Type, Optional
+from typing import Type
 
 from ..utils.subclass_with_meta import SubclassWithMeta, SubclassWithMeta_Meta
 from ..utils.trim_docstring import trim_docstring
 
 
 class BaseOptions:
-    name: Optional[str] = None
-    description: Optional[str] = None
+    name = None  # type: str
+    description = None  # type: str
 
-    _frozen: bool = False
+    _frozen = False  # type: bool
 
-    def __init__(self, class_type: Type):
-        self.class_type: Type = class_type
+    def __init__(self, class_type):
+        self.class_type = class_type  # type: Type
 
     def freeze(self):
         self._frozen = True

graphene/types/datetime.py

@@ -1,7 +1,8 @@
+from __future__ import absolute_import
+
 import datetime
 
-from dateutil.parser import isoparse
-
+from aniso8601 import parse_date, parse_datetime, parse_time
 from graphql.error import GraphQLError
 from graphql.language import StringValueNode, print_ast
 
@@ -38,7 +39,7 @@ class Date(Scalar):
         if not isinstance(value, str):
             raise GraphQLError(f"Date cannot represent non-string value: {repr(value)}")
         try:
-            return datetime.date.fromisoformat(value)
+            return parse_date(value)
         except ValueError:
             raise GraphQLError(f"Date cannot represent value: {repr(value)}")
 
@@ -73,7 +74,7 @@ class DateTime(Scalar):
                 f"DateTime cannot represent non-string value: {repr(value)}"
             )
         try:
-            return isoparse(value)
+            return parse_datetime(value)
         except ValueError:
             raise GraphQLError(f"DateTime cannot represent value: {repr(value)}")
 
@@ -106,6 +107,6 @@ class Time(Scalar):
         if not isinstance(value, str):
             raise GraphQLError(f"Time cannot represent non-string value: {repr(value)}")
         try:
-            return datetime.time.fromisoformat(value)
+            return parse_time(value)
         except ValueError:
             raise GraphQLError(f"Time cannot represent value: {repr(value)}")

graphene/types/decimal.py

@@ -1,6 +1,7 @@
+from __future__ import absolute_import
+
 from decimal import Decimal as _Decimal
 
-from graphql import Undefined
 from graphql.language.ast import StringValueNode, IntValueNode
 
 from .scalars import Scalar
@@ -24,11 +25,10 @@ class Decimal(Scalar):
     def parse_literal(cls, node, _variables=None):
         if isinstance(node, (StringValueNode, IntValueNode)):
             return cls.parse_value(node.value)
-        return Undefined
 
     @staticmethod
     def parse_value(value):
         try:
             return _Decimal(value)
-        except Exception:
-            return Undefined
+        except ValueError:
+            return None

graphene/types/definitions.py

@@ -20,11 +20,6 @@ class GrapheneGraphQLType:
         self.graphene_type = kwargs.pop("graphene_type")
         super(GrapheneGraphQLType, self).__init__(*args, **kwargs)
 
-    def __copy__(self):
-        result = GrapheneGraphQLType(graphene_type=self.graphene_type)
-        result.__dict__.update(self.__dict__)
-        return result
-
 
 class GrapheneInterfaceType(GrapheneGraphQLType, GraphQLInterfaceType):
     pass

graphene/types/enum.py

@@ -12,10 +12,6 @@ def eq_enum(self, other):
     return self.value is other
 
 
-def hash_enum(self):
-    return hash(self.name)
-
-
 EnumType = type(PyEnum)
 
 
@@ -26,16 +22,14 @@ class EnumOptions(BaseOptions):
 
 class EnumMeta(SubclassWithMeta_Meta):
     def __new__(cls, name_, bases, classdict, **options):
-        enum_members = dict(classdict, __eq__=eq_enum, __hash__=hash_enum)
+        enum_members = dict(classdict, __eq__=eq_enum)
         # We remove the Meta attribute from the class to not collide
         # with the enum values.
         enum_members.pop("Meta", None)
         enum = PyEnum(cls.__name__, enum_members)
-        obj = SubclassWithMeta_Meta.__new__(
+        return SubclassWithMeta_Meta.__new__(
             cls, name_, bases, dict(classdict, __enum__=enum), **options
         )
-        globals()[name_] = obj.__enum__
-        return obj
 
     def get(cls, value):
         return cls._meta.enum(value)
@@ -58,19 +52,15 @@ class EnumMeta(SubclassWithMeta_Meta):
         return super(EnumMeta, cls).__call__(*args, **kwargs)
         # return cls._meta.enum(*args, **kwargs)
 
-    def __iter__(cls):
-        return cls._meta.enum.__iter__()
-
-    def from_enum(cls, enum, name=None, description=None, deprecation_reason=None):  # noqa: N805
-        name = name or enum.__name__
-        description = description or enum.__doc__ or "An enumeration."
+    def from_enum(cls, enum, description=None, deprecation_reason=None):  # noqa: N805
+        description = description or enum.__doc__
         meta_dict = {
             "enum": enum,
             "description": description,
             "deprecation_reason": deprecation_reason,
         }
         meta_class = type("Meta", (object,), meta_dict)
-        return type(name, (Enum,), {"Meta": meta_class})
+        return type(meta_class.enum.__name__, (Enum,), {"Meta": meta_class})
 
 
 class Enum(UnmountedType, BaseType, metaclass=EnumMeta):

graphene/types/field.py

@@ -43,8 +43,7 @@ class Field(MountedType):
     args:
         type (class for a graphene.UnmountedType): Must be a class (not an instance) of an
             unmounted graphene type (ex. scalar or object) which is used for the type of this
-            field in the GraphQL schema. You can provide a dotted module import path (string)
-            to the class instead of the class itself (e.g. to avoid circular import issues).
+            field in the GraphQL schema.
         args (optional, Dict[str, graphene.Argument]): Arguments that can be input to the field.
             Prefer to use ``**extra_args``, unless you use an argument name that clashes with one
             of the Field arguments presented here (see :ref:`example<ResolverParamGraphQLArguments>`).

graphene/types/generic.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from graphql.language.ast import (
     BooleanValueNode,
     FloatValueNode,

graphene/types/inputfield.py

@@ -55,14 +55,11 @@ class InputField(MountedType):
         description=None,
         required=False,
         _creation_counter=None,
-        **extra_args,
+        **extra_args
     ):
         super(InputField, self).__init__(_creation_counter=_creation_counter)
         self.name = name
         if required:
-            assert (
-                deprecation_reason is None
-            ), f"InputField {name} is required, cannot deprecate it."
             type_ = NonNull(type_)
         self._type = type_
         self.deprecation_reason = deprecation_reason

graphene/types/inputobjecttype.py

@@ -1,12 +1,11 @@
-from typing import TYPE_CHECKING
-
 from .base import BaseOptions, BaseType
 from .inputfield import InputField
 from .unmountedtype import UnmountedType
 from .utils import yank_fields_from_attrs
 
-# For static type checking with type checker
-if TYPE_CHECKING:
+# For static type checking with Mypy
+MYPY = False
+if MYPY:
     from typing import Dict, Callable  # NOQA
 
 
@@ -15,39 +14,14 @@ class InputObjectTypeOptions(BaseOptions):
     container = None  # type: InputObjectTypeContainer
 
 
-# Currently in Graphene, we get a `None` whenever we access an (optional) field that was not set in an InputObjectType
-# using the InputObjectType.<attribute> dot access syntax. This is ambiguous, because in this current (Graphene
-# historical) arrangement, we cannot distinguish between a field not being set and a field being set to None.
-# At the same time, we shouldn't break existing code that expects a `None` when accessing a field that was not set.
-_INPUT_OBJECT_TYPE_DEFAULT_VALUE = None
-
-# To mitigate this, we provide the function `set_input_object_type_default_value` to allow users to change the default
-# value returned in non-specified fields in InputObjectType to another meaningful sentinel value (e.g. Undefined)
-# if they want to. This way, we can keep code that expects a `None` working while we figure out a better solution (or
-# a well-documented breaking change) for this issue.
-
-
-def set_input_object_type_default_value(default_value):
-    """
-    Change the sentinel value returned by non-specified fields in an InputObjectType
-    Useful to differentiate between a field not being set and a field being set to None by using a sentinel value
-    (e.g. Undefined is a good sentinel value for this purpose)
-
-    This function should be called at the beginning of the app or in some other place where it is guaranteed to
-    be called before any InputObjectType is defined.
-    """
-    global _INPUT_OBJECT_TYPE_DEFAULT_VALUE
-    _INPUT_OBJECT_TYPE_DEFAULT_VALUE = default_value
-
-
-class InputObjectTypeContainer(dict, BaseType):  # type: ignore
+class InputObjectTypeContainer(dict, BaseType):
     class Meta:
         abstract = True
 
     def __init__(self, *args, **kwargs):
         dict.__init__(self, *args, **kwargs)
         for key in self._meta.fields:
-            setattr(self, key, self.get(key, _INPUT_OBJECT_TYPE_DEFAULT_VALUE))
+            setattr(self, key, self.get(key, None))
 
     def __init_subclass__(cls, *args, **kwargs):
         pass

graphene/types/interface.py

@@ -1,17 +1,15 @@
-from typing import TYPE_CHECKING
-
 from .base import BaseOptions, BaseType
 from .field import Field
 from .utils import yank_fields_from_attrs
 
-# For static type checking with type checker
-if TYPE_CHECKING:
-    from typing import Dict, Iterable, Type  # NOQA
+# For static type checking with Mypy
+MYPY = False
+if MYPY:
+    from typing import Dict  # NOQA
 
 
 class InterfaceOptions(BaseOptions):
     fields = None  # type: Dict[str, Field]
-    interfaces = ()  # type: Iterable[Type[Interface]]
 
 
 class Interface(BaseType):
@@ -47,7 +45,7 @@ class Interface(BaseType):
     """
 
     @classmethod
-    def __init_subclass_with_meta__(cls, _meta=None, interfaces=(), **options):
+    def __init_subclass_with_meta__(cls, _meta=None, **options):
         if not _meta:
             _meta = InterfaceOptions(cls)
 
@@ -60,9 +58,6 @@ class Interface(BaseType):
         else:
             _meta.fields = fields
 
-        if not _meta.interfaces:
-            _meta.interfaces = interfaces
-
         super(Interface, cls).__init_subclass_with_meta__(_meta=_meta, **options)
 
     @classmethod

graphene/types/json.py

@@ -1,6 +1,7 @@
+from __future__ import absolute_import
+
 import json
 
-from graphql import Undefined
 from graphql.language.ast import StringValueNode
 
 from .scalars import Scalar
@@ -21,11 +22,7 @@ class JSONString(Scalar):
     @staticmethod
     def parse_literal(node, _variables=None):
         if isinstance(node, StringValueNode):
-            try:
-                return json.loads(node.value)
-            except Exception as error:
-                raise ValueError(f"Badly formed JSONString: {str(error)}")
-        return Undefined
+            return json.loads(node.value)
 
     @staticmethod
     def parse_value(value):

graphene/types/mutation.py

@@ -1,5 +1,3 @@
-from typing import TYPE_CHECKING
-
 from ..utils.deprecated import warn_deprecation
 from ..utils.get_unbound_function import get_unbound_function
 from ..utils.props import props
@@ -8,8 +6,9 @@ from .objecttype import ObjectType, ObjectTypeOptions
 from .utils import yank_fields_from_attrs
 from .interface import Interface
 
-# For static type checking with type checker
-if TYPE_CHECKING:
+# For static type checking with Mypy
+MYPY = False
+if MYPY:
     from .argument import Argument  # NOQA
     from typing import Dict, Type, Callable, Iterable  # NOQA
 
@@ -30,21 +29,21 @@ class Mutation(ObjectType):
 
     .. code:: python
 
-        import graphene
+        from graphene import Mutation, ObjectType, String, Boolean, Field
 
-        class CreatePerson(graphene.Mutation):
+        class CreatePerson(Mutation):
             class Arguments:
-                name = graphene.String()
+                name = String()
 
-            ok = graphene.Boolean()
-            person = graphene.Field(Person)
+            ok = Boolean()
+            person = Field(Person)
 
             def mutate(parent, info, name):
                 person = Person(name=name)
                 ok = True
                 return CreatePerson(person=person, ok=ok)
 
-        class Mutation(graphene.ObjectType):
+        class Mutation(ObjectType):
             create_person = CreatePerson.Field()
 
     Meta class options (optional):

graphene/types/objecttype.py

@@ -1,14 +1,15 @@
-from typing import TYPE_CHECKING
-
 from .base import BaseOptions, BaseType, BaseTypeMeta
 from .field import Field
 from .interface import Interface
 from .utils import yank_fields_from_attrs
 
-from dataclasses import make_dataclass, field
-
-# For static type checking with type checker
-if TYPE_CHECKING:
+try:
+    from dataclasses import make_dataclass, field
+except ImportError:
+    from ..pyutils.dataclasses import make_dataclass, field  # type: ignore
+# For static type checking with Mypy
+MYPY = False
+if MYPY:
     from typing import Dict, Iterable, Type  # NOQA
 
 

graphene/types/scalars.py

@@ -1,6 +1,5 @@
 from typing import Any
 
-from graphql import Undefined
 from graphql.language.ast import (
     BooleanValueNode,
     FloatValueNode,
@@ -68,10 +67,9 @@ class Int(Scalar):
             try:
                 num = int(float(value))
             except ValueError:
-                return Undefined
+                return None
         if MIN_INT <= num <= MAX_INT:
             return num
-        return Undefined
 
     serialize = coerce_int
     parse_value = coerce_int
@@ -82,7 +80,6 @@ class Int(Scalar):
             num = int(ast.value)
             if MIN_INT <= num <= MAX_INT:
                 return num
-        return Undefined
 
 
 class BigInt(Scalar):
@@ -100,7 +97,7 @@ class BigInt(Scalar):
             try:
                 num = int(float(value))
             except ValueError:
-                return Undefined
+                return None
         return num
 
     serialize = coerce_int
@@ -110,7 +107,6 @@ class BigInt(Scalar):
     def parse_literal(ast, _variables=None):
         if isinstance(ast, IntValueNode):
             return int(ast.value)
-        return Undefined
 
 
 class Float(Scalar):
@@ -121,11 +117,12 @@ class Float(Scalar):
     """
 
     @staticmethod
-    def coerce_float(value: Any) -> float:
+    def coerce_float(value):
+        # type: (Any) -> float
         try:
             return float(value)
         except ValueError:
-            return Undefined
+            return None
 
     serialize = coerce_float
     parse_value = coerce_float
@@ -134,7 +131,6 @@ class Float(Scalar):
     def parse_literal(ast, _variables=None):
         if isinstance(ast, (FloatValueNode, IntValueNode)):
             return float(ast.value)
-        return Undefined
 
 
 class String(Scalar):
@@ -157,7 +153,6 @@ class String(Scalar):
     def parse_literal(ast, _variables=None):
         if isinstance(ast, StringValueNode):
             return ast.value
-        return Undefined
 
 
 class Boolean(Scalar):
@@ -172,7 +167,6 @@ class Boolean(Scalar):
     def parse_literal(ast, _variables=None):
         if isinstance(ast, BooleanValueNode):
             return ast.value
-        return Undefined
 
 
 class ID(Scalar):
@@ -191,4 +185,3 @@ class ID(Scalar):
     def parse_literal(ast, _variables=None):
         if isinstance(ast, (StringValueNode, IntValueNode)):
             return ast.value
-        return Undefined

graphene/types/schema.py

@@ -1,4 +1,3 @@
-from enum import Enum as PyEnum
 import inspect
 from functools import partial
 
@@ -170,16 +169,10 @@ class TypeMap(dict):
         values = {}
         for name, value in graphene_type._meta.enum.__members__.items():
             description = getattr(value, "description", None)
-            # if the "description" attribute is an Enum, it is likely an enum member
-            # called description, not a description property
-            if isinstance(description, PyEnum):
-                description = None
+            deprecation_reason = getattr(value, "deprecation_reason", None)
             if not description and callable(graphene_type._meta.description):
                 description = graphene_type._meta.description(value)
 
-            deprecation_reason = getattr(value, "deprecation_reason", None)
-            if isinstance(deprecation_reason, PyEnum):
-                deprecation_reason = None
             if not deprecation_reason and callable(
                 graphene_type._meta.deprecation_reason
             ):
@@ -240,20 +233,11 @@ class TypeMap(dict):
             else None
         )
 
-        def interfaces():
-            interfaces = []
-            for graphene_interface in graphene_type._meta.interfaces:
-                interface = self.add_type(graphene_interface)
-                assert interface.graphene_type == graphene_interface
-                interfaces.append(interface)
-            return interfaces
-
         return GrapheneInterfaceType(
             graphene_type=graphene_type,
             name=graphene_type._meta.name,
             description=graphene_type._meta.description,
             fields=partial(self.create_fields_for_type, graphene_type),
-            interfaces=interfaces,
             resolve_type=resolve_type,
         )
 
@@ -316,7 +300,6 @@ class TypeMap(dict):
                     default_value=field.default_value,
                     out_name=name,
                     description=field.description,
-                    deprecation_reason=field.deprecation_reason,
                 )
             else:
                 args = {}
@@ -328,7 +311,6 @@ class TypeMap(dict):
                         out_name=arg_name,
                         description=arg.description,
                         default_value=arg.default_value,
-                        deprecation_reason=arg.deprecation_reason,
                     )
                 subscribe = field.wrap_subscribe(
                     self.get_function_for_type(

graphene/types/tests/conftest.py

@@ -1,12 +0,0 @@
-import pytest
-from graphql import Undefined
-
-from graphene.types.inputobjecttype import set_input_object_type_default_value
-
-
-@pytest.fixture()
-def set_default_input_object_type_to_undefined():
-    """This fixture is used to change the default value of optional inputs in InputObjectTypes for specific tests"""
-    set_input_object_type_default_value(Undefined)
-    yield
-    set_input_object_type_default_value(None)

graphene/types/tests/test_argument.py

@@ -18,20 +18,8 @@ def test_argument():
 
 
 def test_argument_comparasion():
-    arg1 = Argument(
-        String,
-        name="Hey",
-        description="Desc",
-        default_value="default",
-        deprecation_reason="deprecated",
-    )
-    arg2 = Argument(
-        String,
-        name="Hey",
-        description="Desc",
-        default_value="default",
-        deprecation_reason="deprecated",
-    )
+    arg1 = Argument(String, name="Hey", description="Desc", default_value="default")
+    arg2 = Argument(String, name="Hey", description="Desc", default_value="default")
 
     assert arg1 == arg2
     assert arg1 != String()
@@ -52,30 +40,6 @@ def test_to_arguments():
     }
 
 
-def test_to_arguments_deprecated():
-    args = {"unmounted_arg": String(required=False, deprecation_reason="deprecated")}
-
-    my_args = to_arguments(args)
-    assert my_args == {
-        "unmounted_arg": Argument(
-            String, required=False, deprecation_reason="deprecated"
-        ),
-    }
-
-
-def test_to_arguments_required_deprecated():
-    args = {
-        "unmounted_arg": String(
-            required=True, name="arg", deprecation_reason="deprecated"
-        )
-    }
-
-    with raises(AssertionError) as exc_info:
-        to_arguments(args)
-
-    assert str(exc_info.value) == "Argument arg is required, cannot deprecate it."
-
-
 def test_to_arguments_raises_if_field():
     args = {"arg_string": Field(String)}
 

graphene/types/tests/test_datetime.py

@@ -1,5 +1,6 @@
 import datetime
 
+import pytz
 from graphql import GraphQLError
 
 from pytest import fixture
@@ -29,7 +30,7 @@ schema = Schema(query=Query)
 
 @fixture
 def sample_datetime():
-    utc_datetime = datetime.datetime(2019, 5, 25, 5, 30, 15, 10, datetime.timezone.utc)
+    utc_datetime = datetime.datetime(2019, 5, 25, 5, 30, 15, 10, pytz.utc)
     return utc_datetime
 
 
@@ -227,18 +228,6 @@ def test_time_query_variable(sample_time):
     assert result.data == {"time": isoformat}
 
 
-def test_support_isoformat():
-    isoformat = "2011-11-04T00:05:23Z"
-
-    # test time variable provided as Python time
-    result = schema.execute(
-        """query DateTime($time: DateTime){ datetime(in: $time) }""",
-        variables={"time": isoformat},
-    )
-    assert not result.errors
-    assert result.data == {"datetime": "2011-11-04T00:05:23+00:00"}
-
-
 def test_bad_variables(sample_date, sample_datetime, sample_time):
     def _test_bad_variables(type_, input_):
         result = schema.execute(

graphene/types/tests/test_decimal.py

@@ -39,25 +39,8 @@ def test_bad_decimal_query():
     not_a_decimal = "Nobody expects the Spanish Inquisition!"
 
     result = schema.execute("""{ decimal(input: "%s") }""" % not_a_decimal)
-    assert result.errors
     assert len(result.errors) == 1
     assert result.data is None
-    assert (
-        result.errors[0].message
-        == "Expected value of type 'Decimal', found \"Nobody expects the Spanish Inquisition!\"."
-    )
-
-    result = schema.execute("{ decimal(input: true) }")
-    assert result.errors
-    assert len(result.errors) == 1
-    assert result.data is None
-    assert result.errors[0].message == "Expected value of type 'Decimal', found true."
-
-    result = schema.execute("{ decimal(input: 1.2) }")
-    assert result.errors
-    assert len(result.errors) == 1
-    assert result.data is None
-    assert result.errors[0].message == "Expected value of type 'Decimal', found 1.2."
 
 
 def test_decimal_string_query_integer():

graphene/types/tests/test_definition.py

@@ -1,7 +1,4 @@
-import copy
-
 from ..argument import Argument
-from ..definitions import GrapheneGraphQLType
 from ..enum import Enum
 from ..field import Field
 from ..inputfield import InputField
@@ -315,16 +312,3 @@ def test_does_not_mutate_passed_field_definitions():
         pass
 
     assert TestInputObject1._meta.fields == TestInputObject2._meta.fields
-
-
-def test_graphene_graphql_type_can_be_copied():
-    class Query(ObjectType):
-        field = String()
-
-        def resolve_field(self, info):
-            return ""
-
-    schema = Schema(query=Query)
-    query_type_copy = copy.copy(schema.graphql_schema.query_type)
-    assert query_type_copy.__dict__ == schema.graphql_schema.query_type.__dict__
-    assert isinstance(schema.graphql_schema.query_type, GrapheneGraphQLType)

graphene/types/tests/test_enum.py

@@ -65,21 +65,6 @@ def test_enum_from_builtin_enum():
     assert RGB.BLUE
 
 
-def test_enum_custom_description_in_constructor():
-    description = "An enumeration, but with a custom description"
-    RGB = Enum(
-        "RGB",
-        "RED,GREEN,BLUE",
-        description=description,
-    )
-    assert RGB._meta.description == description
-
-
-def test_enum_from_python3_enum_uses_default_builtin_doc():
-    RGB = Enum("RGB", "RED,GREEN,BLUE")
-    assert RGB._meta.description == "An enumeration."
-
-
 def test_enum_from_builtin_enum_accepts_lambda_description():
     def custom_description(value):
         if not value:
@@ -343,52 +328,6 @@ def test_enum_resolver_compat():
     assert results.data["colorByName"] == Color.RED.name
 
 
-def test_enum_with_name():
-    from enum import Enum as PyEnum
-
-    class Color(PyEnum):
-        RED = 1
-        YELLOW = 2
-        BLUE = 3
-
-    GColor = Enum.from_enum(Color, description="original colors")
-    UniqueGColor = Enum.from_enum(
-        Color, name="UniqueColor", description="unique colors"
-    )
-
-    class Query(ObjectType):
-        color = GColor(required=True)
-        unique_color = UniqueGColor(required=True)
-
-    schema = Schema(query=Query)
-
-    assert (
-        str(schema).strip()
-        == dedent(
-            '''
-            type Query {
-              color: Color!
-              uniqueColor: UniqueColor!
-            }
-
-            """original colors"""
-            enum Color {
-              RED
-              YELLOW
-              BLUE
-            }
-
-            """unique colors"""
-            enum UniqueColor {
-              RED
-              YELLOW
-              BLUE
-            }
-            '''
-        ).strip()
-    )
-
-
 def test_enum_resolver_invalid():
     from enum import Enum as PyEnum
 
@@ -533,83 +472,3 @@ def test_mutation_enum_input_type():
     assert result.data == {"createPaint": {"color": "RED"}}
 
     assert color_input_value == RGB.RED
-
-
-def test_hashable_enum():
-    class RGB(Enum):
-        """Available colors"""
-
-        RED = 1
-        GREEN = 2
-        BLUE = 3
-
-    color_map = {RGB.RED: "a", RGB.BLUE: "b", 1: "c"}
-
-    assert color_map[RGB.RED] == "a"
-    assert color_map[RGB.BLUE] == "b"
-    assert color_map[1] == "c"
-
-
-def test_hashable_instance_creation_enum():
-    Episode = Enum("Episode", [("NEWHOPE", 4), ("EMPIRE", 5), ("JEDI", 6)])
-
-    trilogy_map = {Episode.NEWHOPE: "better", Episode.EMPIRE: "best", 5: "foo"}
-
-    assert trilogy_map[Episode.NEWHOPE] == "better"
-    assert trilogy_map[Episode.EMPIRE] == "best"
-    assert trilogy_map[5] == "foo"
-
-
-def test_enum_iteration():
-    class TestEnum(Enum):
-        FIRST = 1
-        SECOND = 2
-
-    result = []
-    expected_values = ["FIRST", "SECOND"]
-    for c in TestEnum:
-        result.append(c.name)
-    assert result == expected_values
-
-
-def test_iterable_instance_creation_enum():
-    TestEnum = Enum("TestEnum", [("FIRST", 1), ("SECOND", 2)])
-
-    result = []
-    expected_values = ["FIRST", "SECOND"]
-    for c in TestEnum:
-        result.append(c.name)
-    assert result == expected_values
-
-
-# https://github.com/graphql-python/graphene/issues/1321
-def test_enum_description_member_not_interpreted_as_property():
-    class RGB(Enum):
-        """Description"""
-
-        red = "red"
-        green = "green"
-        blue = "blue"
-        description = "description"
-        deprecation_reason = "deprecation_reason"
-
-    class Query(ObjectType):
-        color = RGB()
-
-        def resolve_color(_, info):
-            return RGB.description
-
-    values = RGB._meta.enum.__members__.values()
-    assert sorted(v.name for v in values) == [
-        "blue",
-        "deprecation_reason",
-        "description",
-        "green",
-        "red",
-    ]
-
-    schema = Schema(query=Query)
-
-    results = schema.execute("query { color }")
-    assert not results.errors
-    assert results.data["color"] == RGB.description.name

graphene/types/tests/test_field.py

@@ -128,20 +128,13 @@ def test_field_name_as_argument():
 
 def test_field_source_argument_as_kw():
     MyType = object()
-    deprecation_reason = "deprecated"
-    field = Field(
-        MyType,
-        b=NonNull(True),
-        c=Argument(None, deprecation_reason=deprecation_reason),
-        a=NonNull(False),
-    )
+    field = Field(MyType, b=NonNull(True), c=Argument(None), a=NonNull(False))
     assert list(field.args) == ["b", "c", "a"]
     assert isinstance(field.args["b"], Argument)
     assert isinstance(field.args["b"].type, NonNull)
     assert field.args["b"].type.of_type is True
     assert isinstance(field.args["c"], Argument)
     assert field.args["c"].type is None
-    assert field.args["c"].deprecation_reason == deprecation_reason
     assert isinstance(field.args["a"], Argument)
     assert isinstance(field.args["a"].type, NonNull)
     assert field.args["a"].type.of_type is False

graphene/types/tests/test_inputfield.py

@@ -1,7 +1,5 @@
 from functools import partial
 
-from pytest import raises
-
 from ..inputfield import InputField
 from ..structures import NonNull
 from .utils import MyLazyType
@@ -14,22 +12,6 @@ def test_inputfield_required():
     assert field.type.of_type == MyType
 
 
-def test_inputfield_deprecated():
-    MyType = object()
-    deprecation_reason = "deprecated"
-    field = InputField(MyType, required=False, deprecation_reason=deprecation_reason)
-    assert isinstance(field.type, type(MyType))
-    assert field.deprecation_reason == deprecation_reason
-
-
-def test_inputfield_required_deprecated():
-    MyType = object()
-    with raises(AssertionError) as exc_info:
-        InputField(MyType, name="input", required=True, deprecation_reason="deprecated")
-
-    assert str(exc_info.value) == "InputField input is required, cannot deprecate it."
-
-
 def test_inputfield_with_lazy_type():
     MyType = object()
     field = InputField(lambda: MyType)

graphene/types/tests/test_inputobjecttype.py

@@ -1,5 +1,3 @@
-from graphql import Undefined
-
 from ..argument import Argument
 from ..field import Field
 from ..inputfield import InputField
@@ -8,7 +6,6 @@ from ..objecttype import ObjectType
 from ..scalars import Boolean, String
 from ..schema import Schema
 from ..unmountedtype import UnmountedType
-from ... import NonNull
 
 
 class MyType:
@@ -139,31 +136,3 @@ def test_inputobjecttype_of_input():
 
     assert not result.errors
     assert result.data == {"isChild": True}
-
-
-def test_inputobjecttype_default_input_as_undefined(
-    set_default_input_object_type_to_undefined,
-):
-    class TestUndefinedInput(InputObjectType):
-        required_field = String(required=True)
-        optional_field = String()
-
-    class Query(ObjectType):
-        undefined_optionals_work = Field(NonNull(Boolean), input=TestUndefinedInput())
-
-        def resolve_undefined_optionals_work(self, info, input: TestUndefinedInput):
-            # Confirm that optional_field comes as Undefined
-            return (
-                input.required_field == "required" and input.optional_field is Undefined
-            )
-
-    schema = Schema(query=Query)
-    result = schema.execute(
-        """query basequery {
-        undefinedOptionalsWork(input: {requiredField: "required"})
-    }
-    """
-    )
-
-    assert not result.errors
-    assert result.data == {"undefinedOptionalsWork": True}

graphene/types/tests/test_interface.py

@@ -25,18 +25,13 @@ def test_generate_interface():
 
 
 def test_generate_interface_with_meta():
-    class MyFirstInterface(Interface):
-        pass
-
     class MyInterface(Interface):
         class Meta:
             name = "MyOtherInterface"
             description = "Documentation"
-            interfaces = [MyFirstInterface]
 
     assert MyInterface._meta.name == "MyOtherInterface"
     assert MyInterface._meta.description == "Documentation"
-    assert MyInterface._meta.interfaces == [MyFirstInterface]
 
 
 def test_generate_interface_with_fields():

graphene/types/tests/test_json.py

@@ -21,10 +21,6 @@ def test_jsonstring_query():
     assert not result.errors
     assert result.data == {"json": json_value}
 
-    result = schema.execute("""{ json(input: "{}") }""")
-    assert not result.errors
-    assert result.data == {"json": "{}"}
-
 
 def test_jsonstring_query_variable():
     json_value = '{"key": "value"}'
@@ -35,46 +31,3 @@ def test_jsonstring_query_variable():
     )
     assert not result.errors
     assert result.data == {"json": json_value}
-
-
-def test_jsonstring_optional_uuid_input():
-    """
-    Test that we can provide a null value to an optional input
-    """
-    result = schema.execute("{ json(input: null) }")
-    assert not result.errors
-    assert result.data == {"json": None}
-
-
-def test_jsonstring_invalid_query():
-    """
-    Test that if an invalid type is provided we get an error
-    """
-    result = schema.execute("{ json(input: 1) }")
-    assert result.errors == [
-        {"message": "Expected value of type 'JSONString', found 1."},
-    ]
-
-    result = schema.execute("{ json(input: {}) }")
-    assert result.errors == [
-        {"message": "Expected value of type 'JSONString', found {}."},
-    ]
-
-    result = schema.execute('{ json(input: "a") }')
-    assert result.errors == [
-        {
-            "message": "Expected value of type 'JSONString', found \"a\"; "
-            "Badly formed JSONString: Expecting value: line 1 column 1 (char 0)",
-        },
-    ]
-
-    result = schema.execute("""{ json(input: "{\\'key\\': 0}") }""")
-    assert result.errors == [
-        {"message": "Syntax Error: Invalid character escape sequence: '\\''."},
-    ]
-
-    result = schema.execute("""{ json(input: "{\\"key\\": 0,}") }""")
-    assert len(result.errors) == 1
-    assert result.errors[0].message.startswith(
-        'Expected value of type \'JSONString\', found "{\\"key\\": 0,}"; Badly formed JSONString:'
-    )

graphene/types/tests/test_scalar.py

@@ -1,7 +1,4 @@
-from ..objecttype import ObjectType, Field
-from ..scalars import Scalar, Int, BigInt, Float, String, Boolean
-from ..schema import Schema
-from graphql import Undefined
+from ..scalars import Scalar, Int, BigInt
 from graphql.language.ast import IntValueNode
 
 
@@ -14,295 +11,19 @@ def test_scalar():
 
 
 def test_ints():
-    assert Int.parse_value(2**31 - 1) is not Undefined
-    assert Int.parse_value("2.0") == 2
-    assert Int.parse_value(2**31) is Undefined
+    assert Int.parse_value(2**31 - 1) is not None
+    assert Int.parse_value("2.0") is not None
+    assert Int.parse_value(2**31) is None
 
     assert Int.parse_literal(IntValueNode(value=str(2**31 - 1))) == 2**31 - 1
-    assert Int.parse_literal(IntValueNode(value=str(2**31))) is Undefined
+    assert Int.parse_literal(IntValueNode(value=str(2**31))) is None
 
-    assert Int.parse_value(-(2**31)) is not Undefined
-    assert Int.parse_value(-(2**31) - 1) is Undefined
+    assert Int.parse_value(-(2**31)) is not None
+    assert Int.parse_value(-(2**31) - 1) is None
 
-    assert BigInt.parse_value(2**31) is not Undefined
-    assert BigInt.parse_value("2.0") == 2
-    assert BigInt.parse_value(-(2**31) - 1) is not Undefined
+    assert BigInt.parse_value(2**31) is not None
+    assert BigInt.parse_value("2.0") is not None
+    assert BigInt.parse_value(-(2**31) - 1) is not None
 
     assert BigInt.parse_literal(IntValueNode(value=str(2**31 - 1))) == 2**31 - 1
     assert BigInt.parse_literal(IntValueNode(value=str(2**31))) == 2**31
-
-
-def return_input(_parent, _info, input):
-    return input
-
-
-class Optional(ObjectType):
-    int = Int(input=Int(), resolver=return_input)
-    big_int = BigInt(input=BigInt(), resolver=return_input)
-    float = Float(input=Float(), resolver=return_input)
-    bool = Boolean(input=Boolean(), resolver=return_input)
-    string = String(input=String(), resolver=return_input)
-
-
-class Query(ObjectType):
-    optional = Field(Optional)
-
-    def resolve_optional(self, info):
-        return Optional()
-
-    def resolve_required(self, info, input):
-        return input
-
-
-schema = Schema(query=Query)
-
-
-class TestInt:
-    def test_query(self):
-        """
-        Test that a normal query works.
-        """
-        result = schema.execute("{ optional { int(input: 20) } }")
-        assert not result.errors
-        assert result.data == {"optional": {"int": 20}}
-
-    def test_optional_input(self):
-        """
-        Test that we can provide a null value to an optional input
-        """
-        result = schema.execute("{ optional { int(input: null) } }")
-        assert not result.errors
-        assert result.data == {"optional": {"int": None}}
-
-    def test_invalid_input(self):
-        """
-        Test that if an invalid type is provided we get an error
-        """
-        result = schema.execute('{ optional { int(input: "20") } }')
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message == 'Int cannot represent non-integer value: "20"'
-        )
-
-        result = schema.execute('{ optional { int(input: "a") } }')
-        assert result.errors
-        assert len(result.errors) == 1
-        assert result.errors[0].message == 'Int cannot represent non-integer value: "a"'
-
-        result = schema.execute("{ optional { int(input: true) } }")
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message == "Int cannot represent non-integer value: true"
-        )
-
-
-class TestBigInt:
-    def test_query(self):
-        """
-        Test that a normal query works.
-        """
-        value = 2**31
-        result = schema.execute("{ optional { bigInt(input: %s) } }" % value)
-        assert not result.errors
-        assert result.data == {"optional": {"bigInt": value}}
-
-    def test_optional_input(self):
-        """
-        Test that we can provide a null value to an optional input
-        """
-        result = schema.execute("{ optional { bigInt(input: null) } }")
-        assert not result.errors
-        assert result.data == {"optional": {"bigInt": None}}
-
-    def test_invalid_input(self):
-        """
-        Test that if an invalid type is provided we get an error
-        """
-        result = schema.execute('{ optional { bigInt(input: "20") } }')
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message == "Expected value of type 'BigInt', found \"20\"."
-        )
-
-        result = schema.execute('{ optional { bigInt(input: "a") } }')
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message == "Expected value of type 'BigInt', found \"a\"."
-        )
-
-        result = schema.execute("{ optional { bigInt(input: true) } }")
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message == "Expected value of type 'BigInt', found true."
-        )
-
-
-class TestFloat:
-    def test_query(self):
-        """
-        Test that a normal query works.
-        """
-        result = schema.execute("{ optional { float(input: 20) } }")
-        assert not result.errors
-        assert result.data == {"optional": {"float": 20.0}}
-
-        result = schema.execute("{ optional { float(input: 20.2) } }")
-        assert not result.errors
-        assert result.data == {"optional": {"float": 20.2}}
-
-    def test_optional_input(self):
-        """
-        Test that we can provide a null value to an optional input
-        """
-        result = schema.execute("{ optional { float(input: null) } }")
-        assert not result.errors
-        assert result.data == {"optional": {"float": None}}
-
-    def test_invalid_input(self):
-        """
-        Test that if an invalid type is provided we get an error
-        """
-        result = schema.execute('{ optional { float(input: "20") } }')
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message == 'Float cannot represent non numeric value: "20"'
-        )
-
-        result = schema.execute('{ optional { float(input: "a") } }')
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message == 'Float cannot represent non numeric value: "a"'
-        )
-
-        result = schema.execute("{ optional { float(input: true) } }")
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message == "Float cannot represent non numeric value: true"
-        )
-
-
-class TestBoolean:
-    def test_query(self):
-        """
-        Test that a normal query works.
-        """
-        result = schema.execute("{ optional { bool(input: true) } }")
-        assert not result.errors
-        assert result.data == {"optional": {"bool": True}}
-
-        result = schema.execute("{ optional { bool(input: false) } }")
-        assert not result.errors
-        assert result.data == {"optional": {"bool": False}}
-
-    def test_optional_input(self):
-        """
-        Test that we can provide a null value to an optional input
-        """
-        result = schema.execute("{ optional { bool(input: null) } }")
-        assert not result.errors
-        assert result.data == {"optional": {"bool": None}}
-
-    def test_invalid_input(self):
-        """
-        Test that if an invalid type is provided we get an error
-        """
-        result = schema.execute('{ optional { bool(input: "True") } }')
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message
-            == 'Boolean cannot represent a non boolean value: "True"'
-        )
-
-        result = schema.execute('{ optional { bool(input: "true") } }')
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message
-            == 'Boolean cannot represent a non boolean value: "true"'
-        )
-
-        result = schema.execute('{ optional { bool(input: "a") } }')
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message
-            == 'Boolean cannot represent a non boolean value: "a"'
-        )
-
-        result = schema.execute("{ optional { bool(input: 1) } }")
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message
-            == "Boolean cannot represent a non boolean value: 1"
-        )
-
-        result = schema.execute("{ optional { bool(input: 0) } }")
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message
-            == "Boolean cannot represent a non boolean value: 0"
-        )
-
-
-class TestString:
-    def test_query(self):
-        """
-        Test that a normal query works.
-        """
-        result = schema.execute('{ optional { string(input: "something something") } }')
-        assert not result.errors
-        assert result.data == {"optional": {"string": "something something"}}
-
-        result = schema.execute('{ optional { string(input: "True") } }')
-        assert not result.errors
-        assert result.data == {"optional": {"string": "True"}}
-
-        result = schema.execute('{ optional { string(input: "0") } }')
-        assert not result.errors
-        assert result.data == {"optional": {"string": "0"}}
-
-    def test_optional_input(self):
-        """
-        Test that we can provide a null value to an optional input
-        """
-        result = schema.execute("{ optional { string(input: null) } }")
-        assert not result.errors
-        assert result.data == {"optional": {"string": None}}
-
-    def test_invalid_input(self):
-        """
-        Test that if an invalid type is provided we get an error
-        """
-        result = schema.execute("{ optional { string(input: 1) } }")
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message == "String cannot represent a non string value: 1"
-        )
-
-        result = schema.execute("{ optional { string(input: 3.2) } }")
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message
-            == "String cannot represent a non string value: 3.2"
-        )
-
-        result = schema.execute("{ optional { string(input: true) } }")
-        assert result.errors
-        assert len(result.errors) == 1
-        assert (
-            result.errors[0].message
-            == "String cannot represent a non string value: true"
-        )

graphene/types/tests/test_scalars_serialization.py

@@ -1,4 +1,3 @@
-from graphql import Undefined
 from ..scalars import Boolean, Float, Int, String
 
 
@@ -10,12 +9,12 @@ def test_serializes_output_int():
     assert Int.serialize(1.1) == 1
     assert Int.serialize(-1.1) == -1
     assert Int.serialize(1e5) == 100000
-    assert Int.serialize(9876504321) is Undefined
-    assert Int.serialize(-9876504321) is Undefined
-    assert Int.serialize(1e100) is Undefined
-    assert Int.serialize(-1e100) is Undefined
+    assert Int.serialize(9876504321) is None
+    assert Int.serialize(-9876504321) is None
+    assert Int.serialize(1e100) is None
+    assert Int.serialize(-1e100) is None
     assert Int.serialize("-1.1") == -1
-    assert Int.serialize("one") is Undefined
+    assert Int.serialize("one") is None
     assert Int.serialize(False) == 0
     assert Int.serialize(True) == 1
 
@@ -28,7 +27,7 @@ def test_serializes_output_float():
     assert Float.serialize(1.1) == 1.1
     assert Float.serialize(-1.1) == -1.1
     assert Float.serialize("-1.1") == -1.1
-    assert Float.serialize("one") is Undefined
+    assert Float.serialize("one") is None
     assert Float.serialize(False) == 0
     assert Float.serialize(True) == 1
 
@@ -39,7 +38,7 @@ def test_serializes_output_string():
     assert String.serialize(-1.1) == "-1.1"
     assert String.serialize(True) == "true"
     assert String.serialize(False) == "false"
-    assert String.serialize("\U0001f601") == "\U0001f601"
+    assert String.serialize("\U0001F601") == "\U0001F601"
 
 
 def test_serializes_output_boolean():

graphene/types/tests/test_type_map.py

@@ -20,8 +20,8 @@ from ..inputobjecttype import InputObjectType
 from ..interface import Interface
 from ..objecttype import ObjectType
 from ..scalars import Int, String
-from ..schema import Schema
 from ..structures import List, NonNull
+from ..schema import Schema
 
 
 def create_type_map(types, auto_camelcase=True):
@@ -227,18 +227,6 @@ def test_inputobject():
     assert foo_field.description == "Field description"
 
 
-def test_inputobject_undefined(set_default_input_object_type_to_undefined):
-    class OtherObjectType(InputObjectType):
-        optional_field = String()
-
-    type_map = create_type_map([OtherObjectType])
-    assert "OtherObjectType" in type_map
-    graphql_type = type_map["OtherObjectType"]
-
-    container = graphql_type.out_type({})
-    assert container.optional_field is Undefined
-
-
 def test_objecttype_camelcase():
     class MyObjectType(ObjectType):
         """Description"""
@@ -301,33 +289,3 @@ def test_objecttype_with_possible_types():
     assert graphql_type.is_type_of
     assert graphql_type.is_type_of({}, None) is True
     assert graphql_type.is_type_of(MyObjectType(), None) is False
-
-
-def test_interface_with_interfaces():
-    class FooInterface(Interface):
-        foo = String()
-
-    class BarInterface(Interface):
-        class Meta:
-            interfaces = [FooInterface]
-
-        foo = String()
-        bar = String()
-
-    type_map = create_type_map([FooInterface, BarInterface])
-    assert "FooInterface" in type_map
-    foo_graphql_type = type_map["FooInterface"]
-    assert isinstance(foo_graphql_type, GraphQLInterfaceType)
-    assert foo_graphql_type.name == "FooInterface"
-
-    assert "BarInterface" in type_map
-    bar_graphql_type = type_map["BarInterface"]
-    assert isinstance(bar_graphql_type, GraphQLInterfaceType)
-    assert bar_graphql_type.name == "BarInterface"
-
-    fields = bar_graphql_type.fields
-    assert list(fields) == ["foo", "bar"]
-    assert isinstance(fields["foo"], GraphQLField)
-    assert isinstance(fields["bar"], GraphQLField)
-
-    assert list(bar_graphql_type.interfaces) == list([foo_graphql_type])

graphene/types/tests/test_uuid.py

@@ -1,19 +1,14 @@
 from ..objecttype import ObjectType
 from ..schema import Schema
 from ..uuid import UUID
-from ..structures import NonNull
 
 
 class Query(ObjectType):
     uuid = UUID(input=UUID())
-    required_uuid = UUID(input=NonNull(UUID), required=True)
 
     def resolve_uuid(self, info, input):
         return input
 
-    def resolve_required_uuid(self, info, input):
-        return input
-
 
 schema = Schema(query=Query)
 
@@ -34,50 +29,3 @@ def test_uuidstring_query_variable():
     )
     assert not result.errors
     assert result.data == {"uuid": uuid_value}
-
-
-def test_uuidstring_invalid_argument():
-    uuid_value = {"not": "a string"}
-
-    result = schema.execute(
-        """query Test($uuid: UUID){ uuid(input: $uuid) }""",
-        variables={"uuid": uuid_value},
-    )
-    assert result.errors
-    assert len(result.errors) == 1
-    assert (
-        result.errors[0].message
-        == "Variable '$uuid' got invalid value {'not': 'a string'}; UUID cannot represent value: {'not': 'a string'}"
-    )
-
-
-def test_uuidstring_optional_uuid_input():
-    """
-    Test that we can provide a null value to an optional input
-    """
-    result = schema.execute("{ uuid(input: null) }")
-    assert not result.errors
-    assert result.data == {"uuid": None}
-
-
-def test_uuidstring_invalid_query():
-    """
-    Test that if an invalid type is provided we get an error
-    """
-    result = schema.execute("{ uuid(input: 1) }")
-    assert result.errors
-    assert len(result.errors) == 1
-    assert result.errors[0].message == "Expected value of type 'UUID', found 1."
-
-    result = schema.execute('{ uuid(input: "a") }')
-    assert result.errors
-    assert len(result.errors) == 1
-    assert (
-        result.errors[0].message
-        == "Expected value of type 'UUID', found \"a\"; badly formed hexadecimal UUID string"
-    )
-
-    result = schema.execute("{ requiredUuid(input: null) }")
-    assert result.errors
-    assert len(result.errors) == 1
-    assert result.errors[0].message == "Expected value of type 'UUID!', found null."

graphene/types/union.py

@@ -1,10 +1,9 @@
-from typing import TYPE_CHECKING
-
 from .base import BaseOptions, BaseType
 from .unmountedtype import UnmountedType
 
-# For static type checking with type checker
-if TYPE_CHECKING:
+# For static type checking with Mypy
+MYPY = False
+if MYPY:
     from .objecttype import ObjectType  # NOQA
     from typing import Iterable, Type  # NOQA
 
@@ -22,7 +21,7 @@ class Union(UnmountedType, BaseType):
     to determine which type is actually used when the field is resolved.
 
     The schema in this example can take a search text and return any of the GraphQL object types
-    indicated: Human, Droid or Starship.
+    indicated: Human, Droid or Startship.
 
     Ambiguous return types can be resolved on each ObjectType through ``Meta.possible_types``
     attribute or ``is_type_of`` method. Or by implementing ``resolve_type`` class method on the
@@ -51,14 +50,12 @@ class Union(UnmountedType, BaseType):
     """
 
     @classmethod
-    def __init_subclass_with_meta__(cls, types=None, _meta=None, **options):
+    def __init_subclass_with_meta__(cls, types=None, **options):
         assert (
             isinstance(types, (list, tuple)) and len(types) > 0
         ), f"Must provide types for Union {cls.__name__}."
 
-        if not _meta:
-            _meta = UnionOptions(cls)
-
+        _meta = UnionOptions(cls)
         _meta.types = types
         super(Union, cls).__init_subclass_with_meta__(_meta=_meta, **options)
 

graphene/types/uuid.py

@@ -1,8 +1,7 @@
+from __future__ import absolute_import
 from uuid import UUID as _UUID
 
-from graphql.error import GraphQLError
 from graphql.language.ast import StringValueNode
-from graphql import Undefined
 
 from .scalars import Scalar
 
@@ -25,13 +24,7 @@ class UUID(Scalar):
     def parse_literal(node, _variables=None):
         if isinstance(node, StringValueNode):
             return _UUID(node.value)
-        return Undefined
 
     @staticmethod
     def parse_value(value):
-        if isinstance(value, _UUID):
-            return value
-        try:
-            return _UUID(value)
-        except (ValueError, AttributeError):
-            raise GraphQLError(f"UUID cannot represent value: {repr(value)}")
+        return _UUID(value)

graphene/utils/dataloader.py

@@ -1,280 +0,0 @@
-from asyncio import (
-    gather,
-    ensure_future,
-    get_event_loop,
-    iscoroutine,
-    iscoroutinefunction,
-)
-from collections import namedtuple
-from collections.abc import Iterable
-from functools import partial
-
-from typing import List
-
-Loader = namedtuple("Loader", "key,future")
-
-
-def iscoroutinefunctionorpartial(fn):
-    return iscoroutinefunction(fn.func if isinstance(fn, partial) else fn)
-
-
-class DataLoader(object):
-    batch = True
-    max_batch_size = None  # type: int
-    cache = True
-
-    def __init__(
-        self,
-        batch_load_fn=None,
-        batch=None,
-        max_batch_size=None,
-        cache=None,
-        get_cache_key=None,
-        cache_map=None,
-        loop=None,
-    ):
-        self._loop = loop
-
-        if batch_load_fn is not None:
-            self.batch_load_fn = batch_load_fn
-
-        assert iscoroutinefunctionorpartial(
-            self.batch_load_fn
-        ), "batch_load_fn must be coroutine. Received: {}".format(self.batch_load_fn)
-
-        if not callable(self.batch_load_fn):
-            raise TypeError(  # pragma: no cover
-                (
-                    "DataLoader must be have a batch_load_fn which accepts "
-                    "Iterable<key> and returns Future<Iterable<value>>, but got: {}."
-                ).format(batch_load_fn)
-            )
-
-        if batch is not None:
-            self.batch = batch  # pragma: no cover
-
-        if max_batch_size is not None:
-            self.max_batch_size = max_batch_size
-
-        if cache is not None:
-            self.cache = cache  # pragma: no cover
-
-        self.get_cache_key = get_cache_key or (lambda x: x)
-
-        self._cache = cache_map if cache_map is not None else {}
-        self._queue: List[Loader] = []
-
-    @property
-    def loop(self):
-        if not self._loop:
-            self._loop = get_event_loop()
-
-        return self._loop
-
-    def load(self, key=None):
-        """
-        Loads a key, returning a `Future` for the value represented by that key.
-        """
-        if key is None:
-            raise TypeError(  # pragma: no cover
-                (
-                    "The loader.load() function must be called with a value, "
-                    "but got: {}."
-                ).format(key)
-            )
-
-        cache_key = self.get_cache_key(key)
-
-        # If caching and there is a cache-hit, return cached Future.
-        if self.cache:
-            cached_result = self._cache.get(cache_key)
-            if cached_result:
-                return cached_result
-
-        # Otherwise, produce a new Future for this value.
-        future = self.loop.create_future()
-        # If caching, cache this Future.
-        if self.cache:
-            self._cache[cache_key] = future
-
-        self.do_resolve_reject(key, future)
-        return future
-
-    def do_resolve_reject(self, key, future):
-        # Enqueue this Future to be dispatched.
-        self._queue.append(Loader(key=key, future=future))
-        # Determine if a dispatch of this queue should be scheduled.
-        # A single dispatch should be scheduled per queue at the time when the
-        # queue changes from "empty" to "full".
-        if len(self._queue) == 1:
-            if self.batch:
-                # If batching, schedule a task to dispatch the queue.
-                enqueue_post_future_job(self.loop, self)
-            else:
-                # Otherwise dispatch the (queue of one) immediately.
-                dispatch_queue(self)  # pragma: no cover
-
-    def load_many(self, keys):
-        """
-        Loads multiple keys, returning a list of values
-
-        >>> a, b = await my_loader.load_many([ 'a', 'b' ])
-
-        This is equivalent to the more verbose:
-
-        >>> a, b = await gather(
-        >>>    my_loader.load('a'),
-        >>>    my_loader.load('b')
-        >>> )
-        """
-        if not isinstance(keys, Iterable):
-            raise TypeError(  # pragma: no cover
-                (
-                    "The loader.load_many() function must be called with Iterable<key> "
-                    "but got: {}."
-                ).format(keys)
-            )
-
-        return gather(*[self.load(key) for key in keys])
-
-    def clear(self, key):
-        """
-        Clears the value at `key` from the cache, if it exists. Returns itself for
-        method chaining.
-        """
-        cache_key = self.get_cache_key(key)
-        self._cache.pop(cache_key, None)
-        return self
-
-    def clear_all(self):
-        """
-        Clears the entire cache. To be used when some event results in unknown
-        invalidations across this particular `DataLoader`. Returns itself for
-        method chaining.
-        """
-        self._cache.clear()
-        return self
-
-    def prime(self, key, value):
-        """
-        Adds the provied key and value to the cache. If the key already exists, no
-        change is made. Returns itself for method chaining.
-        """
-        cache_key = self.get_cache_key(key)
-
-        # Only add the key if it does not already exist.
-        if cache_key not in self._cache:
-            # Cache a rejected future if the value is an Error, in order to match
-            # the behavior of load(key).
-            future = self.loop.create_future()
-            if isinstance(value, Exception):
-                future.set_exception(value)
-            else:
-                future.set_result(value)
-
-            self._cache[cache_key] = future
-
-        return self
-
-
-def enqueue_post_future_job(loop, loader):
-    async def dispatch():
-        dispatch_queue(loader)
-
-    loop.call_soon(ensure_future, dispatch())
-
-
-def get_chunks(iterable_obj, chunk_size=1):
-    chunk_size = max(1, chunk_size)
-    return (
-        iterable_obj[i : i + chunk_size]
-        for i in range(0, len(iterable_obj), chunk_size)
-    )
-
-
-def dispatch_queue(loader):
-    """
-    Given the current state of a Loader instance, perform a batch load
-    from its current queue.
-    """
-    # Take the current loader queue, replacing it with an empty queue.
-    queue = loader._queue
-    loader._queue = []
-
-    # If a max_batch_size was provided and the queue is longer, then segment the
-    # queue into multiple batches, otherwise treat the queue as a single batch.
-    max_batch_size = loader.max_batch_size
-
-    if max_batch_size and max_batch_size < len(queue):
-        chunks = get_chunks(queue, max_batch_size)
-        for chunk in chunks:
-            ensure_future(dispatch_queue_batch(loader, chunk))
-    else:
-        ensure_future(dispatch_queue_batch(loader, queue))
-
-
-async def dispatch_queue_batch(loader, queue):
-    # Collect all keys to be loaded in this dispatch
-    keys = [loaded.key for loaded in queue]
-
-    # Call the provided batch_load_fn for this loader with the loader queue's keys.
-    batch_future = loader.batch_load_fn(keys)
-
-    # Assert the expected response from batch_load_fn
-    if not batch_future or not iscoroutine(batch_future):
-        return failed_dispatch(  # pragma: no cover
-            loader,
-            queue,
-            TypeError(
-                (
-                    "DataLoader must be constructed with a function which accepts "
-                    "Iterable<key> and returns Future<Iterable<value>>, but the function did "
-                    "not return a Coroutine: {}."
-                ).format(batch_future)
-            ),
-        )
-
-    try:
-        values = await batch_future
-        if not isinstance(values, Iterable):
-            raise TypeError(  # pragma: no cover
-                (
-                    "DataLoader must be constructed with a function which accepts "
-                    "Iterable<key> and returns Future<Iterable<value>>, but the function did "
-                    "not return a Future of a Iterable: {}."
-                ).format(values)
-            )
-
-        values = list(values)
-        if len(values) != len(keys):
-            raise TypeError(  # pragma: no cover
-                (
-                    "DataLoader must be constructed with a function which accepts "
-                    "Iterable<key> and returns Future<Iterable<value>>, but the function did "
-                    "not return a Future of a Iterable with the same length as the Iterable "
-                    "of keys."
-                    "\n\nKeys:\n{}"
-                    "\n\nValues:\n{}"
-                ).format(keys, values)
-            )
-
-        # Step through the values, resolving or rejecting each Future in the
-        # loaded queue.
-        for loaded, value in zip(queue, values):
-            if isinstance(value, Exception):
-                loaded.future.set_exception(value)
-            else:
-                loaded.future.set_result(value)
-
-    except Exception as e:
-        return failed_dispatch(loader, queue, e)
-
-
-def failed_dispatch(loader, queue, error):
-    """
-    Do not cache individual loads if the entire batch dispatch fails,
-    but still reject each request so they do not hang.
-    """
-    for loaded in queue:
-        loader.clear(loaded.key)
-        loaded.future.set_exception(error)

graphene/utils/deprecated.py

@@ -1,5 +1,70 @@
-from warnings import warn
+import functools
+import inspect
+import warnings
+
+string_types = (type(b""), type(""))
 
 
-def warn_deprecation(text: str):
-    warn(text, category=DeprecationWarning, stacklevel=2)
+def warn_deprecation(text):
+    warnings.warn(text, category=DeprecationWarning, stacklevel=2)
+
+
+def deprecated(reason):
+    """
+    This is a decorator which can be used to mark functions
+    as deprecated. It will result in a warning being emitted
+    when the function is used.
+    """
+
+    if isinstance(reason, string_types):
+
+        # The @deprecated is used with a 'reason'.
+        #
+        # .. code-block:: python
+        #
+        #    @deprecated("please, use another function")
+        #    def old_function(x, y):
+        #      pass
+
+        def decorator(func1):
+
+            if inspect.isclass(func1):
+                fmt1 = f"Call to deprecated class {func1.__name__} ({reason})."
+            else:
+                fmt1 = f"Call to deprecated function {func1.__name__} ({reason})."
+
+            @functools.wraps(func1)
+            def new_func1(*args, **kwargs):
+                warn_deprecation(fmt1)
+                return func1(*args, **kwargs)
+
+            return new_func1
+
+        return decorator
+
+    elif inspect.isclass(reason) or inspect.isfunction(reason):
+
+        # The @deprecated is used without any 'reason'.
+        #
+        # .. code-block:: python
+        #
+        #    @deprecated
+        #    def old_function(x, y):
+        #      pass
+
+        func2 = reason
+
+        if inspect.isclass(func2):
+            fmt2 = f"Call to deprecated class {func2.__name__}."
+        else:
+            fmt2 = f"Call to deprecated function {func2.__name__}."
+
+        @functools.wraps(func2)
+        def new_func2(*args, **kwargs):
+            warn_deprecation(fmt2)
+            return func2(*args, **kwargs)
+
+        return new_func2
+
+    else:
+        raise TypeError(repr(type(reason)))

graphene/utils/resolve_only_args.py

@@ -1,5 +1,6 @@
 from functools import wraps
-from typing_extensions import deprecated
+
+from .deprecated import deprecated
 
 
 @deprecated("This function is deprecated")

graphene/utils/tests/test_dataloader.py

@@ -1,452 +0,0 @@
-from asyncio import gather
-from collections import namedtuple
-from functools import partial
-from unittest.mock import Mock
-
-from graphene.utils.dataloader import DataLoader
-from pytest import mark, raises
-
-from graphene import ObjectType, String, Schema, Field, List
-
-CHARACTERS = {
-    "1": {"name": "Luke Skywalker", "sibling": "3"},
-    "2": {"name": "Darth Vader", "sibling": None},
-    "3": {"name": "Leia Organa", "sibling": "1"},
-}
-
-get_character = Mock(side_effect=lambda character_id: CHARACTERS[character_id])
-
-
-class CharacterType(ObjectType):
-    name = String()
-    sibling = Field(lambda: CharacterType)
-
-    async def resolve_sibling(character, info):
-        if character["sibling"]:
-            return await info.context.character_loader.load(character["sibling"])
-        return None
-
-
-class Query(ObjectType):
-    skywalker_family = List(CharacterType)
-
-    async def resolve_skywalker_family(_, info):
-        return await info.context.character_loader.load_many(["1", "2", "3"])
-
-
-mock_batch_load_fn = Mock(
-    side_effect=lambda character_ids: [get_character(id) for id in character_ids]
-)
-
-
-class CharacterLoader(DataLoader):
-    async def batch_load_fn(self, character_ids):
-        return mock_batch_load_fn(character_ids)
-
-
-Context = namedtuple("Context", "character_loader")
-
-
-@mark.asyncio
-async def test_basic_dataloader():
-    schema = Schema(query=Query)
-
-    character_loader = CharacterLoader()
-    context = Context(character_loader=character_loader)
-
-    query = """
-        {
-            skywalkerFamily {
-                name
-                sibling {
-                    name
-                }
-            }
-        }
-    """
-
-    result = await schema.execute_async(query, context=context)
-
-    assert not result.errors
-    assert result.data == {
-        "skywalkerFamily": [
-            {"name": "Luke Skywalker", "sibling": {"name": "Leia Organa"}},
-            {"name": "Darth Vader", "sibling": None},
-            {"name": "Leia Organa", "sibling": {"name": "Luke Skywalker"}},
-        ]
-    }
-
-    assert mock_batch_load_fn.call_count == 1
-    assert get_character.call_count == 3
-
-
-def id_loader(**options):
-    load_calls = []
-
-    async def default_resolve(x):
-        return x
-
-    resolve = options.pop("resolve", default_resolve)
-
-    async def fn(keys):
-        load_calls.append(keys)
-        return await resolve(keys)
-        # return keys
-
-    identity_loader = DataLoader(fn, **options)
-    return identity_loader, load_calls
-
-
-@mark.asyncio
-async def test_build_a_simple_data_loader():
-    async def call_fn(keys):
-        return keys
-
-    identity_loader = DataLoader(call_fn)
-
-    promise1 = identity_loader.load(1)
-
-    value1 = await promise1
-    assert value1 == 1
-
-
-@mark.asyncio
-async def test_can_build_a_data_loader_from_a_partial():
-    value_map = {1: "one"}
-
-    async def call_fn(context, keys):
-        return [context.get(key) for key in keys]
-
-    partial_fn = partial(call_fn, value_map)
-    identity_loader = DataLoader(partial_fn)
-
-    promise1 = identity_loader.load(1)
-
-    value1 = await promise1
-    assert value1 == "one"
-
-
-@mark.asyncio
-async def test_supports_loading_multiple_keys_in_one_call():
-    async def call_fn(keys):
-        return keys
-
-    identity_loader = DataLoader(call_fn)
-
-    promise_all = identity_loader.load_many([1, 2])
-
-    values = await promise_all
-    assert values == [1, 2]
-
-    promise_all = identity_loader.load_many([])
-
-    values = await promise_all
-    assert values == []
-
-
-@mark.asyncio
-async def test_batches_multiple_requests():
-    identity_loader, load_calls = id_loader()
-
-    promise1 = identity_loader.load(1)
-    promise2 = identity_loader.load(2)
-
-    p = gather(promise1, promise2)
-
-    value1, value2 = await p
-
-    assert value1 == 1
-    assert value2 == 2
-
-    assert load_calls == [[1, 2]]
-
-
-@mark.asyncio
-async def test_batches_multiple_requests_with_max_batch_sizes():
-    identity_loader, load_calls = id_loader(max_batch_size=2)
-
-    promise1 = identity_loader.load(1)
-    promise2 = identity_loader.load(2)
-    promise3 = identity_loader.load(3)
-
-    p = gather(promise1, promise2, promise3)
-
-    value1, value2, value3 = await p
-
-    assert value1 == 1
-    assert value2 == 2
-    assert value3 == 3
-
-    assert load_calls == [[1, 2], [3]]
-
-
-@mark.asyncio
-async def test_coalesces_identical_requests():
-    identity_loader, load_calls = id_loader()
-
-    promise1 = identity_loader.load(1)
-    promise2 = identity_loader.load(1)
-
-    assert promise1 == promise2
-    p = gather(promise1, promise2)
-
-    value1, value2 = await p
-
-    assert value1 == 1
-    assert value2 == 1
-
-    assert load_calls == [[1]]
-
-
-@mark.asyncio
-async def test_caches_repeated_requests():
-    identity_loader, load_calls = id_loader()
-
-    a, b = await gather(identity_loader.load("A"), identity_loader.load("B"))
-
-    assert a == "A"
-    assert b == "B"
-
-    assert load_calls == [["A", "B"]]
-
-    a2, c = await gather(identity_loader.load("A"), identity_loader.load("C"))
-
-    assert a2 == "A"
-    assert c == "C"
-
-    assert load_calls == [["A", "B"], ["C"]]
-
-    a3, b2, c2 = await gather(
-        identity_loader.load("A"), identity_loader.load("B"), identity_loader.load("C")
-    )
-
-    assert a3 == "A"
-    assert b2 == "B"
-    assert c2 == "C"
-
-    assert load_calls == [["A", "B"], ["C"]]
-
-
-@mark.asyncio
-async def test_clears_single_value_in_loader():
-    identity_loader, load_calls = id_loader()
-
-    a, b = await gather(identity_loader.load("A"), identity_loader.load("B"))
-
-    assert a == "A"
-    assert b == "B"
-
-    assert load_calls == [["A", "B"]]
-
-    identity_loader.clear("A")
-
-    a2, b2 = await gather(identity_loader.load("A"), identity_loader.load("B"))
-
-    assert a2 == "A"
-    assert b2 == "B"
-
-    assert load_calls == [["A", "B"], ["A"]]
-
-
-@mark.asyncio
-async def test_clears_all_values_in_loader():
-    identity_loader, load_calls = id_loader()
-
-    a, b = await gather(identity_loader.load("A"), identity_loader.load("B"))
-
-    assert a == "A"
-    assert b == "B"
-
-    assert load_calls == [["A", "B"]]
-
-    identity_loader.clear_all()
-
-    a2, b2 = await gather(identity_loader.load("A"), identity_loader.load("B"))
-
-    assert a2 == "A"
-    assert b2 == "B"
-
-    assert load_calls == [["A", "B"], ["A", "B"]]
-
-
-@mark.asyncio
-async def test_allows_priming_the_cache():
-    identity_loader, load_calls = id_loader()
-
-    identity_loader.prime("A", "A")
-
-    a, b = await gather(identity_loader.load("A"), identity_loader.load("B"))
-
-    assert a == "A"
-    assert b == "B"
-
-    assert load_calls == [["B"]]
-
-
-@mark.asyncio
-async def test_does_not_prime_keys_that_already_exist():
-    identity_loader, load_calls = id_loader()
-
-    identity_loader.prime("A", "X")
-
-    a1 = await identity_loader.load("A")
-    b1 = await identity_loader.load("B")
-
-    assert a1 == "X"
-    assert b1 == "B"
-
-    identity_loader.prime("A", "Y")
-    identity_loader.prime("B", "Y")
-
-    a2 = await identity_loader.load("A")
-    b2 = await identity_loader.load("B")
-
-    assert a2 == "X"
-    assert b2 == "B"
-
-    assert load_calls == [["B"]]
-
-
-# # Represents Errors
-@mark.asyncio
-async def test_resolves_to_error_to_indicate_failure():
-    async def resolve(keys):
-        mapped_keys = [
-            key if key % 2 == 0 else Exception("Odd: {}".format(key)) for key in keys
-        ]
-        return mapped_keys
-
-    even_loader, load_calls = id_loader(resolve=resolve)
-
-    with raises(Exception) as exc_info:
-        await even_loader.load(1)
-
-    assert str(exc_info.value) == "Odd: 1"
-
-    value2 = await even_loader.load(2)
-    assert value2 == 2
-    assert load_calls == [[1], [2]]
-
-
-@mark.asyncio
-async def test_can_represent_failures_and_successes_simultaneously():
-    async def resolve(keys):
-        mapped_keys = [
-            key if key % 2 == 0 else Exception("Odd: {}".format(key)) for key in keys
-        ]
-        return mapped_keys
-
-    even_loader, load_calls = id_loader(resolve=resolve)
-
-    promise1 = even_loader.load(1)
-    promise2 = even_loader.load(2)
-
-    with raises(Exception) as exc_info:
-        await promise1
-
-    assert str(exc_info.value) == "Odd: 1"
-    value2 = await promise2
-    assert value2 == 2
-    assert load_calls == [[1, 2]]
-
-
-@mark.asyncio
-async def test_caches_failed_fetches():
-    async def resolve(keys):
-        mapped_keys = [Exception("Error: {}".format(key)) for key in keys]
-        return mapped_keys
-
-    error_loader, load_calls = id_loader(resolve=resolve)
-
-    with raises(Exception) as exc_info:
-        await error_loader.load(1)
-
-    assert str(exc_info.value) == "Error: 1"
-
-    with raises(Exception) as exc_info:
-        await error_loader.load(1)
-
-    assert str(exc_info.value) == "Error: 1"
-
-    assert load_calls == [[1]]
-
-
-@mark.asyncio
-async def test_caches_failed_fetches_2():
-    identity_loader, load_calls = id_loader()
-
-    identity_loader.prime(1, Exception("Error: 1"))
-
-    with raises(Exception) as _:
-        await identity_loader.load(1)
-
-    assert load_calls == []
-
-
-# It is resilient to job queue ordering
-@mark.asyncio
-async def test_batches_loads_occuring_within_promises():
-    identity_loader, load_calls = id_loader()
-
-    async def load_b_1():
-        return await load_b_2()
-
-    async def load_b_2():
-        return await identity_loader.load("B")
-
-    values = await gather(identity_loader.load("A"), load_b_1())
-
-    assert values == ["A", "B"]
-
-    assert load_calls == [["A", "B"]]
-
-
-@mark.asyncio
-async def test_catches_error_if_loader_resolver_fails():
-    exc = Exception("AOH!")
-
-    def do_resolve(x):
-        raise exc
-
-    a_loader, a_load_calls = id_loader(resolve=do_resolve)
-
-    with raises(Exception) as exc_info:
-        await a_loader.load("A1")
-
-    assert exc_info.value == exc
-
-
-@mark.asyncio
-async def test_can_call_a_loader_from_a_loader():
-    deep_loader, deep_load_calls = id_loader()
-    a_loader, a_load_calls = id_loader(
-        resolve=lambda keys: deep_loader.load(tuple(keys))
-    )
-    b_loader, b_load_calls = id_loader(
-        resolve=lambda keys: deep_loader.load(tuple(keys))
-    )
-
-    a1, b1, a2, b2 = await gather(
-        a_loader.load("A1"),
-        b_loader.load("B1"),
-        a_loader.load("A2"),
-        b_loader.load("B2"),
-    )
-
-    assert a1 == "A1"
-    assert b1 == "B1"
-    assert a2 == "A2"
-    assert b2 == "B2"
-
-    assert a_load_calls == [["A1", "A2"]]
-    assert b_load_calls == [["B1", "B2"]]
-    assert deep_load_calls == [[("A1", "A2"), ("B1", "B2")]]
-
-
-@mark.asyncio
-async def test_dataloader_clear_with_missing_key_works():
-    async def do_resolve(x):
-        return x
-
-    a_loader, a_load_calls = id_loader(resolve=do_resolve)
-    assert a_loader.clear("A1") == a_loader

graphene/utils/tests/test_deprecated.py

@@ -1,9 +1,75 @@
+from pytest import raises
+
 from .. import deprecated
+from ..deprecated import deprecated as deprecated_decorator
 from ..deprecated import warn_deprecation
 
 
 def test_warn_deprecation(mocker):
-    mocker.patch.object(deprecated, "warn")
+    mocker.patch.object(deprecated.warnings, "warn")
 
     warn_deprecation("OH!")
-    deprecated.warn.assert_called_with("OH!", stacklevel=2, category=DeprecationWarning)
+    deprecated.warnings.warn.assert_called_with(
+        "OH!", stacklevel=2, category=DeprecationWarning
+    )
+
+
+def test_deprecated_decorator(mocker):
+    mocker.patch.object(deprecated, "warn_deprecation")
+
+    @deprecated_decorator
+    def my_func():
+        return True
+
+    result = my_func()
+    assert result
+    deprecated.warn_deprecation.assert_called_with(
+        "Call to deprecated function my_func."
+    )
+
+
+def test_deprecated_class(mocker):
+    mocker.patch.object(deprecated, "warn_deprecation")
+
+    @deprecated_decorator
+    class X:
+        pass
+
+    result = X()
+    assert result
+    deprecated.warn_deprecation.assert_called_with("Call to deprecated class X.")
+
+
+def test_deprecated_decorator_text(mocker):
+    mocker.patch.object(deprecated, "warn_deprecation")
+
+    @deprecated_decorator("Deprecation text")
+    def my_func():
+        return True
+
+    result = my_func()
+    assert result
+    deprecated.warn_deprecation.assert_called_with(
+        "Call to deprecated function my_func (Deprecation text)."
+    )
+
+
+def test_deprecated_class_text(mocker):
+    mocker.patch.object(deprecated, "warn_deprecation")
+
+    @deprecated_decorator("Deprecation text")
+    class X:
+        pass
+
+    result = X()
+    assert result
+    deprecated.warn_deprecation.assert_called_with(
+        "Call to deprecated class X (Deprecation text)."
+    )
+
+
+def test_deprecated_other_object(mocker):
+    mocker.patch.object(deprecated, "warn_deprecation")
+
+    with raises(TypeError):
+        deprecated_decorator({})

graphene/utils/tests/test_resolve_only_args.py

@@ -9,5 +9,6 @@ def test_resolve_only_args(mocker):
         return root, args
 
     wrapped_resolver = resolve_only_args(resolver)
+    assert deprecated.warn_deprecation.called
     result = wrapped_resolver(1, 2, a=3)
     assert result == (1, {"a": 3})

graphene/validation/depth_limit.py

@@ -30,7 +30,7 @@ try:
 except ImportError:
     # backwards compatibility for v3.6
     from typing import Pattern
-from typing import Callable, Dict, List, Optional, Union, Tuple
+from typing import Callable, Dict, List, Optional, Union
 
 from graphql import GraphQLError
 from graphql.validation import ValidationContext, ValidationRule
@@ -53,7 +53,7 @@ IgnoreType = Union[Callable[[str], bool], Pattern, str]
 def depth_limit_validator(
     max_depth: int,
     ignore: Optional[List[IgnoreType]] = None,
-    callback: Optional[Callable[[Dict[str, int]], None]] = None,
+    callback: Callable[[Dict[str, int]], None] = None,
 ):
     class DepthLimitValidator(ValidationRule):
         def __init__(self, validation_context: ValidationContext):
@@ -82,7 +82,7 @@ def depth_limit_validator(
 
 
 def get_fragments(
-    definitions: Tuple[DefinitionNode, ...],
+    definitions: List[DefinitionNode],
 ) -> Dict[str, FragmentDefinitionNode]:
     fragments = {}
     for definition in definitions:
@@ -94,7 +94,7 @@ def get_fragments(
 # This will actually get both queries and mutations.
 # We can basically treat those the same
 def get_queries_and_mutations(
-    definitions: Tuple[DefinitionNode, ...],
+    definitions: List[DefinitionNode],
 ) -> Dict[str, OperationDefinitionNode]:
     operations = {}
 

setup.cfg

@@ -1,5 +1,12 @@
+[flake8]
+exclude = setup.py,docs/*,*/examples/*,graphene/pyutils/*,tests
+max-line-length = 120
+
 [coverage:run]
 omit = graphene/pyutils/*,*/tests/*,graphene/types/scalars.py
 
+[isort]
+known_first_party=graphene
+
 [bdist_wheel]
 universal=1

setup.py

@@ -45,50 +45,48 @@ class PyTest(TestCommand):
 
 
 tests_require = [
-    "pytest>=8,<9",
-    "pytest-benchmark>=4,<5",
-    "pytest-cov>=5,<6",
+    "pytest>=6,<7",
+    "pytest-benchmark>=3.4,<4",
+    "pytest-cov>=3,<4",
     "pytest-mock>=3,<4",
     "pytest-asyncio>=0.16,<2",
-    "coveralls>=3.3,<5",
+    "snapshottest>=0.6,<1",
+    "coveralls>=3.3,<4",
+    "promise>=2.3,<3",
+    "mock>=4,<5",
+    "pytz==2022.1",
+    "iso8601>=1,<2",
 ]
 
-dev_requires = [
-    "ruff==0.5.0",
-    "types-python-dateutil>=2.8.1,<3",
-    "mypy>=1.10,<2",
-] + tests_require
+dev_requires = ["black==22.3.0", "flake8>=4,<5"] + tests_require
 
 setup(
     name="graphene",
     version=version,
     description="GraphQL Framework for Python",
     long_description=codecs.open(
-        "README.md", "r", encoding="ascii", errors="replace"
+        "README.rst", "r", encoding="ascii", errors="replace"
     ).read(),
-    long_description_content_type="text/markdown",
     url="https://github.com/graphql-python/graphene",
     author="Syrus Akbary",
     author_email="me@syrusakbary.com",
     license="MIT",
     classifiers=[
-        "Development Status :: 5 - Production/Stable",
+        "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",
         "Topic :: Software Development :: Libraries",
+        "Programming Language :: Python :: 3.6",
+        "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 :: 3.13",
     ],
     keywords="api graphql protocol rest relay graphene",
     packages=find_packages(exclude=["examples*"]),
     install_requires=[
         "graphql-core>=3.1,<3.3",
         "graphql-relay>=3.1,<3.3",
-        "python-dateutil>=2.7.0,<3",
-        "typing-extensions>=4.7.1,<5",
+        "aniso8601>=8,<10",
     ],
     tests_require=tests_require,
     extras_require={"test": tests_require, "dev": dev_requires},

tox.ini

@@ -1,27 +1,37 @@
 [tox]
-envlist = py3{8,9,10,11,12,13}, mypy, pre-commit
+envlist = py3{6,7,8,9,10}, flake8, mypy, pre-commit
 skipsdist = true
 
 [testenv]
 deps =
     .[test]
+setenv =
+     PYTHONPATH = .:{envdir}
 commands =
-    pytest --cov=graphene graphene --cov-report=term --cov-report=xml examples {posargs}
+    py{36,37,38,39,310}: pytest --cov=graphene graphene examples {posargs}
 
 [testenv:pre-commit]
-basepython = python3.10
+basepython = python3.9
 deps =
-    pre-commit>=3.7,<4
+    pre-commit>=2.16,<3
 setenv =
     LC_CTYPE=en_US.UTF-8
 commands =
     pre-commit run --all-files --show-diff-on-failure
 
 [testenv:mypy]
-basepython = python3.10
+basepython = python3.9
 deps =
-    .[dev]
+    mypy>=0.950,<1
 commands =
     mypy graphene
 
+[testenv:flake8]
+basepython = python3.9
+deps =
+    flake8>=4,<5
+commands =
+    pip install --pre -e .
+    flake8 graphene
+
 [pytest]