diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 64de8be..715ac39 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,26 +14,32 @@ repos: - id: mixed-line-ending - id: trailing-whitespace - repo: https://github.com/adamchainz/django-upgrade - rev: 1.22.1 + rev: 1.22.2 hooks: - id: django-upgrade args: [--target-version, "3.2"] + - repo: https://github.com/MarcoGorelli/absolufy-imports + rev: v0.3.1 + hooks: + - id: absolufy-imports - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.7.1" + rev: "v0.9.1" hooks: - id: ruff - id: ruff-format - - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.1.0 - hooks: - - id: prettier - args: [--list-different, --no-semi] - exclude: "^conf/|.*\\.html$" - repo: https://github.com/tox-dev/pyproject-fmt rev: v2.5.0 hooks: - id: pyproject-fmt - repo: https://github.com/abravalheri/validate-pyproject - rev: v0.22 + rev: v0.23 hooks: - id: validate-pyproject + - repo: local + hooks: + - id: prettier + name: prettier + entry: npx prettier@3.4.2 --no-semi --write + language: system + types_or: [markdown, css, javascript] + require_serial: true diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d3f63c8..0e5ea2d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,7 +4,7 @@ Change log Next version ~~~~~~~~~~~~ -- Added Django 5.1 to the testsuite. +- Added Python 3.13, Django 5.1 and 5.2a1 to the testsuite. - Added tests showing that ``.descendants().update(...)`` doesn't work, but ``.filter(pk__in=....descendants()).update(...)`` does. - Added Python 3.13 to the testsuite. diff --git a/tox.ini b/tox.ini index 20c2d95..1df993d 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ envlist = docs py{38,39,310}-dj{32,41,42}-{sqlite,postgresql,mysql} py{310,311,312}-dj{32,41,42,50,51,main}-{sqlite,postgresql,mysql} - py{313}-dj{51,main}-{sqlite,postgresql,mysql} + py{312,313}-dj{51,52,main}-{sqlite,postgresql,mysql} [testenv] deps = @@ -12,6 +12,7 @@ deps = dj42: Django>=4.2,<5.0 dj50: Django>=5.0,<5.1 dj51: Django>=5.1,<5.2 + dj52: Django>=5.2a1,<6.0 djmain: https://github.com/django/django/archive/main.tar.gz postgresql: psycopg2-binary mysql: mysqlclient @@ -36,19 +37,19 @@ pip_pre = True commands = python tests/manage.py test -v 2 {posargs:testapp} -[testenv:py{38,39,310,311,312}-dj{32,41,42,50,main}-postgresql] +[testenv:py{38,39,310,311,312,313}-dj{32,41,42,50,51,52,main}-postgresql] setenv = {[testenv]setenv} DB_BACKEND = postgresql DB_PORT = {env:DB_PORT:5432} -[testenv:py{38,39,310,311,312}-dj{32,41,42,50,main}-mysql] +[testenv:py{38,39,310,311,312,313}-dj{32,41,42,50,51,52,main}-mysql] setenv = {[testenv]setenv} DB_BACKEND = mysql DB_PORT = {env:DB_PORT:3306} -[testenv:py{38,39,310,311,312}-dj{32,41,42,50,main}-sqlite] +[testenv:py{38,39,310,311,312,313}-dj{32,41,42,50,51,52,main}-sqlite] setenv = {[testenv]setenv} DB_BACKEND = sqlite3 @@ -67,6 +68,7 @@ python = 3.10: py310 3.11: py311 3.12: py312 + 3.13: py313 [gh-actions:env] DB_BACKEND =