Skip to content

Commit 7355df9

Browse files
Add Python 3.14 and Django 6.0 to CI workflow matrix (#1529)
* Add Python 3.14 to CI workflow matrix Python v3.14 -- October 7th * https://www.python.org/download/pre-releases * https://www.python.org/downloads/release/python-3140rc3 * https://docs.python.org/3.14/whatsnew/3.14.html * https://code.djangoproject.com/ticket/35844 > Django 5.2 will be the first version to support Python 3.14 * Add Python 3.14 and Django 52 to tox configuration * Add testing support for Django 6.0 * Add Christian Clauss to the AUTHORS list --------- Co-authored-by: Tim Schilling <[email protected]>
1 parent 2ff6207 commit 7355df9

File tree

6 files changed

+35
-11
lines changed

6 files changed

+35
-11
lines changed

.github/workflows/test.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,37 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
15-
django-version: ['4.2', '5.0', '5.1', '5.2', 'main']
14+
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', '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

@@ -73,6 +86,7 @@ jobs:
7386
pyproject.toml
7487
tox.ini
7588
requirements/*.txt
89+
allow-prereleases: true
7690

7791
- name: Install dependencies
7892
run: |
@@ -107,7 +121,7 @@ jobs:
107121
- name: Set up newest stable Python version
108122
uses: actions/setup-python@v6
109123
with:
110-
python-version: 3.13
124+
python-version: 3.x
111125
cache: 'pip'
112126
# Invalidate the cache when this file updates, as the dependencies' versions
113127
# are pinned in the step below
@@ -117,9 +131,9 @@ jobs:
117131
run: |
118132
python -m pip install --upgrade pip
119133
# Install this project in editable mode, so that its package metadata can be queried
120-
pip install -e .
134+
pip install --editable .
121135
# Install the latest minor version of Django we support
122-
pip install Django==5.1
136+
pip install --pre "Django>=6.0a1"
123137
124138
- name: Check translation files are updated
125139
run: python -m simple_history.tests.generated_file_checks.check_translations

AUTHORS.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Authors
2727
- Brian Mesick (`bmedx <https://github.com/bmedx>`_)
2828
- Buddy Lindsey, Jr.
2929
- Carlos San Emeterio (`Carlos-San-Emeterio <https://github.com/Carlos-San-Emeterio>`_)
30+
- Christian Clauss (`cclauss <https://github.com/cclauss>`_)
3031
- Christopher Broderick (`uhurusurfa <https://github.com/uhurusurfa>`_)
3132
- Christopher Johns (`tyrantwave <https://github.com/tyrantwave>`_)
3233
- Conrad (`creyD <https://github.com/creyD>`_)

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: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +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},
5+
py3{12-13}-dj{60,main}-{sqlite3,postgres,mysql,mariadb},
6+
py314-dj{52,60,main}-{sqlite3,postgres,mysql,mariadb},
67
docs,
78
lint
89

@@ -13,13 +14,15 @@ python =
1314
3.11: py311, docs, lint
1415
3.12: py312
1516
3.13: py313
17+
3.14: py314
1618

1719
[gh-actions:env]
1820
DJANGO =
1921
4.2: dj42
2022
5.0: dj50
2123
5.1: dj51
2224
5.2: dj52
25+
6.0: dj60
2326
main: djmain
2427

2528
[flake8]
@@ -34,7 +37,8 @@ deps =
3437
dj42: Django>=4.2,<4.3
3538
dj50: Django>=5.0,<5.1
3639
dj51: Django>=5.1,<5.2
37-
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
3842
djmain: https://github.com/django/django/tarball/main
3943
postgres: -rrequirements/postgres.txt
4044
mysql: -rrequirements/mysql.txt

0 commit comments

Comments
 (0)