Skip to content
Open
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
43 changes: 37 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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: |
Expand Down Expand Up @@ -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
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@

## 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.
- 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.
Expand Down
6 changes: 6 additions & 0 deletions MAINTAINING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading