Skip to content

Commit 857e329

Browse files
living180matthiask
authored andcommitted
Minor updates to tox.ini
* Simplify envlist specification (no functional changes) * Tweak dj42 django dependency specification * Enable selenium tests for Python 3.11/Django 4.2 instead of for Python 3.10/Django 4.1. * Minor file formatting tweaks.
1 parent 2ac592d commit 857e329

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

tox.ini

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,22 @@ isolated_build = true
33
envlist =
44
docs
55
packaging
6-
py{38,39,310}-dj{32}-{sqlite,postgresql,postgis,mysql}
7-
py{310}-dj{40}-{sqlite}
8-
py{310,311}-dj{41}-{sqlite,postgresql,postgis,mysql}
9-
py{310,311}-dj{42,main}-{sqlite,postgresql,postgis,mysql}
10-
py{310,311}-dj{42,main}-psycopg3
6+
py{38,39,310}-dj32-{sqlite,postgresql,postgis,mysql}
7+
py310-dj40-sqlite
8+
py{310,311}-dj41-{sqlite,postgresql,postgis,mysql}
9+
py{310,311}-dj{42,main}-{sqlite,postgresql,psycopg3,postgis,mysql}
1110

1211
[testenv]
1312
deps =
1413
dj32: django~=3.2.9
1514
dj40: django~=4.0.0
1615
dj41: django~=4.1.3
17-
dj42: django>=4.2a1,<5
16+
dj42: django~=4.2.1
17+
djmain: https://github.com/django/django/archive/main.tar.gz
1818
postgresql: psycopg2-binary
1919
psycopg3: psycopg[binary]
2020
postgis: psycopg2-binary
2121
mysql: mysqlclient
22-
djmain: https://github.com/django/django/archive/main.tar.gz
2322
coverage[toml]
2423
Jinja2
2524
html5lib
@@ -40,7 +39,7 @@ setenv =
4039
PYTHONPATH = {toxinidir}
4140
PYTHONWARNINGS = d
4241
py39-dj32-postgresql: DJANGO_SELENIUM_TESTS = true
43-
py310-dj41-postgresql: DJANGO_SELENIUM_TESTS = true
42+
py311-dj42-postgresql: DJANGO_SELENIUM_TESTS = true
4443
DB_NAME = {env:DB_NAME:debug_toolbar}
4544
DB_USER = {env:DB_USER:debug_toolbar}
4645
DB_HOST = {env:DB_HOST:localhost}
@@ -56,7 +55,6 @@ setenv =
5655
DB_BACKEND = postgresql
5756
DB_PORT = {env:DB_PORT:5432}
5857

59-
6058
[testenv:py{38,39,310,311}-dj{32,40,41,42,main}-postgis]
6159
setenv =
6260
{[testenv]setenv}

0 commit comments

Comments
 (0)