Skip to content

Commit 6470734

Browse files
committed
chore(ci): update tox envlist and gha matrix
1 parent e222e86 commit 6470734

File tree

2 files changed

+34
-18
lines changed

2 files changed

+34
-18
lines changed

.github/workflows/test.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,28 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
grappelli: ["0"]
11-
python-version: ["3.8"]
12-
django-version: ["3.2"]
10+
grappelli: ["0", "1"]
11+
python-version: ["3.11"]
12+
django-version: ["4.2"]
13+
exclude:
14+
- python-version: "3.11"
15+
grappelli: "1"
1316
include:
14-
- grappelli: "0"
15-
name-suffix: ""
17+
- python-version: "3.8"
18+
django-version: "4.2"
19+
grappelli: "1"
1620
- python-version: "3.9"
17-
django-version: "4.0"
21+
django-version: "5.0"
22+
grappelli: "0"
1823
- python-version: "3.10"
19-
django-version: "4.1"
20-
- grappelli: "1"
21-
name-suffix: " + grappelli"
22-
python-version: "3.7"
23-
django-version: "3.2"
24-
- grappelli: "1"
25-
name-suffix: " + grappelli"
26-
python-version: "3.8"
27-
django-version: "4.0"
24+
django-version: "5.0"
25+
grappelli: "1"
26+
- python-version: "3.12"
27+
django-version: "5.1"
28+
grappelli: "0"
2829

2930
runs-on: ubuntu-latest
30-
name: Django ${{ matrix.django-version }} (Python ${{ matrix.python-version }})${{ matrix.name-suffix }}
31+
name: Django ${{ matrix.django-version }} (Python ${{ matrix.python-version }})${{ matrix.grappelli == '1' && ' + grappelli' || '' }})
3132

3233
env:
3334
DJANGO: ${{ matrix.django-version }}

tox.ini

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ envlist =
33
py{36,37,38,39}-dj22-{grp,nogrp}
44
py{36,37,38,39,310}-dj32-{grp,nogrp}
55
py{38,39,310}-dj40-{grp,nogrp}
6-
py{38,39,310}-dj41-nogrp
6+
py{38,39,310,311}-dj41-{grp,nogrp}
7+
py{38,39,310,311,312}-dj42-{grp,nogrp}
8+
py{310,311,312}-dj50-{grp,nogrp}
9+
py{310,311,312}-dj51-nogrp
710
black,flake8
811
skipsdist=True
912

@@ -32,9 +35,16 @@ deps =
3235
dj22: Django>=2.2,<3.0
3336
dj32: Django>=3.2,<4.0
3437
dj40: Django>=4.0,<4.1
38+
dj41: Django>=4.1,<4.2
39+
dj42: Django>=4.2,<4.3
40+
dj50: Django>=5.0,<5.1
41+
dj51: Django>=5.1a1,<5.2
3542
dj22-grp: django-grappelli>=2.13,<2.14
3643
dj32-grp: django-grappelli>=2.15,<2.16
37-
dj40-grp: django-grappelli>=3.0,<3.1
44+
dj40-grp: django-grappelli==3.0.8
45+
dj41-grp: django-grappelli==3.0.8
46+
dj42-grp: django-grappelli>=3.0,<3.1
47+
dj50-grp: django-grappelli>=4.0,<4.1
3848

3949
[testenv:black]
4050
basepython = python3.9
@@ -79,13 +89,18 @@ python =
7989
3.8: py38
8090
3.9: py39
8191
3.10: py310
92+
3.11: py311
93+
3.12: py312
8294

8395
[gh-actions:env]
8496
DJANGO =
8597
2.2: dj22
8698
3.2: dj32
8799
4.0: dj40
88100
4.1: dj41
101+
4.2: dj42
102+
5.0: dj50
103+
5.1: dj51
89104
GRAPPELLI =
90105
0: nogrp
91106
1: grp

0 commit comments

Comments
 (0)