From 9044f99d98ceacf85947d09195627742b1882fd8 Mon Sep 17 00:00:00 2001
From: Josh <josh@joshthomas.dev>
Date: Wed, 6 Oct 2021 14:46:25 -0500
Subject: [PATCH 1/3] Swap Python 3.10 for 3.9 in GH action workflows

---
 .github/workflows/compile_catalog.yml | 2 +-
 .github/workflows/linters.yml         | 8 ++++----
 .github/workflows/precommit.yml       | 2 +-
 .github/workflows/pytest.yml          | 3 ++-
 .github/workflows/security.yml        | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/compile_catalog.yml b/.github/workflows/compile_catalog.yml
index 5e408784a..bcdea4cb8 100644
--- a/.github/workflows/compile_catalog.yml
+++ b/.github/workflows/compile_catalog.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Python 3.x
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - run: python -m pip install tox
       - name: Compile Catalog
         run: tox
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index c20062988..641b71915 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -16,12 +16,12 @@ jobs:
       - name: Set up Python 3.x
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - run: python -m pip install tox
-      - name: tox py39-flake8
+      - name: tox py310-flake8
         run: tox
         env:
-          TOXENV: py39-flake8
+          TOXENV: py310-flake8
 
   mypy:
     name: mypy
@@ -32,7 +32,7 @@ jobs:
       - name: Set up Python 3.x
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - run: python -m pip install tox
       - name: tox mypy
         run: tox
diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml
index 85caad922..dd8cdd412 100644
--- a/.github/workflows/precommit.yml
+++ b/.github/workflows/precommit.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Python 3.x
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - run: python -m pip install tox
       - name: tox precommit
         run: tox
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index ff338210d..c2d51f210 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -18,6 +18,7 @@ jobs:
           - 3.7
           - 3.8
           - 3.9
+          - "3.10"
           - pypy3
         tox-django-version:
           - "22"
@@ -58,7 +59,7 @@ jobs:
       max-parallel: 4
       matrix:
         python-version:
-          - 3.9
+          - "3.10"
         tox-django-version:
           - "32"
     steps:
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
index de6fa94e7..f4a3430fe 100644
--- a/.github/workflows/security.yml
+++ b/.github/workflows/security.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Python 3.x
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - run: python -m pip install tox
       - name: safety
         run: tox

From c0fb8c1151088c01530c99eada666554846154ef Mon Sep 17 00:00:00 2001
From: Josh <josh@joshthomas.dev>
Date: Wed, 6 Oct 2021 14:47:00 -0500
Subject: [PATCH 2/3] add py310 to tox.ini

---
 tox.ini | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/tox.ini b/tox.ini
index 71052dbc1..69647e83e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,15 +8,15 @@ envlist =
     precommit
     safety
     mypy
-    {py37,py38,py39}-flake8
-    {py36,py37,py38,py39,pypy}-dj22
-    {py36,py37,py38,py39,pypy}-dj30
-    {py36,py37,py38,py39,pypy}-dj31
-    {py36,py37,py38,py39,pypy}-dj32
-    {py38,py39,pypy}-djmaster
-    py39-dj32-postgres
-    py39-dj32-mysql
-    py39-djmaster-postgres
+    {py37,py38,py39,py310}-flake8
+    {py36,py37,py38,py39,py310,pypy}-dj22
+    {py36,py37,py38,py39,py310,pypy}-dj30
+    {py36,py37,py38,py39,py310,pypy}-dj31
+    {py36,py37,py38,py39,py310,pypy}-dj32
+    {py38,py39,py310,pypy}-djmaster
+    py310-dj32-postgres
+    py310-dj32-mysql
+    py310-djmaster-postgres
 
 [testenv]
 commands = make test
@@ -91,3 +91,9 @@ deps =
     pip >= 21.1
     flake8
 commands = flake8 django_extensions tests
+
+[testenv:py310-flake8]
+deps =
+    pip >= 21.1
+    flake8
+commands = flake8 django_extensions tests

From ffa2f7acbe4b305a600138c4796550318b50d1e9 Mon Sep 17 00:00:00 2001
From: Josh <josh@joshthomas.dev>
Date: Wed, 6 Oct 2021 14:47:23 -0500
Subject: [PATCH 3/3] add Python 3.10 trove classifier

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

diff --git a/setup.py b/setup.py
index f15a33ad7..111be0f0e 100644
--- a/setup.py
+++ b/setup.py
@@ -127,6 +127,7 @@ def fullsplit(path, result=None):
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Utilities',