Merge branch 'master' into support-3.12

.github/workflows/deploy.yml

@@ -10,9 +10,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+<<<<<<< support-3.12
     - uses: actions/checkout@v3
     - name: Set up Python 3.11
       uses: actions/setup-python@v4
+=======
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v5
+>>>>>>> master
       with:
         python-version: "3.11"
     - name: Build wheel and source tarball

.github/workflows/lint.yml

@@ -7,9 +7,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+<<<<<<< support-3.12
     - uses: actions/checkout@v3
     - name: Set up Python 3.11
       uses: actions/setup-python@v4
+=======
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v5
+>>>>>>> master
       with:
         python-version: "3.11"
     - name: Install dependencies

.github/workflows/tests.yml

@@ -25,14 +25,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
+<<<<<<< support-3.12
           - {name: '3.12.0-rc.1', python: '3.12.0-rc.1', os: ubuntu-latest, tox: py312}
+=======
+          - {name: '3.12', python: '3.12', os: ubuntu-latest, tox: py312}
+>>>>>>> master
           - {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}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
 
@@ -43,14 +47,12 @@ jobs:
 
       - name: get pip cache dir
         id: pip-cache
-        run: echo "::set-output name=dir::$(pip cache dir)"
-
+        run: echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
       - name: cache pip dependencies
         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

.isort.cfg

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

README.rst

@@ -141,7 +141,11 @@ file:
 
 .. code:: sh
 
+<<<<<<< support-3.12
    tox -e py311
+=======
+   tox -e py10
+>>>>>>> master
 
 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

docs/quickstart.rst

@@ -59,7 +59,8 @@ When we send a **Query** requesting only one **Field**, ``hello``, and specify a
 Requirements
 ~~~~~~~~~~~~
 
--  Python (3.8, 3.9, 3.10, 3.11, pypy)
+-  Python (3.8, 3.9, 3.10, 3.11, 3.12, pypy)
+
 -  Graphene (3.0)
 
 Project setup