From 6b90a9e701fffb62650e6baa73c20dfd31872189 Mon Sep 17 00:00:00 2001
From: Jelmer Draaijer <info@jelmert.nl>
Date: Thu, 8 Feb 2024 16:42:07 +0100
Subject: [PATCH 01/35] Implement allauth elements and add body & main block
 for more override capabilities

---
 .../templates/account/account_inactive.html   | 12 ---
 .../templates/account/base.html               | 14 ----
 .../account/base_manage_password.html         | 11 +++
 .../templates/account/email.html              | 80 -------------------
 .../templates/account/email_confirm.html      | 28 -------
 .../templates/account/login.html              | 53 ------------
 .../templates/account/logout.html             | 21 -----
 .../templates/account/password_change.html    | 19 -----
 .../templates/account/password_reset.html     | 29 -------
 .../account/password_reset_done.html          | 18 -----
 .../account/password_reset_from_key.html      | 37 ---------
 .../account/password_reset_from_key_done.html | 12 ---
 .../templates/account/password_set.html       | 22 -----
 .../templates/account/signup.html             | 28 -------
 .../templates/account/signup_closed.html      | 12 ---
 .../templates/account/verification_sent.html  | 14 ----
 .../account/verified_email_required.html      | 25 ------
 .../templates/allauth/elements/alert.html     |  7 ++
 .../templates/allauth/elements/badge.html     |  6 ++
 .../templates/allauth/elements/button.html    | 20 +++++
 .../templates/allauth/elements/field.html     | 67 ++++++++++++++++
 .../templates/allauth/elements/fields.html    |  3 +
 .../templates/allauth/elements/panel.html     | 19 +++++
 .../templates/allauth/elements/table.html     |  6 ++
 .../templates/allauth/layouts/entrance.html   | 18 +++++
 .../templates/allauth/layouts/manage.html     |  6 ++
 .../templates/base.html                       | 13 ++-
 27 files changed, 172 insertions(+), 428 deletions(-)
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/account_inactive.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base.html
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base_manage_password.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email_confirm.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_change.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_done.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_set.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup_closed.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/verification_sent.html
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/verified_email_required.html
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/alert.html
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/badge.html
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/button.html
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/field.html
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/fields.html
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/panel.html
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/table.html
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/manage.html

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/account_inactive.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/account_inactive.html
deleted file mode 100644
index a9112cf09..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/account_inactive.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% raw %}{% extends "account/base.html" %}
-
-{% load i18n %}
-
-{% block head_title %}
-  {% translate "Account Inactive" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>{% translate "Account Inactive" %}</h1>
-  <p>{% translate "This account is inactive." %}</p>
-{% endblock inner %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base.html
deleted file mode 100644
index 057618257..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% raw %}{% extends "base.html" %}
-
-{% block title %}
-  {% block head_title %}
-  {% endblock head_title %}
-{% endblock title %}
-{% block content %}
-  <div class="row">
-    <div class="col-md-6 offset-md-3">
-      {% block inner %}{% endblock inner %}
-    </div>
-  </div>
-{% endblock content %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base_manage_password.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base_manage_password.html
new file mode 100644
index 000000000..515f5244a
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base_manage_password.html
@@ -0,0 +1,11 @@
+{% raw %}{% extends "account/base_manage.html" %}
+
+{% block main %}
+  <div class="card">
+    <div class="card-body">
+      {% block content %}
+      {% endblock content %}
+    </div>
+  </div>
+{% endblock main %}{% endraw %}
+
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
deleted file mode 100644
index 37770f00c..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
+++ /dev/null
@@ -1,80 +0,0 @@
-{% raw %}
-{% extends "account/base.html" %}
-
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block head_title %}
-  {% translate "Account" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>{% translate "E-mail Addresses" %}</h1>
-  {% if user.emailaddress_set.all %}
-    <p>{% translate "The following e-mail addresses are associated with your account:" %}</p>
-    <form action="{% url 'account_email' %}" class="email_list" method="post">
-      {% csrf_token %}
-      <fieldset class="blockLabels">
-        {% for emailaddress in user.emailaddress_set.all %}
-          <div class="radio">
-            <label for="email_radio_{{ forloop.counter }}"
-                   class="{% if emailaddress.primary %}primary_email{% endif %}">
-              <input id="email_radio_{{ forloop.counter }}"
-                     type="radio"
-                     name="email"
-                     {% if emailaddress.primary or user.emailaddress_set.count == 1 %}checked="checked"{% endif %}
-                     value="{{ emailaddress.email }}" />
-              {{ emailaddress.email }}
-              {% if emailaddress.verified %}
-                <span class="verified">{% translate "Verified" %}</span>
-              {% else %}
-                <span class="unverified">{% translate "Unverified" %}</span>
-              {% endif %}
-              {% if emailaddress.primary %}
-                <span class="primary">{% translate "Primary" %}</span>
-              {% endif %}
-            </label>
-          </div>
-        {% endfor %}
-        <div class="form-group">
-          <button class="secondaryAction btn btn-primary"
-                  type="submit"
-                  name="action_primary">{% translate "Make Primary" %}</button>
-          <button class="secondaryAction btn btn-primary"
-                  type="submit"
-                  name="action_send">{% translate "Re-send Verification" %}</button>
-          <button class="primaryAction btn btn-primary"
-                  type="submit"
-                  name="action_remove">{% translate "Remove" %}</button>
-        </div>
-      </fieldset>
-    </form>
-  {% else %}
-    <p>
-      <strong>{% translate "Warning:" %}</strong> {% translate "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}
-    </p>
-  {% endif %}
-  <h2>{% translate "Add E-mail Address" %}</h2>
-  <form method="post" action="{% url 'account_email' %}" class="add_email">
-    {% csrf_token %}
-    {{ form|crispy }}
-    <button class="btn btn-primary" name="action_add" type="submit">{% translate "Add E-mail" %}</button>
-  </form>
-{% endblock inner %}
-{% block inline_javascript %}
-  {{ block.super }}
-  <script type="text/javascript">
-    window.addEventListener('DOMContentLoaded', function() {
-      const message = "{% translate 'Do you really want to remove the selected e-mail address?' %}";
-      const actions = document.getElementsByName('action_remove');
-      if (actions.length) {
-        actions[0].addEventListener("click", function(e) {
-          if (!confirm(message)) {
-            e.preventDefault();
-          }
-        });
-      }
-      Array.from(document.getElementsByClassName('form-group')).forEach(x => x.classList.remove('row'));
-    });
-  </script>
-{% endblock inline_javascript %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email_confirm.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email_confirm.html
deleted file mode 100644
index 40ca4a47b..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email_confirm.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% raw %}{% extends "account/base.html" %}
-
-{% load i18n %}
-{% load account %}
-
-{% block head_title %}
-  {% translate "Confirm E-mail Address" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>{% translate "Confirm E-mail Address" %}</h1>
-  {% if confirmation %}
-    {% user_display confirmation.email_address.user as user_display %}
-    <p>
-      {% blocktranslate with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktranslate %}
-    </p>
-    <form method="post"
-          action="{% url 'account_confirm_email' confirmation.key %}">
-      {% csrf_token %}
-      <button class="btn btn-primary" type="submit">{% translate "Confirm" %}</button>
-    </form>
-  {% else %}
-    {% url 'account_email' as email_url %}
-    <p>
-      {% blocktranslate %}This e-mail confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new e-mail confirmation request</a>.{% endblocktranslate %}
-    </p>
-  {% endif %}
-{% endblock inner %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
deleted file mode 100644
index 5737afc06..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% raw %}{% extends "account/base.html" %}
-
-{% load i18n %}
-{% load account socialaccount %}
-{% load crispy_forms_tags %}
-
-{% block head_title %}
-  {% translate "Sign In" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>{% translate "Sign In" %}</h1>
-  {% get_providers as socialaccount_providers %}
-  {% if socialaccount_providers %}
-    <p>
-      {% translate "Please sign in with one of your existing third party accounts:" %}
-      {% if ACCOUNT_ALLOW_REGISTRATION %}
-        {% blocktranslate trimmed %}
-          Or, <a href="{{ signup_url }}">sign up</a>
-          for a {{ site_name }} account and sign in below:
-        {% endblocktranslate %}
-      {% endif %}
-    </p>
-    <div class="socialaccount_ballot">
-      <ul class="socialaccount_providers">
-        {% include "socialaccount/snippets/provider_list.html" with process="login" %}
-      </ul>
-      <div class="login-or">{% translate "or" %}</div>
-    </div>
-    {% include "socialaccount/snippets/login_extra.html" %}
-  {% else %}
-    {% if ACCOUNT_ALLOW_REGISTRATION %}
-      <p>
-        {% blocktranslate trimmed %}
-          If you have not created an account yet, then please
-          <a href="{{ signup_url }}">sign up</a> first.
-        {% endblocktranslate %}
-      </p>
-    {% endif %}
-  {% endif %}
-  <form class="login" method="post" action="{% url 'account_login' %}">
-    {% csrf_token %}
-    {{ form|crispy }}
-    {% if redirect_field_value %}
-      <input type="hidden"
-             name="{{ redirect_field_name }}"
-             value="{{ redirect_field_value }}" />
-    {% endif %}
-    <a class="button secondaryAction"
-       href="{% url 'account_reset_password' %}">{% translate "Forgot Password?" %}</a>
-    <button class="primaryAction btn btn-primary" type="submit">{% translate "Sign In" %}</button>
-  </form>
-{% endblock inner %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html
deleted file mode 100644
index 43ae9ed38..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% raw %}{% extends "account/base.html" %}
-
-{% load i18n %}
-
-{% block head_title %}
-  {% translate "Sign Out" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>{% translate "Sign Out" %}</h1>
-  <p>{% translate "Are you sure you want to sign out?" %}</p>
-  <form method="post" action="{% url 'account_logout' %}">
-    {% csrf_token %}
-    {% if redirect_field_value %}
-      <input type="hidden"
-             name="{{ redirect_field_name }}"
-             value="{{ redirect_field_value }}" />
-    {% endif %}
-    <button class="btn btn-danger" type="submit">{% translate "Sign Out" %}</button>
-  </form>
-{% endblock inner %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_change.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_change.html
deleted file mode 100644
index 2e6110d5d..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_change.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% raw %}{% extends "account/base.html" %}
-
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block head_title %}
-  {% translate "Change Password" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>{% translate "Change Password" %}</h1>
-  <form method="post"
-        action="{% url 'account_change_password' %}"
-        class="password_change">
-    {% csrf_token %}
-    {{ form|crispy }}
-    <button class="btn btn-primary" type="submit" name="action">{% translate "Change Password" %}</button>
-  </form>
-{% endblock inner %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html
deleted file mode 100644
index 0c184269a..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% raw %}{% extends "account/base.html" %}
-
-{% load i18n %}
-{% load account %}
-{% load crispy_forms_tags %}
-
-{% block head_title %}
-  {% translate "Password Reset" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>{% translate "Password Reset" %}</h1>
-  {% if user.is_authenticated %}
-    {% include "account/snippets/already_logged_in.html" %}
-  {% endif %}
-  <p>
-    {% translate "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}
-  </p>
-  <form method="post"
-        action="{% url 'account_reset_password' %}"
-        class="password_reset">
-    {% csrf_token %}
-    {{ form|crispy }}
-    <input class="btn btn-primary"
-           type="submit"
-           value="{% translate 'Reset My Password' %}" />
-  </form>
-  <p>{% blocktranslate %}Please contact us if you have any trouble resetting your password.{% endblocktranslate %}</p>
-{% endblock inner %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_done.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_done.html
deleted file mode 100644
index a596425bb..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_done.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% raw %}{% extends "account/base.html" %}
-
-{% load i18n %}
-{% load account %}
-
-{% block head_title %}
-  {% translate "Password Reset" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>{% translate "Password Reset" %}</h1>
-  {% if user.is_authenticated %}
-    {% include "account/snippets/already_logged_in.html" %}
-  {% endif %}
-  <p>
-    {% blocktranslate %}We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.{% endblocktranslate %}
-  </p>
-{% endblock inner %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html
deleted file mode 100644
index a958ba089..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% raw %}{% extends "account/base.html" %}
-
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block head_title %}
-  {% translate "Change Password" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>
-    {% if token_fail %}
-      {% translate "Bad Token" %}
-    {% else %}
-      {% translate "Change Password" %}
-    {% endif %}
-  </h1>
-  {% if token_fail %}
-    {% url 'account_reset_password' as passwd_reset_url %}
-    <p>
-      {% blocktranslate %}The password reset link was invalid, possibly because it has already been used.  Please request a <a href="{{ passwd_reset_url }}">new password reset</a>.{% endblocktranslate %}
-    </p>
-  {% else %}
-    {% if form %}
-      <form method="post" action=".">
-        {% csrf_token %}
-        {{ form|crispy }}
-        <input class="btn btn-primary"
-               type="submit"
-               name="action"
-               value="{% translate 'change password' %}" />
-      </form>
-    {% else %}
-      <p>{% translate "Your password is now changed." %}</p>
-    {% endif %}
-  {% endif %}
-{% endblock inner %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html
deleted file mode 100644
index ee399b404..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% raw %}{% extends "account/base.html" %}
-
-{% load i18n %}
-
-{% block head_title %}
-  {% translate "Change Password" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>{% translate "Change Password" %}</h1>
-  <p>{% translate "Your password is now changed." %}</p>
-{% endblock inner %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_set.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_set.html
deleted file mode 100644
index 3efc30874..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_set.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% raw %}{% extends "account/base.html" %}
-
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block head_title %}
-  {% translate "Set Password" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>{% translate "Set Password" %}</h1>
-  <form method="post"
-        action="{% url 'account_set_password' %}"
-        class="password_set">
-    {% csrf_token %}
-    {{ form|crispy }}
-    <input class="btn btn-primary"
-           type="submit"
-           name="action"
-           value="{% translate 'Set Password' %}" />
-  </form>
-{% endblock inner %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup.html
deleted file mode 100644
index 54150a474..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% raw %}{% extends "account/base.html" %}
-
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block head_title %}
-  {% translate "Signup" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>{% translate "Sign Up" %}</h1>
-  <p>
-    {% blocktranslate %}Already have an account? Then please <a href="{{ login_url }}">sign in</a>.{% endblocktranslate %}
-  </p>
-  <form class="signup"
-        id="signup_form"
-        method="post"
-        action="{% url 'account_signup' %}">
-    {% csrf_token %}
-    {{ form|crispy }}
-    {% if redirect_field_value %}
-      <input type="hidden"
-             name="{{ redirect_field_name }}"
-             value="{{ redirect_field_value }}" />
-    {% endif %}
-    <button class="btn btn-primary" type="submit">{% translate "Sign Up" %} »</button>
-  </form>
-{% endblock inner %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup_closed.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup_closed.html
deleted file mode 100644
index b3472ed6d..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup_closed.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% raw %}{% extends "account/base.html" %}
-
-{% load i18n %}
-
-{% block head_title %}
-  {% translate "Sign Up Closed" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>{% translate "Sign Up Closed" %}</h1>
-  <p>{% translate "We are sorry, but the sign up is currently closed." %}</p>
-{% endblock inner %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/verification_sent.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/verification_sent.html
deleted file mode 100644
index d71bbc41a..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/verification_sent.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% raw %}{% extends "account/base.html" %}
-
-{% load i18n %}
-
-{% block head_title %}
-  {% translate "Verify Your E-mail Address" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>{% translate "Verify Your E-mail Address" %}</h1>
-  <p>
-    {% blocktranslate %}We have sent an e-mail to you for verification. Follow the link provided to finalize the signup process. Please contact us if you do not receive it within a few minutes.{% endblocktranslate %}
-  </p>
-{% endblock inner %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/verified_email_required.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/verified_email_required.html
deleted file mode 100644
index b736581ce..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/verified_email_required.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% raw %}{% extends "account/base.html" %}
-
-{% load i18n %}
-
-{% block head_title %}
-  {% translate "Verify Your E-mail Address" %}
-{% endblock head_title %}
-{% block inner %}
-  <h1>{% translate "Verify Your E-mail Address" %}</h1>
-  {% url 'account_email' as email_url %}
-  <p>
-    {% blocktranslate %}This part of the site requires us to verify that
-you are who you claim to be. For this purpose, we require that you
-verify ownership of your e-mail address. {% endblocktranslate %}
-  </p>
-  <p>
-    {% blocktranslate %}We have sent an e-mail to you for
-verification. Please click on the link inside this e-mail. Please
-contact us if you do not receive it within a few minutes.{% endblocktranslate %}
-  </p>
-  <p>
-    {% blocktranslate %}<strong>Note:</strong> you can still <a href="{{ email_url }}">change your e-mail address</a>.{% endblocktranslate %}
-  </p>
-{% endblock inner %}
-{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/alert.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/alert.html
new file mode 100644
index 000000000..090c2cbf6
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/alert.html
@@ -0,0 +1,7 @@
+{% raw %}{% load i18n %}
+{% load allauth %}
+
+<div class="alert alert-error">
+  {% slot message %}
+{% endslot %}
+</div>{% endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/badge.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/badge.html
new file mode 100644
index 000000000..7093939da
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/badge.html
@@ -0,0 +1,6 @@
+{% raw %}{% load allauth %}
+
+<span class="badge {% if 'success' in attrs.tags %}bg-success{% endif %} {% if 'warning' in attrs.tags %}bg-warning{% endif %} {% if 'secondary' in attrs.tags %}bg-secondary{% endif %} {% if 'danger' in attrs.tags %}bg-danger{% endif %} {% if 'primary' in attrs.tags %}bg-primary{% endif %}">
+  {% slot %}
+{% endslot %}
+</span>{% endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/button.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/button.html
new file mode 100644
index 000000000..1c0ae4b99
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/button.html
@@ -0,0 +1,20 @@
+{% raw %}{% load allauth %}
+
+{% comment %} djlint:off {% endcomment %}
+<{% if attrs.href %}a href="{{ attrs.href }}"{% else %}button{% endif %}
+                      {% if attrs.form %}form="{{ attrs.form }}"{% endif %}
+                      {% if attrs.id %}id="{{ attrs.id }}"{% endif %}
+                      {% if attrs.name %}name="{{ attrs.name }}"{% endif %}
+                      {% if attrs.type %}type="{{ attrs.type }}"{% endif %}
+                      class="btn
+{% if 'success' in attrs.tags %}btn-success
+{% elif 'warning' in attrs.tags %}btn-warning
+{% elif 'secondary' in attrs.tags %}btn-secondary
+{% elif 'danger' in attrs.tags %}btn-danger
+{% elif 'primary' in attrs.tags %}btn-primary
+{% else %}btn-primary
+{% endif %}"
+>
+  {% slot %}
+  {% endslot %}
+  </{% if attrs.href %}a{% else %}button{% endif %}>{% endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/field.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/field.html
new file mode 100644
index 000000000..1ed9309a2
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/field.html
@@ -0,0 +1,67 @@
+{% raw %}{% load allauth %}
+{% load crispy_forms_tags %}
+
+{% if attrs.type == "textarea" %}
+  <div class="row mb-3">
+    <div class="col-sm-10">
+      <label for="{{ attrs.id }}">
+        {% slot label %}
+      {% endslot %}
+    </label>
+  </div>
+  <textarea {% if attrs.required %}required{% endif %}
+            {% if attrs.rows %}rows="{{ attrs.rows }}"{% endif %}
+            {% if attrs.disabled %}disabled{% endif %}
+            {% if attrs.readonly %}readonly{% endif %}
+            {% if attrs.checked %}checked{% endif %}
+            {% if attrs.name %}name="{{ attrs.name }}"{% endif %}
+            {% if attrs.id %}id="{{ attrs.id }}"{% endif %}
+            {% if attrs.placeholder %}placeholder="{{ attrs.placeholder }}"{% endif %}
+            class="form-control">{% slot value %}{% endslot %}</textarea>
+</div>
+{% elif attrs.type == "radio" %}
+<div class="row mb-3">
+  <div class="col-sm-10">
+    <div class="form-check">
+      <input {% if attrs.required %}required{% endif %}
+             {% if attrs.disabled %}disabled{% endif %}
+             {% if attrs.readonly %}readonly{% endif %}
+             {% if attrs.checked %}checked{% endif %}
+             {% if attrs.name %}name="{{ attrs.name }}"{% endif %}
+             {% if attrs.id %}id="{{ attrs.id }}"{% endif %}
+             {% if attrs.placeholder %}placeholder="{{ attrs.placeholder }}"{% endif %}
+             {% if attrs.autocomplete %}autocomplete="{{ attrs.autocomplete }}"{% endif %}
+             value="{{ attrs.value|default_if_none:"" }}"
+             type="{{ attrs.type }}" />
+      <label class="form-check-label" for="gridRadios1">
+        {% slot label %}
+      {% endslot %}
+    </label>
+  </div>
+</div>
+</div>
+{% else %}
+<div class="col-sm-10">
+  <label for="{{ attrs.id }}">
+    {% slot label %}
+  {% endslot %}
+</label>
+</div>
+<div class="col-sm-10">
+  <input {% if attrs.required %}required{% endif %}
+         {% if attrs.disabled %}disabled{% endif %}
+         {% if attrs.readonly %}readonly{% endif %}
+         {% if attrs.checked %}checked{% endif %}
+         {% if attrs.name %}name="{{ attrs.name }}"{% endif %}
+         {% if attrs.id %}id="{{ attrs.id }}"{% endif %}
+         {% if attrs.placeholder %}placeholder="{{ attrs.placeholder }}"{% endif %}
+         {% if attrs.autocomplete %}autocomplete="{{ attrs.autocomplete }}"{% endif %}
+         value="{{ attrs.value|default_if_none:"" }}"
+         type="{{ attrs.type }}"
+         class="form-control" />
+</div>
+{% endif %}
+{% if slots.help_text %}
+  <div class="form-text">{% slot help_text %}</div>
+{% endslot %}
+{% endif %}{% endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/fields.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/fields.html
new file mode 100644
index 000000000..6a2f3c2cb
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/fields.html
@@ -0,0 +1,3 @@
+{% raw %}{% load crispy_forms_tags %}
+
+{{ attrs.form|crispy }}{% endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/panel.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/panel.html
new file mode 100644
index 000000000..ce179b587
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/panel.html
@@ -0,0 +1,19 @@
+{% raw %}{% load allauth %}
+
+<section>
+  <div class="card mb-4">
+    <div class="card-body">
+      <h2 class="card-title">
+        {% slot title %}
+      {% endslot %}
+    </h2>
+    {% slot body %}
+  {% endslot %}
+  {% if slots.actions %}
+    <ul>
+      {% for action in slots.actions %}<li>{{ action }}</li>{% endfor %}
+    </ul>
+  {% endif %}
+</div>
+</div>
+</section>{% endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/table.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/table.html
new file mode 100644
index 000000000..7ceb9234d
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/table.html
@@ -0,0 +1,6 @@
+{% raw %}{% load allauth %}
+
+<table class="table">
+  {% slot %}
+{% endslot %}
+</table>{% endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html
new file mode 100644
index 000000000..2632f3c56
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html
@@ -0,0 +1,18 @@
+{% raw %}{% extends "base.html" %}
+{% load i18n %}
+{% block bodyclass %}bg-light{% endblock bodyclass %}
+
+{% block css %}{{ block.super }}{% endblock css %}
+{% block title %}
+  {% block head_title %}
+    {% trans "Sign In" %}
+  {% endblock head_title %}
+{% endblock title %}
+{% block body %}
+  <div class="d-flex align-items-center h-100 py-4">
+    <div class="m-auto py-4 my-4">
+      {% block content %}
+      {% endblock content %}
+    </div>
+  </div>
+{% endblock body %}{% endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/manage.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/manage.html
new file mode 100644
index 000000000..b7ff36ba2
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/manage.html
@@ -0,0 +1,6 @@
+{% raw %}{% extends "base.html" %}
+
+{% block main %}
+  {% block content %}
+  {% endblock content %}
+{% endblock main %}{% endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 421973e57..ec873c801 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -111,7 +111,8 @@
 {% raw %}
 {% endblock javascript %}
 </head>
-<body>
+<body class="{% block bodyclass %}{% endblock bodyclass %}">
+  {% block body %}
   <div class="mb-1">
     <nav class="navbar navbar-expand-md navbar-light bg-light">
       <div class="container-fluid">
@@ -171,10 +172,14 @@
         </div>
       {% endfor %}
     {% endif %}
-    {% block content %}
-      <p>Use this document as a way to quick start any new project.</p>
-    {% endblock content %}
+    {% block main %}
+      {% block content %}
+        <p>Use this document as a way to quick start any new project.</p>
+      {% endblock content %}
+    {% endblock main %}
+
   </div>
+  {% endblock body %}
   <!-- /container -->
   {% block modal %}
   {% endblock modal %}

From 44ca412dc1de5489dfdfa3ec5285f18d5b9c7565 Mon Sep 17 00:00:00 2001
From: Jelmer Draaijer <info@jelmert.nl>
Date: Thu, 8 Feb 2024 16:52:16 +0100
Subject: [PATCH 02/35] Enable allauth.mfa for two-factor authentication

---
 {{cookiecutter.project_slug}}/config/settings/base.py          | 1 +
 {{cookiecutter.project_slug}}/requirements/base.txt            | 2 +-
 .../templates/users/user_detail.html                           | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 3bf3a73cc..9884814b1 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -83,6 +83,7 @@ THIRD_PARTY_APPS = [
     "crispy_bootstrap5",
     "allauth",
     "allauth.account",
+    "allauth.mfa",
     "allauth.socialaccount",
 {%- if cookiecutter.use_celery == 'y' %}
     "django_celery_beat",
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 8658b0b2b..27d303cfe 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -31,7 +31,7 @@ uvicorn[standard]==0.27.0.post1  # https://github.com/encode/uvicorn
 django==4.2.10  # pyup: < 5.0  # https://www.djangoproject.com/
 django-environ==0.11.2  # https://github.com/joke2k/django-environ
 django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
-django-allauth==0.61.0  # https://github.com/pennersr/django-allauth
+django-allauth[mfa]==0.61.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==2.1  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==2023.10  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
index ab36ba56b..2dc7bfdc7 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
@@ -41,6 +41,9 @@
         <a class="btn btn-primary"
            href="{% url 'account_email' %}"
            role="button">E-Mail</a>
+        <a class="btn btn-primary"
+           href="{% url 'mfa_index' %}"
+           role="button">MFA</a>
         <!-- Your Stuff: Custom user template urls -->
       </div>
     </div>

From a76656aba16c35a2c1bb7e35a238d5271446dac4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 22 Feb 2024 10:39:45 +0100
Subject: [PATCH 03/35] Add a maintainer guide to the docs

---
 docs/index.rst                 |  1 +
 docs/maintainer-guide.md       | 93 ++++++++++++++++++++++++++++++++++
 scripts/update_contributors.py |  4 +-
 3 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 docs/maintainer-guide.md

diff --git a/docs/index.rst b/docs/index.rst
index da5186487..70daa1852 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -28,6 +28,7 @@ Contents
    faq
    troubleshooting
    contributing
+   maintainer-guide
 
 Indices and tables
 ------------------
diff --git a/docs/maintainer-guide.md b/docs/maintainer-guide.md
new file mode 100644
index 000000000..508918abe
--- /dev/null
+++ b/docs/maintainer-guide.md
@@ -0,0 +1,93 @@
+# Maintainer guide
+
+This document is intended for maintainers of the template.
+
+## Automation scripts
+
+We have a few workflows which have been automated over time. They usually run using GitHub actions and might need a few small manual actions to work nicely. Some have a few limitations which we should document here.
+
+### CI
+
+`ci.yml`
+
+The CI workflow tries to cover 2 main aspects of the template:
+
+- Check all combinations to make sure that valid files are generated with no major linting issues. Issues which are fixed by an auto-formatter after generation aren't considered major, and only aim for best effort. This is under the `test` job.
+- Run more in-depth tests on a few combinations, by installing dependencies, running type checker and the test suite of the generated project. We try to cover docker (`docker` job) and non-docker (`bare` job) setups.
+
+We also run the deployment checks, but we don't do much more beyond that for testing the production setup.
+
+### Django issue checker
+
+`django-issue-checker.yml`
+
+This workflow runs daily, on schedule, and checks if there is a new major version of Django (not in the pure SemVer sense) released that we are not running, and list our dependencies compatibility.
+
+For example, at time of writing, we use Django 4.2, but the latest version of Django is 5.0, so the workflow created a ["Django 5.0" issue](https://github.com/cookiecutter/cookiecutter-django/issues/4724) in GitHub, with a compatibility table and keeps it up to date every day.
+
+#### Limitations
+
+Here are a few current and past limitations of the script
+
+- When a new dependency is added to the template, the script fails to update an existing issue
+- Not sure what happens when a deps is removed
+- ~~Unable to parse classifiers without minor version~~
+- ~~Creates an issue even if we are on the latest version~~
+
+### Issue manager
+
+`issue-manager.yml`
+
+A workflow that uses [Sebastian Ramirez' issue-manager](https://github.com/tiangolo/issue-manager) to help us automate issue management. The tag line from the repo explains it well:
+
+> Automatically close issues or Pull Requests that have a label, after a custom delay, if no one replies back.
+
+It runs on a schedule as well as when some actions are taken on issues and pull requests.
+
+We wait 10 days before closing issues, and we have a few customised reasons, which are configured in the workflow itself. The config should be fairly self-explanatory.
+
+### Pre-commit auto-update
+
+`pre-commit-autoupdate.yml`
+
+Run daily, to do `pre-commit autoupdate` on the template as well as the generated project, and opens a pull request with the changes.
+
+#### Limitations
+
+- The PR is open as GitHub action which means that CI does NOT run. The documentation for create-pull-request action [explains why](https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#triggering-further-workflow-runs).
+- Some hooks are also installed as local dependencies (via `requirements/local.txt`), but these are updated separately via PyUP.
+
+### Update changelog
+
+`update-changelog.yml`
+
+Run daily at 2AM to update our changelog and create a GitHub release. This runs a custom script which:
+
+- List all pull requests merged the day before
+- The release name is calendar based, so `YYYY.MM.DD`
+- For each PR:
+  - Get the PR title to summarize the change
+  - Look at the PR labels to classify it in a section of the release notes:
+    - anything labelled `project infrastructure` is excluded
+    - label `update` goes in section "Updated"
+    - label `bug` goes in section "Fixed"
+    - label `docs` goes in section "Documentation"
+    - Default to section "Changed"
+
+With that in mind, when merging changes, it's a good idea to set the labels and rename the PR title to give a good summary of the change, in the context of the changelog.
+
+#### Limitations
+
+- Dependencies updates for the template repo (tox, cookiecutter, etc...) don't need to appear in changelog, and need to be labelled as `project infrastructure` manually. By default, they come from PyUp labelled as `update`.
+- Dependabot updates for npm & Docker have a verbose title, try to rename them to be more readable: `Bump webpack-dev-server from 4.15.1 to 5.0.2 in /{{cookiecutter.project_slug}}` -> `Bump webpack-dev-server to 5.0.2`
+
+### Update contributors
+
+`update-contributors.yml`
+
+Runs on each push to master branch. List the 5 most recently merged pull requests and extract their author. If any of the authors is a new one, updates the `.github/contributors.json`, regenerate the `CONTRIBUTORS.md` from it, and push back the changes to master.
+
+#### Limitations
+
+- If you merge a pull request from a new contributor, and merge another one right after, the push to master will fail as the remote will be out of date.
+- If you merge more than 5 pull requests in a row like this, the new contributor might fail to be added.
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 09a7082c0..7f7b48d76 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -40,8 +40,8 @@ def iter_recent_authors():
     """
     Fetch users who opened recently merged pull requests.
 
-    Use Github API to fetch recent authors rather than
-    git CLI to work with Github usernames.
+    Use GitHub API to fetch recent authors rather than
+    git CLI to work with GitHub usernames.
     """
     repo = Github(login_or_token=GITHUB_TOKEN, per_page=5).get_repo(GITHUB_REPO)
     recent_pulls = repo.get_pulls(state="closed", sort="updated", direction="desc").get_page(0)

From 357604f37b0137e49e08e0e043c75cbf4457c366 Mon Sep 17 00:00:00 2001
From: Mounir <messelmeni.mounir@gmail.com>
Date: Fri, 23 Feb 2024 15:35:52 +0100
Subject: [PATCH 04/35] Install ruff extension in devcontainer.json (#4887)

organizeImports is expecting a string.
---
 .../.devcontainer/devcontainer.json                          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.devcontainer/devcontainer.json b/{{cookiecutter.project_slug}}/.devcontainer/devcontainer.json
index 7fcd62872..e16d06a20 100644
--- a/{{cookiecutter.project_slug}}/.devcontainer/devcontainer.json
+++ b/{{cookiecutter.project_slug}}/.devcontainer/devcontainer.json
@@ -35,7 +35,7 @@
                     "analysis.typeCheckingMode": "basic",
                     "defaultInterpreterPath": "/usr/local/bin/python",
                     "editor.codeActionsOnSave": {
-                        "source.organizeImports": true
+                        "source.organizeImports": "always"
                     },
                     "editor.defaultFormatter": "charliermarsh.ruff",
                     "languageServer": "Pylance",
@@ -54,8 +54,7 @@
                 // python
                 "ms-python.python",
                 "ms-python.vscode-pylance",
-                "ms-python.isort",
-                "ms-python.black-formatter",
+                "charliermarsh.ruff",
                 // django
                 "batisteo.vscode-django"
             ]

From 916f6666372bf5b1a61e2abe2b24f4e62294d5d3 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 23 Feb 2024 14:36:31 +0000
Subject: [PATCH 05/35] Update Contributors

---
 .github/contributors.json | 5 +++++
 CONTRIBUTORS.md           | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/.github/contributors.json b/.github/contributors.json
index 057309a52..785ee4b35 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1523,5 +1523,10 @@
     "name": "Paul Wulff",
     "github_login": "mtmpaulwulff",
     "twitter_username": ""
+  },
+  {
+    "name": "Mounir",
+    "github_login": "mounirmesselmeni",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 734900362..30064acb8 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1552,6 +1552,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Mounir</td>
+    <td>
+      <a href="https://github.com/mounirmesselmeni">mounirmesselmeni</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>mozillazg</td>
     <td>

From 4db3ea1e581be7d5792ea77326aa7cfb42d0548c Mon Sep 17 00:00:00 2001
From: Matthew Foster Walsh <15671892+mfosterw@users.noreply.github.com>
Date: Fri, 23 Feb 2024 09:37:34 -0500
Subject: [PATCH 06/35] Switch to local imports within app (#4883)

---
 .../{{cookiecutter.project_slug}}/users/admin.py            | 6 +++---
 .../{{cookiecutter.project_slug}}/users/forms.py            | 2 +-
 .../{{cookiecutter.project_slug}}/users/managers.py         | 2 +-
 .../{{cookiecutter.project_slug}}/users/models.py           | 2 +-
 .../{{cookiecutter.project_slug}}/users/tasks.py            | 2 +-
 .../{{cookiecutter.project_slug}}/users/urls.py             | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
index d0d1488f8..70f829256 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
@@ -4,9 +4,9 @@ from django.contrib.auth import admin as auth_admin
 from django.contrib.auth.decorators import login_required
 from django.utils.translation import gettext_lazy as _
 
-from {{ cookiecutter.project_slug }}.users.forms import UserAdminChangeForm
-from {{ cookiecutter.project_slug }}.users.forms import UserAdminCreationForm
-from {{ cookiecutter.project_slug }}.users.models import User
+from .forms import UserAdminChangeForm
+from .forms import UserAdminCreationForm
+from .models import User
 
 if settings.DJANGO_ADMIN_FORCE_ALLAUTH:
     # Force the `admin` sign in process to go through the `django-allauth` workflow:
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
index 2d18de208..830fca60d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
@@ -6,7 +6,7 @@ from django.forms import EmailField
 {%- endif %}
 from django.utils.translation import gettext_lazy as _
 
-from {{ cookiecutter.project_slug }}.users.models import User
+from .models import User
 
 
 class UserAdminChangeForm(admin_forms.UserChangeForm):
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/managers.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/managers.py
index c75c0e970..d8beaa48e 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/managers.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/managers.py
@@ -4,7 +4,7 @@ from django.contrib.auth.hashers import make_password
 from django.contrib.auth.models import UserManager as DjangoUserManager
 
 if TYPE_CHECKING:
-    from {{ cookiecutter.project_slug }}.users.models import User  # noqa: F401
+    from .models import User  # noqa: F401
 
 
 class UserManager(DjangoUserManager["User"]):
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
index fd78c26a8..4a870cc28 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
@@ -11,7 +11,7 @@ from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 {%- if cookiecutter.username_type == "email" %}
 
-from {{ cookiecutter.project_slug }}.users.managers import UserManager
+from .managers import UserManager
 {%- endif %}
 
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tasks.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tasks.py
index 2afd4d4bd..ca51cd740 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tasks.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tasks.py
@@ -1,6 +1,6 @@
 from celery import shared_task
 
-from {{ cookiecutter.project_slug }}.users.models import User
+from .models import User
 
 
 @shared_task()
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
index 40719ed21..74d65da1e 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
@@ -1,8 +1,8 @@
 from django.urls import path
 
-from {{ cookiecutter.project_slug }}.users.views import user_detail_view
-from {{ cookiecutter.project_slug }}.users.views import user_redirect_view
-from {{ cookiecutter.project_slug }}.users.views import user_update_view
+from .views import user_detail_view
+from .views import user_redirect_view
+from .views import user_update_view
 
 app_name = "users"
 urlpatterns = [

From 0ca9be321ad3e3d67c65efcfad1521cab32f274a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Feb 2024 14:38:40 +0000
Subject: [PATCH 07/35] Bump webpack-dev-server to 5.0.2 (#4875)

* Bump webpack-dev-server in /{{cookiecutter.project_slug}}

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.15.1 to 5.0.2.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.15.1...v5.0.2)

---
updated-dependencies:
- dependency-name: webpack-dev-server
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update server proxy syntax for webpack-dev-server@v5

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 {{cookiecutter.project_slug}}/package.json      |  2 +-
 .../webpack/dev.config.js                       | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index efa2136e5..9ca728208 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -31,7 +31,7 @@
     "webpack": "^5.65.0",
     "webpack-bundle-tracker": "^3.0.1",
     "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.6.0",
+    "webpack-dev-server": "^5.0.2",
     "webpack-merge": "^5.8.0"
   },
   "engines": {
diff --git a/{{cookiecutter.project_slug}}/webpack/dev.config.js b/{{cookiecutter.project_slug}}/webpack/dev.config.js
index 8276c3489..7c774185e 100644
--- a/{{cookiecutter.project_slug}}/webpack/dev.config.js
+++ b/{{cookiecutter.project_slug}}/webpack/dev.config.js
@@ -6,13 +6,16 @@ module.exports = merge(commonConfig, {
   devtool: 'inline-source-map',
   devServer: {
     port: 3000,
-    proxy: {
-      {%- if cookiecutter.use_docker == 'n' %}
-      '/': 'http://0.0.0.0:8000',
-      {%- else %}
-      '/': 'http://django:8000',
-      {%- endif %}
-    },
+    proxy: [
+      {
+        context: ['/'],
+        {%- if cookiecutter.use_docker == 'n' %}
+        target: 'http://0.0.0.0:8000',
+        {%- else %}
+        target: 'http://django:8000',
+        {%- endif %}
+      },
+    ],
     client: {
       overlay: {
         errors: true,

From 37f974157bc5a8b59585c99c62de35e03b9e0358 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 23 Feb 2024 15:43:30 +0100
Subject: [PATCH 08/35] Switch to dependabot for template & docs deps updates

This enables us to use a separate label
---
 .github/dependabot.yml | 16 ++++++++++++++++
 .pyup.yml              |  2 --
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e6590469a..3582a2125 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,6 +3,22 @@
 
 version: 2
 updates:
+  # Update Python deps for the template (not the generated project)
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "project infrastructure"
+
+  # Update Python deps for the documentation
+  - package-ecosystem: "pip"
+    directory: "docs/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "project infrastructure"
+
   # Update GitHub actions in workflows
   - package-ecosystem: "github-actions"
     directory: "/"
diff --git a/.pyup.yml b/.pyup.yml
index e5d4752e4..13d336d57 100644
--- a/.pyup.yml
+++ b/.pyup.yml
@@ -14,8 +14,6 @@ pin: True
 label_prs: update
 
 requirements:
-  - "requirements.txt"
-  - "docs/requirements.txt"
   - "{{cookiecutter.project_slug}}/requirements/base.txt"
   - "{{cookiecutter.project_slug}}/requirements/local.txt"
   - "{{cookiecutter.project_slug}}/requirements/production.txt"

From 899a1915cd5b73a8e57ef1e083babd6d73fdf06d Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 23 Feb 2024 15:53:03 +0100
Subject: [PATCH 09/35] Add paragraph about automated updates

---
 docs/maintainer-guide.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/maintainer-guide.md b/docs/maintainer-guide.md
index 508918abe..9baac688a 100644
--- a/docs/maintainer-guide.md
+++ b/docs/maintainer-guide.md
@@ -2,6 +2,17 @@
 
 This document is intended for maintainers of the template.
 
+## Automated updates
+
+We use 2 separate services to keep our dependencies up-to-date:
+
+- Dependabot, which manages updates of Python deps of the template, GitHub actions, npm packages and Docker images.
+- PyUp, which manages the Python deps for the generated project.
+
+We don't use Dependabot for the generated project deps because our requirements files are templated, and Dependabot fails to parse them. PyUp is -AFAIK- the only service out there that supports having Jinja tags in the requirements file.
+
+Updates for the template should be labelled as `project infrastructure` while the ones about the generated project should be labelled as `update`. This is use to work in conjunction with our changelog script (see later).
+
 ## Automation scripts
 
 We have a few workflows which have been automated over time. They usually run using GitHub actions and might need a few small manual actions to work nicely. Some have a few limitations which we should document here.
@@ -78,8 +89,8 @@ With that in mind, when merging changes, it's a good idea to set the labels and
 
 #### Limitations
 
-- Dependencies updates for the template repo (tox, cookiecutter, etc...) don't need to appear in changelog, and need to be labelled as `project infrastructure` manually. By default, they come from PyUp labelled as `update`.
 - Dependabot updates for npm & Docker have a verbose title, try to rename them to be more readable: `Bump webpack-dev-server from 4.15.1 to 5.0.2 in /{{cookiecutter.project_slug}}` -> `Bump webpack-dev-server to 5.0.2`
+- ~~Dependencies updates for the template repo (tox, cookiecutter, etc...) don't need to appear in changelog, and need to be labelled as `project infrastructure` manually. By default, they come from PyUp labelled as `update`.~~
 
 ### Update contributors
 

From 91ebf6f95b02ea0dba7603d14066bdfe877c7925 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 24 Feb 2024 02:08:16 +0000
Subject: [PATCH 10/35] Release 2024.02.23

---
 CHANGELOG.md | 13 +++++++++++++
 setup.py     |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8ad3f6bf..088e814c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2024.02.23
+
+
+### Changed
+
+- Switch to local imports within app ([#4883](https://github.com/cookiecutter/cookiecutter-django/pull/4883))
+
+- Install ruff extension in `devcontainer.json` ([#4887](https://github.com/cookiecutter/cookiecutter-django/pull/4887))
+
+### Updated
+
+- Bump webpack-dev-server to 5.0.2 ([#4875](https://github.com/cookiecutter/cookiecutter-django/pull/4875))
+
 ## 2024.02.21
 
 
diff --git a/setup.py b/setup.py
index 62b38573d..f7947b0e7 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2024.02.21"
+version = "2024.02.23"
 
 with open("README.md") as readme_file:
     long_description = readme_file.read()

From ddf18527687f7d9fca0731d197f8feee3d3d8618 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 24 Feb 2024 04:50:30 -0800
Subject: [PATCH 11/35] Update coverage from 7.4.1 to 7.4.3 (#4888)

---
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 8225dab0f..618226f6d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ sphinx-autobuild==2024.2.4 # https://github.com/GaretJax/sphinx-autobuild
 # Code quality
 # ------------------------------------------------------------------------------
 ruff==0.2.2  # https://github.com/astral-sh/ruff
-coverage==7.4.1  # https://github.com/nedbat/coveragepy
+coverage==7.4.3  # https://github.com/nedbat/coveragepy
 djlint==1.34.1  # https://github.com/Riverside-Healthcare/djLint
 pre-commit==3.6.2  # https://github.com/pre-commit/pre-commit
 

From 052330272acfd4eba473fcc05e80e32e1abbbe92 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 24 Feb 2024 18:14:52 +0100
Subject: [PATCH 12/35] Bump Heroku Python version to 3.11.8

---
 {{cookiecutter.project_slug}}/runtime.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt
index 1f79d441f..cf3b80423 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.11.7
+python-3.11.8

From 2c93ef4009a583da58d9b3272511a38a48d3c0cc Mon Sep 17 00:00:00 2001
From: Jelmer Draaijer <info@jelmert.nl>
Date: Sat, 24 Feb 2024 19:31:34 +0100
Subject: [PATCH 13/35] Entrance justify-content-center with a sice of md-4

---
 .../templates/allauth/layouts/entrance.html                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html
index 2632f3c56..156a6e930 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html
@@ -9,8 +9,8 @@
   {% endblock head_title %}
 {% endblock title %}
 {% block body %}
-  <div class="d-flex align-items-center h-100 py-4">
-    <div class="m-auto py-4 my-4">
+  <div class="d-flex justify-content-center h-100 py-4">
+    <div class="col-md-4 py-4 my-4 px-4">
       {% block content %}
       {% endblock content %}
     </div>

From 0e41e5e8d047bb565a7e7c9a22f9804d1459e1b7 Mon Sep 17 00:00:00 2001
From: Jelmer Draaijer <info@jelmert.nl>
Date: Sat, 24 Feb 2024 19:32:56 +0100
Subject: [PATCH 14/35] Added messages to entrance page

---
 .../templates/allauth/layouts/entrance.html           | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html
index 156a6e930..91cbaba3f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/layouts/entrance.html
@@ -11,6 +11,17 @@
 {% block body %}
   <div class="d-flex justify-content-center h-100 py-4">
     <div class="col-md-4 py-4 my-4 px-4">
+      {% if messages %}
+        {% for message in messages %}
+          <div class="alert alert-dismissible {% if message.tags %}alert-{{ message.tags }}{% endif %}">
+            {{ message }}
+            <button type="button"
+                    class="btn-close"
+                    data-bs-dismiss="alert"
+                    aria-label="Close"></button>
+          </div>
+        {% endfor %}
+      {% endif %}
       {% block content %}
       {% endblock content %}
     </div>

From c3708c080981349e3e728a4284de1685424649f3 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 25 Feb 2024 02:12:02 +0000
Subject: [PATCH 15/35] Release 2024.02.24

---
 CHANGELOG.md | 7 +++++++
 setup.py     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 088e814c0..2c8430927 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2024.02.24
+
+
+### Updated
+
+- Update coverage to 7.4.3 ([#4888](https://github.com/cookiecutter/cookiecutter-django/pull/4888))
+
 ## 2024.02.23
 
 
diff --git a/setup.py b/setup.py
index f7947b0e7..f5a26920f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2024.02.23"
+version = "2024.02.24"
 
 with open("README.md") as readme_file:
     long_description = readme_file.read()

From 56f630bae6bccaf6cfd34c5b1c30eaf1e5fd3c33 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 25 Feb 2024 02:12:07 +0000
Subject: [PATCH 16/35] Update pytest from 8.0.1 to 8.0.2

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 138744a26..70bc7df81 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.6.2
 # Testing
 # ------------------------------------------------------------------------------
 tox==4.13.0
-pytest==8.0.1
+pytest==8.0.2
 pytest-xdist==3.5.0
 pytest-cookies==0.7.0
 pytest-instafail==0.5.0

From c7872e6c0fc7a8ac4b27de2903b9f385461098d1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 25 Feb 2024 02:12:07 +0000
Subject: [PATCH 17/35] Update pytest from 8.0.1 to 8.0.2

---
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 618226f6d..0de14977a 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchfiles==0.21.0  # https://github.com/samuelcolvin/watchfiles
 # ------------------------------------------------------------------------------
 mypy==1.7.1  # https://github.com/python/mypy
 django-stubs[compatible-mypy]==4.2.7  # https://github.com/typeddjango/django-stubs
-pytest==8.0.1  # https://github.com/pytest-dev/pytest
+pytest==8.0.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==1.0.0  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs[compatible-mypy]==3.14.5  # https://github.com/typeddjango/djangorestframework-stubs

From 5f2c9e6e409a55a8d64a65aa5f55890b50fe5197 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 25 Feb 2024 09:38:31 +0000
Subject: [PATCH 18/35] Update crispy-bootstrap5 from 2023.10 to 2024.2

---
 {{cookiecutter.project_slug}}/requirements/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index f090018ef..5ad49607d 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -33,7 +33,7 @@ django-environ==0.11.2  # https://github.com/joke2k/django-environ
 django-model-utils==4.4.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.61.1  # https://github.com/pennersr/django-allauth
 django-crispy-forms==2.1  # https://github.com/django-crispy-forms/django-crispy-forms
-crispy-bootstrap5==2023.10  # https://github.com/django-crispy-forms/crispy-bootstrap5
+crispy-bootstrap5==2024.2  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 django-compressor==4.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}

From 1174889779c7569c5516d89bf5d479b84587ee9d Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 27 Feb 2024 02:09:36 +0000
Subject: [PATCH 19/35] Release 2024.02.26

---
 CHANGELOG.md | 13 +++++++++++++
 setup.py     |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c8430927..42cce9d2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2024.02.26
+
+
+### Changed
+
+- Allauth elements &amp; MFA ([#4843](https://github.com/cookiecutter/cookiecutter-django/pull/4843))
+
+### Updated
+
+- Update pytest to 8.0.2 ([#4890](https://github.com/cookiecutter/cookiecutter-django/pull/4890))
+
+- Update crispy-bootstrap5 to 2024.2 ([#4891](https://github.com/cookiecutter/cookiecutter-django/pull/4891))
+
 ## 2024.02.24
 
 
diff --git a/setup.py b/setup.py
index f5a26920f..8c2374049 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2024.02.24"
+version = "2024.02.26"
 
 with open("README.md") as readme_file:
     long_description = readme_file.read()

From f86df89db9b34d8ede8cb8c348cddc293d9ed70a Mon Sep 17 00:00:00 2001
From: Reggie Riser <reggie@truss.works>
Date: Tue, 27 Feb 2024 14:53:12 -0500
Subject: [PATCH 20/35] Fixed invalid HTML in django-allauth field element
 template

---
 .../templates/allauth/elements/field.html                    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/field.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/field.html
index 1ed9309a2..8585f7a4d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/field.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/allauth/elements/field.html
@@ -33,7 +33,7 @@
              {% if attrs.autocomplete %}autocomplete="{{ attrs.autocomplete }}"{% endif %}
              value="{{ attrs.value|default_if_none:"" }}"
              type="{{ attrs.type }}" />
-      <label class="form-check-label" for="gridRadios1">
+      <label class="form-check-label" for="{{ attrs.id }}">
         {% slot label %}
       {% endslot %}
     </label>
@@ -62,6 +62,5 @@
 </div>
 {% endif %}
 {% if slots.help_text %}
-  <div class="form-text">{% slot help_text %}</div>
-{% endslot %}
+  <div class="form-text">{% slot help_text %}{% endslot %}</div>
 {% endif %}{% endraw %}

From 81a1fc8a38e94c3b19ce617c812574179beedba8 Mon Sep 17 00:00:00 2001
From: JAEGYUN JUNG <twicegoddessana1229@gmail.com>
Date: Wed, 28 Feb 2024 18:36:39 +0900
Subject: [PATCH 21/35] Fix broken "Two scoops of django" link in FAQ (#4892)

---
 docs/faq.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 52a99467c..9f0b52a7d 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -22,6 +22,6 @@ TODO
 Why doesn't this follow the layout from Two Scoops of Django?
 -------------------------------------------------------------
 
-You may notice that some elements of this project do not exactly match what we describe in chapter 3 of `Two Scoops of Django 1.11`_. The reason for that is this project, amongst other things, serves as a test bed for trying out new ideas and concepts. Sometimes they work, sometimes they don't, but the end result is that it won't necessarily match precisely what is described in the book I co-authored.
+You may notice that some elements of this project do not exactly match what we describe in chapter 3 of `Two Scoops of Django 3.x`_. The reason for that is this project, amongst other things, serves as a test bed for trying out new ideas and concepts. Sometimes they work, sometimes they don't, but the end result is that it won't necessarily match precisely what is described in the book I co-authored.
 
-.. _Two Scoops of Django 1.11: https://www.feldroy.com/collections/django/products/two-scoops-of-django-1-11
+.. _Two Scoops of Django 3.x: https://www.feldroy.com/books/two-scoops-of-django-3-x

From f617433bac2b6ca29cc969ce9180048e1b942121 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 28 Feb 2024 09:37:18 +0000
Subject: [PATCH 22/35] Update Contributors

---
 .github/contributors.json | 5 +++++
 CONTRIBUTORS.md           | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/.github/contributors.json b/.github/contributors.json
index 785ee4b35..534cee5bd 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1528,5 +1528,10 @@
     "name": "Mounir",
     "github_login": "mounirmesselmeni",
     "twitter_username": ""
+  },
+  {
+    "name": "JAEGYUN JUNG",
+    "github_login": "TGoddessana",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 30064acb8..e4edad3f7 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1048,6 +1048,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>JAEGYUN JUNG</td>
+    <td>
+      <a href="https://github.com/TGoddessana">TGoddessana</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Jakub Boukal</td>
     <td>

From 95e5598dfd07bdd6fb0bc898354411c29879ce29 Mon Sep 17 00:00:00 2001
From: Simeon Emanuilov <simeon.emanuilov@gmail.com>
Date: Wed, 28 Feb 2024 11:41:08 +0200
Subject: [PATCH 23/35] Fix permissions for media files when served by nginx
 (#4889)

chore: adding recursive flag for the WORKDIR directory
---
 .../compose/production/django/Dockerfile                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index fb7fec50f..8c000016a 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -117,7 +117,7 @@ COPY --chown=django:django . ${APP_HOME}
 {%- endif %}
 
 # make django owner of the WORKDIR directory as well.
-RUN chown django:django ${APP_HOME}
+RUN chown -R django:django ${APP_HOME}
 
 USER django
 

From ebb6c8b22509096efee343604d9790a75ffd0f58 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 28 Feb 2024 09:41:45 +0000
Subject: [PATCH 24/35] Update Contributors

---
 .github/contributors.json | 5 +++++
 CONTRIBUTORS.md           | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/.github/contributors.json b/.github/contributors.json
index 534cee5bd..b47a56246 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1533,5 +1533,10 @@
     "name": "JAEGYUN JUNG",
     "github_login": "TGoddessana",
     "twitter_username": ""
+  },
+  {
+    "name": "Simeon Emanuilov",
+    "github_login": "s-emanuilov",
+    "twitter_username": "s_emanuilov"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index e4edad3f7..c14c0ea3b 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1846,6 +1846,13 @@ Listed in alphabetical order.
     </td>
     <td>shywn_mrk</td>
   </tr>
+  <tr>
+    <td>Simeon Emanuilov</td>
+    <td>
+      <a href="https://github.com/s-emanuilov">s-emanuilov</a>
+    </td>
+    <td>s_emanuilov</td>
+  </tr>
   <tr>
     <td>Simon Rey</td>
     <td>

From 93e5e16fc2d73a78bcc9da3caad458a6dcde8b4b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 28 Feb 2024 01:42:30 -0800
Subject: [PATCH 25/35] Update sentry-sdk to 1.40.6 (#4893)

---
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 4d96e86e1..d813a8fc4 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg[c]==3.1.18  # https://github.com/psycopg/psycopg
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.40.5  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.40.6  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==2.3.2  # https://github.com/redis/hiredis-py

From e72da846f2413c99a06967a0b090b57273f7f49c Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 28 Feb 2024 06:47:46 -0800
Subject: [PATCH 26/35] Update redis to 5.0.2 (#4895)

---
 {{cookiecutter.project_slug}}/requirements/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index ea0524ebd..eb0d961e8 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -11,7 +11,7 @@ argon2-cffi==23.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.6.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==5.0.1  # https://github.com/redis/redis-py
+redis==5.0.2  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.3.2  # https://github.com/redis/hiredis-py
 {%- endif %}

From b0cfbc35b125541bf4cc91d7aa746331d4d6dfd2 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 29 Feb 2024 02:09:01 +0000
Subject: [PATCH 27/35] Release 2024.02.28

---
 CHANGELOG.md | 19 +++++++++++++++++++
 setup.py     |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42cce9d2f..a4d4c3734 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,25 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2024.02.28
+
+
+### Fixed
+
+- Fix invalid HTML in django-allauth field element template ([#4894](https://github.com/cookiecutter/cookiecutter-django/pull/4894))
+
+- Fix permissions for media files when served by nginx ([#4889](https://github.com/cookiecutter/cookiecutter-django/pull/4889))
+
+### Documentation
+
+- Fix broken &#34;Two scoops of django&#34; link in FAQ ([#4892](https://github.com/cookiecutter/cookiecutter-django/pull/4892))
+
+### Updated
+
+- Update redis to 5.0.2 ([#4895](https://github.com/cookiecutter/cookiecutter-django/pull/4895))
+
+- Update sentry-sdk to 1.40.6 ([#4893](https://github.com/cookiecutter/cookiecutter-django/pull/4893))
+
 ## 2024.02.26
 
 
diff --git a/setup.py b/setup.py
index 8c2374049..c5925976d 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2024.02.26"
+version = "2024.02.28"
 
 with open("README.md") as readme_file:
     long_description = readme_file.read()

From 46c0c51c520ed938ff08e6e2310aa993de505134 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 29 Feb 2024 15:44:35 +0000
Subject: [PATCH 28/35] Update ruff from 0.2.2 to 0.3.0

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 70bc7df81..be7416bd1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-ruff==0.2.2
+ruff==0.3.0
 django-upgrade==1.16.0
 djlint==1.34.1
 pre-commit==3.6.2

From 48fadda99a54fe156c49699f45ebf12fe79c6224 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 29 Feb 2024 15:44:35 +0000
Subject: [PATCH 29/35] Update ruff from 0.2.2 to 0.3.0

---
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 0de14977a..fc39202cd 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -28,7 +28,7 @@ sphinx-autobuild==2024.2.4 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
 # ------------------------------------------------------------------------------
-ruff==0.2.2  # https://github.com/astral-sh/ruff
+ruff==0.3.0  # https://github.com/astral-sh/ruff
 coverage==7.4.3  # https://github.com/nedbat/coveragepy
 djlint==1.34.1  # https://github.com/Riverside-Healthcare/djLint
 pre-commit==3.6.2  # https://github.com/pre-commit/pre-commit

From 4887b921481e805e15af952e8fc1a4457a980acb Mon Sep 17 00:00:00 2001
From: browniebroke <861044+browniebroke@users.noreply.github.com>
Date: Fri, 1 Mar 2024 02:24:13 +0000
Subject: [PATCH 30/35] Auto-update pre-commit hooks

---
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 1d06c042f..d95f5390d 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -35,7 +35,7 @@ repos:
 
   # Run the Ruff linter.
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.2
+    rev: v0.3.0
     hooks:
       # Linter
       - id: ruff

From 22d927ed1767361a5139f787ee51e7bf9a96332e Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 2 Mar 2024 02:08:19 +0000
Subject: [PATCH 31/35] Release 2024.03.01

---
 CHANGELOG.md | 13 +++++++++++++
 setup.py     |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4d4c3734..e8d825295 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2024.03.01
+
+
+### Changed
+
+- Add a maintainer guide to the docs ([#4884](https://github.com/cookiecutter/cookiecutter-django/pull/4884))
+
+### Updated
+
+- Auto-update pre-commit hooks ([#4897](https://github.com/cookiecutter/cookiecutter-django/pull/4897))
+
+- Update ruff to 0.3.0 ([#4896](https://github.com/cookiecutter/cookiecutter-django/pull/4896))
+
 ## 2024.02.28
 
 
diff --git a/setup.py b/setup.py
index c5925976d..db90aae34 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2024.02.28"
+version = "2024.03.01"
 
 with open("README.md") as readme_file:
     long_description = readme_file.read()

From 6d6f037b07b710dafba333dfe7eb287871361b52 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 3 Mar 2024 10:56:41 -0800
Subject: [PATCH 32/35] Update django-celery-beat from 2.5.0 to 2.6.0 (#4899)

---
 {{cookiecutter.project_slug}}/requirements/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index eb0d961e8..6fe3628de 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -17,7 +17,7 @@ hiredis==2.3.2  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
 celery==5.3.6  # pyup: < 6.0  # https://github.com/celery/celery
-django-celery-beat==2.5.0  # https://github.com/celery/django-celery-beat
+django-celery-beat==2.6.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==2.0.1  # https://github.com/mher/flower
 {%- endif %}

From 3d4dcee35637e22ed493537fe74baa18034b5604 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 4 Mar 2024 02:33:36 +0000
Subject: [PATCH 33/35] Release 2024.03.03

---
 CHANGELOG.md | 7 +++++++
 setup.py     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8d825295..8cf537eb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2024.03.03
+
+
+### Updated
+
+- Update django-celery-beat to 2.6.0 ([#4899](https://github.com/cookiecutter/cookiecutter-django/pull/4899))
+
 ## 2024.03.01
 
 
diff --git a/setup.py b/setup.py
index db90aae34..6e1ea0727 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2024.03.01"
+version = "2024.03.03"
 
 with open("README.md") as readme_file:
     long_description = readme_file.read()

From 2aff1bdb7531bd46724fba9b9787103c9989d5b8 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 4 Mar 2024 04:32:18 -0800
Subject: [PATCH 34/35] Update django to 4.2.11 (#4901)

---
 {{cookiecutter.project_slug}}/requirements/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 6fe3628de..3aad4c947 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -28,7 +28,7 @@ uvicorn[standard]==0.27.1  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==4.2.10  # pyup: < 5.0  # https://www.djangoproject.com/
+django==4.2.11  # pyup: < 5.0  # https://www.djangoproject.com/
 django-environ==0.11.2  # https://github.com/joke2k/django-environ
 django-model-utils==4.4.0  # https://github.com/jazzband/django-model-utils
 django-allauth[mfa]==0.61.1  # https://github.com/pennersr/django-allauth

From 0b4e92739c3c03ccf35f891c1c0ed35c3c3e3b74 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 4 Mar 2024 04:36:36 -0800
Subject: [PATCH 35/35] Update pytest to 8.1.0 (#4900)

* Update pytest from 8.0.2 to 8.1.0

* Update pytest from 8.0.2 to 8.1.0
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index be7416bd1..4fcc7bb8c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.6.2
 # Testing
 # ------------------------------------------------------------------------------
 tox==4.13.0
-pytest==8.0.2
+pytest==8.1.0
 pytest-xdist==3.5.0
 pytest-cookies==0.7.0
 pytest-instafail==0.5.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index fc39202cd..4acd2c4dd 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchfiles==0.21.0  # https://github.com/samuelcolvin/watchfiles
 # ------------------------------------------------------------------------------
 mypy==1.7.1  # https://github.com/python/mypy
 django-stubs[compatible-mypy]==4.2.7  # https://github.com/typeddjango/django-stubs
-pytest==8.0.2  # https://github.com/pytest-dev/pytest
+pytest==8.1.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==1.0.0  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs[compatible-mypy]==3.14.5  # https://github.com/typeddjango/djangorestframework-stubs