From 87b20e2c1cce4291cd94be575ea1e59fce53eb7f Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 15 Oct 2026 20:52:42 +0100 Subject: [PATCH 1/3] Add ruff.toml Signed-off-by: Stephen Finucane --- ruff.toml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 ruff.toml diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 00000000..a235fec9 --- /dev/null +++ b/ruff.toml @@ -0,0 +1,7 @@ +line-length = 79 + +[format] +quote-style = "preserve" + +[lint] +select = ["E4", "E7", "E9", "F"] From 1a4732f46db44a798a44ace014f9cb4ac172b10f Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 15 Oct 2026 17:49:42 +0100 Subject: [PATCH 2/3] pre-commit: Bump versions Signed-off-by: Stephen Finucane --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index abc5dac8..95482351 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: exclude: (.*\.mbox)|(.*\.svg) - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.15.16 + rev: v0.17.1 hooks: # Run the linter. - id: ruff @@ -30,7 +30,7 @@ repos: hooks: - id: bashate - repo: https://github.com/daveshanley/vacuum - rev: v0.29.2 + rev: v0.33.1 hooks: - id: vacuum files: ^docs/api/schemas/(latest|v\d\.\d)/patchwork.yaml From 6ea4b3f67276dae3b102c73f64359bc4cb8f7647 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 15 Oct 2026 17:47:13 +0100 Subject: [PATCH 3/3] Add testing for Django 6.1 This including bumping all dependencies. Signed-off-by: Stephen Finucane --- .../notes/django-6-1-support-b1a71aae8e67d7d5.yaml | 5 +++++ requirements-dev.txt | 4 ++-- requirements-prod.txt | 6 +++--- requirements-test.txt | 4 ++-- tox.ini | 9 ++++++--- 5 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 releasenotes/notes/django-6-1-support-b1a71aae8e67d7d5.yaml diff --git a/releasenotes/notes/django-6-1-support-b1a71aae8e67d7d5.yaml b/releasenotes/notes/django-6-1-support-b1a71aae8e67d7d5.yaml new file mode 100644 index 00000000..d681382a --- /dev/null +++ b/releasenotes/notes/django-6-1-support-b1a71aae8e67d7d5.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + `Django 6.1 `_ is + now supported. diff --git a/requirements-dev.txt b/requirements-dev.txt index 4a36fa3f..348604af 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ -Django~=6.0.0 -djangorestframework~=3.17.1 +Django~=6.1.0 +djangorestframework~=3.18.3 django-filter~=26.1.0 django-debug-toolbar~=8.0.0 django-dbbackup~=5.3.0 diff --git a/requirements-prod.txt b/requirements-prod.txt index 4008ca96..12d894c9 100644 --- a/requirements-prod.txt +++ b/requirements-prod.txt @@ -1,5 +1,5 @@ -Django~=6.0.0 -djangorestframework~=3.17.1 +Django~=6.1.0 +djangorestframework~=3.18.3 django-filter~=26.1.0 psycopg~=3.3.4 -sqlparse~=0.5.5 +sqlparse~=0.6.0 diff --git a/requirements-test.txt b/requirements-test.txt index 8c88ae0f..5d3b4b11 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,6 +1,6 @@ -mysqlclient~=2.2.8 +mysqlclient~=2.3.0 psycopg~=3.3.4 -sqlparse~=0.5.5 +sqlparse~=0.6.0 python-dateutil~=2.9.0 tblib~=3.2.2 openapi-core~=0.19.2 diff --git a/tox.ini b/tox.ini index 721b8be8..6e71aa35 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 4.6 -envlist = pep8,docs,py{311,312,313,314}-django52,py{312,313,314}-django60 +envlist = pep8,docs,py{311,312,313,314}-django52,py{312,313,314}-django6{0,1} [testenv] skip_install = true @@ -10,8 +10,11 @@ deps = django52: djangorestframework~=3.16.0 django52: django-filter~=25.1.0 django60: django~=6.0.0 - django60: djangorestframework~=3.16.0 - django60: django-filter~=25.2.0 + django60: djangorestframework~=3.18.0 + django60: django-filter~=26.1.0 + django61: django~=6.1.0 + django61: djangorestframework~=3.18.0 + django61: django-filter~=26.1.0 setenv = DJANGO_SETTINGS_MODULE = patchwork.settings.dev PYTHONDEVMODE = 1