django-bootstrap5 23.4__tar.gz → 24.2__tar.gz

django_bootstrap5-24.2/.editorconfig

@@ -0,0 +1,23 @@
+# https://editorconfig.org/
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8
+
+[*.py]
+max_line_length = 88
+
+[*.toml]
+indent_size = 2
+
+[docs/**.rst]
+max_line_length = 79
+
+[*.{yaml,yml}]
+indent_size = 2

django_bootstrap5-24.2/.readthedocs.yaml

@@ -0,0 +1,19 @@
+# .readthedocs.yaml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+
+build:
+   os: ubuntu-22.04
+   tools:
+     python: "3.11"
+
+sphinx:
+   configuration: docs/conf.py
+
+python:
+   install:
+   - requirements: docs/requirements.txt
+   - method: pip
+     path: .

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 24.2 (2024-04-23)
+
+- Add .editorconfig (#598).
+- Remove support for Django 4.1 (EOL) (#597).
+- Add support for color mode (#593).
+- Change bootstrap_setting from filter to tag (#595).
+- Remove support for Python 3.7 (EOL) (#588).
+- Remove support for Django 3.2 (EOL) (#583).
+- Update Bootstrap to 5.3.3 (#584).
+- Fix Read the Docs (#585, #587).
+
+## 24.1 (2024-04-12)
+
+- Fix RadioSelectButtonGroup rendering and add 'disabled' attribute to radio button group template (#447).
+
 ## 23.4 (2023-12-28)
 
 - Use ruff instead of black for formatting (#536).

django_bootstrap5-24.2/MANIFEST.in

@@ -0,0 +1,17 @@
+include LICENSE
+include MANIFEST.in
+include .editorconfig
+include *.yaml
+include pyproject.toml
+include *.md
+include *.py
+include *.txt
+include Makefile
+include tox.ini
+include docs/*.rst docs/*.txt docs/*.py docs/Makefile
+graft src
+graft tests
+graft example
+prune docs/_build
+exclude example/db.sqlite3
+global-exclude *.py[cod]

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/Makefile

@@ -12,11 +12,11 @@ tests:
 .PHONY: reformat
 reformat:
 	ruff format .
-	ruff --fix .
+	ruff check . --fix
 
 .PHONY: lint
 lint:
-	ruff .
+	ruff check .
 
 .PHONY: docs
 docs: clean
@@ -45,12 +45,15 @@ else
 endif
 
 .PHONY: build
-build: docs
+build:
 	python -m build
+	twine check dist/*
+	check-manifest
+	pyroma .
+	check-wheel-contents dist
 
 .PHONY: publish
-publish: porcelain branch build
-	twine check dist/*
+publish: porcelain branch docs build
 	twine upload dist/*
 	git tag -a v${VERSION} -m "Release ${VERSION}"
 	git push origin --tags

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-bootstrap5
-Version: 23.4
+Version: 24.2
 Summary: Bootstrap 5 for Django
 Author-email: Dylan Verheul <dylan@dyve.net>
 License: BSD 3-Clause License
@@ -37,11 +37,10 @@ Project-URL: Documentation, https://django-bootstrap5.readthedocs.io/
 Project-URL: Homepage, https://github.com/zostera/django-bootstrap5
 Project-URL: Issues, https://github.com/zostera/django-bootstrap5/issues
 Project-URL: Source, https://github.com/zostera/django-bootstrap5
+Keywords: django,bootstrap,bootstrap5
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.2
-Classifier: Framework :: Django :: 4.1
 Classifier: Framework :: Django :: 4.2
 Classifier: Framework :: Django :: 5.0
 Classifier: Intended Audience :: Developers
@@ -59,7 +58,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: Django>=3.2
+Requires-Dist: Django>=4.2
 
 # django-bootstrap5
 

django_bootstrap5-24.2/docs/changelog.rst

@@ -0,0 +1,2 @@
+.. include:: ../CHANGELOG.md
+   :parser: myst_parser.sphinx_

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/docs/conf.py

@@ -15,7 +15,7 @@ copyright = f"{year}, {author}"
 extensions = [
     "sphinx.ext.autodoc",
     "sphinx.ext.viewcode",
-    "sphinx_mdinclude",
+    "myst_parser",
 ]
 
 htmlhelp_basename = f"{project}-doc"

django_bootstrap5-24.2/docs/contributing.rst

@@ -0,0 +1,2 @@
+.. include:: ../CONTRIBUTING.md
+   :parser: myst_parser.sphinx_

django_bootstrap5-24.2/docs/migrate.rst

@@ -0,0 +1,2 @@
+.. include:: ../MIGRATE.md
+   :parser: myst_parser.sphinx_

django_bootstrap5-24.2/docs/requirements.txt

@@ -0,0 +1,3 @@
+sphinx==7.3.7
+myst-parser==2.0.0
+furo==2024.1.29

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/docs/settings.rst

@@ -16,7 +16,7 @@ The ``BOOTSTRAP5`` dict variable contains these settings and defaults:
 
         # The complete URL to the Bootstrap CSS file.
         # Note that a URL can be either a string
-        # ("https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css"),
+        # ("https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css"),
         # or a dict with keys `url`, `integrity` and `crossorigin` like the default value below.
         "css_url": {
             "url": "https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css",
@@ -34,6 +34,9 @@ The ``BOOTSTRAP5`` dict variable contains these settings and defaults:
         # The complete URL to the Bootstrap CSS theme file (None means no theme).
         "theme_url": None,
 
+        # Color mode (None means do not set color mode).
+        "color_mode": None,
+
         # Put JavaScript in the HEAD section of the HTML document (only relevant if you use bootstrap5.html).
         'javascript_in_head': False,
 

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/example/settings.py

@@ -141,7 +141,13 @@ LOGGING = {
             "class": "django.utils.log.AdminEmailHandler",
         }
     },
-    "loggers": {"django.request": {"handlers": ["mail_admins"], "level": "ERROR", "propagate": True}},
+    "loggers": {
+        "django.request": {
+            "handlers": ["mail_admins"],
+            "level": "ERROR",
+            "propagate": True,
+        }
+    },
 }
 
 # Settings for django-bootstrap5

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
 build-backend = "setuptools.build_meta"
-requires = ["setuptools>=64", "setuptools_scm>=8"]
+requires = ["setuptools>=64"]
 
 [project]
 authors = [
@@ -10,8 +10,6 @@ classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Environment :: Web Environment",
   "Framework :: Django",
-  "Framework :: Django :: 3.2",
-  "Framework :: Django :: 4.1",
   "Framework :: Django :: 4.2",
   "Framework :: Django :: 5.0",
   "Intended Audience :: Developers",
@@ -26,13 +24,14 @@ classifiers = [
   "Topic :: Software Development :: Libraries",
   "Topic :: Utilities",
 ]
-dependencies = ["Django>=3.2"]
+dependencies = ["Django>=4.2"]
 description = "Bootstrap 5 for Django"
+keywords = ["django", "bootstrap", "bootstrap5"]
 license = {file = "LICENSE"}
 name = "django-bootstrap5"
 readme = "README.md"
 requires-python = ">=3.8"
-version = "23.4"
+version = "24.2"
 
 [project.urls]
 Changelog = "https://github.com/zostera/django-bootstrap5/blob/main/CHANGELOG.md"
@@ -43,6 +42,11 @@ Source = "https://github.com/zostera/django-bootstrap5"
 
 [tool.ruff]
 fix = false
+line-length = 120
+src = ["src"]
+target-version = "py38"
+
+[tool.ruff.lint]
 fixable = [
   "I001", # isort (sorting)
   "F", # flake8
@@ -55,7 +59,6 @@ ignore = [
   "D212", # D212: Multi-line docstring summary should start at the first line
   "D301", # D301: Use r”“” if any backslashes in a docstring (unclear how else to handle backslashes in docstrings)
 ]
-line-length = 120
 select = [
   "D", # pydocstyle
   "E", # pycodestyle
@@ -63,14 +66,12 @@ select = [
   "I", # isort
   "UP", # pyupgrade
 ]
-src = ["src"]
-target-version = "py38"
 unfixable = [
   "F8", # names in flake8, such as defined but unused variables
 ]
 
-[tool.ruff.isort]
-known-first-party = ["django_marina", "app"]
+[tool.ruff.lint.isort]
+known-first-party = ["django_bootstrap5", "app"]
 known-third-party = ["django"]
 
 [tool.coverage.run]
@@ -78,7 +79,7 @@ branch = true
 source = ["src", "tests"]
 
 [tool.coverage.paths]
-package = ["src/django_marina", "*/django_marina/src/django_marina"]
+package = ["src/django_bootstrap5", "*/django_bootstrap5/src/django_bootstrap5"]
 
 [tool.coverage.report]
 show_missing = true

django_bootstrap5-24.2/requirements-dev.txt

@@ -0,0 +1,8 @@
+-r requirements-test.txt
+-r docs/requirements.txt
+twine==5.0.0
+build==1.2.1
+setuptools==69.5.1
+check-manifest==0.49
+pyroma==4.2
+check-wheel-contents==0.6.0

django_bootstrap5-24.2/requirements-test.txt

@@ -0,0 +1,5 @@
+tox==4.14.2
+coverage==7.4.4
+ruff==0.4.1
+pillow>=10.3.0
+beautifulsoup4>=4.12.3

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/src/django_bootstrap5/core.py

@@ -5,16 +5,17 @@ from django.conf import settings
 BOOTSTRAP5 = {"foo": "bar"}
 BOOTSTRAP5_DEFAULTS = {
     "css_url": {
-        "url": "https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css",
-        "integrity": "sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65",
+        "url": "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css",
+        "integrity": "sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH",
         "crossorigin": "anonymous",
     },
     "javascript_url": {
-        "url": "https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js",
-        "integrity": "sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4",
+        "url": "https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js",
+        "integrity": "sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz",
         "crossorigin": "anonymous",
     },
     "theme_url": None,
+    "color_mode": None,
     "javascript_in_head": False,
     "wrapper_class": "mb-3",
     "inline_wrapper_class": "",

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/src/django_bootstrap5/renderers.py

@@ -19,7 +19,7 @@ from .forms import render_field, render_form, render_label
 from .size import DEFAULT_SIZE, SIZE_MD, get_size_class, parse_size
 from .text import text_value
 from .utils import render_template_file
-from .widgets import ReadOnlyPasswordHashWidget, is_widget_with_placeholder
+from .widgets import RadioSelectButtonGroup, ReadOnlyPasswordHashWidget, is_widget_with_placeholder
 
 
 class BaseRenderer:
@@ -347,7 +347,9 @@ class FieldRenderer(BaseRenderer):
         for widget in widgets:
             self.add_widget_class_attrs(widget)
             self.add_placeholder_attrs(widget)
-            if isinstance(widget, (RadioSelect, CheckboxSelectMultiple)):
+            if isinstance(widget, (RadioSelect, CheckboxSelectMultiple)) and not isinstance(
+                widget, RadioSelectButtonGroup
+            ):
                 widget.template_name = "django_bootstrap5/widgets/radio_select.html"
             elif isinstance(widget, ClearableFileInput):
                 widget.template_name = "django_bootstrap5/widgets/clearable_file_input.html"

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/src/django_bootstrap5/templates/django_bootstrap5/bootstrap5.html

@@ -2,41 +2,31 @@
 {% load django_bootstrap5 %}
 {% load i18n %}
 {% get_current_language as LANGUAGE_CODE %}
-<html lang="{{ LANGUAGE_CODE|default:'en_us' }}">
-
+{% bootstrap_setting "color_mode" as COLOR_MODE %}
+{% bootstrap_setting "javascript_in_head" as BOOTSTRAP_JAVASCRIPT_IN_HEAD %}
+<html lang="{{ LANGUAGE_CODE|default:'en_us' }}"{% if COLOR_MODE %} data-bs-theme="{{ COLOR_MODE }}"{% endif %}>
 <head>
-
     <!-- Required meta tags -->
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
     <!-- Page title -->
     <title>{% block bootstrap5_title %}django-bootstrap5 template title{% endblock %}</title>
-
     <!-- Bootstrap CSS -->
     {% bootstrap_css %}
-
     <!-- Bootstrap JavaScript if it is in head -->
-    {% if 'javascript_in_head'|bootstrap_setting %}
-        {% bootstrap_javascript %}
-    {% endif %}
-
-    {% block bootstrap5_extra_head %}{% endblock %}
+    {% if BOOTSTRAP_JAVASCRIPT_IN_HEAD %}{% bootstrap_javascript %}{% endif %}
 
+  {% block bootstrap5_extra_head %}{% endblock %}
 </head>
 
 <body>
 {% block bootstrap5_before_content %}{% endblock %}
 {% block bootstrap5_content %} CONTENT {% endblock %}
 {% block bootstrap5_after_content %}{% endblock %}
-
 <!-- Bootstrap JavaScript if it is in body -->
-{% if not 'javascript_in_head'|bootstrap_setting %}
-    {% bootstrap_javascript %}
-{% endif %}
+{% if not BOOTSTRAP_JAVASCRIPT_IN_HEAD %}{% bootstrap_javascript %}{% endif %}
 
 {% block bootstrap5_extra_script %}{% endblock %}
-
 </body>
 
 </html>

django_bootstrap5-24.2/src/django_bootstrap5/templates/django_bootstrap5/widgets/radio_select_button_group.html

@@ -0,0 +1,16 @@
+<div{% if widget.attrs.id %} id="{{ widget.attrs.id }}"{% endif %} class="btn-group" role="group">
+  {% for group, options, index in widget.optgroups %}
+    {% for option in options %}
+      <input type="{{ option.type }}"
+             class="{{ widget.attrs.class|add:' btn-check' }}"
+             autocomplete="off"
+             name="{{ option.name }}"
+             id="{{ option.attrs.id }}"
+             {% if option.value != None %} value="{{ option.value|stringformat:'s' }}"
+              {% if option.attrs.checked %} checked="checked"{% endif %}{% endif %}
+             {% if widget.attrs.disabled %} disabled{% endif %}
+             {% if widget.required %} required{% endif %}>
+      <label class="btn btn-outline-primary" for="{{ option.attrs.id }}">{{ option.label }}</label>
+    {% endfor %}
+  {% endfor %}
+</div>

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/src/django_bootstrap5/templatetags/django_bootstrap5.py

@@ -10,7 +10,14 @@ from django.utils.safestring import mark_safe
 from ..components import render_alert, render_button
 from ..core import css_url, get_bootstrap_setting, javascript_url, theme_url
 from ..css import _css_class_list, merge_css_classes
-from ..forms import render_field, render_form, render_form_errors, render_formset, render_formset_errors, render_label
+from ..forms import (
+    render_field,
+    render_form,
+    render_form_errors,
+    render_formset,
+    render_formset_errors,
+    render_label,
+)
 from ..html import render_link_tag, render_script_tag
 from ..size import get_size_class
 from ..utils import render_template_file, url_replace_param
@@ -26,12 +33,12 @@ MESSAGE_ALERT_TYPES = {
 register = template.Library()
 
 
-@register.filter
+@register.simple_tag
 def bootstrap_setting(value):
     """
     Return django-bootstrap5 setting for use in in a template.
 
-    Please consider this filter private, do not use it in your own templates.
+    Please consider this tag private, do not use it in your own templates.
     """
     return get_bootstrap_setting(value)
 
@@ -775,7 +782,14 @@ def get_pagination_context(
     if extra:
         params.update(parse_qs(extra))
     url = urlunparse(
-        [parts.scheme, parts.netloc, parts.path, parts.params, urlencode(params, doseq=True), parts.fragment]
+        [
+            parts.scheme,
+            parts.netloc,
+            parts.path,
+            parts.params,
+            urlencode(params, doseq=True),
+            parts.fragment,
+        ]
     )
 
     pagination_css_classes = ["pagination"]

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/src/django_bootstrap5.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-bootstrap5
-Version: 23.4
+Version: 24.2
 Summary: Bootstrap 5 for Django
 Author-email: Dylan Verheul <dylan@dyve.net>
 License: BSD 3-Clause License
@@ -37,11 +37,10 @@ Project-URL: Documentation, https://django-bootstrap5.readthedocs.io/
 Project-URL: Homepage, https://github.com/zostera/django-bootstrap5
 Project-URL: Issues, https://github.com/zostera/django-bootstrap5/issues
 Project-URL: Source, https://github.com/zostera/django-bootstrap5
+Keywords: django,bootstrap,bootstrap5
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.2
-Classifier: Framework :: Django :: 4.1
 Classifier: Framework :: Django :: 4.2
 Classifier: Framework :: Django :: 5.0
 Classifier: Intended Audience :: Developers
@@ -59,7 +58,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: Django>=3.2
+Requires-Dist: Django>=4.2
 
 # django-bootstrap5
 

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/src/django_bootstrap5.egg-info/SOURCES.txt

@@ -1,9 +1,10 @@
-.gitignore
-.readthedocs.yml
+.editorconfig
+.readthedocs.yaml
 AUTHORS
 CHANGELOG.md
 CONTRIBUTING.md
 LICENSE
+MANIFEST.in
 MIGRATE.md
 Makefile
 README.md
@@ -12,9 +13,6 @@ pyproject.toml
 requirements-dev.txt
 requirements-test.txt
 tox.ini
-.github/dependabot.yml
-.github/workflows/dependabot-auto-approve-and-merge.yml
-.github/workflows/test.yml
 docs/changelog.rst
 docs/conf.py
 docs/contributing.rst
@@ -90,6 +88,7 @@ tests/test_bootstrap_field_input_range.py
 tests/test_bootstrap_field_input_text.py
 tests/test_bootstrap_field_parameters.py
 tests/test_bootstrap_field_radio_select.py
+tests/test_bootstrap_field_radio_select_button_group.py
 tests/test_bootstrap_field_select.py
 tests/test_bootstrap_field_textarea.py
 tests/test_bootstrap_form.py

django_bootstrap5-24.2/src/django_bootstrap5.egg-info/requires.txt

@@ -0,0 +1 @@
+Django>=4.2

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/tests/test_bootstrap_css_and_js_tags.py

@@ -41,8 +41,15 @@ class MediaTestCase(BootstrapTestCase):
                 self.expected_bootstrap_css + '<link rel="stylesheet" href="//example.com/theme.css">',
             )
 
-    def test_bootstrap_setting_filter(self):
-        self.assertEqual(self.render('{{ "required_css_class"|bootstrap_setting }}'), "django_bootstrap5-req")
+    def test_bootstrap_setting_tag(self):
         self.assertEqual(
-            self.render('{% if "javascript_in_head"|bootstrap_setting %}head{% else %}body{% endif %}'), "head"
+            self.render('{% bootstrap_setting "required_css_class" %}'),
+            "django_bootstrap5-req",
+        )
+        self.assertEqual(
+            self.render(
+                '{% bootstrap_setting "javascript_in_head" as BOOTSTRAP_JAVASCRIPT_IN_HEAD %}'
+                + "{% if BOOTSTRAP_JAVASCRIPT_IN_HEAD %}head{% else %}body{% endif %}"
+            ),
+            "head",
         )

{django-bootstrap5-23.4 → django_bootstrap5-24.2}/tests/test_bootstrap_field_datetime.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.contrib.admin.widgets import AdminSplitDateTime
 
-from tests.base import DJANGO_VERSION, BootstrapTestCase
+from tests.base import BootstrapTestCase
 
 
 class DateTimeTestForm(forms.Form):
@@ -9,17 +9,11 @@ class DateTimeTestForm(forms.Form):
 
 
 class DateTimeTestCase(BootstrapTestCase):
-    def fix_django41(self, html):
-        """Return expected HTML fixed for Django 4.1 if necessary."""
-        if DJANGO_VERSION >= "4.1":
-            html = html.replace(' for="id_test_0"', "")
-        return html
-
     def test_input_type_admin_split_date_time(self):
         """Test field with AdminSplitDateTime widget."""
         expected_html = (
             '<div class="django_bootstrap5-req mb-3">'
-            '<label class="form-label" for="id_test_0">Test</label>'
+            '<label class="form-label">Test</label>'
             '<p class="datetime">'
             "Date: "
             '<input type="text" name="test_0" class="form-control vDateField" size="10"'
@@ -33,14 +27,14 @@ class DateTimeTestCase(BootstrapTestCase):
         )
         self.assertHTMLEqual(
             self.render("{% bootstrap_field form.test %}", context={"form": DateTimeTestForm()}),
-            self.fix_django41(expected_html),
+            expected_html,
         )
 
     def test_input_type_admin_split_date_time_horizontal(self):
         """Test field with AdminSplitDateTime widget with layout horizontal."""
         expected_html = (
             '<div class="django_bootstrap5-req row mb-3">'
-            '<label class="col-form-label col-sm-2" for="id_test_0">Test</label>'
+            '<label class="col-form-label col-sm-2">Test</label>'
             '<div class="col-sm-10">'
             '<p class="datetime">'
             "Date: "
@@ -55,15 +49,18 @@ class DateTimeTestCase(BootstrapTestCase):
             "</div>"
         )
         self.assertHTMLEqual(
-            self.render('{% bootstrap_field form.test layout="horizontal" %}', context={"form": DateTimeTestForm()}),
-            self.fix_django41(expected_html),
+            self.render(
+                '{% bootstrap_field form.test layout="horizontal" %}',
+                context={"form": DateTimeTestForm()},
+            ),
+            expected_html,
         )
 
     def test_input_type_admin_split_date_time_floating(self):
         """Test field with AdminSplitDateTime widget with layout floating."""
         expected_html = (
             '<div class="django_bootstrap5-req mb-3">'
-            '<label class="form-label" for="id_test_0">Test</label>'
+            '<label class="form-label">Test</label>'
             '<p class="datetime">'
             "Date: "
             '<input type="text" name="test_0" class="form-control vDateField" size="10"'
@@ -76,6 +73,9 @@ class DateTimeTestCase(BootstrapTestCase):
             "</div>"
         )
         self.assertHTMLEqual(
-            self.render('{% bootstrap_field form.test layout="floating" %}', context={"form": DateTimeTestForm()}),
-            self.fix_django41(expected_html),
+            self.render(
+                '{% bootstrap_field form.test layout="floating" %}',
+                context={"form": DateTimeTestForm()},
+            ),
+            expected_html,
         )