Skip to content

Commit e113045

Browse files
authored
Merge pull request #306 from adamchainz/django_5.0
Test on Django 5.0
2 parents 5af8854 + 83b5857 commit e113045

File tree

3 files changed

+66
-6
lines changed

3 files changed

+66
-6
lines changed

.github/workflows/ci.yml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,46 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
19-
django: ['3.2', '4.0', '4.1', '4.2', 'main']
18+
python-version:
19+
- '3.7'
20+
- '3.8'
21+
- '3.9'
22+
- '3.10'
23+
- '3.11'
24+
django:
25+
- '3.2'
26+
- '4.0'
27+
- '4.1'
28+
- '4.2'
29+
- '5.0'
30+
- 'main'
2031
exclude:
2132
- python-version: '3.7'
2233
django: '4.0'
2334
- python-version: '3.7'
2435
django: '4.1'
2536
- python-version: '3.7'
2637
django: '4.2'
38+
- python-version: '3.7'
39+
django: '5.0'
2740
- python-version: '3.7'
2841
django: 'main'
42+
- python-version: '3.8'
43+
django: '5.0'
44+
- python-version: '3.9'
45+
django: '5.0'
2946
- python-version: '3.11'
3047
django: '3.2'
3148
- python-version: '3.11'
3249
django: '4.0'
50+
- python-version: '3.12'
51+
django: '3.2'
52+
- python-version: '3.12'
53+
django: '4.0'
54+
- python-version: '3.12'
55+
django: '4.1'
56+
- python-version: '3.12'
57+
django: '4.2'
3358

3459
steps:
3560
- uses: actions/checkout@v4

.github/workflows/release.yml

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,46 @@ jobs:
1111
strategy:
1212
fail-fast: true
1313
matrix:
14-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
15-
django: ['3.2', '4.0', '4.1']
14+
python-version:
15+
- '3.7'
16+
- '3.8'
17+
- '3.9'
18+
- '3.10'
19+
- '3.11'
20+
django:
21+
- '3.2'
22+
- '4.0'
23+
- '4.1'
24+
- '4.2'
25+
- '5.0'
26+
- 'main'
1627
exclude:
1728
- python-version: '3.7'
1829
django: '4.0'
1930
- python-version: '3.7'
2031
django: '4.1'
32+
- python-version: '3.7'
33+
django: '4.2'
34+
- python-version: '3.7'
35+
django: '5.0'
36+
- python-version: '3.7'
37+
django: 'main'
38+
- python-version: '3.8'
39+
django: '5.0'
40+
- python-version: '3.9'
41+
django: '5.0'
42+
- python-version: '3.11'
43+
django: '3.2'
44+
- python-version: '3.11'
45+
django: '4.0'
46+
- python-version: '3.12'
47+
django: '3.2'
48+
- python-version: '3.12'
49+
django: '4.0'
50+
- python-version: '3.12'
51+
django: '4.1'
52+
- python-version: '3.12'
53+
django: '4.2'
2154

2255
steps:
2356
- uses: actions/checkout@v4

tox.ini

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ envlist =
33
py37-django32,
44
py38-django{32,40,41,42,main},
55
py39-django{32,40,41,42,main},
6-
py310-django{32,40,41,42,main},
7-
py311-django{41,42,main},
6+
py310-django{32,40,41,42,50,main},
7+
py311-django{41,42,50,main},
8+
py312-django{50,main},
89
pypy39-django{32,40,41,main},
910

1011
[testenv]
@@ -14,6 +15,7 @@ deps =
1415
django40: Django>=4.0,<4.1
1516
django41: Django>=4.1,<4.2
1617
django42: Django>=4.2,<4.3
18+
django50: Django>=5.0a1,<5.1
1719
djangomain: https://github.com/django/django/archive/main.tar.gz
1820
pymemcache>=4.0,<5.0
1921
django-redis>=5.2,<6.0

0 commit comments

Comments
 (0)