From ade42e934347eb7d89226f8a9cc29faa69602e7d Mon Sep 17 00:00:00 2001
From: David Smith <39445562+smithdc1@users.noreply.github.com>
Date: Tue, 28 Sep 2021 19:47:24 +0100
Subject: [PATCH] Confirmed Django 4.0 support (#78)

* Confirmed Django 4.0 support

* Removed 'for ="..."' from RadioSelect's <label>.

Mirrors change in Django 4.0
django/django@b9e872b
---
 .github/workflows/test.yml                        | 7 ++++++-
 CHANGELOG.md                                      | 5 ++++-
 crispy_bootstrap5/templates/bootstrap5/field.html | 3 ++-
 setup.py                                          | 5 +++--
 tests/results/radio.html                          | 2 +-
 tests/results/test_grouped_radios.html            | 2 +-
 tests/results/test_grouped_radios_failing.html    | 2 +-
 tests/test_settings.py                            | 2 ++
 8 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 548c64c..0375221 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,7 +12,12 @@ jobs:
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8, 3.9]
-        django: [2.2.*, 3.1.*, 3.2.*]
+        django: [2.2.*, 3.1.*, 3.2.*, 4.0a1]
+        exclude:
+          - python-version: 3.6
+            django: 4.0a1
+          - python-version: 3.7
+            django: 4.0a1            
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1750fd8..0d7ec8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG FOR CRISPY-BOOTSTRAP5
 
+## 0.6 (2021-09-28)
+* Added Django 4.0 support
+
 ## 0.5 (2021-08-20)
 * Added support for [Accordion Flush](https://getbootstrap.com/docs/5.0/components/accordion/#flush) and 
   [Always Open](https://getbootstrap.com/docs/5.0/components/accordion/#always-open) (#63)
@@ -40,4 +43,4 @@ See [Milestones](https://github.com/django-crispy-forms/crispy-bootstrap5/milest
 * Converted templates from Bootstrap 4, and initial set of fixes
 * Brought forward Bootstrap 4 test suite and updated for Bootstrap5
 
-See [Milestones](https://github.com/django-crispy-forms/crispy-bootstrap5/milestone/1) for full changelog. 
\ No newline at end of file
+See [Milestones](https://github.com/django-crispy-forms/crispy-bootstrap5/milestone/1) for full changelog. 
diff --git a/crispy_bootstrap5/templates/bootstrap5/field.html b/crispy_bootstrap5/templates/bootstrap5/field.html
index 1e32fab..37aea03 100644
--- a/crispy_bootstrap5/templates/bootstrap5/field.html
+++ b/crispy_bootstrap5/templates/bootstrap5/field.html
@@ -11,7 +11,8 @@
     {% endif %}
     <{% if tag %}{{ tag }}{% else %}div{% endif %} id="div_{{ field.auto_id }}" class="mb-3{% if 'form-horizontal' in form_class %} row{% endif %}{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
         {% if field.label and not field|is_checkbox and form_show_labels %}
-            <label {% if field.id_for_label %}for="{{ field.id_for_label }}"{% endif %} class="{% if 'form-horizontal' in form_class %}col-form-label{% else %}form-label{% endif %}{% if label_class %} {{ label_class }}{% endif %}{% if field.field.required %} requiredField{% endif %}">
+           {# not field|is_radioselect in row below can be removed once Django 3.2 is no longer supported #}
+            <label {% if field.id_for_label and not field|is_radioselect %}for="{{ field.id_for_label }}"{% endif %} class="{% if 'form-horizontal' in form_class %}col-form-label{% else %}form-label{% endif %}{% if label_class %} {{ label_class }}{% endif %}{% if field.field.required %} requiredField{% endif %}">
                 {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
             </label>
         {% endif %}
diff --git a/setup.py b/setup.py
index 6330683..9ee7c9c 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import setup
 
-VERSION = "0.5"
+VERSION = "0.6"
 
 
 def get_long_description():
@@ -30,7 +30,7 @@ def get_long_description():
     license="MIT",
     version=VERSION,
     packages=["crispy_bootstrap5"],
-    install_requires=["django-crispy-forms>=1.12.0", "django>=2.2"],
+    install_requires=["django-crispy-forms>=1.13.0", "django>=2.2"],
     extras_require={"test": ["pytest", "pytest-django"]},
     tests_require=["crispy-bootstrap5[test]"],
     python_requires=">=3.6",
@@ -41,6 +41,7 @@ def get_long_description():
         "Framework :: Django :: 2.2",
         "Framework :: Django :: 3.1",
         "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4.0",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 3",
diff --git a/tests/results/radio.html b/tests/results/radio.html
index 588bf17..df9ae8a 100644
--- a/tests/results/radio.html
+++ b/tests/results/radio.html
@@ -1,6 +1,6 @@
 <form method="post">
   <div id="div_id_radio" class="mb-3">
-    <label for="id_radio_0" class="form-label requiredField"
+    <label class="form-label requiredField"
       > Radio<span class="asteriskField">*</span>
     </label>
     <div>
diff --git a/tests/results/test_grouped_radios.html b/tests/results/test_grouped_radios.html
index dfec765..9a20148 100644
--- a/tests/results/test_grouped_radios.html
+++ b/tests/results/test_grouped_radios.html
@@ -1,5 +1,5 @@
 <form method="post">
-    <div class="mb-3" id="div_id_radio"><label class="form-label requiredField" for="id_radio_0">Radio<span
+    <div class="mb-3" id="div_id_radio"><label class="form-label requiredField">Radio<span
                 class="asteriskField">*</span></label>
         <div><strong>Audio</strong>
             <div class="form-check"><input class="form-check-input" id="id_radio_0_0" name="radio" required type="radio"
diff --git a/tests/results/test_grouped_radios_failing.html b/tests/results/test_grouped_radios_failing.html
index af8d7ff..4888f75 100644
--- a/tests/results/test_grouped_radios_failing.html
+++ b/tests/results/test_grouped_radios_failing.html
@@ -1,5 +1,5 @@
 <form method="post">
-        <div class="mb-3" id="div_id_radio"><label class="form-label requiredField" for="id_radio_0">Radio<span
+        <div class="mb-3" id="div_id_radio"><label class="form-label requiredField">Radio<span
                                 class="asteriskField">*</span></label>
                 <div><strong>Audio</strong>
                         <div class="form-check"><input class="form-check-input is-invalid" id="id_radio_0_0"
diff --git a/tests/test_settings.py b/tests/test_settings.py
index e280e96..5453c15 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -53,3 +53,5 @@
 CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5"
 
 CRISPY_TEMPLATE_PACK = "bootstrap5"
+
+USE_TZ = True