Skip to content

Commit cbfaba0

Browse files
authored
Add support for Django 6.0 (#1258)
Copying the same kinds of changes I made back in #1179, add Django 6.0 to the test matrix, metadata, and documentation. I ran the tests locally with `tox -e py314-dj60-sqlite-coverage` and saw that they passed, with no new warnings.
1 parent 6ab3416 commit cbfaba0

File tree

5 files changed

+21
-6
lines changed

5 files changed

+21
-6
lines changed

.github/workflows/main.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ jobs:
9090
python: '3.14'
9191
allow_failure: true
9292

93+
- name: py314-dj60-postgres-xdist-coverage
94+
python: '3.14'
95+
allow_failure: false
96+
9397
- name: py314-dj52-postgres-xdist-coverage
9498
python: '3.14'
9599
allow_failure: false
@@ -102,6 +106,10 @@ jobs:
102106
python: '3.13'
103107
allow_failure: false
104108

109+
- name: py312-dj60-postgres-xdist-coverage
110+
python: '3.12'
111+
allow_failure: false
112+
105113
- name: py312-dj42-postgres-xdist-coverage
106114
python: '3.12'
107115
allow_failure: false
@@ -138,6 +146,10 @@ jobs:
138146
python: '3.13'
139147
allow_failure: true
140148

149+
- name: py313-dj60-sqlite-coverage
150+
python: '3.13'
151+
allow_failure: false
152+
141153
- name: py313-dj52-sqlite-coverage
142154
python: '3.13'
143155
allow_failure: false

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pytest-django allows you to test your Django project/applications with the
3232
<https://pytest-django.readthedocs.io/en/latest/contributing.html>`_
3333
* Version compatibility:
3434

35-
* Django: 4.2, 5.1, 5.2 and latest main branch (compatible at the time
35+
* Django: 4.2, 5.1, 5.2, 6.0 and latest main branch (compatible at the time
3636
of each release)
3737
* Python: CPython>=3.10 or PyPy 3
3838
* pytest: >=7.0

docs/changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Compatibility
99

1010
* Official Python 3.14 support.
1111
* Dropped support for Python 3.9, minimum version is now Python 3.10.
12+
* Official Django 6.0 support.
1213

1314
Improvements
1415
^^^^^^^^^^^^

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ classifiers = [
2424
"Framework :: Django :: 4.2",
2525
"Framework :: Django :: 5.1",
2626
"Framework :: Django :: 5.2",
27+
"Framework :: Django :: 6.0",
2728
"Intended Audience :: Developers",
2829
"License :: OSI Approved :: BSD License",
2930
"Operating System :: OS Independent",

tox.ini

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[tox]
22
envlist =
3-
py314-dj{main,52,51}-postgres
4-
py313-dj{main,52,51}-postgres
5-
py312-dj{main,52,51,42}-postgres
6-
py311-dj{main,52,51,42}-postgres
7-
py310-dj{main,52,51,42}-postgres
3+
py314-dj{main,60,52,51}-postgres
4+
py313-dj{main,60,52,51}-postgres
5+
py312-dj{main,60,52,51,42}-postgres
6+
py311-dj{52,51,42}-postgres
7+
py310-dj{52,51,42}-postgres
88
linting
99

1010
[testenv]
@@ -16,6 +16,7 @@ dependency_groups =
1616
xdist: xdist
1717
deps =
1818
djmain: https://github.com/django/django/archive/main.tar.gz
19+
dj60: Django>=6.0a1,<6.1
1920
dj52: Django>=5.2a1,<6.0
2021
dj51: Django>=5.1,<5.2
2122
dj50: Django>=5.0,<5.1

0 commit comments

Comments
 (0)