Merge branch 'master' into fix/ariadne-link

Author: erikwrede

.github/workflows/coveralls.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.8
+    - name: Set up Python 3.9
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
     - name: Build wheel and source tarball
       run: |
         pip install wheel

.github/workflows/deploy.yml

@@ -8,10 +8,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.8
+    - name: Set up Python 3.9
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/lint.yml

@@ -25,12 +25,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {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}
+          - {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@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python }}
 
@@ -45,10 +47,20 @@ jobs:
         run: echo "::set-output name=dir::$(pip cache dir)"
 
       - name: cache pip dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         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@v3
+        with:
+          name: graphene-sqlalchemy-coverage
+          path: coverage.xml
+          if-no-files-found: error
+      - name: Upload coverage.xml to codecov
+        if: ${{ matrix.python == '3.10' }}
+        uses: codecov/codecov-action@v3

.github/workflows/tests.yml

@@ -1,9 +1,9 @@
 default_language_version:
-  python: python3.8
+  python: python3.9
 
 repos:
--   repo: git://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
     hooks:
     -   id: check-merge-conflict
     -   id: check-json
@@ -16,15 +16,15 @@ repos:
         - --autofix
     -   id: trailing-whitespace
         exclude: README.md
--   repo: git://github.com/asottile/pyupgrade
-    rev: v2.24.0
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v2.37.3
     hooks:
     -   id: pyupgrade
--   repo: git://github.com/ambv/black
-    rev: 19.3b0
+-   repo: https://github.com/psf/black
+    rev: 22.6.0
     hooks:
     -   id: black
--   repo: git://github.com/PyCQA/flake8
-    rev: 3.8.4
+-   repo: https://github.com/PyCQA/flake8
+    rev: 5.0.4
     hooks:
     -   id: flake8

.pre-commit-config.yaml

@@ -4,12 +4,6 @@
 
 **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 ❤️
 
----
-
-**The below readme is the documentation 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/)**
-
----
-
 ## Introduction
 
 [Graphene](http://graphene-python.org) is an opinionated Python library for building GraphQL schemas/types fast and easily.
@@ -34,10 +28,10 @@ Also, Graphene is fully compatible with the GraphQL spec, working seamlessly wit
 
 ## Installation
 
-For instaling graphene, just run this command in your shell
+To install `graphene`, just run this command in your shell
 
 ```bash
-pip install "graphene>=2.0"
+pip install "graphene>=3.0"
 ```
 
 ## Examples

README.md

@@ -1,18 +1,18 @@
-**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 ❤️
-
---------------
-
 |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 a Python library for
-building GraphQL schemas/types fast and easily.
+`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.
@@ -27,17 +27,18 @@ Integrations
 
 Graphene has multiple integrations with different frameworks:
 
-+---------------------+----------------------------------------------------------------------------------------------+
-| integration         | Package                                                                                      |
-+=====================+==============================================================================================+
-| 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/>`__                           |
-+---------------------+----------------------------------------------------------------------------------------------+
-| Peewee              | *In progress* (`Tracking Issue <https://github.com/graphql-python/graphene/issues/289>`__)   |
-+---------------------+----------------------------------------------------------------------------------------------+
++-------------------+-------------------------------------------------+
+| 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
@@ -48,17 +49,11 @@ seamlessly with all GraphQL clients, such as
 Installation
 ------------
 
-For instaling graphene, just run this command in your shell
+To install `graphene`, just run this command in your shell
 
 .. code:: bash
 
-    pip install "graphene>=2.0"
-
-2.0 Upgrade Guide
------------------
-
-Please read `UPGRADE-v2.0.md </UPGRADE-v2.0.md>`__ to learn how to
-upgrade.
+   pip install "graphene>=3.0"
 
 Examples
 --------
@@ -67,26 +62,26 @@ Here is one example for you to get started:
 
 .. code:: python
 
-    import graphene
+   import graphene
 
-    class Query(graphene.ObjectType):
-        hello = graphene.String(description='A typical hello world')
+   class Query(graphene.ObjectType):
+       hello = graphene.String(description='A typical hello world')
 
-        def resolve_hello(self, info):
-            return 'World'
+       def resolve_hello(self, info):
+           return 'World'
 
-    schema = graphene.Schema(query=Query)
+   schema = graphene.Schema(query=Query)
 
 Then Querying ``graphene.Schema`` is as simple as:
 
 .. code:: python
 
-    query = '''
-        query SayHello {
-          hello
-        }
-    '''
-    result = schema.execute(query)
+   query = '''
+       query SayHello {
+         hello
+       }
+   '''
+   result = schema.execute(query)
 
 If you want to learn even more, you can also check the following
 `examples <examples/>`__:
@@ -110,20 +105,20 @@ dependencies are installed by running:
 
 .. code:: sh
 
-    virtualenv venv
-    source venv/bin/activate
-    pip install -e ".[test]"
+   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
+   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
+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.
@@ -132,7 +127,7 @@ You can also run the benchmarks with:
 
 .. code:: sh
 
-    py.test 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
@@ -142,14 +137,14 @@ config file, just run:
 
 .. code:: sh
 
-    tox
+   tox
 
 If you wish to run against a specific version defined in the ``tox.ini``
 file:
 
 .. code:: sh
 
-    tox -e py36
+   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
@@ -168,7 +163,7 @@ An HTML version of the documentation is produced by running:
 
 .. code:: sh
 
-    make docs
+   make docs
 
 .. |Graphene Logo| image:: http://graphene-python.org/favicon.png
 .. |Build Status| image:: https://travis-ci.org/graphql-python/graphene.svg?branch=master

README.rst

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

UPGRADE-v1.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 stantard `Connection`'s arguments (first, before, after, before).**
+**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).**
 You may need something like this:
 
 ```python