diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 82a34373..49aaa5a1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -90,6 +90,10 @@ jobs: python: '3.14' allow_failure: true + - name: py314-dj60-postgres-xdist-coverage + python: '3.14' + allow_failure: false + - name: py314-dj52-postgres-xdist-coverage python: '3.14' allow_failure: false @@ -102,6 +106,10 @@ jobs: python: '3.13' allow_failure: false + - name: py312-dj60-postgres-xdist-coverage + python: '3.12' + allow_failure: false + - name: py312-dj42-postgres-xdist-coverage python: '3.12' allow_failure: false @@ -138,6 +146,10 @@ jobs: python: '3.13' allow_failure: true + - name: py313-dj60-sqlite-coverage + python: '3.13' + allow_failure: false + - name: py313-dj52-sqlite-coverage python: '3.13' allow_failure: false diff --git a/README.rst b/README.rst index 6b31e079..123217f0 100644 --- a/README.rst +++ b/README.rst @@ -32,7 +32,7 @@ pytest-django allows you to test your Django project/applications with the `_ * Version compatibility: - * Django: 4.2, 5.1, 5.2 and latest main branch (compatible at the time + * Django: 4.2, 5.1, 5.2, 6.0 and latest main branch (compatible at the time of each release) * Python: CPython>=3.10 or PyPy 3 * pytest: >=7.0 diff --git a/docs/changelog.rst b/docs/changelog.rst index 8c256e4e..5a83b61e 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -9,6 +9,7 @@ Compatibility * Official Python 3.14 support. * Dropped support for Python 3.9, minimum version is now Python 3.10. +* Official Django 6.0 support. Improvements ^^^^^^^^^^^^ diff --git a/pyproject.toml b/pyproject.toml index 34843643..1e98e6f6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,6 +24,7 @@ classifiers = [ "Framework :: Django :: 4.2", "Framework :: Django :: 5.1", "Framework :: Django :: 5.2", + "Framework :: Django :: 6.0", "Intended Audience :: Developers", "License :: OSI Approved :: BSD License", "Operating System :: OS Independent", diff --git a/tox.ini b/tox.ini index 255f016e..e95c5749 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,10 @@ [tox] envlist = - py314-dj{main,52,51}-postgres - py313-dj{main,52,51}-postgres - py312-dj{main,52,51,42}-postgres - py311-dj{main,52,51,42}-postgres - py310-dj{main,52,51,42}-postgres + py314-dj{main,60,52,51}-postgres + py313-dj{main,60,52,51}-postgres + py312-dj{main,60,52,51,42}-postgres + py311-dj{52,51,42}-postgres + py310-dj{52,51,42}-postgres linting [testenv] @@ -16,6 +16,7 @@ dependency_groups = xdist: xdist deps = djmain: https://github.com/django/django/archive/main.tar.gz + dj60: Django>=6.0a1,<6.1 dj52: Django>=5.2a1,<6.0 dj51: Django>=5.1,<5.2 dj50: Django>=5.0,<5.1