Skip to content

Update tox and github actions. #1500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 12, 2021
Merged

Update tox and github actions. #1500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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}
Expand All @@ -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
Expand Down Expand Up @@ -90,6 +91,7 @@ python =
3.7: py37
3.8: py38
3.9: py39
3.10: py310

[gh-actions:env]
DB_BACKEND =
Expand Down