Skip to content

Commit 28036d4

Browse files
committed
feat: support Django 6.0
1 parent f079301 commit 28036d4

File tree

5 files changed

+44
-25
lines changed

5 files changed

+44
-25
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,18 @@ jobs:
1111
runs-on: ubuntu-24.04
1212
strategy:
1313
matrix:
14-
python-version: [3.8, 3.13]
14+
python-version: [3.8, 3.12, 3.13, 3.14]
15+
include:
16+
- python-version: 3.8
17+
debian-version: bookworm
18+
- python-version: 3.12
19+
debian-version: trixie
20+
- python-version: 3.13
21+
debian-version: trixie
22+
- python-version: 3.14
23+
debian-version: trixie
1524
container:
16-
image: python:${{ matrix.python-version }}-bookworm
25+
image: python:${{ matrix.python-version }}-${{ debian-version}}
1726
steps:
1827
- uses: actions/checkout@v5
1928
- name: Install dependencies
@@ -32,9 +41,9 @@ jobs:
3241
needs: []
3342
strategy:
3443
matrix:
35-
python-version: [3.13]
44+
python-version: [3.14]
3645
container:
37-
image: python:3.13-bookworm
46+
image: python:3.14-trixie
3847
steps:
3948
- uses: actions/checkout@v5
4049
- name: Install nox
@@ -47,9 +56,9 @@ jobs:
4756
needs: []
4857
strategy:
4958
matrix:
50-
python-version: [3.13]
59+
python-version: [3.14]
5160
container:
52-
image: python:3.13-bookworm
61+
image: python:3.14-trixie
5362
steps:
5463
- uses: actions/checkout@v5
5564
- name: Install nox
@@ -62,9 +71,9 @@ jobs:
6271
needs: []
6372
strategy:
6473
matrix:
65-
python-version: [3.13]
74+
python-version: [3.14]
6675
container:
67-
image: node:22-bookworm
76+
image: node:22-trixie
6877
steps:
6978
- uses: actions/checkout@v5
7079
- name: Install standardjs dependencies

.woodpecker.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,47 @@ when:
55

66
steps:
77
test:
8-
image: python:${PYTHON_VERSION}-bookworm
8+
image: python:${PYTHON_VERSION}-${DEBIAN_VERSION}
99
commands:
1010
- apt-get update
1111
- apt-get install -y --no-install-recommends gettext make
1212
- pip install nox
1313
- nox -x --session "test-${PYTHON_VERSION}"
1414

1515
docs:
16-
image: python:3.13-bookworm
16+
image: python:3.14-trixie
1717
commands:
1818
- pip install nox
1919
- nox -x --session "docs"
2020
depends_on: []
2121
when:
2222
- matrix:
23-
PYTHON_VERSION: 3.13
23+
PYTHON_VERSION: 3.14
2424

2525
lint:
26-
image: python:3.13-bookworm
26+
image: python:3.14-trixie
2727
commands:
2828
- pip install nox
2929
- nox -x -t lint
3030
depends_on: []
3131
when:
3232
- matrix:
33-
PYTHON_VERSION: 3.13
33+
PYTHON_VERSION: 3.14
3434

3535
standardjs:
36-
image: node:22-bookworm
36+
image: node:22-trixie
3737
commands:
3838
- make ci-install-standardjs
3939
- make standardjs
4040
depends_on: []
4141
when:
4242
- matrix:
43-
PYTHON_VERSION: 3.13
43+
PYTHON_VERSION: 3.14
4444

4545
matrix:
4646
include:
4747
# To cut down on CI pipeline duration, test oldest/latest Python only.
4848
- PYTHON_VERSION: 3.8
49-
- PYTHON_VERSION: 3.13
49+
DEBIAN_VERSION: bookworm
50+
- PYTHON_VERSION: 3.14
51+
DEBIAN_VERSION: trixie

ChangeLog.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
65.13.1 (unreleased)
22
********************
33

4+
Note worthy changes
5+
-------------------
6+
7+
- Django 6.0 is now offically supported.
8+
9+
410
Fixes
511
-----
612

noxfile.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,16 @@ def djlint(session):
4949

5050

5151
DJANGO_PYTHON_REQ = {
52-
"4.2.20": ("3.8", "3.9", "3.10", "3.11"),
52+
"4.2.20": ("3.8", "3.9", "3.10", "3.11", "3.12"),
5353
"5.0": ("3.10", "3.11", "3.12"),
54-
"5.1": ("3.10", "3.11", "3.12"),
55-
"5.2": ("3.10", "3.11", "3.12", "3.13"),
54+
"5.1": ("3.10", "3.11", "3.12", "3.13"),
55+
"5.2": ("3.10", "3.11", "3.12", "3.13", "3.14"),
56+
"6.0": ("3.12", "3.13", "3.14"),
5657
}
5758
DJANGO_LTS = "5.2"
5859

5960

60-
@nox.session(python=["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"])
61+
@nox.session(python=["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"])
6162
@nox.parametrize("django", list(DJANGO_PYTHON_REQ.keys()))
6263
@nox.parametrize(
6364
"project", ["regular", "headless_only", "account_only", "login_required_mw"]
@@ -80,7 +81,7 @@ def test(session, django, project):
8081
print(f"Skipping: Django {django} does not support python{session.python}")
8182
return
8283
session.install(
83-
f"django=={django}",
84+
f"django~={django}.0",
8485
"pytest>=8.3.5,<9",
8586
"pytest-asyncio==0.23.8",
8687
"pytest-django>=4.11,<5",
@@ -102,7 +103,7 @@ def test(session, django, project):
102103
os.environ.get("GITHUB_TOKEN")
103104
and project == "regular"
104105
and django == "5.2"
105-
and session.python == "3.13"
106+
and session.python == "3.14"
106107
)
107108
if run_coveralls:
108109
session.install("coveralls")
@@ -116,9 +117,9 @@ def test(session, django, project):
116117
)
117118
if run_coveralls:
118119
session.run("coveralls", "--service=github")
119-
if django == "5.1" and session.python == "3.13":
120+
if django == "5.2" and session.python == "3.14":
120121
session.install(
121-
"django-stubs==5.1.3",
122-
"types-requests==2.32.0.20240602",
122+
"django-stubs~=5.2.7",
123+
"types-requests==2.32.4.20250913",
123124
)
124125
session.run("mypy", "allauth")

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ classifiers = [
3232
"Framework :: Django :: 5.0",
3333
"Framework :: Django :: 5.1",
3434
"Framework :: Django :: 5.2",
35+
"Framework :: Django :: 6.0",
3536
]
3637
requires-python = ">= 3.8"
3738
dependencies = [

0 commit comments

Comments
 (0)