Skip to content
Merged
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
26 changes: 5 additions & 21 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- python: "3.10"
toxenv: py310-django42-wagtail63-sqlite
- python: "3.14"
toxenv: py314-django52-wagtail72-sqlite
toxenv: py314-django60-wagtail73-sqlite

steps:
- name: Checkout repository
Expand All @@ -33,13 +33,9 @@ jobs:
python-version: ${{ matrix.python }}
enable-cache: true

- name: Sync dependencies
id: sync-dependencies
run: uv sync --locked

- name: Test with tox
id: test-with-tox
run: uv run tox -e ${{ matrix.toxenv }}
run: uvx --with tox-gh-actions tox -e ${{ matrix.toxenv }}

test-sqlite-main:
if: github.base_ref == 'main'
Expand All @@ -60,13 +56,9 @@ jobs:
python-version: ${{ matrix.python }}
enable-cache: true

- name: Sync dependencies
id: sync-dependencies
run: uv sync --locked

- name: Test with tox
id: test-with-tox
run: uv run tox
run: uvx --with tox-gh-actions tox
env:
DATABASE: ${{ matrix.database }}

Expand Down Expand Up @@ -100,13 +92,9 @@ jobs:
python-version: ${{ matrix.python }}
enable-cache: true

- name: Sync dependencies
id: sync-dependencies
run: uv sync --locked

- name: Test with tox
id: test-with-tox
run: uv run tox
run: uvx --with tox-gh-actions tox
env:
DB_NAME: postgres
DB_USER: postgres
Expand Down Expand Up @@ -148,13 +136,9 @@ jobs:
python-version: ${{ matrix.python }}
enable-cache: true

- name: Sync dependencies
id: sync-dependencies
run: uv sync --locked

- name: Test with tox
id: test-with-tox
run: uv run tox
run: uvx --with tox-gh-actions tox
env:
DB_NAME: mysql
DB_USER: root
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/astral-sh/uv-pre-commit
rev: 0.11.3
rev: 0.11.7
hooks:
- id: uv-lock
- repo: https://github.com/astral-sh/ruff-pre-commit
Expand All @@ -10,15 +10,15 @@ repos:
args: [--fix]
- id: ruff-format
- repo: https://github.com/jackdewinter/pymarkdown
rev: v0.9.33
rev: v0.9.36
hooks:
- id: pymarkdown
args:
- --disable-rules
- line-length
- scan
- repo: https://github.com/adamchainz/django-upgrade
rev: "1.29.1" # replace with latest tag on GitHub
rev: "1.30.0" # replace with latest tag on GitHub
hooks:
- id: django-upgrade
args: [--target-version, "5.2"] # Replace with Django version
2 changes: 2 additions & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ This file guides coding agents working in this repository. Keep it operational a

- Treat `release` as the repository default branch.
- Start all new work from `release`; it tracks the latest changes that are not yet released to PyPI.
- Before making repo-tracked changes, create and switch to a new branch from `release`.
- Do not make routine feature, fix, or documentation changes directly on `release` or `main` unless the task explicitly requires it.
- Treat `main` as the release-preparation branch, not the starting point for routine feature or fix work.
- Target merge requests at `release`.

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ All notable changes to this project will be documented in this file.

## Unreleased

- Add Wagtail 7.3 testing coverage and Django 6.0 coverage for that compatibility line
- Run CI tox jobs via `uvx` so Python 3.10 and 3.11 jobs do not require the Python 3.12+ dev environment
- Document the `release` branch workflow and require merge requests to target `release`
- Require agents to create a new branch from `release` before making repo-tracked changes
- Add agent instructions to keep pull request titles and summaries current and update the changelog on every PR
- Require review-driven code changes to be committed, pushed, and followed by an updated review reply
- Adopt `uv` as the default contributor workflow and lock the local development environment
Expand Down
2 changes: 1 addition & 1 deletion docs/developer.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ uv python install 3.12
uv sync
```

The default synced environment is intended to track the latest tested local stack for this repo: Python 3.12 with Django 5.2 and Wagtail 7.2. Use `tox` for the broader compatibility matrix.
The default synced environment is intended to track the latest tested local stack for this repo: Python 3.12 with Django 6.0 and Wagtail 7.3. Use `tox` for the broader compatibility matrix.

There is a [testapp](../tests/testapp/) provided that is a fully configured minimal setup using Wagtail v6.3+

Expand Down
8 changes: 6 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers = [
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.1",
"Framework :: Django :: 5.2",
"Framework :: Django :: 6.0",
"Framework :: Wagtail",
"Framework :: Wagtail :: 6",
"Framework :: Wagtail :: 7",
Expand All @@ -34,13 +35,13 @@ dependencies =[
[dependency-groups]
dev = [
"coverage",
"Django>=5.2,<5.3",
"Django>=6.0,<6.1",
"django-upgrade",
"pre-commit",
"ruff==0.15.11",
"tox",
"tox-gh-actions",
"Wagtail>=7.2,<7.3",
"Wagtail>=7.3,<7.4",
]

[project.urls]
Expand All @@ -51,6 +52,9 @@ Changelog = "https://github.com/wagtail-packages/wagtail-honeypot/blob/release/C
[tool.uv]
default-groups = ["dev"]

[tool.uv.dependency-groups]
dev = { requires-python = ">=3.12" }

[tool.ruff]
line-length = 120
target-version = "py310"
Expand Down
9 changes: 6 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ usedevelop = True
isolated_build = True

envlist =
py{310,311,312}-django42-wagtail{63,70,71,72}-sqlite
py{310,311,312}-django42-wagtail{63,70,71,72,73}-sqlite
py{312,313}-django{51,52}-wagtail{70,71,72}-sqlite
py314-django52-wagtail72-sqlite
py314-django52-wagtail72-{postgres,mysql}
py{312,313}-django{52,60}-wagtail73-sqlite
py314-django60-wagtail73-sqlite
py314-django60-wagtail73-{postgres,mysql}

[gh-actions]
python =
Expand Down Expand Up @@ -35,11 +36,13 @@ deps =
django42: Django>=4.2,<5.0
django51: Django>=5.1,<5.2
django52: Django>=5.2,<5.3
django60: Django>=6.0,<6.1

wagtail63: wagtail>=6.3,<6.4
wagtail70: wagtail>=7.0,<7.1
wagtail71: wagtail>=7.1,<7.2
wagtail72: wagtail>=7.2,<7.3
wagtail73: wagtail>=7.3,<7.4

postgres: psycopg2
mysql: mysqlclient
Loading
Loading