Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ jobs:
- {name: py313-dj52-sqlite-coverage, python: '3.13', allow_failure: false}
- {name: py314-dj52-postgres-xdist-coverage, python: '3.14', allow_failure: false}

# Django 6.0 / Python 3.12–3.14
- {name: py312-dj60-postgres-xdist-coverage, python: '3.12', allow_failure: false}
- {name: py313-dj60-sqlite-coverage, python: '3.13', allow_failure: false}
- {name: py314-dj60-postgres-xdist-coverage, python: '3.14', allow_failure: false}
# Django 6.1 / Python 3.12–3.14
- {name: py312-dj61-postgres-xdist-coverage, python: '3.12', allow_failure: false}
- {name: py313-dj61-sqlite-coverage, python: '3.13', allow_failure: false}
- {name: py314-dj61-postgres-xdist-coverage, python: '3.14', allow_failure: false}
# Pin the minimum supported pytest on the latest stable combo.
- {name: py313-dj60-sqlite-pytestmin-coverage, python: '3.13', allow_failure: false}
- {name: py313-dj61-sqlite-pytestmin-coverage, python: '3.14', allow_failure: false}

# Django main / Python [latest]
- {name: py313-djmain-sqlite-coverage, python: '3.13', allow_failure: true}
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pytest-django allows you to test your Django project/applications with the
<https://pytest-django.readthedocs.io/en/latest/contributing.html>`_
* Version compatibility:

* Django: 5.2, 6.0 and latest main branch (compatible at the time
* Django: 5.2, 6.1 and latest main branch (compatible at the time
of each release)
* Python: CPython>=3.10 or PyPy 3
* pytest: >=7.0
Expand Down
1 change: 1 addition & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ v4.12.1 (unreleased)
Compatibility
^^^^^^^^^^^^^

* Official Django 6.1 support.
* Dropped support for Django 4.2 and 5.1.

Bugfixes
Expand Down
6 changes: 3 additions & 3 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ writing), running them all will take a long time. All valid configurations can
be found in `tox.ini`. To test against a few of them, invoke tox with the `-e`
flag::

$ tox -e py313-dj60-postgres,py314-dj62-mysql
$ tox -e py313-dj61-postgres,py314-dj52-mysql

This will run the tests on Python 3.13/Django 60/PostgeSQL and Python
3.14/Django 6.2/MySQL.
This will run the tests on Python 3.13/Django 6.1/PostgeSQL and Python
3.14/Django 5.2/MySQL.


Measuring test coverage
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ classifiers = [
"Development Status :: 5 - Production/Stable",
"Framework :: Django",
"Framework :: Django :: 5.2",
"Framework :: Django :: 6.0",
"Framework :: Django :: 6.1",
"Intended Audience :: Developers",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
Expand Down
7 changes: 3 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[tox]
envlist =
py314-dj{main,60,52}-postgres
py313-dj{main,60,52}-postgres
py312-dj{main,60,52}-postgres
py314-dj{main,61,52}-postgres
py313-dj{main,61,52}-postgres
py312-dj{main,61,52}-postgres
py311-dj{52}-postgres
py310-dj{52}-postgres
linting
Expand All @@ -17,7 +17,6 @@ dependency_groups =
deps =
djmain: https://github.com/django/django/archive/main.tar.gz
dj61: Django>=6.1a1,<6.2
dj60: Django>=6.0a1,<6.1
dj52: Django>=5.2a1,<6.0
pytestmin: pytest>=7.0,<7.1

Expand Down