Skip to content

Commit d779328

Browse files
Update tox and github actions. (#1500)
- Test with python 3.10 - Switch selenium test to py3.9 and django 3.2 - Use latest versions of mariadb and postgresql in CI
1 parent e20ac73 commit d779328

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.github/workflows/test.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
fail-fast: false
1010
max-parallel: 5
1111
matrix:
12-
python-version: ['3.6', '3.7', '3.8', '3.9']
12+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10.0-rc.1']
1313

1414
services:
1515
mariadb:
16-
image: mariadb:10.3
16+
image: mariadb
1717
env:
1818
MYSQL_ROOT_PASSWORD: debug_toolbar
1919
options: >-
@@ -76,11 +76,11 @@ jobs:
7676
fail-fast: false
7777
max-parallel: 5
7878
matrix:
79-
python-version: ['3.6', '3.7', '3.8', '3.9']
79+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10.0-rc.1']
8080

8181
services:
8282
postgres:
83-
image: 'postgres:9.5'
83+
image: postgres
8484
env:
8585
POSTGRES_DB: debug_toolbar
8686
POSTGRES_USER: debug_toolbar
@@ -143,7 +143,7 @@ jobs:
143143
fail-fast: false
144144
max-parallel: 5
145145
matrix:
146-
python-version: ['3.6', '3.7', '3.8', '3.9']
146+
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10.0-rc.1']
147147

148148
steps:
149149
- uses: actions/checkout@v2

tox.ini

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ envlist =
66
py{36,37}-dj{22,31,32}-sqlite
77
py{38,39}-dj{22,31,32,main}-sqlite
88
py{36,37,38,39}-dj{22,31,32}-{postgresql,mysql}
9+
py{310}-dj{32,main}-{sqlite,postgresql,mysql}
910

1011
[testenv]
1112
deps =
@@ -33,7 +34,7 @@ passenv=
3334
setenv =
3435
PYTHONPATH = {toxinidir}
3536
PYTHONWARNINGS = d
36-
py38-dj31-postgresql: DJANGO_SELENIUM_TESTS = true
37+
py39-dj32-postgresql: DJANGO_SELENIUM_TESTS = true
3738
DB_NAME = {env:DB_NAME:debug_toolbar}
3839
DB_USER = {env:DB_USER:debug_toolbar}
3940
DB_HOST = {env:DB_HOST:localhost}
@@ -42,19 +43,19 @@ whitelist_externals = make
4243
pip_pre = True
4344
commands = make coverage TEST_ARGS='{posargs:tests}'
4445

45-
[testenv:py{36,37,38,39}-dj{22,31,32}-postgresql]
46+
[testenv:py{36,37,38,39,310}-dj{22,31,32}-postgresql]
4647
setenv =
4748
{[testenv]setenv}
4849
DB_BACKEND = postgresql
4950
DB_PORT = {env:DB_PORT:5432}
5051

51-
[testenv:py{36,37,38,39}-dj{22,31,32}-mysql]
52+
[testenv:py{36,37,38,39,310}-dj{22,31,32}-mysql]
5253
setenv =
5354
{[testenv]setenv}
5455
DB_BACKEND = mysql
5556
DB_PORT = {env:DB_PORT:3306}
5657

57-
[testenv:py{36,37,38,39}-dj{22,31,32,main}-sqlite]
58+
[testenv:py{36,37,38,39,310}-dj{22,31,32,main}-sqlite]
5859
setenv =
5960
{[testenv]setenv}
6061
DB_BACKEND = sqlite3
@@ -90,6 +91,7 @@ python =
9091
3.7: py37
9192
3.8: py38
9293
3.9: py39
94+
3.10: py310
9395

9496
[gh-actions:env]
9597
DB_BACKEND =

0 commit comments

Comments
 (0)