Skip to content

Commit 74a3d61

Browse files
committed
Add testing support for Django 6.0
1 parent 4b6aea5 commit 74a3d61

File tree

5 files changed

+29
-9
lines changed

5 files changed

+29
-9
lines changed

.github/workflows/test.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,36 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
15-
django-version: ['4.2', '5.0', '5.1', '5.2', 'main']
15+
django-version: ['4.2', '5.0', '5.1', '5.2', '6.0', 'main']
1616

1717
exclude:
1818
# Exclude py3.9 for Django >= 5.0,
1919
# and py3.10 and py3.11 for Django > 5.2
20+
# and py3.14 for Django < 5.2
2021
- python-version: '3.9'
2122
django-version: '5.0'
2223
- python-version: '3.9'
2324
django-version: '5.1'
2425
- python-version: '3.9'
2526
django-version: '5.2'
27+
- python-version: '3.9'
28+
django-version: '6.0'
2629
- python-version: '3.9'
2730
django-version: 'main'
31+
- python-version: '3.10'
32+
django-version: '6.0'
2833
- python-version: '3.10'
2934
django-version: 'main'
35+
- python-version: '3.11'
36+
django-version: '6.0'
3037
- python-version: '3.11'
3138
django-version: 'main'
39+
- python-version: '3.14'
40+
django-version: '4.2'
41+
- python-version: '3.14'
42+
django-version: '5.0'
43+
- python-version: '3.14'
44+
django-version: '5.1'
3245

3346
services:
3447

@@ -120,7 +133,7 @@ jobs:
120133
# Install this project in editable mode, so that its package metadata can be queried
121134
pip install --editable .
122135
# Install the latest minor version of Django we support
123-
pip install Django==5.2
136+
pip install Django==6.0
124137
125138
- name: Check translation files are updated
126139
run: python -m simple_history.tests.generated_file_checks.check_translations

CHANGES.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Changes
44
Unreleased
55
----------
66

7+
- Added support for Python 3.14
8+
- Added support for Django 6.0
9+
710
3.10.1 (2025-06-20)
811
-------------------
912

README.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ This app supports the following combinations of Django and Python:
4444
4.2 3.9, 3.10, 3.11, 3.12, 3.13
4545
5.0 3.10, 3.11, 3.12, 3.13
4646
5.1 3.10, 3.11, 3.12, 3.13
47-
5.2 3.10, 3.11, 3.12, 3.13
48-
main 3.12, 3.13
47+
5.2 3.10, 3.11, 3.12, 3.13, 3.14
48+
6.0 3.12, 3.13, 3.14
49+
main 3.12, 3.13, 3.14
4950
========== ========================
5051

5152
Getting Help

docs/index.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ This app supports the following combinations of Django and Python:
4040
4.2 3.9, 3.10, 3.11, 3.12, 3.13
4141
5.0 3.10, 3.11, 3.12, 3.13
4242
5.1 3.10, 3.11, 3.12, 3.13
43-
5.2 3.10, 3.11, 3.12, 3.13
44-
main 3.12, 3.13
43+
5.2 3.10, 3.11, 3.12, 3.13, 3.14
44+
6.0 3.12, 3.13, 3.14
45+
main 3.12, 3.13, 3.14
4546
========== =======================
4647

4748
Contribute

tox.ini

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
envlist =
33
py3{9-13}-dj42-{sqlite3,postgres,mysql,mariadb},
44
py3{10-13}-dj{50-52}-{sqlite3,postgres,mysql,mariadb},
5-
py3{12-13}-dj{main}-{sqlite3,postgres,mysql,mariadb},
6-
py314-dj{52,main}-{sqlite3,postgres,mysql,mariadb},
5+
py3{12-13}-dj{60,main}-{sqlite3,postgres,mysql,mariadb},
6+
py314-dj{52,60,main}-{sqlite3,postgres,mysql,mariadb},
77
docs,
88
lint
99

@@ -22,6 +22,7 @@ DJANGO =
2222
5.0: dj50
2323
5.1: dj51
2424
5.2: dj52
25+
6.0: dj60
2526
main: djmain
2627

2728
[flake8]
@@ -36,7 +37,8 @@ deps =
3637
dj42: Django>=4.2,<4.3
3738
dj50: Django>=5.0,<5.1
3839
dj51: Django>=5.1,<5.2
39-
dj52: Django>=5.2a1,<5.3 # Use a1 to allow testing of the release candidates
40+
dj52: Django>=5.2,<5.3
41+
dj60: Django>=6.0a1,<6.1 # Use a1 to allow testing of the release candidates
4042
djmain: https://github.com/django/django/tarball/main
4143
postgres: -rrequirements/postgres.txt
4244
mysql: -rrequirements/mysql.txt

0 commit comments

Comments
 (0)