From a9af392b149ba1e5f605f26ce752d0c9ce668890 Mon Sep 17 00:00:00 2001 From: Dylan Verheul Date: Mon, 21 Sep 2026 09:01:52 +0200 Subject: [PATCH 1/2] release: 26.4 Three commits have touched src/ since v26.3 on 2026-08-28: addon support on floating-label fields, week/search/color inputs recognised as form controls, and the BOOTSTRAP5 system check. The test dependency group listed coverage[toml]>=7.6.1 twice. The duplicate is dropped and the group sorted alphabetically, matching the docs group next to it. Resolution does not change, only the lockfile's version of this package. Entries are reordered to the convention in MAINTAINING.md: the missing inline_field_class default first as a fix, then the three features, then tooling, then documentation. Verified with just lint and just build: check-manifest clean, pyroma 10/10, and both the wheel and the sdist smoke-test against an isolated environment. Co-Authored-By: Claude Opus 5 (1M context) --- CHANGELOG.md | 5 +++-- pyproject.toml | 3 +-- uv.lock | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ede13cb..23520f78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,12 @@ # Changelog -## Unreleased +## 26.4 (2026-09-21) +- Add the documented `inline_field_class` setting to `BOOTSTRAP5_DEFAULTS`, where it was missing. Its effective default is unchanged. - Support `addon_before`/`addon_after` on fields with `layout="floating"` (#866). The `form-floating` element is now nested inside the `input-group`, as Bootstrap's floating-label input-group markup requires, instead of the two being alternatives. This removes the warning added in 26.3 (#833), which existed because the combination was unsupported. - Recognize `week`, `search` and `color` input-type widgets as form-control widgets, so `addon_before`/`addon_after` work on them, and warn instead of silently dropping addons on a widget that cannot have them (#743, #872). Floating labels stay unsupported for `color`, where Bootstrap sizes the swatch itself. - Add a system check that warns about keys in the `BOOTSTRAP5` setting that the package does not read, such as a setting removed in an earlier release or one carried over from django-bootstrap3 or django-bootstrap4 (`django_bootstrap5.W001`, #867). Silence it with `SILENCED_SYSTEM_CHECKS` if you keep extra keys deliberately. -- Add the documented `inline_field_class` setting to `BOOTSTRAP5_DEFAULTS`, where it was missing. Its effective default is unchanged. +- Drop a duplicate `coverage[toml]` entry from the `test` dependency group and sort it alphabetically. - Add `just release-check` to list `src/` changes against changelog entries before a release. - Fix the release process in MAINTAINING.md: the version bump goes through a PR, not a direct push to protected `main`. - Note in MAINTAINING.md why the `Django` dependency carries no upper bound. diff --git a/pyproject.toml b/pyproject.toml index 9da5c80d..d7b0d9af 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ license-files = ["LICENSE", "AUTHORS"] name = "django-bootstrap5" readme = "README.md" requires-python = ">=3.10" -version = "26.3" +version = "26.4" [project.optional-dependencies] jinja = ["Jinja2>=3.0,<4"] @@ -99,7 +99,6 @@ docs = [ "sphinx>=7.1.2", ] test = [ - "coverage[toml]>=7.6.1", "beautifulsoup4>=4.12.3", "coverage[toml]>=7.6.1", "pillow>=11.0.0", diff --git a/uv.lock b/uv.lock index 2f61c144..19903761 100644 --- a/uv.lock +++ b/uv.lock @@ -289,7 +289,7 @@ wheels = [ [[package]] name = "django-bootstrap5" -version = "26.3" +version = "26.4" source = { editable = "." } dependencies = [ { name = "django" }, From 03e498c487b0c1160f2982e3484c39cb8514dbd6 Mon Sep 17 00:00:00 2001 From: Dylan Verheul Date: Mon, 21 Sep 2026 11:16:32 +0200 Subject: [PATCH 2/2] ci: sync ci.yml from django-marina (Python 3.15, gate every job) Two changes propagated from django-marina, both in ci.yml, so they travel together rather than as two rounds of review. Python 3.15.0rc2 runs as a non-blocking matrix job against Django 6.1 and main. No Django release claims 3.15 yet, so pairing it with 5.2 or 6.0 would park permanent red legs that say nothing about this package. uv sync now pins the interpreter with --python, because uv skips pre-release interpreters when it resolves by discovery and the 3.15 leg would otherwise test on whatever else the runner had. The tests job is the only required status check on main, and it only failed on the test matrix. docs and build feed nothing, so a failure in either left the matrix green and the gate green with it: a broken docs build or a failing packaging preflight could be merged. It now reads every job it needs. always() stays because a job skipped after a failed need reports success to branch protection, which is GitHub's documented behaviour and the reason the condition is spelled out. MAINTAINING.md names Pillow as the C-extension dependency that gates making a pre-release job blocking. Pillow 12.3.0 already publishes cp315 wheels, so that gate is open whenever 3.15 goes final. The bullet stays as policy rather than recording today's state, which would go stale. The GDAL install steps and the jinja extra stay where they are, as PACKAGING.md requires for this package. Apart from those, ci.yml and tox.ini are now byte-identical to django-marina. Verified: py315-6.1 and py315-main pass here on 3.15.0rc2, 172 tests. Co-Authored-By: Claude Opus 5 (1M context) --- .github/workflows/ci.yml | 43 ++++++++++++++++++++++++++++++++++------ CHANGELOG.md | 5 +++++ MAINTAINING.md | 6 ++++++ tox.ini | 3 +++ 4 files changed, 51 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0cab2030..dd80f43f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,10 +33,14 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 needs: [lint] + # Python 3.15 is still a release candidate, so its legs are non-blocking: they + # run and report, but a failure does not fail the build. Drop this once 3.15 is + # final and the Django series under test support it. + continue-on-error: ${{ matrix.python-version == '3.15' }} strategy: fail-fast: false matrix: - python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"] + python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"] django-version: ["5.2", "6.0", "6.1", "main"] exclude: # Django 6.0 @@ -54,6 +58,12 @@ jobs: django-version: "main" - python-version: "3.11" django-version: "main" + # Python 3.15 (pre-release): no Django release claims it yet, so test only + # the series that will get it first rather than collecting known failures. + - python-version: "3.15" + django-version: "5.2" + - python-version: "3.15" + django-version: "6.0" steps: - uses: actions/checkout@v7 @@ -73,7 +83,9 @@ jobs: run: uv python install ${{ matrix.python-version }} - name: Install dependencies - run: uv sync + # Pin the interpreter explicitly: uv does not pick up a pre-release Python + # by discovery, so the 3.15 leg would otherwise resolve to another version. + run: uv sync --python ${{ matrix.python-version }} - name: Install Django ${{ matrix.django-version }} run: | @@ -147,12 +159,31 @@ jobs: timeout-minutes: 15 needs: [python_django_matrix, lint, docs, build] steps: - - name: Check tests matrix status - if: needs.python_django_matrix.result != 'success' - run: exit 1 - - name: Finish Coveralls parallel build uses: coverallsapp/github-action@v2 with: parallel-finished: true github-token: ${{ secrets.GITHUB_TOKEN }} + + # This job is the only required status check on main, so it has to fail + # whenever any job it needs fails. It cannot leave that to needs alone. A + # job skipped because one of its needs failed reports success to branch + # protection, so without always() this gate would go green on a failure + # and the pull request would merge. GitHub documents always() with needs + # as the way round that, which is why the condition is spelled out here: + # https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks + # + # Checking the matrix alone left docs and build ungated: neither feeds the + # matrix, so a failure in either kept the matrix green and this job with + # it. Lint was already covered, since the matrix needs it and a skipped + # matrix is not a success. Reading every need means the gate no longer + # depends on the shape of the graph. No job here is conditional, so a + # skipped need also means something failed. + - name: Check that every job succeeded + if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'skipped') + env: + NEEDS: ${{ toJSON(needs) }} + run: | + echo "$NEEDS" + echo "::error::A job this gate depends on did not succeed." + exit 1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 23520f78..6ade90d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## Unreleased + +- Test on Python 3.15 (release candidate) against Django 6.1 and `main`. The job is non-blocking and 3.15 is not yet advertised as supported. +- Fail the CI gate when any job fails, not only the test matrix. A failing docs or packaging build could previously be merged. + ## 26.4 (2026-09-21) - Add the documented `inline_field_class` setting to `BOOTSTRAP5_DEFAULTS`, where it was missing. Its effective default is unchanged. diff --git a/MAINTAINING.md b/MAINTAINING.md index 2af51bb6..6c835bff 100644 --- a/MAINTAINING.md +++ b/MAINTAINING.md @@ -25,6 +25,12 @@ copy always drifts out of sync with the files that actually enforce it. it's cut, so the interpreter itself is rarely the blocker. Only make the job blocking once our C-extension test dependencies (currently Pillow) publish wheels for it; that's normally the actual bottleneck. +- A pre-release goes in `tox.ini` and `ci.yml` but **not** in the `pyproject.toml` classifiers. + A classifier is a promise to users, and a job that cannot fail the build does not back one. + Add the classifier in the same change that makes the job blocking. Pair the pre-release only + with the Django series that will support it first, the newest one plus `main`. A leg against + a series that will never claim it is a standing red mark, and it teaches reviewers to ignore + the column. ### Bootstrap diff --git a/tox.ini b/tox.ini index ea7605ae..ede6986d 100644 --- a/tox.ini +++ b/tox.ini @@ -8,6 +8,9 @@ envlist = py312-{5.2,6.0,6.1,main}, py313-{5.2,6.0,6.1,main}, py314-{5.2,6.0,6.1,main}, + ; Python 3.15 is still a release candidate, and no Django release claims it yet. + ; Non-blocking in CI (see ci.yml), so only the series that will support it first. + py315-{6.1,main}, [testenv] runner = uv-venv-runner