From e085001a746b5e0d6c2ab3b8c54616a7d66e6ba7 Mon Sep 17 00:00:00 2001
From: Tim Schilling <schillingt@better-simple.com>
Date: Sat, 11 Sep 2021 10:10:26 -0500
Subject: [PATCH] Update tox and github actions.

- Test with python 3.10
- Switch selenium test to py3.9 and django 3.2
- Use latest versions of mariadb and postgresql in CI
---
 .github/workflows/test.yml | 10 +++++-----
 tox.ini                    | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 667846cdc..5ab3122fd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,11 +9,11 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10.0-rc.1']
 
     services:
       mariadb:
-        image: mariadb:10.3
+        image: mariadb
         env:
           MYSQL_ROOT_PASSWORD: debug_toolbar
         options: >-
@@ -76,11 +76,11 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10.0-rc.1']
 
     services:
       postgres:
-        image: 'postgres:9.5'
+        image: postgres
         env:
           POSTGRES_DB: debug_toolbar
           POSTGRES_USER: debug_toolbar
@@ -143,7 +143,7 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10.0-rc.1']
 
     steps:
     - uses: actions/checkout@v2
diff --git a/tox.ini b/tox.ini
index c3bb0bac2..e65718d29 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,7 @@ envlist =
     py{36,37}-dj{22,31,32}-sqlite
     py{38,39}-dj{22,31,32,main}-sqlite
     py{36,37,38,39}-dj{22,31,32}-{postgresql,mysql}
+    py{310}-dj{32,main}-{sqlite,postgresql,mysql}
 
 [testenv]
 deps =
@@ -33,7 +34,7 @@ passenv=
 setenv =
     PYTHONPATH = {toxinidir}
     PYTHONWARNINGS = d
-    py38-dj31-postgresql: DJANGO_SELENIUM_TESTS = true
+    py39-dj32-postgresql: DJANGO_SELENIUM_TESTS = true
     DB_NAME = {env:DB_NAME:debug_toolbar}
     DB_USER = {env:DB_USER:debug_toolbar}
     DB_HOST = {env:DB_HOST:localhost}
@@ -42,19 +43,19 @@ whitelist_externals = make
 pip_pre = True
 commands = make coverage TEST_ARGS='{posargs:tests}'
 
-[testenv:py{36,37,38,39}-dj{22,31,32}-postgresql]
+[testenv:py{36,37,38,39,310}-dj{22,31,32}-postgresql]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = postgresql
     DB_PORT = {env:DB_PORT:5432}
 
-[testenv:py{36,37,38,39}-dj{22,31,32}-mysql]
+[testenv:py{36,37,38,39,310}-dj{22,31,32}-mysql]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = mysql
     DB_PORT = {env:DB_PORT:3306}
 
-[testenv:py{36,37,38,39}-dj{22,31,32,main}-sqlite]
+[testenv:py{36,37,38,39,310}-dj{22,31,32,main}-sqlite]
 setenv =
     {[testenv]setenv}
     DB_BACKEND = sqlite3
@@ -90,6 +91,7 @@ python =
     3.7: py37
     3.8: py38
     3.9: py39
+    3.10: py310
 
 [gh-actions:env]
 DB_BACKEND =